Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-openoffice grimoire by Eric Sandall (252d6cf07ee1ae785db34adc93563cf4a7f8e47f)

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-openoffice grimoire by Eric Sandall (252d6cf07ee1ae785db34adc93563cf4a7f8e47f)
  • Date: Sun, 23 Sep 2007 18:41:58 -0500

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

ChangeLog
| 131
accounts
| 1
antivirus/clamav/DETAILS
| 2
antivirus/clamav/HISTORY
| 6
antivirus/clamav/PRE_REMOVE
| 4
archive-libs/zziplib/DETAILS
| 4
archive-libs/zziplib/HISTORY
| 3
archive/amanda/amanda-2.5.2p1.tar.gz.sig
|binary
archive/backup-manager/DETAILS
| 11
archive/backup-manager/HISTORY
| 3
archive/cpio/HISTORY
| 5
archive/cpio/PRE_BUILD
| 3
archive/cpio/cpio-futimens.patch
| 27
archive/dar/DETAILS
| 4
archive/dar/HISTORY
| 3
archive/gzip/HISTORY
| 5
archive/gzip/PRE_BUILD
| 3
archive/gzip/gzip-futimens.patch
| 39
archive/p7zip/DETAILS
| 4
archive/p7zip/HISTORY
| 6
archive/rsnapshot/BUILD
| 12
archive/rsnapshot/DEPENDS
| 4
archive/rsnapshot/DETAILS
| 16
archive/rsnapshot/FINAL
| 4
archive/rsnapshot/HISTORY
| 2
archive/star/DETAILS
| 7
archive/star/HISTORY
| 5
archive/tar/DETAILS
| 2
archive/tar/HISTORY
| 5
archive/tar/PRE_BUILD
| 7
archive/tar/contains_dot_dot.diff
| 15
asterisk.gpg
|binary
audio-creation/ardour2/BUILD
| 2
audio-creation/ardour2/CONFIGURE
| 20
audio-creation/ardour2/DEPENDS
| 37
audio-creation/ardour2/DETAILS
| 22
audio-creation/ardour2/HISTORY
| 2
audio-creation/ardour2/INSTALL
| 1
audio-creation/espeak/DETAILS
| 4
audio-creation/espeak/HISTORY
| 6
audio-creation/gtkpod/DEPENDS
| 1
audio-creation/gtkpod/DETAILS
| 5
audio-creation/gtkpod/HISTORY
| 6
audio-creation/gtkpod/gtkpod-0.99.8.tar.gz.sig
| 0
audio-creation/nekobee/DEPENDS
| 7
audio-creation/nekobee/DETAILS
| 6
audio-creation/nekobee/HISTORY
| 6
audio-creation/nekobee/PRE_BUILD
| 6
audio-creation/nekobee/nekobee_gtk.patch
| 14
audio-creation/qsynth/BUILD
| 3
audio-creation/qsynth/CONFIGURE
| 4
audio-creation/qsynth/DEPENDS
| 12
audio-creation/qsynth/DETAILS
| 14
audio-creation/qsynth/HISTORY
| 11
audio-creation/qsynth/PRE_BUILD
| 7
audio-creation/rosegarden/DETAILS
| 15
audio-creation/rosegarden/HISTORY
| 7
audio-creation/rosegarden/PREPARE
| 6
audio-creation/soundtracker/BUILD
| 2
audio-creation/soundtracker/DEPENDS
| 2
audio-creation/soundtracker/DETAILS
| 7
audio-creation/soundtracker/HISTORY
| 9
audio-creation/soundtracker/soundtracker-0.6.8.tar.gz.sig
|binary
audio-creation/specimen/DEPENDS
| 7
audio-creation/specimen/DETAILS
| 19
audio-creation/specimen/HISTORY
| 8
audio-creation/specimen/PREPARE
| 6
audio-creation/specimen/PRE_BUILD
| 7
audio-drivers/alsa-driver/DETAILS
| 4
audio-drivers/alsa-driver/HISTORY
| 3
audio-drivers/alsa-firmware/DETAILS
| 4
audio-drivers/alsa-firmware/HISTORY
| 3
audio-drivers/alsa-lib/DETAILS
| 4
audio-drivers/alsa-lib/HISTORY
| 4
audio-drivers/alsa-lib/PRE_BUILD
| 7
audio-drivers/alsa-plugins/DETAILS
| 4
audio-drivers/alsa-plugins/HISTORY
| 3
audio-drivers/alsa-utils/DETAILS
| 4
audio-drivers/alsa-utils/HISTORY
| 3
audio-drivers/jack-cvs/HISTORY
| 3
audio-drivers/jack-cvs/PROVIDES
| 1
audio-drivers/jackdmp/DEPENDS
| 3
audio-drivers/jackdmp/DETAILS
| 4
audio-drivers/jackdmp/HISTORY
| 9
audio-drivers/jackdmp/INSTALL
| 30
audio-drivers/jackdmp/jack.pc
| 10
audio-drivers/pyalsa/DETAILS
| 4
audio-drivers/pyalsa/HISTORY
| 3
audio-drivers/yiff/DETAILS
| 8
audio-drivers/yiff/HISTORY
| 3
audio-libs/libgpod/DETAILS
| 5
audio-libs/libgpod/HISTORY
| 3
audio-libs/libgpod/libgpod-0.4.0.tar.gz.sig
| 0
audio-libs/libtunepimp/DETAILS
| 1
audio-libs/libtunepimp/HISTORY
| 4
audio-libs/libtunepimp/UP_TRIGGERS
| 6
audio-libs/lilypond/DETAILS
| 4
audio-libs/lilypond/HISTORY
| 3
audio-libs/trm/HISTORY
| 5
audio-libs/trm/PRE_BUILD
| 3
audio-libs/trm/qualification.patch
| 12
audio-players/amarok/HISTORY
| 3
audio-players/amarok/TRIGGERS
| 3
audio-players/audacious/DEPENDS
| 1
audio-players/audacious/HISTORY
| 3
audio-players/banshee/DETAILS
| 2
audio-players/banshee/HISTORY
| 6
audio-players/banshee/banshee-0.12.1.tar.gz.sig
| 0
audio-players/banshee/banshee-0.13.1.tar.gz.sig
|binary
audio-players/bmpx/DETAILS
| 4
audio-players/bmpx/HISTORY
| 6
audio-players/lame/BUILD
| 4
audio-players/lame/DEPENDS
| 4
audio-players/lame/DETAILS
| 7
audio-players/lame/HISTORY
| 8
audio-players/lame/PRE_BUILD
| 10
audio-players/moc/DETAILS
| 4
audio-players/moc/HISTORY
| 3
audio-players/ncmpc/DETAILS
| 4
audio-players/ncmpc/HISTORY
| 4
audio-players/ncmpc/PRE_BUILD
| 3
audio-players/ncmpc/ncmpc-wide-char.patch
| 20
audio-players/rhythmbox/DETAILS
| 2
audio-players/rhythmbox/HISTORY
| 3
audio-players/rhythmbox/rhythmbox-0.10.1.tar.bz2.sig
| 0
audio-players/rhythmbox/rhythmbox-0.11.2.tar.bz2.sig
|binary
audio-players/sonata/DETAILS
| 4
audio-players/sonata/HISTORY
| 3
audio-players/sound-juicer/DETAILS
| 2
audio-players/sound-juicer/HISTORY
| 6
audio-players/sound-juicer/sound-juicer-2.16.4.tar.gz.sig
| 0
audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig
|binary
audio-soft/cuetools/DETAILS
| 14
audio-soft/cuetools/HISTORY
| 2
audio-soft/eyeD3/BUILD
| 1
audio-soft/eyeD3/DEPENDS
| 1
audio-soft/eyeD3/DETAILS
| 17
audio-soft/eyeD3/HISTORY
| 5
audio-soft/eyeD3/INSTALL
| 1
audio-soft/eyeD3/PRE_BUILD
| 1
audio-soft/eyeD3/TRIGGERS
| 1
audio-soft/eyed3/CONFLICTS
| 1
audio-soft/eyed3/DEPENDS
| 1
audio-soft/eyed3/DETAILS
| 16
audio-soft/eyed3/HISTORY
| 2
audio-soft/fusepod/DEPENDS
| 5
audio-soft/fusepod/DETAILS
| 17
audio-soft/fusepod/HISTORY
| 7
audio-soft/gnupod/3A2F207A.gpg
|binary
audio-soft/gnupod/DETAILS
| 7
audio-soft/gnupod/HISTORY
| 5
audio-soft/qjackctl/BUILD
| 4
audio-soft/qjackctl/CONFIGURE
| 10
audio-soft/qjackctl/DEPENDS
| 14
audio-soft/qjackctl/DETAILS
| 21
audio-soft/qjackctl/HISTORY
| 19
audio-soft/qjackctl/PRE_BUILD
| 13
audio-soft/qjackctl/qt4_bin_path_fix.diff
| 12
audio-soft/qloud/DETAILS
| 4
audio-soft/qloud/HISTORY
| 3
audio-soft/shntool/DETAILS
| 6
audio-soft/shntool/HISTORY
| 3
chat-im/amsn/DETAILS
| 12
chat-im/amsn/HISTORY
| 4
chat-im/amsn/amsn-0.96.tar.bz2.sig
| 0
chat-im/amsn/amsn-0.97RC1.tar.bz2.sig
|binary
chat-im/ayttm/BUILD
| 7
chat-im/ayttm/DEPENDS
| 14
chat-im/ayttm/DETAILS
| 8
chat-im/ayttm/HISTORY
| 11
chat-im/ayttm/ayttm-0.5.0-10.tar.bz2.sig
|binary
chat-im/centerim/DETAILS
| 2
chat-im/centerim/HISTORY
| 3
chat-im/centerim/centerim-20070618.tar.gz.sig
| 0
chat-im/centerim/centerim-20070625.tar.gz.sig
|binary
chat-im/ekiga/DETAILS
| 4
chat-im/ekiga/HISTORY
| 3
chat-im/ekiga/ekiga-2.0.11.tar.gz.sig
|binary
chat-im/ekiga/ekiga-2.0.9.tar.gz.sig
| 0
chat-im/gajim/DEPENDS
| 1
chat-im/gajim/DETAILS
| 2
chat-im/gajim/HISTORY
| 6
chat-im/gajim/gajim-0.11.1.tar.bz2.sig
| 0
chat-im/gajim/gajim-0.11.2.tar.bz2.sig
|binary
chat-im/gossip/DETAILS
| 2
chat-im/gossip/HISTORY
| 3
chat-im/gossip/gossip-0.26.tar.bz2.sig
| 0
chat-im/gossip/gossip-0.27.tar.bz2.sig
|binary
chat-im/pidgin-otr/DETAILS
| 4
chat-im/pidgin-otr/HISTORY
| 3
chat-im/pidgin-otr/pidgin-otr-3.0.1.tar.gz.sig
| 0
chat-im/pidgin-otr/pidgin-otr-3.1.0.tar.gz.sig
|binary
chat-im/pidgin/BUILD
| 1
chat-im/pidgin/DETAILS
| 2
chat-im/pidgin/HISTORY
| 10
chat-im/pidgin/pidgin-2.1.0.tar.bz2.sig
| 0
chat-im/pidgin/pidgin-2.2.0.tar.bz2.sig
|binary
chat-irc/bitlbee/DETAILS
| 3
chat-irc/bitlbee/HISTORY
| 3
chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig
| 0
chat-irc/bitlbee/bitlbee-1.0.4.tar.gz.sig
|binary
chat-irc/weechat/DETAILS
| 2
chat-irc/weechat/HISTORY
| 9
chat-irc/weechat/weechat-0.2.5.tar.bz2.sig
| 0
chat-irc/weechat/weechat-0.2.6.tar.bz2.sig
|binary
chat-libs/libotr/DETAILS
| 4
chat-libs/libotr/HISTORY
| 3
chat-libs/loudmouth/DEPENDS
| 1
chat-libs/loudmouth/DETAILS
| 2
chat-libs/loudmouth/HISTORY
| 4
chat-libs/loudmouth/loudmouth-1.2.2.tar.bz2.sig
| 0
chat-libs/loudmouth/loudmouth-1.2.3.tar.bz2.sig
|binary
chat-libs/opal/DETAILS
| 4
chat-libs/opal/HISTORY
| 3
chat-libs/opal/opal-2.2.11.tar.gz.sig
|binary
chat-libs/opal/opal-2.2.8.tar.gz.sig
| 0
chat-libs/pwlib/DETAILS
| 5
chat-libs/pwlib/HISTORY
| 4
chat-libs/pwlib/pwlib-1.10.10.tar.gz.sig
|binary
chat-libs/pwlib/pwlib-1.10.7.tar.gz.sig
| 0
cluster/mpich2/DETAILS
| 6
cluster/mpich2/HISTORY
| 3
cluster/mpich2/mpich2-1.0.3.tar.gz.sig
| 0
cluster/mpich2/mpich2-1.0.6.tar.gz.sig
|binary
collab/openldap/DETAILS
| 9
collab/openldap/HISTORY
| 4
collab/subversion/DETAILS
| 6
collab/subversion/HISTORY
| 3
collab/webmin/DETAILS
| 4
collab/webmin/HISTORY
| 3
crypto/cryptsetup-luks/BUILD
| 5
crypto/cryptsetup-luks/FINAL
| 1
crypto/cryptsetup-luks/HISTORY
| 6
crypto/cryptsetup-luks/INSTALL
| 4
crypto/cryptsetup-luks/PRE_BUILD
| 3
crypto/gnupg-exp/DETAILS
| 2
crypto/gnupg-exp/HISTORY
| 3
crypto/gnutls/DETAILS
| 5
crypto/gnutls/HISTORY
| 6
crypto/gnutls/PREPARE
| 2
crypto/krb5/BUILD
| 3
crypto/krb5/DETAILS
| 2
crypto/krb5/HISTORY
| 4
crypto/krb5/MITKRB5-SA-2007-006.txt
| 294
crypto/libassuan/DETAILS
| 2
crypto/libassuan/HISTORY
| 3
crypto/opencdk/DETAILS
| 22
crypto/opencdk/HISTORY
| 10
crypto/opencdk/PREPARE
| 1
crypto/opencdk/opencdk.gpg
|binary
crypto/openct/DETAILS
| 4
crypto/openct/HISTORY
| 6
crypto/opensc/DETAILS
| 4
crypto/opensc/HISTORY
| 3
crypto/openssh/DETAILS
| 3
crypto/openssh/HISTORY
| 3
crypto/pcsc-lite/DETAILS
| 6
crypto/pcsc-lite/HISTORY
| 3
crypto/pgpdump/DETAILS
| 8
crypto/pgpdump/HISTORY
| 3
crypto/qca2/DETAILS
| 6
crypto/qca2/HISTORY
| 6
crypto/seahorse/DETAILS
| 8
crypto/seahorse/HISTORY
| 6
database/firebird/DETAILS
| 9
database/firebird/HISTORY
| 13
database/firebird/PREPARE
| 2
database/firebird/fb2.0.patch.bz2
|binary
database/pgadmin3/DEPENDS
| 4
database/pgadmin3/DETAILS
| 7
database/pgadmin3/HISTORY
| 18
database/pgadmin3/pgadmin3.gpg
|binary
database/postgresql/DEPENDS
| 5
database/postgresql/DETAILS
| 6
database/postgresql/HISTORY
| 12
database/postgresql/PRE_BUILD
| 4
database/postgresql/pgcluster-1.7.0rc3-patch.tar.gz
| 0
database/postgresql/pgcluster-1.7.0rc7.patch.tar.gz
|binary
database/pxlib/DETAILS
| 5
database/pxlib/HISTORY
| 3
database/tora/DETAILS
| 4
database/tora/HISTORY
| 3
dev/null
|binary
devel/anjuta/DEPENDS
| 2
devel/anjuta/HISTORY
| 3
devel/binutils/DETAILS
| 3
devel/binutils/HISTORY
| 3
devel/bisonc++/DETAILS
| 4
devel/bisonc++/HISTORY
| 3
devel/boost-jam/HISTORY
| 5
devel/boost-jam/PRE_BUILD
| 4
devel/boost-jam/gcc_42_fix.diff
| 11
devel/darcs/DEPENDS
| 5
devel/darcs/DETAILS
| 4
devel/darcs/HISTORY
| 4
devel/fpc/DETAILS
| 6
devel/fpc/HISTORY
| 3
devel/fpcsrc/DETAILS
| 6
devel/fpcsrc/HISTORY
| 5
devel/ghc/HISTORY
| 3
devel/ghc/POST_RESURRECT
| 7
devel/ghc/PRE_RESURRECT
| 7
devel/git/DETAILS
| 3
devel/git/HISTORY
| 6
devel/graphviz/DEPENDS
| 5
devel/graphviz/DETAILS
| 4
devel/graphviz/HISTORY
| 4
devel/graphviz/PRE_BUILD
| 4
devel/graphviz/diffimg.patch
| 16
devel/graphviz/no_postscript_alias.diff
| 14
devel/jruby/DETAILS
| 4
devel/jruby/HISTORY
| 4
devel/jruby/INSTALL
| 2
devel/mono/DETAILS
| 5
devel/mono/HISTORY
| 6
devel/phpmyadmin/DETAILS
| 4
devel/phpmyadmin/HISTORY
| 6
devel/pkgconfig/BUILD
| 2
devel/pkgconfig/HISTORY
| 4
devel/pkgconfig/INSTALL
| 6
devel/pkgconfig/profile.d/pkgconfig.sh
| 8
devel/qt4pas/DETAILS
| 4
devel/qt4pas/HISTORY
| 18
devel/qt4pas/TRIGGERS
| 1
devel/ragel/DETAILS
| 2
devel/ragel/HISTORY
| 3
devel/rake/DETAILS
| 6
devel/rake/HISTORY
| 3
devel/re2c/DETAILS
| 4
devel/re2c/HISTORY
| 3
devel/ruby-ecore/DEPENDS
| 2
devel/ruby-ecore/DETAILS
| 5
devel/ruby-ecore/HISTORY
| 4
devel/ruby-edje/DEPENDS
| 2
devel/ruby-edje/DETAILS
| 5
devel/ruby-edje/HISTORY
| 4
devel/ruby-esmart/DEPENDS
| 2
devel/ruby-esmart/DETAILS
| 5
devel/ruby-esmart/HISTORY
| 4
devel/ruby-evas/DEPENDS
| 2
devel/ruby-evas/DETAILS
| 5
devel/ruby-evas/HISTORY
| 4
devel/rubygems/DETAILS
| 6
devel/rubygems/HISTORY
| 3
devel/slang/DETAILS
| 2
devel/slang/HISTORY
| 3
devel/vala/DETAILS
| 2
devel/vala/HISTORY
| 3
devel/vala/vala-0.1.2.tar.bz2.sig
| 0
devel/vala/vala-0.1.3.tar.bz2.sig
|binary
devel/valgrind/DEPENDS
| 6
devel/valgrind/HISTORY
| 5
devel/valgrind/PRE_BUILD
| 7
devel/valgrind/glibc_2.6_fix.diff
| 266
disk/acl/DETAILS
| 4
disk/acl/HISTORY
| 3
disk/attr/DETAILS
| 4
disk/attr/HISTORY
| 3
disk/brasero/DEPENDS
| 2
disk/brasero/DETAILS
| 5
disk/brasero/HISTORY
| 4
disk/brasero/brasero-0.5.1.tar.bz2.sig
| 0
disk/brasero/brasero-0.6.1.tar.bz2.sig
|binary
disk/cdrdao/DETAILS
| 8
disk/cdrdao/HISTORY
| 3
disk/cdrdao/PREPARE
| 6
disk/fuse-python/BUILD
| 2
disk/fuse-python/DETAILS
| 10
disk/fuse-python/HISTORY
| 5
disk/fuse-python/INSTALL
| 1
disk/hdparm/DETAILS
| 2
disk/hdparm/HISTORY
| 5
disk/hdparm/INSTALL
| 6
disk/hdparm/init.d/hdparm
| 3
disk/jfsutils/DETAILS
| 5
disk/jfsutils/HISTORY
| 3
disk/jfsutils/jfsutils-1.1.11.tar.gz.sig
| 0
disk/lvm/DETAILS
| 4
disk/lvm/HISTORY
| 3
disk/mdadm/DETAILS
| 12
disk/mdadm/HISTORY
| 3
disk/mdadm/mdadm-2.6.3.tgz.sig
|binary
disk/netatalk/BUILD
| 2
disk/netatalk/CONFIGURE
| 36
disk/netatalk/DETAILS
| 14
disk/netatalk/HISTORY
| 10
disk/netatalk/PRE_BUILD
| 4
disk/netatalk/netatalk-2.0.3-db43.patch
| 32
disk/netatalk/netatalk-2.0.3-newerdb.patch
| 28
disk/ntfs-3g/DETAILS
| 4
disk/ntfs-3g/HISTORY
| 9
disk/parted/BUILD
| 2
disk/parted/HISTORY
| 3
disk/partimage/DETAILS
| 4
disk/partimage/HISTORY
| 3
disk/udev/DETAILS
| 3
disk/udev/HISTORY
| 8
disk/udev/init.d/coldplug
| 13
disk/xfsdump/DETAILS
| 4
disk/xfsdump/HISTORY
| 3
disk/xfsprogs/DETAILS
| 4
disk/xfsprogs/HISTORY
| 3
doc/devhelp/DETAILS
| 2
doc/devhelp/HISTORY
| 3
doc/devhelp/devhelp-0.15.tar.bz2.sig
| 0
doc/devhelp/devhelp-0.16.tar.bz2.sig
|binary
doc/evince/DEPENDS
| 2
doc/evince/DETAILS
| 2
doc/evince/HISTORY
| 11
doc/evince/PRE_BUILD
| 7
doc/evince/evince-0.8.3.tar.bz2.sig
| 0
doc/evince/evince-2.20.0.tar.bz2.sig
|binary
doc/gnucash-docs/DEPENDS
| 4
doc/gnucash-docs/HISTORY
| 3
doc/man-pages-cs/DETAILS
| 4
doc/man-pages-cs/HISTORY
| 3
doc/man-pages-fr/DETAILS
| 8
doc/man-pages-fr/HISTORY
| 3
doc/man-pages/DETAILS
| 2
doc/man-pages/HISTORY
| 3
doc/pstoedit/DEPENDS
| 13
doc/pstoedit/DETAILS
| 8
doc/pstoedit/HISTORY
| 6
e/e-emotion/DEPENDS
| 10
e/e-emotion/HISTORY
| 4
e/e_dbus/DEPENDS
| 3
e/e_dbus/HISTORY
| 3
e/e_modules/DEPENDS
| 5
e/e_modules/HISTORY
| 3
e/ecore/BUILD
| 2
e/ecore/CONFIGURE
| 3
e/ecore/HISTORY
| 3
e/euphoria/DEPENDS
| 2
e/euphoria/DETAILS
| 2
e/euphoria/HISTORY
| 4
editors/bless/DEPENDS
| 2
editors/bless/HISTORY
| 3
editors/ed/DETAILS
| 2
editors/ed/HISTORY
| 3
editors/lyx/BUILD
| 10
editors/lyx/DEPENDS
| 2
editors/lyx/DETAILS
| 4
editors/lyx/HISTORY
| 5
editors/pdfedit/DETAILS
| 4
editors/pdfedit/HISTORY
| 4
editors/pdfedit/PRE_BUILD
| 3
editors/tea/DETAILS
| 4
editors/tea/HISTORY
| 9
editors/transfig/BUILD
| 3
editors/transfig/DETAILS
| 4
editors/transfig/HISTORY
| 4
editors/transfig/transfig.patch
| 31
editors/xfig/DETAILS
| 4
editors/xfig/HISTORY
| 3
fonts/dejavu-ttf/DETAILS
| 4
fonts/dejavu-ttf/HISTORY
| 3
ftp-libs/libtorrent/DETAILS
| 4
ftp-libs/libtorrent/HISTORY
| 6
ftp/aria2/DETAILS
| 4
ftp/aria2/HISTORY
| 3
ftp/curl/DETAILS
| 4
ftp/curl/HISTORY
| 3
ftp/lftp/DETAILS
| 2
ftp/lftp/HISTORY
| 6
ftp/ncftp/DETAILS
| 2
ftp/ncftp/HISTORY
| 4
ftp/rtorrent/DETAILS
| 4
ftp/rtorrent/HISTORY
| 6
gnome1-libs/gdm/DEPENDS
| 10
gnome1-libs/gdm/HISTORY
| 5
gnome1-libs/gnome-core/DEPENDS
| 2
gnome1-libs/gnome-core/HISTORY
| 3
gnome1-libs/gnome-media/DEPENDS
| 4
gnome1-libs/gnome-media/HISTORY
| 3
gnome1-libs/gnome-user-docs/DEPENDS
| 2
gnome1-libs/gnome-user-docs/HISTORY
| 3
gnome1-libs/libgda/DEPENDS
| 12
gnome1-libs/libgda/HISTORY
| 3
gnome1-libs/nautilus/DEPENDS
| 2
gnome1-libs/nautilus/HISTORY
| 3
gnome2-apps/abiword/DETAILS
| 2
gnome2-apps/abiword/HISTORY
| 3
gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig
| 0
gnome2-apps/abiword/abiword-2.5.2.tar.gz.sig
|binary
gnome2-apps/accerciser/BUILD
| 3
gnome2-apps/accerciser/DEPENDS
| 5
gnome2-apps/accerciser/DETAILS
| 19
gnome2-apps/accerciser/HISTORY
| 2
gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig
|binary
gnome2-apps/balsa/DEPENDS
| 2
gnome2-apps/balsa/HISTORY
| 3
gnome2-apps/deskbar-applet/DETAILS
| 2
gnome2-apps/deskbar-applet/HISTORY
| 3
gnome2-apps/deskbar-applet/deskbar-applet-2.18.1.tar.bz2.sig
| 0
gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig
|binary
gnome2-apps/eog2/DEPENDS
| 2
gnome2-apps/eog2/DETAILS
| 2
gnome2-apps/eog2/HISTORY
| 4
gnome2-apps/eog2/eog-2.18.2.tar.bz2.sig
| 0
gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig
|binary
gnome2-apps/epiphany-extensions/DETAILS
| 2
gnome2-apps/epiphany-extensions/HISTORY
| 3
gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig
| 0
gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig
|binary
gnome2-apps/epiphany/DETAILS
| 2
gnome2-apps/epiphany/HISTORY
| 3
gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig
| 0
gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig
|binary
gnome2-apps/evolution/DEPENDS
| 15
gnome2-apps/evolution/DETAILS
| 2
gnome2-apps/evolution/HISTORY
| 9
gnome2-apps/evolution/evolution-2.10.3.tar.bz2.sig
| 0
gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig
|binary
gnome2-apps/file-roller/DEPENDS
| 2
gnome2-apps/file-roller/DETAILS
| 2
gnome2-apps/file-roller/HISTORY
| 4
gnome2-apps/file-roller/file-roller-2.18.4.tar.gz.sig
| 0
gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig
|binary
gnome2-apps/gazpacho/DETAILS
| 4
gnome2-apps/gazpacho/HISTORY
| 3
gnome2-apps/gcalctool/DEPENDS
| 2
gnome2-apps/gcalctool/DETAILS
| 2
gnome2-apps/gcalctool/HISTORY
| 4
gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig
|binary
gnome2-apps/gcalctool/gcalctool-5.9.14.tar.gz.sig
| 0
gnome2-apps/gedit-plugins/DEPENDS
| 2
gnome2-apps/gedit-plugins/HISTORY
| 3
gnome2-apps/gedit/DEPENDS
| 5
gnome2-apps/gedit/DETAILS
| 2
gnome2-apps/gedit/HISTORY
| 10
gnome2-apps/gedit/gedit-2.18.2.tar.bz2.sig
| 0
gnome2-apps/gedit/gedit-2.20.0.tar.bz2.sig
|binary
gnome2-apps/ggv/DEPENDS
| 2
gnome2-apps/ggv/HISTORY
| 3
gnome2-apps/glabels2/DEPENDS
| 3
gnome2-apps/glabels2/HISTORY
| 3
gnome2-apps/glade2/DEPENDS
| 10
gnome2-apps/glade2/HISTORY
| 3
gnome2-apps/glade3/DETAILS
| 2
gnome2-apps/glade3/HISTORY
| 3
gnome2-apps/glade3/glade3-3.2.2.tar.bz2.sig
| 0
gnome2-apps/glade3/glade3-3.4.0.tar.bz2.sig
|binary
gnome2-apps/gnome-build/DETAILS
| 2
gnome2-apps/gnome-build/HISTORY
| 3
gnome2-apps/gnome-build/gnome-build-0.1.7.tar.bz2.sig
| 0
gnome2-apps/gnome-build/gnome-build-0.2.0.tar.bz2.sig
|binary
gnome2-apps/gnome-keyring-manager/DETAILS
| 2
gnome2-apps/gnome-keyring-manager/HISTORY
| 3
gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.18.0.tar.bz2.sig
| 0
gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.20.0.tar.bz2.sig
|binary
gnome2-apps/gnome-power-manager/DETAILS
| 2
gnome2-apps/gnome-power-manager/HISTORY
| 3
gnome2-apps/gnome-power-manager/gnome-power-manager-2.18.3.tar.gz.sig
| 0
gnome2-apps/gnome-power-manager/gnome-power-manager-2.20.0.tar.gz.sig
|binary
gnome2-apps/gnome-system-tools/DETAILS
| 2
gnome2-apps/gnome-system-tools/HISTORY
| 3
gnome2-apps/gnome-system-tools/gnome-system-tools-2.18.1.tar.bz2.sig
| 0
gnome2-apps/gnome-system-tools/gnome-system-tools-2.20.0.tar.bz2.sig
|binary
gnome2-apps/gnucash/DEPENDS
| 6
gnome2-apps/gnucash/DETAILS
| 11
gnome2-apps/gnucash/HISTORY
| 6
gnome2-apps/gnumeric/CONFIGURE
| 16
gnome2-apps/gnumeric/DEPENDS
| 10
gnome2-apps/gnumeric/DETAILS
| 2
gnome2-apps/gnumeric/HISTORY
| 12
gnome2-apps/gnumeric/PREPARE
| 8
gnome2-apps/gnumeric/gnumeric-1.7.11.tar.bz2.sig
| 0
gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig
|binary
gnome2-apps/gok/DEPENDS
| 2
gnome2-apps/gok/DETAILS
| 2
gnome2-apps/gok/HISTORY
| 4
gnome2-apps/gok/gok-1.2.3.tar.bz2.sig
| 0
gnome2-apps/gok/gok-1.3.4.tar.bz2.sig
|binary
gnome2-apps/goobox/DEPENDS
| 2
gnome2-apps/goobox/DETAILS
| 2
gnome2-apps/goobox/HISTORY
| 4
gnome2-apps/goobox/goobox-1.9.1.tar.bz2.sig
| 0
gnome2-apps/goobox/goobox-1.9.2.tar.bz2.sig
|binary
gnome2-apps/gramps/DEPENDS
| 2
gnome2-apps/gramps/HISTORY
| 3
gnome2-apps/gthumb2/DEPENDS
| 2
gnome2-apps/gthumb2/HISTORY
| 3
gnome2-apps/gucharmap/DETAILS
| 2
gnome2-apps/gucharmap/HISTORY
| 3
gnome2-apps/gucharmap/gucharmap-1.10.0.tar.bz2.sig
| 0
gnome2-apps/gucharmap/gucharmap-1.10.1.tar.bz2.sig
|binary
gnome2-apps/orca/DETAILS
| 2
gnome2-apps/orca/HISTORY
| 3
gnome2-apps/orca/orca-2.18.1.tar.bz2.sig
| 0
gnome2-apps/orca/orca-2.20.0.tar.bz2.sig
|binary
gnome2-apps/pan/DETAILS
| 2
gnome2-apps/pan/HISTORY
| 3
gnome2-apps/pessulus/DEPENDS
| 2
gnome2-apps/pessulus/DETAILS
| 21
gnome2-apps/pessulus/HISTORY
| 2
gnome2-apps/pessulus/pessulus-2.16.3.tar.bz2.sig
|binary
gnome2-apps/sabayon/BUILD
| 3
gnome2-apps/sabayon/DEPENDS
| 8
gnome2-apps/sabayon/DETAILS
| 19
gnome2-apps/sabayon/HISTORY
| 2
gnome2-apps/sabayon/PRE_BUILD
| 4
gnome2-apps/sabayon/sabayon-2.20.1.tar.bz2.sig
|binary
gnome2-apps/sabayon/sabayon-configure.diff
| 32
gnome2-apps/system-tools-backends/DETAILS
| 2
gnome2-apps/system-tools-backends/HISTORY
| 3
gnome2-apps/system-tools-backends/system-tools-backends-2.2.1.tar.bz2.sig
| 0
gnome2-apps/system-tools-backends/system-tools-backends-2.4.0.tar.bz2.sig
|binary
gnome2-apps/tomboy/DETAILS
| 2
gnome2-apps/tomboy/HISTORY
| 3
gnome2-apps/tomboy/tomboy-0.6.3.tar.gz.sig
| 0
gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig
|binary
gnome2-libs/at-spi/DETAILS
| 2
gnome2-libs/at-spi/HISTORY
| 6
gnome2-libs/at-spi/at-spi-1.18.1.tar.bz2.sig
| 0
gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig
|binary
gnome2-libs/atk/DETAILS
| 2
gnome2-libs/atk/HISTORY
| 6
gnome2-libs/atk/atk-1.18.0.tar.bz2.sig
| 0
gnome2-libs/atk/atk-1.20.0.tar.bz2.sig
|binary
gnome2-libs/bug-buddy2/DEPENDS
| 3
gnome2-libs/bug-buddy2/DETAILS
| 2
gnome2-libs/bug-buddy2/HISTORY
| 5
gnome2-libs/bug-buddy2/bug-buddy-2.18.1.tar.bz2.sig
| 0
gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig
|binary
gnome2-libs/control-center2/BUILD
| 4
gnome2-libs/control-center2/DEPENDS
| 45
gnome2-libs/control-center2/DETAILS
| 7
gnome2-libs/control-center2/HISTORY
| 3
gnome2-libs/control-center2/INSTALL
| 1
gnome2-libs/control-center2/PRE_BUILD
| 8
gnome2-libs/control-center2/TRIGGERS
| 1
gnome2-libs/dasher/DETAILS
| 2
gnome2-libs/dasher/HISTORY
| 6
gnome2-libs/dasher/dasher-4.4.2.tar.bz2.sig
| 0
gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig
|binary
gnome2-libs/eel2/DETAILS
| 2
gnome2-libs/eel2/HISTORY
| 6
gnome2-libs/eel2/eel-2.18.3.tar.bz2.sig
| 0
gnome2-libs/eel2/eel-2.20.0.tar.bz2.sig
|binary
gnome2-libs/evolution-data-server/DETAILS
| 2
gnome2-libs/evolution-data-server/HISTORY
| 6
gnome2-libs/evolution-data-server/evolution-data-server-1.10.3.1.tar.bz2.sig
| 0
gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
|binary
gnome2-libs/evolution-exchange/DETAILS
| 2
gnome2-libs/evolution-exchange/HISTORY
| 3
gnome2-libs/evolution-exchange/evolution-exchange-2.10.3.tar.bz2.sig
| 0
gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig
|binary
gnome2-libs/evolution-sharp/DETAILS
| 2
gnome2-libs/evolution-sharp/HISTORY
| 3
gnome2-libs/evolution-sharp/evolution-sharp-0.12.4.tar.bz2.sig
| 0
gnome2-libs/evolution-sharp/evolution-sharp-0.14.0.1.tar.bz2.sig
|binary
gnome2-libs/evolution-webcal/DETAILS
| 2
gnome2-libs/evolution-webcal/HISTORY
| 6
gnome2-libs/evolution-webcal/evolution-webcal-2.10.0.tar.bz2.sig
| 0
gnome2-libs/evolution-webcal/evolution-webcal-2.12.0.tar.bz2.sig
|binary
gnome2-libs/fast-user-switch-applet/DEPENDS
| 2
gnome2-libs/fast-user-switch-applet/DETAILS
| 2
gnome2-libs/fast-user-switch-applet/HISTORY
| 4

gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.18.0.tar.bz2.sig
| 0

gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gail/DEPENDS
| 13
gnome2-libs/gail/DETAILS
| 2
gnome2-libs/gail/HISTORY
| 10
gnome2-libs/gail/gail-1.18.0.tar.bz2.sig
| 0
gnome2-libs/gail/gail-1.20.0.tar.bz2.sig
|binary
gnome2-libs/gconf-editor/DETAILS
| 2
gnome2-libs/gconf-editor/HISTORY
| 6
gnome2-libs/gconf-editor/gconf-editor-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gconf-editor/gconf-editor-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gconf2/DETAILS
| 2
gnome2-libs/gconf2/GConf-2.18.0.1.tar.bz2.sig
| 0
gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gconf2/HISTORY
| 6
gnome2-libs/gdm2/DEPENDS
| 2
gnome2-libs/gdm2/DETAILS
| 2
gnome2-libs/gdm2/HISTORY
| 7
gnome2-libs/gdm2/gdm-2.18.4.tar.bz2.sig
| 0
gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig
|binary
gnome2-libs/glib2/DETAILS
| 2
gnome2-libs/glib2/HISTORY
| 3
gnome2-libs/glib2/glib-2.14.0.tar.bz2.sig
| 0
gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig
|binary
gnome2-libs/glibmm/DETAILS
| 2
gnome2-libs/glibmm/HISTORY
| 6
gnome2-libs/glibmm/glibmm-2.12.10.tar.bz2.sig
| 0
gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig
|binary
gnome2-libs/gnome-applets2/DEPENDS
| 2
gnome2-libs/gnome-applets2/DETAILS
| 2
gnome2-libs/gnome-applets2/HISTORY
| 7
gnome2-libs/gnome-applets2/gnome-applets-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-applets2/gnome-applets-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-backgrounds/DETAILS
| 2
gnome2-libs/gnome-backgrounds/HISTORY
| 3
gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig
| 0
gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-common2/DETAILS
| 2
gnome2-libs/gnome-common2/HISTORY
| 3
gnome2-libs/gnome-common2/gnome-common-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-common2/gnome-common-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-control-center/BUILD
| 3
gnome2-libs/gnome-control-center/CONFLICTS
| 5
gnome2-libs/gnome-control-center/DEPENDS
| 44
gnome2-libs/gnome-control-center/DETAILS
| 17
gnome2-libs/gnome-control-center/G_SCHEMAS
| 8
gnome2-libs/gnome-control-center/HISTORY
| 3
gnome2-libs/gnome-control-center/PRE_BUILD
| 7
gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-control-center/volatiles
| 1
gnome2-libs/gnome-desktop/DEPENDS
| 2
gnome2-libs/gnome-desktop/DETAILS
| 2
gnome2-libs/gnome-desktop/HISTORY
| 7
gnome2-libs/gnome-desktop/gnome-desktop-2.18.3.tar.bz2.sig
| 0
gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-devel-docs/DEPENDS
| 2
gnome2-libs/gnome-devel-docs/DETAILS
| 15
gnome2-libs/gnome-devel-docs/HISTORY
| 5
gnome2-libs/gnome-devel-docs/gnome-devel-docs-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-doc-utils/DEPENDS
| 2
gnome2-libs/gnome-doc-utils/DETAILS
| 2
gnome2-libs/gnome-doc-utils/HISTORY
| 7
gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.10.3.tar.bz2.sig
| 0
gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.12.0.tar.bz2.sig
|binary
gnome2-libs/gnome-games-extra-data/DETAILS
| 2
gnome2-libs/gnome-games-extra-data/HISTORY
| 3
gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-games2/DEPENDS
| 2
gnome2-libs/gnome-games2/DETAILS
| 2
gnome2-libs/gnome-games2/HISTORY
| 7
gnome2-libs/gnome-games2/gnome-games-2.18.2.1.tar.bz2.sig
| 0
gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig
|binary
gnome2-libs/gnome-icon-theme/DETAILS
| 2
gnome2-libs/gnome-icon-theme/HISTORY
| 6
gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-keyring/DETAILS
| 2
gnome2-libs/gnome-keyring/HISTORY
| 6
gnome2-libs/gnome-keyring/gnome-keyring-0.8.1.tar.bz2.sig
| 0
gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-mag/DETAILS
| 2
gnome2-libs/gnome-mag/HISTORY
| 6
gnome2-libs/gnome-mag/gnome-mag-0.14.10.tar.bz2.sig
|binary
gnome2-libs/gnome-mag/gnome-mag-0.14.6.tar.bz2.sig
| 0
gnome2-libs/gnome-media2/DEPENDS
| 2
gnome2-libs/gnome-media2/DETAILS
| 2
gnome2-libs/gnome-media2/HISTORY
| 7
gnome2-libs/gnome-media2/gnome-media-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-media2/gnome-media-2.20.1.tar.bz2.sig
|binary
gnome2-libs/gnome-menus/DETAILS
| 2
gnome2-libs/gnome-menus/HISTORY
| 6
gnome2-libs/gnome-menus/gnome-menus-2.18.3.tar.bz2.sig
| 0
gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-nettool/DETAILS
| 2
gnome2-libs/gnome-nettool/HISTORY
| 6
gnome2-libs/gnome-nettool/gnome-nettool-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-nettool/gnome-nettool-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-panel/DEPENDS
| 2
gnome2-libs/gnome-panel/DETAILS
| 2
gnome2-libs/gnome-panel/HISTORY
| 7
gnome2-libs/gnome-panel/gnome-panel-2.18.3.tar.bz2.sig
| 0
gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig
|binary
gnome2-libs/gnome-python-desktop/DETAILS
| 2
gnome2-libs/gnome-python-desktop/HISTORY
| 6
gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-python-extras/DETAILS
| 2
gnome2-libs/gnome-python-extras/HISTORY
| 3
gnome2-libs/gnome-python-extras/gnome-python-extras-2.14.3.tar.bz2.sig
| 0
gnome2-libs/gnome-python-extras/gnome-python-extras-2.19.1.tar.bz2.sig
|binary
gnome2-libs/gnome-python2/DETAILS
| 2
gnome2-libs/gnome-python2/HISTORY
| 3
gnome2-libs/gnome-python2/gnome-python-2.18.2.tar.bz2.sig
| 0
gnome2-libs/gnome-python2/gnome-python-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-screensaver/DEPENDS
| 10
gnome2-libs/gnome-screensaver/DETAILS
| 2
gnome2-libs/gnome-screensaver/HISTORY
| 7
gnome2-libs/gnome-screensaver/gnome-screensaver-2.18.2.tar.bz2.sig
| 0
gnome2-libs/gnome-screensaver/gnome-screensaver-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-session/DEPENDS
| 10
gnome2-libs/gnome-session/DETAILS
| 2
gnome2-libs/gnome-session/HISTORY
| 6
gnome2-libs/gnome-session/gnome-session-2.18.3.tar.bz2.sig
| 0
gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-system-monitor/DEPENDS
| 5
gnome2-libs/gnome-system-monitor/DETAILS
| 2
gnome2-libs/gnome-system-monitor/HISTORY
| 10
gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.18.2.tar.bz2.sig
| 0
gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-terminal/DETAILS
| 2
gnome2-libs/gnome-terminal/HISTORY
| 3
gnome2-libs/gnome-terminal/gnome-terminal-2.18.1.tar.bz2.sig
| 0
gnome2-libs/gnome-terminal/gnome-terminal-2.18.2.tar.bz2.sig
|binary
gnome2-libs/gnome-themes-extras/DETAILS
| 2
gnome2-libs/gnome-themes-extras/HISTORY
| 3
gnome2-libs/gnome-themes-extras/gnome-themes-extras-0.9.0.tar.bz2.sig
| 0
gnome2-libs/gnome-themes-extras/gnome-themes-extras-2.20.tar.bz2.sig
|binary
gnome2-libs/gnome-themes/DETAILS
| 2
gnome2-libs/gnome-themes/HISTORY
| 6
gnome2-libs/gnome-themes/gnome-themes-2.18.1.tar.bz2.sig
| 0
gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-utils2/DEPENDS
| 2
gnome2-libs/gnome-utils2/DETAILS
| 2
gnome2-libs/gnome-utils2/HISTORY
| 6
gnome2-libs/gnome-utils2/gnome-utils-2.18.1.tar.bz2.sig
| 0
gnome2-libs/gnome-utils2/gnome-utils-2.19.91.tar.bz2.sig
|binary
gnome2-libs/gnome-vfs2/DETAILS
| 2
gnome2-libs/gnome-vfs2/HISTORY
| 6
gnome2-libs/gnome-vfs2/gnome-vfs-2.18.1.tar.bz2.sig
| 0
gnome2-libs/gnome-vfs2/gnome-vfs-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome-vfsmm/DETAILS
| 2
gnome2-libs/gnome-vfsmm/HISTORY
| 3
gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.18.0.tar.bz2.sig
| 0
gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.20.0.tar.bz2.sig
|binary
gnome2-libs/gnome2-user-docs/DEPENDS
| 2
gnome2-libs/gnome2-user-docs/DETAILS
| 2
gnome2-libs/gnome2-user-docs/HISTORY
| 5
gnome2-libs/gnome2-user-docs/gnome-user-docs-2.18.2.tar.bz2.sig
| 0
gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig
|binary
gnome2-libs/goffice-0.5/BUILD
| 2
gnome2-libs/goffice-0.5/DEPENDS
| 23
gnome2-libs/goffice-0.5/DETAILS
| 15
gnome2-libs/goffice-0.5/HISTORY
| 2
gnome2-libs/goffice-0.5/PRE_SUB_DEPENDS
| 4
gnome2-libs/goffice-0.5/SUB_DEPENDS
| 6
gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig
|binary
gnome2-libs/goffice-dev/DETAILS
| 2
gnome2-libs/goffice-dev/HISTORY
| 3
gnome2-libs/goffice-dev/goffice-0.4.2.tar.bz2.sig
| 0
gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig
|binary
gnome2-libs/gtk-engines2/DETAILS
| 2
gnome2-libs/gtk-engines2/HISTORY
| 9
gnome2-libs/gtk-engines2/gtk-engines-2.10.2.tar.bz2.sig
| 0
gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig
|binary
gnome2-libs/gtkhtml2/DETAILS
| 2
gnome2-libs/gtkhtml2/HISTORY
| 6
gnome2-libs/gtkhtml2/gtkhtml-3.14.3.tar.bz2.sig
| 0
gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig
|binary
gnome2-libs/gtksourceview/DETAILS
| 2
gnome2-libs/gtksourceview/HISTORY
| 6
gnome2-libs/gtksourceview/gtksourceview-1.8.5.tar.bz2.sig
| 0
gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig
|binary
gnome2-libs/intltool/DETAILS
| 2
gnome2-libs/intltool/HISTORY
| 6
gnome2-libs/intltool/intltool-0.36.0.tar.bz2.sig
| 0
gnome2-libs/intltool/intltool-0.36.2.tar.bz2.sig
|binary
gnome2-libs/java-access-bridge/BUILD
| 2
gnome2-libs/java-access-bridge/DEPENDS
| 7
gnome2-libs/java-access-bridge/HISTORY
| 7
gnome2-libs/libbonobo/DETAILS
| 2
gnome2-libs/libbonobo/HISTORY
| 6
gnome2-libs/libbonobo/libbonobo-2.18.0.tar.bz2.sig
| 0
gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libbonoboui/DETAILS
| 2
gnome2-libs/libbonoboui/HISTORY
| 6
gnome2-libs/libbonoboui/libbonoboui-2.18.0.tar.bz2.sig
| 0
gnome2-libs/libbonoboui/libbonoboui-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgail-gnome/DETAILS
| 2
gnome2-libs/libgail-gnome/HISTORY
| 6
gnome2-libs/libgail-gnome/libgail-gnome-1.18.0.tar.bz2.sig
| 0
gnome2-libs/libgail-gnome/libgail-gnome-1.20.0.tar.bz2.sig
|binary
gnome2-libs/libgda3/DETAILS
| 5
gnome2-libs/libgda3/HISTORY
| 3
gnome2-libs/libgda3/libgda-3.0.1.tar.bz2.sig
| 0
gnome2-libs/libgnome/DETAILS
| 2
gnome2-libs/libgnome/HISTORY
| 6
gnome2-libs/libgnome/libgnome-2.18.0.tar.bz2.sig
| 0
gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgnomecanvas/DEPENDS
| 18
gnome2-libs/libgnomecanvas/DETAILS
| 3
gnome2-libs/libgnomecanvas/HISTORY
| 9
gnome2-libs/libgnomecanvas/libgnomecanvas-2.14.0.tar.bz2.sig
| 0
gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgnomecanvasmm/DETAILS
| 2
gnome2-libs/libgnomecanvasmm/HISTORY
| 3
gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.16.0.tar.bz2.sig
| 0
gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgnomedb3/DETAILS
| 5
gnome2-libs/libgnomedb3/HISTORY
| 3
gnome2-libs/libgnomedb3/libgnomedb-3.0.0.tar.bz2.sig
| 0
gnome2-libs/libgnomekbd/DETAILS
| 2
gnome2-libs/libgnomekbd/HISTORY
| 6
gnome2-libs/libgnomekbd/libgnomekbd-2.18.2.tar.bz2.sig
| 0
gnome2-libs/libgnomekbd/libgnomekbd-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgnomemm/DETAILS
| 2
gnome2-libs/libgnomemm/HISTORY
| 3
gnome2-libs/libgnomemm/libgnomemm-2.18.0.tar.bz2.sig
| 0
gnome2-libs/libgnomemm/libgnomemm-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgnomeprint/DETAILS
| 2
gnome2-libs/libgnomeprint/HISTORY
| 3
gnome2-libs/libgnomeprint/libgnomeprint-2.18.1.tar.bz2.sig
| 0
gnome2-libs/libgnomeprint/libgnomeprint-2.18.2.tar.bz2.sig
|binary
gnome2-libs/libgnomeprintui/DETAILS
| 2
gnome2-libs/libgnomeprintui/HISTORY
| 3
gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.0.tar.bz2.sig
| 0
gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.1.tar.bz2.sig
|binary
gnome2-libs/libgnomeui/DEPENDS
| 1
gnome2-libs/libgnomeui/DETAILS
| 2
gnome2-libs/libgnomeui/HISTORY
| 9
gnome2-libs/libgnomeui/libgnomeui-2.18.1.tar.bz2.sig
| 0
gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgnomeuimm/DETAILS
| 2
gnome2-libs/libgnomeuimm/HISTORY
| 3
gnome2-libs/libgnomeuimm/libgnomeuimm-2.18.0.tar.bz2.sig
| 0
gnome2-libs/libgnomeuimm/libgnomeuimm-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libgsf/DETAILS
| 2
gnome2-libs/libgsf/HISTORY
| 6
gnome2-libs/libgsf/libgsf-1.14.5.tar.bz2.sig
| 0
gnome2-libs/libgsf/libgsf-1.14.7.tar.bz2.sig
|binary
gnome2-libs/libgtop2/DETAILS
| 2
gnome2-libs/libgtop2/HISTORY
| 6
gnome2-libs/libgtop2/libgtop-2.14.9.tar.bz2.sig
| 0
gnome2-libs/libgtop2/libgtop-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libidl/DETAILS
| 2
gnome2-libs/libidl/HISTORY
| 3
gnome2-libs/libidl/libIDL-0.8.8.tar.bz2.sig
| 0
gnome2-libs/libidl/libIDL-0.8.9.tar.bz2.sig
|binary
gnome2-libs/liboobs/DETAILS
| 2
gnome2-libs/liboobs/HISTORY
| 4
gnome2-libs/liboobs/PRE_BUILD
| 4
gnome2-libs/liboobs/liboobs-2.18.1.tar.bz2.sig
| 0
gnome2-libs/liboobs/liboobs-2.20.0.tar.bz2.sig
|binary
gnome2-libs/librsvg2/DETAILS
| 2
gnome2-libs/librsvg2/HISTORY
| 3
gnome2-libs/librsvg2/librsvg-2.18.0.tar.bz2.sig
| 0
gnome2-libs/librsvg2/librsvg-2.18.2.tar.bz2.sig
|binary
gnome2-libs/libwnck/DETAILS
| 2
gnome2-libs/libwnck/HISTORY
| 6
gnome2-libs/libwnck/libwnck-2.18.3.tar.bz2.sig
| 0
gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig
|binary
gnome2-libs/libxklavier/DETAILS
| 2
gnome2-libs/libxklavier/HISTORY
| 3
gnome2-libs/libxklavier/libxklavier-3.2.tar.gz.sig
| 0
gnome2-libs/libxklavier/libxklavier-3.3.tar.gz.sig
|binary
gnome2-libs/metacity/DETAILS
| 2
gnome2-libs/metacity/HISTORY
| 6
gnome2-libs/metacity/metacity-2.18.5.tar.gz.sig
| 0
gnome2-libs/metacity/metacity-2.20.0.tar.gz.sig
|binary
gnome2-libs/nautilus-cd-burner/DETAILS
| 2
gnome2-libs/nautilus-cd-burner/HISTORY
| 6
gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.18.2.tar.bz2.sig
| 0
gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.20.0.tar.bz2.sig
|binary
gnome2-libs/nautilus-sendto/DETAILS
| 2
gnome2-libs/nautilus-sendto/HISTORY
| 3
gnome2-libs/nautilus-sendto/nautilus-sendto-0.10.tar.bz2.sig
| 0
gnome2-libs/nautilus-sendto/nautilus-sendto-0.12.tar.bz2.sig
|binary
gnome2-libs/nautilus2/DEPENDS
| 2
gnome2-libs/nautilus2/DETAILS
| 2
gnome2-libs/nautilus2/HISTORY
| 7
gnome2-libs/nautilus2/nautilus-2.18.3.tar.bz2.sig
| 0
gnome2-libs/nautilus2/nautilus-2.20.0.tar.bz2.sig
|binary
gnome2-libs/orbit2/DETAILS
| 2
gnome2-libs/orbit2/HISTORY
| 3
gnome2-libs/orbit2/ORBit2-2.14.8.tar.bz2.sig
| 0
gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig
|binary
gnome2-libs/pango/DETAILS
| 2
gnome2-libs/pango/HISTORY
| 6
gnome2-libs/pango/pango-1.16.5.tar.bz2.sig
| 0
gnome2-libs/pango/pango-1.18.2.tar.bz2.sig
|binary
gnome2-libs/pygobject/DETAILS
| 9
gnome2-libs/pygobject/HISTORY
| 4
gnome2-libs/pygobject/pygobject-2.12.3.tar.bz2.sig
| 0
gnome2-libs/pygobject/pygobject-2.13.2.tar.bz2.sig
|binary
gnome2-libs/pygtksourceview/DEPENDS
| 4
gnome2-libs/pygtksourceview/DETAILS
| 14
gnome2-libs/pygtksourceview/HISTORY
| 7
gnome2-libs/pygtksourceview/pygtksourceview-2.0.0.tar.bz2.sig
|binary
gnome2-libs/rarian/CONFLICTS
| 1
gnome2-libs/rarian/DEPENDS
| 1
gnome2-libs/rarian/DETAILS
| 46
gnome2-libs/rarian/HISTORY
| 5
gnome2-libs/rarian/rarian-0.6.0.tar.bz2.sig
|binary
gnome2-libs/scrollkeeper/BUILD
| 1
gnome2-libs/scrollkeeper/DEPENDS
| 17
gnome2-libs/scrollkeeper/DETAILS
| 9
gnome2-libs/scrollkeeper/HISTORY
| 3
gnome2-libs/scrollkeeper/INSTALL
| 1
gnome2-libs/scrollkeeper/PRE_BUILD
| 1
gnome2-libs/scrollkeeper/TRIGGER
| 1
gnome2-libs/startup-notification/DETAILS
| 3
gnome2-libs/startup-notification/HISTORY
| 3
gnome2-libs/startup-notification/startup-notification-0.8.tar.bz2.sig
| 0
gnome2-libs/startup-notification/startup-notification-0.9.tar.bz2.sig
|binary
gnome2-libs/tracker/DEPENDS
| 3
gnome2-libs/tracker/DETAILS
| 6
gnome2-libs/tracker/HISTORY
| 5
gnome2-libs/tracker/PRE_BUILD
| 6
gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig
| 0
gnome2-libs/tracker/tracker-0.6.2.tar.bz2.sig
|binary
gnome2-libs/vino/DETAILS
| 2
gnome2-libs/vino/HISTORY
| 6
gnome2-libs/vino/vino-2.18.1.tar.bz2.sig
| 0
gnome2-libs/vino/vino-2.20.0.tar.bz2.sig
|binary
gnome2-libs/vte/DETAILS
| 2
gnome2-libs/vte/HISTORY
| 3
gnome2-libs/vte/vte-0.16.8.tar.bz2.sig
| 0
gnome2-libs/vte/vte-0.16.9.tar.bz2.sig
|binary
gnome2-libs/xdg-user-dirs/DETAILS
| 2
gnome2-libs/xdg-user-dirs/HISTORY
| 3
gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.6.tar.gz.sig
| 0
gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.9.tar.gz.sig
|binary
gnome2-libs/yelp/DEPENDS
| 16
gnome2-libs/yelp/DETAILS
| 2
gnome2-libs/yelp/HISTORY
| 7
gnome2-libs/yelp/yelp-2.18.1.tar.bz2.sig
| 0
gnome2-libs/yelp/yelp-2.20.0.tar.bz2.sig
|binary
gnome2-libs/zenity/DETAILS
| 2
gnome2-libs/zenity/HISTORY
| 3
gnome2-libs/zenity/zenity-2.18.2.tar.bz2.sig
| 0
gnome2-libs/zenity/zenity-2.20.0.tar.bz2.sig
|binary
graphics-libs/agg/DEPENDS
| 7
graphics-libs/agg/DETAILS
| 43
graphics-libs/agg/HISTORY
| 2
graphics-libs/agg/PRE_BUILD
| 5
graphics-libs/cimg/DETAILS
| 6
graphics-libs/cimg/HISTORY
| 3
graphics-libs/libpng/DETAILS
| 4
graphics-libs/libpng/HISTORY
| 6
graphics-libs/mesalib/DEPENDS
| 14
graphics-libs/mesalib/HISTORY
| 5
graphics-libs/ogre/BUILD
| 2
graphics-libs/ogre/HISTORY
| 3
graphics-libs/poppler-data/BUILD
| 1
graphics-libs/poppler-data/DETAILS
| 13
graphics-libs/poppler-data/HISTORY
| 2
graphics-libs/poppler-data/LICENSE
| 41
graphics-libs/poppler-data/Makefile.diff
| 11
graphics-libs/poppler-data/PRE_BUILD
| 4
graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig
|binary
graphics-libs/poppler/DEPENDS
| 59
graphics-libs/poppler/DETAILS
| 6
graphics-libs/poppler/HISTORY
| 14
graphics-libs/poppler/configure.ac.diff
| 11
graphics-libs/poppler/poppler-0.5.9.tar.gz.sig
| 0
graphics-libs/poppler/poppler-0.6.tar.gz.sig
|binary
graphics-libs/rmagick/DETAILS
| 4
graphics-libs/rmagick/HISTORY
| 3
graphics-libs/rmagick/RMagick-2.0.0-beta2.tar.bz2.sig
| 0
graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig
|binary
graphics/blender/BUILD
| 14
graphics/blender/CONFIGURE
| 5
graphics/blender/DEPENDS
| 4
graphics/blender/HISTORY
| 8
graphics/blender/INSTALL
| 19
graphics/blender/PRE_BUILD
| 3
graphics/blender/blender-2.44-scriptsdir.patch
| 91
graphics/fontforge/DETAILS
| 4
graphics/fontforge/HISTORY
| 3
graphics/gimp-lqr-plugin/DEPENDS
| 4
graphics/gimp-lqr-plugin/DETAILS
| 17
graphics/gimp-lqr-plugin/HISTORY
| 5
graphics/gimp-lqr-plugin/PRE_BUILD
| 10
graphics/gimp/DEPENDS
| 10
graphics/gimp/HISTORY
| 7
graphics/graphicsmagick/DETAILS
| 8
graphics/graphicsmagick/HISTORY
| 7
graphics/gscan2pdf/BUILD
| 2
graphics/gscan2pdf/DEPENDS
| 12
graphics/gscan2pdf/DETAILS
| 18
graphics/gscan2pdf/HISTORY
| 2
graphics/imagemagick/DEPENDS
| 7
graphics/imagemagick/DETAILS
| 4
graphics/imagemagick/HISTORY
| 19
graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig
|binary
graphics/imagemagick/ImageMagick-6.3.5-6.tar.bz2.sig
| 0
graphics/inkscape/DEPENDS
| 10
graphics/inkscape/HISTORY
| 3
graphics/libgphoto2/CONFIGURE
| 1
graphics/libgphoto2/HISTORY
| 8
graphics/libgphoto2/drivers
| 39
graphics/libgphoto2/upddrv
| 4
graphics/tesseract/DETAILS
| 18
graphics/tesseract/HISTORY
| 9
graphics/tesseract/PRE_BUILD
| 2
graphics/tesseract/train.diff
| 11
graphics/unpaper/BUILD
| 2
graphics/unpaper/DETAILS
| 23
graphics/unpaper/HISTORY
| 2
graphics/unpaper/INSTALL
| 1
graphics/unpaper/PRE_BUILD
| 3
graphics/xaralx/DETAILS
| 4
graphics/xaralx/HISTORY
| 3
groups
| 1
gurus.gpg
|binary
haskell/FUNCTIONS
| 6
haskell/HASKELL_POST_REMOVE
| 5
haskell/HASKELL_POST_RESURRECT
| 16
haskell/HASKELL_PRE_RESURRECT
| 7
haskell/haskell-html/DEPENDS
| 1
haskell/haskell-html/DETAILS
| 13
haskell/haskell-html/HISTORY
| 3
haskell/haskell-html/POST_REMOVE
| 1
haskell/haskell-html/POST_RESURRECT
| 1
haskell/haskell-html/PRE_RESURRECT
| 1
haskell/haskell-mtl/HISTORY
| 5
haskell/haskell-mtl/POST_REMOVE
| 1
haskell/haskell-mtl/POST_RESURRECT
| 1
haskell/haskell-mtl/PRE_RESURRECT
| 1
haskell/haskell-quickcheck/DEPENDS
| 1
haskell/haskell-quickcheck/DETAILS
| 19
haskell/haskell-quickcheck/HISTORY
| 3
haskell/haskell-quickcheck/POST_REMOVE
| 2
haskell/haskell-quickcheck/POST_RESURRECT
| 1
haskell/haskell-quickcheck/PRE_RESURRECT
| 1
haskell/haskell-x11-extras/DETAILS
| 4
haskell/haskell-x11-extras/HISTORY
| 8
haskell/haskell-x11-extras/POST_REMOVE
| 2
haskell/haskell-x11-extras/POST_RESURRECT
| 1
haskell/haskell-x11-extras/PRE_RESURRECT
| 1
haskell/haskell-x11/HISTORY
| 5
haskell/haskell-x11/POST_REMOVE
| 2
haskell/haskell-x11/POST_RESURRECT
| 1
haskell/haskell-x11/PRE_RESURRECT
| 1
http/apache-mod_ssl/DETAILS
| 7
http/apache-mod_ssl/HISTORY
| 7
http/apache/BUILD
| 3
http/apache/DETAILS
| 10
http/apache/HISTORY
| 4
http/apache/db-4.1.diff
| 16
http/apache2/01_all_gentoo_ipv6.patch
| 23
http/apache2/03_all_redhat_xfsz.patch
| 12
http/apache2/DETAILS
| 6
http/apache2/HISTORY
| 5
http/apache2/PRE_BUILD
| 5
http/apache2/buildconf.patch
| 12
http/apache2/httpd-2.0.59.tar.gz.asc
| 11
http/apache2/httpd-2.0.61.tar.gz.asc
| 7
http/apache22/DETAILS
| 6
http/apache22/HISTORY
| 5
http/cherokee/DETAILS
| 4
http/cherokee/HISTORY
| 3
http/firefox/DETAILS
| 13
http/firefox/HISTORY
| 14
http/firefox/PRE_BUILD
| 5
http/firefox/cairo-fixes.patch
| 15
http/firefox/firefox
| 10
http/firefox/firefox-config.patch
| 10
http/galeon/DEPENDS
| 2
http/galeon/HISTORY
| 3
http/gnash/BUILD
| 11
http/gnash/CONFIGURE
| 40
http/gnash/DEPENDS
| 64
http/gnash/DETAILS
| 7
http/gnash/HISTORY
| 10
http/gnash/INSTALL
| 91
http/gnash/PRE_BUILD
| 7
http/gnash/gnash.gpg
|binary
http/lighttpd/DETAILS
| 6
http/lighttpd/HISTORY
| 6
http/links-twibright/DETAILS
| 5
http/links-twibright/HISTORY
| 3
http/seamonkey/DEPENDS
| 4
http/seamonkey/DETAILS
| 3
http/seamonkey/HISTORY
| 9
http/seamonkey/PRE_BUILD
| 5
http/seamonkey/cairo-fixes.patch
| 15
http/squid/DETAILS
| 4
http/squid/HISTORY
| 6
http/w3m/CONFIGURE
| 2
http/w3m/HISTORY
| 4
i18n/im-ja/CONFIGURE
| 2
i18n/im-ja/HISTORY
| 3
i18n/scim/DETAILS
| 2
i18n/scim/HISTORY
| 3
java/jakarta-log4j/DEPENDS
| 12
java/jakarta-log4j/HISTORY
| 3
java/jakarta-regexp/DEPENDS
| 2
java/jakarta-regexp/HISTORY
| 3
java/tomcat/DEPENDS
| 42
java/tomcat/HISTORY
| 5
kde-apps/digikam/HISTORY
| 3
kde-apps/digikam/PRE_BUILD
| 3
kde-apps/digikam/lcmsprf.h
| 13
kde-apps/gwenview/DETAILS
| 4
kde-apps/gwenview/HISTORY
| 3
kde-apps/k9copy/DETAILS
| 8
kde-apps/k9copy/HISTORY
| 3
kde-apps/k9copy/k9copy-1.0.2.tar.gz.sig
| 0
kde-apps/k9copy/k9copy-1.1.3.tar.gz.sig
|binary
kde-apps/kcpufreq/BUILD
| 9
kde-apps/kcpufreq/CONFIGURE
| 4
kde-apps/kcpufreq/DEPENDS
| 6
kde-apps/kcpufreq/DETAILS
| 17
kde-apps/kcpufreq/HISTORY
| 3
kde-apps/kcpufreq/kcpufreq-0.3.tar.gz.sig
|binary
kde-apps/kid3/BUILD
| 6
kde-apps/kid3/DETAILS
| 4
kde-apps/kid3/HISTORY
| 5
kde-apps/kid3/INSTALL
| 7
kde-apps/kid3/PRE_BUILD
| 6
kde-apps/kipi-plugins/HISTORY
| 3
kde-apps/kipi-plugins/TRIGGERS
| 1
kde-apps/ksquirrel-libs/DEPENDS
| 6
kde-apps/ksquirrel-libs/DETAILS
| 6
kde-apps/ksquirrel-libs/HISTORY
| 8
kde-apps/ksquirrel/DETAILS
| 4
kde-apps/ksquirrel/HISTORY
| 12
kde-apps/ktorrent/DETAILS
| 4
kde-apps/ktorrent/HISTORY
| 3
kde-apps/libkexiv2/DETAILS
| 4
kde-apps/libkexiv2/HISTORY
| 3
kde-core/kdebase/DETAILS
| 2
kde-core/kdebase/HISTORY
| 5
kde-core/kdebase/PRE_BUILD
| 3
kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
| 49
kde-core/kdelibs/DETAILS
| 2
kde-core/kdelibs/HISTORY
| 10
kde-core/kdelibs/PRE_BUILD
| 3
kde-core/kdelibs/cups.diff
| 82
kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
| 61
kde-look/polyester/DETAILS
| 7
kde-look/polyester/HISTORY
| 4
kde-look/polyester/polyester-1.0.2.tar.bz2.sig
|binary
kde-look/qtcurve-kde3/DEPENDS
| 3
kde-look/qtcurve-kde3/DETAILS
| 13
kde-look/qtcurve-kde3/HISTORY
| 3
kde-look/qtcurve-kde3/QtCurve-KDE3-0.52.3.tar.gz.sig
|binary
kde4/HISTORY
| 12
kde4/KDE_DEPENDS
| 10
kde4/NOTES
| 7
kde4/kde4-l10n/BUILD
| 32
kde4/kde4-l10n/CONFIGURE
| 40
kde4/kde4-l10n/DEPENDS
| 1
kde4/kde4-l10n/DETAILS
| 16
kde4/kde4-l10n/HISTORY
| 8
kde4/kde4-l10n/INSTALL
| 13
kde4/kde4-l10n/PRE_BUILD
| 18
kde4/kde4-profile/DEPENDS
| 2
kde4/kde4-profile/DETAILS
| 2
kde4/kde4-profile/HISTORY
| 4
kde4/kdeaccessibility4/CONFIGURE
| 1
kde4/kdeaccessibility4/DEPENDS
| 8
kde4/kdeaccessibility4/DETAILS
| 28
kde4/kdeaccessibility4/HISTORY
| 3
kde4/kdeaddons4/CONFIGURE
| 1
kde4/kdeaddons4/DEPENDS
| 8
kde4/kdeaddons4/DETAILS
| 21
kde4/kdeaddons4/HISTORY
| 3
kde4/kdeadmin4/DEPENDS
| 6
kde4/kdeadmin4/DETAILS
| 4
kde4/kdeadmin4/HISTORY
| 4
kde4/kdebase-workspace4/CONFIGURE
| 1
kde4/kdebase-workspace4/DEPENDS
| 20
kde4/kdebase-workspace4/DETAILS
| 16
kde4/kdebase-workspace4/HISTORY
| 25
kde4/kdebase-workspace4/INSTALL
| 4
kde4/kdebase-workspace4/TRIGGERS
| 1
kde4/kdebase-workspace4/init.d/kdm4
| 8
kde4/kdebase-workspace4/kde4.desktop
| 9
kde4/kdebase4/BUILD
| 14
kde4/kdebase4/DEPENDS
| 33
kde4/kdebase4/DETAILS
| 10
kde4/kdebase4/FINAL
| 24
kde4/kdebase4/HISTORY
| 21
kde4/kdebase4/INSTALL
| 22
kde4/kdebase4/init.d/kdm4
| 8
kde4/kdebase4/kde4.desktop
| 9
kde4/kdeedu4/CONFIGURE
| 1
kde4/kdeedu4/DEPENDS
| 15
kde4/kdeedu4/DETAILS
| 16
kde4/kdeedu4/HISTORY
| 9
kde4/kdegames4/DEPENDS
| 3
kde4/kdegames4/DETAILS
| 4
kde4/kdegames4/HISTORY
| 6
kde4/kdegraphics4/DEPENDS
| 3
kde4/kdegraphics4/DETAILS
| 4
kde4/kdegraphics4/HISTORY
| 4
kde4/kdelibs4/DEPENDS
| 6
kde4/kdelibs4/DETAILS
| 5
kde4/kdelibs4/HISTORY
| 8
kde4/kdelibs4/INSTALL
| 4
kde4/kdemultimedia4/DEPENDS
| 5
kde4/kdemultimedia4/DETAILS
| 4
kde4/kdemultimedia4/HISTORY
| 4
kde4/kdenetwork4/DETAILS
| 4
kde4/kdenetwork4/HISTORY
| 4
kde4/kdepim4/DEPENDS
| 7
kde4/kdepim4/DETAILS
| 4
kde4/kdepim4/HISTORY
| 7
kde4/kdepimlibs4/DETAILS
| 4
kde4/kdepimlibs4/HISTORY
| 3
kde4/kdesdk4/DETAILS
| 4
kde4/kdesdk4/HISTORY
| 3
kde4/kdetoys4/CONFIGURE
| 1
kde4/kdetoys4/DEPENDS
| 1
kde4/kdetoys4/DETAILS
| 16
kde4/kdetoys4/HISTORY
| 7
kde4/kdeutils4/DETAILS
| 4
kde4/kdeutils4/HISTORY
| 3
kde4/koffice2/DEPENDS
| 9
kde4/koffice2/DETAILS
| 5
kde4/koffice2/HISTORY
| 4
kde4/qimageblitz/DEPENDS
| 3
kde4/qimageblitz/DETAILS
| 16
kde4/qimageblitz/HISTORY
| 7
kde4/tagua/DEPENDS
| 2
kde4/tagua/DETAILS
| 23
kde4/tagua/HISTORY
| 4
kernels/dazuko/DETAILS
| 2
kernels/dazuko/HISTORY
| 6
kernels/deskopt/BUILD
| 1
kernels/deskopt/DEPENDS
| 3
kernels/deskopt/DETAILS
| 16
kernels/deskopt/HISTORY
| 6
kernels/deskopt/INSTALL
| 3
kernels/deskopt/init.d/deskopt
| 12
kernels/device-mapper/DETAILS
| 4
kernels/device-mapper/HISTORY
| 3
kernels/kqemu/HISTORY
| 4
kernels/kqemu/PRE_BUILD
| 2
kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
| 16
kernels/kvm/DETAILS
| 4
kernels/kvm/HISTORY
| 18
kernels/linux/HISTORY
| 44
kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc4
| 7
kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc5
| 7
kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc6
| 7
kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc7
| 7
kernels/linux/info/patches/maintenance_patches/patch-2.6.22.4
| 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.22.5
| 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.22.6
| 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.22.7
| 6
kernels/linux/info/patches/mm_patches/2.6.23-rc3-mm1
| 7
kernels/linux/info/patches/mm_patches/2.6.23-rc4-mm1
| 7
kernels/linux/info/patches/mm_patches/2.6.23-rc6-mm1
| 7
kernels/linux/latest.defaults
| 6
kernels/lirc/DETAILS
| 4
kernels/lirc/HISTORY
| 3
kernels/madwifi/DETAILS
| 5
kernels/madwifi/HISTORY
| 7
kernels/madwifi/madwifi-0.9.3.1.tar.bz2.sig
| 0
latex/pgf/DETAILS
| 12
latex/pgf/HISTORY
| 3
libaccount
| 16
libs/ace/BUILD
| 1
libs/ace/DETAILS
| 10
libs/ace/HISTORY
| 6
libs/clucene/DETAILS
| 8
libs/clucene/HISTORY
| 3
libs/confuse/BUILD
| 2
libs/confuse/HISTORY
| 3
libs/elfutils/DETAILS
| 7
libs/elfutils/HISTORY
| 8
libs/elfutils/PRE_BUILD
| 15
libs/elfutils/elfutils-0.127.tar.gz.sig
| 0
libs/elfutils/elfutils-0.128.tar.gz.sig
| 0
libs/elfutils/elfutils-0.129-portability.patch
| 1043 +
libs/elfutils/elfutils-0.129.tar.gz.sig
|binary
libs/elfutils/elfutils-portability.patch.sig
| 0
libs/galago-sharp/DEPENDS
| 6
libs/galago-sharp/HISTORY
| 3
libs/glibc/HISTORY
| 6
libs/glibc/PRE_BUILD
| 1
libs/glibc/as-test-x.patch
| 10
libs/guilib/BUILD
| 4
libs/guilib/HISTORY
| 4
libs/guilib/config.sub.patch
| 32
libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff
| 20
libs/icu/DETAILS
| 11
libs/icu/HISTORY
| 6
libs/libcap/DETAILS
| 3
libs/libcap/HISTORY
| 4
libs/libedit/DETAILS
| 4
libs/libedit/HISTORY
| 3
libs/libidn/DETAILS
| 5
libs/libidn/HISTORY
| 14
libs/liboil/DETAILS
| 4
libs/liboil/HISTORY
| 3
libs/libsigc++3/DETAILS
| 3
libs/libsigc++3/HISTORY
| 3
libs/libsigc++3/libsigc++-2.0.17.tar.gz.sig
| 0
libs/libsigc++3/libsigc++-2.1.1.tar.gz.sig
|binary
libs/libtasn1/DETAILS
| 4
libs/libtasn1/HISTORY
| 7
libs/libtasn1/UP_TRIGGERS
| 9
libs/libxml++/DETAILS
| 2
libs/libxml++/HISTORY
| 3
libs/libxml++/libxml++-2.18.2.tar.bz2.sig
| 0
libs/libxml++/libxml++-2.20.0.tar.bz2.sig
|binary
libs/libxml2/DETAILS
| 4
libs/libxml2/HISTORY
| 3
libs/libxslt/DETAILS
| 4
libs/libxslt/HISTORY
| 3
libs/libxslt/libxslt-1.1.22.tar.gz.sig
|binary
libs/lrmi/HISTORY
| 3
libs/lrmi/INSTALL
| 2
libs/newt/DETAILS
| 4
libs/newt/HISTORY
| 3
libs/ode/DETAILS
| 4
libs/ode/HISTORY
| 3
libs/openbabel/DETAILS
| 5
libs/openbabel/HISTORY
| 3
libs/openbabel/openbabel-2.0.1.tar.gz.sig
| 0
libs/pcre/DETAILS
| 2
libs/pcre/HISTORY
| 6
libs/popt/DETAILS
| 2
libs/popt/HISTORY
| 3
libs/readline/DETAILS
| 2
libs/readline/HISTORY
| 5
libs/readline/PRE_BUILD
| 6
libs/readline/readline52-005
| 328
libs/readline/readline52-006
| 62
libs/readline/readline52-007
| 65
libs/sdl_net/DETAILS
| 5
libs/sdl_net/HISTORY
| 3
libs/uds/DEPENDS
| 1
libs/uds/DETAILS
| 3
libs/uds/HISTORY
| 5
libs/xapian-core/CONFLICTS
| 1
libs/xapian-core/DETAILS
| 4
libs/xapian-core/HISTORY
| 4
mail/claws-mail-extra-plugins/CONFIGURE
| 1
mail/claws-mail-extra-plugins/DETAILS
| 2
mail/claws-mail-extra-plugins/HISTORY
| 7
mail/claws-mail/DETAILS
| 2
mail/claws-mail/HISTORY
| 6
mail/dovecot/BUILD
| 3
mail/dovecot/DETAILS
| 6
mail/dovecot/HISTORY
| 9
mail/dovecot/INSTALL
| 1
mail/dspam/HISTORY
| 5
mail/dspam/INSTALL
| 35
mail/spamassassin/DETAILS
| 2
mail/spamassassin/HISTORY
| 3
mail/spamassassin/Mail-SpamAssassin-3.2.2.tar.bz2.sig
| 0
mail/spamassassin/Mail-SpamAssassin-3.2.3.tar.bz2.sig
|binary
mail/squirrelmail-gpg/DETAILS
| 8
mail/squirrelmail-gpg/HISTORY
| 3
mail/squirrelmail-notes/DETAILS
| 2
mail/squirrelmail-notes/HISTORY
| 3
mail/squirrelmail-notes/INSTALL
| 16
mail/ssmtp/DEPENDS
| 2
mail/ssmtp/HISTORY
| 3
mail/sylpheed/DETAILS
| 5
mail/sylpheed/HISTORY
| 6
mail/thunderbird/DEPENDS
| 1
mail/thunderbird/DETAILS
| 1
mail/thunderbird/HISTORY
| 4
mobile/gnokii/BUILD
| 3
mobile/gnokii/DETAILS
| 4
mobile/gnokii/HISTORY
| 4
mobile/pilot-link/7075AE4A.gpg
|binary
mobile/pilot-link/BUILD
| 7
mobile/pilot-link/CONFIGURE
| 15
mobile/pilot-link/DEPENDS
| 71
mobile/pilot-link/DETAILS
| 4
mobile/pilot-link/HISTORY
| 8
mobile/pilot-link/PREPARE
| 1
mobile/pilot-link/pilot-link-0.12.2.tar.bz2.sig
| 0
net/ipsec-tools/DETAILS
| 4
net/ipsec-tools/HISTORY
| 3
net/iptables/CONFIGURE
| 1
net/iptables/DETAILS
| 20
net/iptables/HISTORY
| 6
net/iptables/PREPARE
| 1
net/iptables/PRE_BUILD
| 7
net/net-tools/CONFIGURE
| 2
net/net-tools/DETAILS
| 2
net/net-tools/HISTORY
| 14
net/net-tools/PRE_BUILD
| 3
net/net-tools/ifdown
| 11
net/net-tools/ifup
| 18
net/net-tools/kernel-headers.patch
| 10
net/netconf/DETAILS
| 2
net/netconf/HISTORY
| 4
net/netconf/netconf
| 45
net/ppp/HISTORY
| 3
net/ppp/PRE_BUILD
| 2
net/samba/BUILD
| 6
net/samba/DETAILS
| 12
net/samba/HISTORY
| 24
net/samba/INSTALL
| 12
net/sfllaw.gpg
| 0
net/shorewall-common/BUILD
| 1
net/shorewall-common/CONFLICTS
| 1
net/shorewall-common/DEPENDS
| 6
net/shorewall-common/DETAILS
| 38
net/shorewall-common/FINAL
| 3
net/shorewall-common/HISTORY
| 4
net/shorewall-common/INSTALL
| 1
net/shorewall-common/PRE_BUILD
| 6
net/shorewall-common/init.d/shorewall
| 47
net/shorewall-common/init.d/shorewall.conf
| 5
net/shorewall-common/shorewall.gpg.key
|binary
net/shorewall-docs-html/BUILD
| 1
net/shorewall-docs-html/DETAILS
| 36
net/shorewall-docs-html/HISTORY
| 3
net/shorewall-docs-html/INSTALL
| 3
net/shorewall-docs-html/shorewall.gpg.key
|binary
net/shorewall-docs-xml/BUILD
| 1
net/shorewall-docs-xml/DETAILS
| 36
net/shorewall-docs-xml/HISTORY
| 3
net/shorewall-docs-xml/INSTALL
| 3
net/shorewall-docs-xml/shorewall.gpg.key
|binary
net/shorewall-lite/BUILD
| 1
net/shorewall-lite/CONFLICTS
| 1
net/shorewall-lite/DEPENDS
| 3
net/shorewall-lite/DETAILS
| 39
net/shorewall-lite/HISTORY
| 4
net/shorewall-lite/INSTALL
| 1
net/shorewall-lite/PRE_BUILD
| 6
net/shorewall-lite/init.d/shorewall
| 47
net/shorewall-lite/init.d/shorewall.conf
| 5
net/shorewall-lite/shorewall.gpg.key
|binary
net/shorewall-perl/BUILD
| 1
net/shorewall-perl/DEPENDS
| 1
net/shorewall-perl/DETAILS
| 40
net/shorewall-perl/HISTORY
| 3
net/shorewall-perl/INSTALL
| 1
net/shorewall-perl/shorewall.gpg.key
|binary
net/shorewall-shell/BUILD
| 1
net/shorewall-shell/DETAILS
| 40
net/shorewall-shell/HISTORY
| 3
net/shorewall-shell/INSTALL
| 1
net/shorewall-shell/shorewall.gpg.key
|binary
net/shorewall/DEPENDS
| 6
net/shorewall/DETAILS
| 22
net/shorewall/FINAL
| 3
net/shorewall/HISTORY
| 5
net/shorewall/INSTALL
| 2
net/shorewall/PREPARE
| 12
net/shorewall/PRE_BUILD
| 7
net/shorewall/init.d/shorewall
| 47
net/shorewall/init.d/shorewall.conf
| 5
net/shorewall/shorewall.gpg.key
| 0
net/strongswan/DETAILS
| 2
net/strongswan/HISTORY
| 3
net/tor/DETAILS
| 8
net/tor/HISTORY
| 8
net/wlach.gpg
|binary
net/wpa_supplicant/HISTORY
| 3
net/wpa_supplicant/init.d/wpa_supplicant
| 5
net/wvdial/DETAILS
| 6
net/wvdial/HISTORY
| 4
net/wvstreams/DETAILS
| 9
net/wvstreams/HISTORY
| 5
net/wvstreams/PRE_BUILD
| 3
net/wvstreams/gcc4.1.patch
| 60
net/xrdp/DEPENDS
| 2
net/xrdp/DETAILS
| 4
net/xrdp/HISTORY
| 4
news/liferea/BUILD
| 2
news/liferea/DEPENDS
| 4
news/liferea/DETAILS
| 4
news/liferea/HISTORY
| 21
news/liferea/liferea-1.2.20.tar.gz.sig
| 0
news/liferea/liferea-1.4-RC3.tar.gz.sig
| 0
news/liferea/liferea-1.4.2b.tar.gz.sig
|binary
odbc-drivers/myodbc/DETAILS
| 11
odbc-drivers/myodbc/HISTORY
| 5
perl-cpan/compress-zlib/DEPENDS
| 4
perl-cpan/compress-zlib/HISTORY
| 3
perl-cpan/dbi/DETAILS
| 4
perl-cpan/dbi/HISTORY
| 3
perl-cpan/file-tail/DETAILS
| 4
perl-cpan/file-tail/HISTORY
| 3
perl-cpan/io-compress-base/IO-Compress-Base-2.004.tar.gz.sig
| 0
perl-cpan/io-compress-zlib/IO-Compress-Zlib-2.004.tar.gz.sig
| 0
perl-cpan/lwp/DETAILS
| 4
perl-cpan/lwp/HISTORY
| 3
perl-cpan/mp3-tag/DEPENDS
| 6
perl-cpan/mp3-tag/HISTORY
| 3
perl-cpan/pdf-api2/DEPENDS
| 3
perl-cpan/pdf-api2/DETAILS
| 4
perl-cpan/pdf-api2/HISTORY
| 4
perl-cpan/perl-fuse/DETAILS
| 4
perl-cpan/perl-fuse/HISTORY
| 3
perl-cpan/perl-gtk2-simple-list/BUILD
| 1
perl-cpan/perl-gtk2-simple-list/DEPENDS
| 1
perl-cpan/perl-gtk2-simple-list/DETAILS
| 15
perl-cpan/perl-gtk2-simple-list/HISTORY
| 3
perl-cpan/perl-gtk2/DETAILS
| 4
perl-cpan/perl-gtk2/HISTORY
| 3
perl-cpan/xml-libxml/HISTORY
| 5
perl-cpan/xml-libxml/INSTALL
| 2
php-pear/pear-xml_serializer/BUILD
| 1
php-pear/pear-xml_serializer/DEPENDS
| 4
php-pear/pear-xml_serializer/HISTORY
| 4
php-pear/php/DETAILS
| 10
php-pear/php/HISTORY
| 3
printer/a2ps/DEPENDS
| 2
printer/a2ps/HISTORY
| 3
printer/cups-drivers/DEPENDS
| 2
printer/cups-drivers/DETAILS
| 24
printer/cups-drivers/DOWNLOAD
| 1
printer/cups-drivers/HISTORY
| 85
printer/cups-drivers/INSTALL
| 6
printer/cups-drivers/PRE_BUILD
| 4
printer/cups-drivers/TRIGGERS
| 1
printer/cups-drivers/cups-drivers-all-0.3.6.tar.gz.sig
| 0
printer/cups/DETAILS
| 11
printer/cups/HISTORY
| 6
printer/ghostscript/CONFLICTS
| 2
printer/ghostscript/HISTORY
| 3
printer/gtklp/DETAILS
| 4
printer/gtklp/HISTORY
| 3
printer/photoprint/DEPENDS
| 2
printer/photoprint/HISTORY
| 3
protected
| 1
python-devel/cherrypy/DETAILS
| 4
python-devel/cherrypy/HISTORY
| 3
python-devel/django/DEPENDS
| 2
python-devel/django/DETAILS
| 20
python-devel/django/HISTORY
| 9
python-devel/django/INSTALL
| 5
python-devel/itools/DETAILS
| 4
python-devel/itools/HISTORY
| 6
python-devel/numpy/DETAILS
| 4
python-devel/numpy/HISTORY
| 3
python-devel/paste/DETAILS
| 4
python-devel/paste/HISTORY
| 3
python-devel/pastescript/DETAILS
| 4
python-devel/pastescript/HISTORY
| 3
python-devel/python-markdown/DEPENDS
| 1
python-devel/python-markdown/DETAILS
| 17
python-devel/python-markdown/HISTORY
| 2
python-devel/python-markdown/PRE_BUILD
| 2
python-devel/soappy/HISTORY
| 3
python-devel/soappy/PRE_BUILD
| 4
python-devel/soappy/import-error.patch
| 54
python-devel/sqlalchemy/DETAILS
| 4
python-devel/sqlalchemy/HISTORY
| 9
python-devel/turbogears/DETAILS
| 4
python-devel/turbogears/HISTORY
| 3
python-devel/turbokid/DETAILS
| 4
python-devel/turbokid/HISTORY
| 3
science-libs/glpk/DEPENDS
| 4
science-libs/glpk/DETAILS
| 30
science-libs/glpk/HISTORY
| 7
science-libs/octave-forge/BUILD
| 11
science-libs/octave-forge/DETAILS
| 14
science-libs/octave-forge/HISTORY
| 7
science/ginac/DETAILS
| 10
science/ginac/HISTORY
| 4
science/kst/DETAILS
| 4
science/kst/HISTORY
| 3
science/octave-devel/DEPENDS
| 32
science/octave-devel/FINAL
| 8
science/octave-devel/HISTORY
| 3
science/octave-devel/INSTALL
| 3
science/octave/DEPENDS
| 1
science/octave/DETAILS
| 5
science/octave/FINAL
| 4
science/octave/HISTORY
| 4
science/qalculate-gtk/DEPENDS
| 2
science/qalculate-gtk/HISTORY
| 3
science/viking/BUILD
| 2
science/viking/DEPENDS
| 4
science/viking/DETAILS
| 17
science/viking/HISTORY
| 2
security/audit/DETAILS
| 17
security/audit/HISTORY
| 2
security/audit/PRE_BUILD
| 3
security/fwknop/BUILD
| 1
security/fwknop/CONFIGURE
| 10
security/fwknop/DEPENDS
| 8
security/fwknop/DETAILS
| 28
security/fwknop/HISTORY
| 4
security/fwknop/INSTALL
| 1
security/fwknop/PRE_BUILD
| 17
security/fwknop/fwknop.gpg
|binary
security/fwknop/homedir_hack.diff
| 18
security/fwknop/init.d/fwknopd
| 24
security/fwknop/init_hack.diff
| 20
security/pam_skey/BUILD
| 2
security/pam_skey/DEPENDS
| 2
security/pam_skey/DETAILS
| 16
security/pam_skey/HISTORY
| 3
security/pam_skey/PRE_BUILD
| 3
security/pam_skey/pam_skey-1.1.4-gentoo.patch
| 1706 +++
security/rsbac-admin/DETAILS
| 2
security/rsbac-admin/HISTORY
| 3
security/seedit/BUILD
| 4
security/seedit/DETAILS
| 13
security/seedit/HISTORY
| 8
security/seedit/INSTALL
| 4
security/seedit/PRE_BUILD
| 3
security/seedit/seedit-core.patch
| 11
security/skey/BUILD
| 2
security/skey/DEPENDS
| 3
security/skey/DETAILS
| 13
security/skey/FINAL
| 4
security/skey/HISTORY
| 7
security/skey/INSTALL
| 5
security/skey/PRE_BUILD
| 18
security/skey/skey-1.1.5-bind-now.patch
| 15
security/skey/skey-1.1.5-fPIC.patch
| 12
security/skey/skey-1.1.5-gentoo.patch
| 5380 ++++++++++
security/skey/skey-1.1.5-otp.patch
| 59
security/skey/skey-login_name_max.patch
| 15
security/snort/DETAILS
| 2
security/snort/HISTORY
| 3
shell-term-fm/bash/DEPENDS
| 3
shell-term-fm/bash/DETAILS
| 2
shell-term-fm/bash/HISTORY
| 8
shell-term-fm/bash/PRE_BUILD
| 8
shell-term-fm/bash/patches/bash32-018
| 98
shell-term-fm/bash/patches/bash32-019
| 343
shell-term-fm/bash/patches/bash32-020
| 183
shell-term-fm/bash/patches/bash32-021
| 72
shell-term-fm/bash/patches/bash32-022
| 126
shell-term-fm/bash/patches/bash32-023
| 51
shell-term-fm/bash/patches/bash32-024
| 77
shell-term-fm/bash/patches/bash32-025
| 79
shell-term-fm/mrxvt/DETAILS
| 4
shell-term-fm/mrxvt/HISTORY
| 4
shell-term-fm/mrxvt/PRE_BUILD
| 3
shell-term-fm/mrxvt/no_debug_x.patch
| 13
shell-term-fm/multi-gnome-terminal/DEPENDS
| 8
shell-term-fm/multi-gnome-terminal/HISTORY
| 3
shell-term-fm/sakura/DETAILS
| 4
shell-term-fm/sakura/HISTORY
| 3
shell-term-fm/xfe/DETAILS
| 4
shell-term-fm/xfe/HISTORY
| 6
smgl/enthrall/DETAILS
| 2
smgl/enthrall/HISTORY
| 3
smgl/enthrall/enthrall-0.5.tar.bz2.sig
| 0
smgl/enthrall/enthrall-0.6.tar.bz2.sig
|binary
smgl/init.d/DETAILS
| 1
smgl/init.d/HISTORY
| 5
smgl/init.d/files/rc
| 5
smgl/linux-initramfs/DETAILS
| 3
smgl/linux-initramfs/HISTORY
| 14
smgl/linux-initramfs/mkinitrd
| 92
smgl/quill/DETAILS
| 2
smgl/quill/HISTORY
| 3
smgl/simpleinit-msb/HISTORY
| 4
smgl/simpleinit-msb/PRE_BUILD
| 1
smgl/simpleinit-msb/simpleinit-selinux.patch
| 109
smgl/smgl-ledger/DETAILS
| 2
smgl/smgl-ledger/HISTORY
| 3
smgl/smgl-ledger/smgl-ledger
| 5
spelling/stardict/DETAILS
| 2
spelling/stardict/HISTORY
| 8
spelling/stardict/PRE_BUILD
| 7
spelling/stardict/tooltips.patch
| 497
telephony/asterisk/DEPENDS
| 5
telephony/asterisk/DETAILS
| 4
telephony/asterisk/HISTORY
| 8
telephony/asterisk/PRE_BUILD
| 2
telephony/asterisk/patches/1.4r80750_app_voicemail.c
| 11
telephony/libtelepathy/DETAILS
| 11
telephony/libtelepathy/HISTORY
| 4
telephony/telepathy-glib/DETAILS
| 11
telephony/telepathy-glib/HISTORY
| 3
telephony/telepathy-mission-control/DETAILS
| 4
telephony/telepathy-mission-control/HISTORY
| 3
telephony/telepathy-sofiasip/DETAILS
| 4
telephony/telepathy-sofiasip/HISTORY
| 3
telephony/telepathy.gpg
|binary
telephony/zaptel/BUILD
| 17
telephony/zaptel/DEPENDS
| 5
telephony/zaptel/DETAILS
| 62
telephony/zaptel/HISTORY
| 9
telephony/zaptel/INSTALL
| 11
utils/915resolution/BUILD
| 2
utils/915resolution/HISTORY
| 3
utils/beagle/DETAILS
| 4
utils/beagle/HISTORY
| 3
utils/bochs/BUILD
| 35
utils/bochs/DEPENDS
| 1
utils/bochs/DETAILS
| 12
utils/bochs/HISTORY
| 13
utils/bochs/bochs-2.3.5.tar.gz.sig
|binary
utils/coreutils/BUILD
| 1
utils/coreutils/CONFIGURE
| 1
utils/coreutils/HISTORY
| 16
utils/coreutils/PRE_BUILD
| 12
utils/coreutils/coreutils-futimens.patch
| 60
utils/coreutils/coreutils-selinux.patch
| 2598 ++++
utils/counter-linux/BUILD
| 1
utils/counter-linux/DEPENDS
| 2
utils/counter-linux/DETAILS
| 25
utils/counter-linux/HISTORY
| 3
utils/counter-linux/INSTALL
| 2
utils/counter-linux/PRE_BUILD
| 1
utils/dialog/DETAILS
| 2
utils/dialog/HISTORY
| 3
utils/gnuplot/BUILD
| 6
utils/gnuplot/DEPENDS
| 11
utils/gnuplot/DETAILS
| 5
utils/gnuplot/FINAL
| 3
utils/gnuplot/HISTORY
| 7
utils/gnuplot/INSTALL
| 10
utils/gnuplot/POST_REMOVE
| 3
utils/gnuplot/PREPARE
| 4
utils/gnuplot/PRE_BUILD
| 9
utils/grep/BUILD
| 6
utils/grep/DEPENDS
| 7
utils/grep/DETAILS
| 1
utils/grep/HISTORY
| 5
utils/grep/INSTALL
| 6
utils/helpdeco/BUILD
| 1
utils/helpdeco/DETAILS
| 22
utils/helpdeco/HISTORY
| 2
utils/helpdeco/PRE_BUILD
| 2
utils/heyu2/DETAILS
| 17
utils/heyu2/HISTORY
| 4
utils/iso-codes/DETAILS
| 2
utils/iso-codes/HISTORY
| 3
utils/ntp/DETAILS
| 8
utils/ntp/HISTORY
| 4
utils/strigi/DETAILS
| 1
utils/strigi/HISTORY
| 7
utils/strigi/INSTALL
| 5
utils/strigi/PREPARE
| 6
utils/strigi/strigi.sh
| 3
utils/sudo/DETAILS
| 2
utils/sudo/HISTORY
| 3
utils/sudo/sudo-1.6.9p3.tar.gz.sig
| 0
utils/sudo/sudo-1.6.9p4.tar.gz.sig
|binary
utils/sysstat/BUILD
| 4
utils/sysstat/DETAILS
| 4
utils/sysstat/HISTORY
| 4
utils/util-linux/DETAILS
| 2
utils/util-linux/HISTORY
| 7
utils/util-linux/PRE_BUILD
| 6
utils/util-linux/util-linux-ng-nls.patch
| 12
utils/virtualbox-module/DETAILS
| 4
utils/virtualbox-module/HISTORY
| 3
utils/virtualbox/DEPENDS
| 2
utils/virtualbox/DETAILS
| 8
utils/virtualbox/HISTORY
| 7
utils/virtualbox/PRE_BUILD
| 2
video-libs/gst-plugins-good/DEPENDS
| 2
video-libs/gst-plugins-good/HISTORY
| 5
video-libs/gst-plugins-good/PRE_SUB_DEPENDS
| 5
video-libs/gst-plugins-good/SUB_DEPENDS
| 7
video-libs/gst-plugins/DEPENDS
| 3
video-libs/gst-plugins/HISTORY
| 3
video-libs/libdvdnav/DETAILS
| 5
video-libs/libdvdnav/HISTORY
| 3
video-libs/libdvdread/DETAILS
| 3
video-libs/libdvdread/HISTORY
| 4
video-libs/libdvdread/libdvdread-0.9.6-udfsymbols.patch
| 4
video-libs/libdvdread/libdvdread-0.9.6.tar.gz.sig
| 0
video-libs/libdvdread/libdvdread-0.9.7.tar.gz.sig
|binary
video-libs/swfdec-mozilla/BUILD
| 12
video-libs/swfdec-mozilla/DEPENDS
| 1
video-libs/swfdec-mozilla/DETAILS
| 2
video-libs/swfdec-mozilla/HISTORY
| 6
video-libs/swfdec-mozilla/POST_REMOVE
| 1
video-libs/swfdec-mozilla/PRE_BUILD
| 4
video-libs/swfdec-mozilla/browser-plugin.patch
| 82
video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig
| 0
video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig
|binary
video-libs/swfdec/BUILD
| 3
video-libs/swfdec/DEPENDS
| 41
video-libs/swfdec/DETAILS
| 2
video-libs/swfdec/HISTORY
| 9
video-libs/swfdec/POST_REMOVE
| 1
video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
| 0
video-libs/swfdec/swfdec-0.5.2.tar.gz.sig
|binary
video-libs/x264/DETAILS
| 4
video-libs/x264/HISTORY
| 3
video-libs/xine-lib/DETAILS
| 4
video-libs/xine-lib/HISTORY
| 3
video/dvgrab/DETAILS
| 4
video/dvgrab/HISTORY
| 3
video/ffmpeg-svn/DEPENDS
| 29
video/ffmpeg-svn/HISTORY
| 4
video/freevo/DETAILS
| 4
video/freevo/HISTORY
| 5
video/freevo/PRE_BUILD
| 2
video/freevo/config
| 1
video/freevo/volatiles
| 1
video/gpac/DEPENDS
| 50
video/gpac/DETAILS
| 44
video/gpac/HISTORY
| 3
video/gpac/PRE_BUILD
| 3
video/kino/DETAILS
| 4
video/kino/HISTORY
| 3
video/kmplayer/DEPENDS
| 13
video/kmplayer/HISTORY
| 4
video/mplayer/DEPENDS
| 8
video/mplayer/HISTORY
| 4
video/mplayerplug-in/DETAILS
| 6
video/mplayerplug-in/HISTORY
| 3
video/mythmusic/DETAILS
| 2
video/mythmusic/HISTORY
| 3
video/mythmusic/mythplugins-0.20.2.tar.bz2.sig
|binary
video/mythmusic/mythplugins-0.20a.tar.bz2.sig
| 0
video/myththemes/BUILD
| 4
video/myththemes/DEPENDS
| 1
video/myththemes/DETAILS
| 13
video/myththemes/HISTORY
| 3
video/mythtv/BUILD
| 2
video/mythtv/CONFIGURE
| 2
video/mythtv/DETAILS
| 4
video/mythtv/HISTORY
| 7
video/mythweb/DETAILS
| 2
video/mythweb/HISTORY
| 3
video/mythweb/mythplugins-0.20.2.tar.bz2.sig
|binary
video/mythweb/mythplugins-0.20a.tar.bz2.sig
| 0
video/totem/DETAILS
| 2
video/totem/HISTORY
| 6
video/totem/totem-2.18.2.tar.bz2.sig
| 0
video/totem/totem-2.20.0.tar.bz2.sig
|binary
video/transcode/DEPENDS
| 5
video/transcode/DETAILS
| 2
video/transcode/HISTORY
| 6
video/transcode/PRE_BUILD
| 2
video/transcode/avcodec.patch
| 12
video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
| 45
video/transcode/transcode-1.0.3.tar.bz2.sig
| 0
video/transcode/transcode-1.0.4.tar.bz2.sig
|binary
volatiles
| 1
windowmanagers/afterstep/AfterStep-2.2.6.tar.bz2.sig
| 0
windowmanagers/afterstep/AfterStep-2.2.7.tar.bz2.sig
|binary
windowmanagers/afterstep/DETAILS
| 2
windowmanagers/afterstep/HISTORY
| 3
windowmanagers/icewm/DETAILS
| 2
windowmanagers/icewm/HISTORY
| 4
windowmanagers/icewm/icewm-1.2.30.tar.gz.sig
| 0
windowmanagers/icewm/icewm-1.2.32.tar.gz.sig
|binary
windowmanagers/jwm/HISTORY
| 5
windowmanagers/jwm/INSTALL
| 3
windowmanagers/jwm/PRE_BUILD
| 3
windowmanagers/jwm/configs
| 2
windowmanagers/jwm/jwm.desktop
| 8
windowmanagers/jwm/separate-rootmenu.patch
| 77
windowmanagers/jwm/startjwm
| 22
windowmanagers/jwm/volatiles
| 2
windowmanagers/xmonad/DETAILS
| 4
windowmanagers/xmonad/HISTORY
| 3
wm-addons/bubblemon-dockapp/DETAILS
| 25
wm-addons/bubblemon-dockapp/HISTORY
| 3
wm-addons/dzen2/DETAILS
| 18
wm-addons/dzen2/HISTORY
| 5
wm-addons/dzen2/PREPARE
| 7
wm-addons/wmgtemp/HISTORY
| 5
wm-addons/xtrlock/BUILD
| 1
wm-addons/xtrlock/DEPENDS
| 1
wm-addons/xtrlock/DETAILS
| 16
wm-addons/xtrlock/HISTORY
| 2
wm-addons/xtrlock/PRE_BUILD
| 9
x11-libs/cairomm/DETAILS
| 5
x11-libs/cairomm/HISTORY
| 3
x11-libs/cairomm/cairomm-1.4.2.tar.gz.sig
| 0
x11-libs/icon-naming-utils/DETAILS
| 2
x11-libs/icon-naming-utils/HISTORY
| 3
x11-libs/icon-naming-utils/icon-naming-utils-0.8.2.tar.gz.sig
| 0
x11-libs/icon-naming-utils/icon-naming-utils-0.8.6.tar.gz.sig
|binary
x11-libs/wine/DETAILS
| 2
x11-libs/wine/HISTORY
| 6
x11-libs/xfree86/DETAILS
| 16
x11-libs/xfree86/HISTORY
| 6
x11-libs/xfree86/PRE_BUILD
| 8
x11-libs/xfree86/ftfuncs.h.patch
| 10
x11-libs/xfree86/ftfuncs.patch
| 241
x11-libs/xfree86/ftsystem.patch
| 13
x11-libs/xfree86/util.c.patch
| 10
x11-toolkits/fox/DEPENDS
| 12
x11-toolkits/fox/HISTORY
| 6
x11-toolkits/gtk+2/DETAILS
| 2
x11-toolkits/gtk+2/HISTORY
| 9
x11-toolkits/gtk+2/PRE_BUILD
| 3
x11-toolkits/gtk+2/gtk+-2.10.14.tar.bz2.sig
| 0
x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig
|binary
x11-toolkits/gtk-sharp-2/DETAILS
| 2
x11-toolkits/gtk-sharp-2/HISTORY
| 3
x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.0.tar.bz2.sig
| 0
x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.2.tar.bz2.sig
|binary
x11-toolkits/gtkmm2/DETAILS
| 2
x11-toolkits/gtkmm2/HISTORY
| 6
x11-toolkits/gtkmm2/gtkmm-2.10.11.tar.bz2.sig
| 0
x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig
|binary
x11-toolkits/kiwi/DETAILS
| 4
x11-toolkits/kiwi/HISTORY
| 3
x11-toolkits/pygtk2/DETAILS
| 2
x11-toolkits/pygtk2/HISTORY
| 3
x11-toolkits/pygtk2/pygtk-2.10.6.tar.bz2.sig
| 0
x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig
|binary
x11-toolkits/qt-x11/175791_3.diff
| 11
x11-toolkits/qt-x11/DETAILS
| 2
x11-toolkits/qt-x11/HISTORY
| 6
x11-toolkits/qt-x11/PRE_BUILD
| 1
x11-toolkits/qt4/175791_4.diff
| 11
x11-toolkits/qt4/DETAILS
| 4
x11-toolkits/qt4/HISTORY
| 6
x11-toolkits/qt4/PRE_BUILD
| 5
x11-toolkits/wxgtk/BUILD
| 7
x11-toolkits/wxgtk/CONFIGURE
| 4
x11-toolkits/wxgtk/DEPENDS
| 2
x11-toolkits/wxgtk/DETAILS
| 5
x11-toolkits/wxgtk/HISTORY
| 26
x11-toolkits/wxgtk/INSTALL
| 1
x11-toolkits/wxgtk/PRE_BUILD
| 6
x11-toolkits/wxgtk/PRE_SUB_DEPENDS
| 17
x11-toolkits/wxgtk/SUB_DEPENDS
| 17
x11-toolkits/wxgtk/debdiff.patch
| 24
x11-toolkits/xaw3d/BUILD
| 1
x11-toolkits/xaw3d/HISTORY
| 3
x11/slim/BUILD
| 2
x11/slim/DEPENDS
| 34
x11/slim/HISTORY
| 5
x11/slim/PRE_BUILD
| 8
xfce/thunar/DEPENDS
| 34
xfce/thunar/HISTORY
| 5
xfce/xfce-utils/DEPENDS
| 7
xfce/xfce-utils/HISTORY
| 3
xfce/xfce4-mixer/BUILD
| 2
xfce/xfce4-mixer/HISTORY
| 3
xfce/xfce4-session/DEPENDS
| 9
xfce/xfce4-session/HISTORY
| 4
xfce/xfce4-session/PRE_BUILD
| 6
xfce/xfce4-session/gconf2.patch
| 24
2006 files changed, 22199 insertions(+), 2811 deletions(-)

New commits:
commit 766dbc712070eb3f825b2bb366f6a563d922e89f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

elfutils: Updated to 0.129. Include portability patch to avoid issues in
the future

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

java-access-bridge: Need to source /etc/profile.d/java.sh before building

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

gst-plugins: Added optional dependency on x264

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

trm: Remove incorrect Metadata:: qualification (gcc 4.1+ now errors on
this)

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

gnome2-libs/pygobject:

DETAILS: updated to 2.13.2, added short and long
descriptions

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

chat-im/gajim:

DETAILS: updated to 0.11.2

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

kvm updated to 44

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

evolution: Depends on libxml2 built with python support (sub_depends
already there for it :))

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

xaw3d: Fails with multiple make jobs

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

915resolution: Clear out 386 prebuilt 915resolution.o before compiling

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

multi-gnome-terminal: changed scrollkeeper to rarian

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

qalculate-gtk: changed scrollkeeper to rarian

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

galeon: changed scrollkeeper to rarian

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

gnome-utils2: changed scrollkeeper to rarian

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

gthumb2: changed scrollkeeper to rarian

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

gramps: changed scrollkeeper to rarian

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

glade2: changed scrollkeeper to rarian

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

glabels2: changed scrollkeeper to rarian

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

ggv: changed scrollkeeper to rarian

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

gedit-plugins: changed scrollkeeper to rarian

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

balsa: changed scrollkeeper to rarian

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

nautilus: changed scrollkeeper to rarian

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

libgda: changed scrollkeeper to rarian

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

gnome-user-docs: changed scrollkeeper to rarian

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

e-emotion, gst-plugins-good: e-emotion may optionally use
gst-plugins-good built with libcdio for CDDA support

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

gst-plugins-good: It's ASCII, not ascii ;)

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

gimp: Uses gimp-print, not gutenprint, for printing support

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

e-emotion: Optionally depends on gst-ffmpeg

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

gimp: That's ASCII, not Ascii ;)

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

e_dbus: Depends on ecore

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

e_modules: e_module-devian no longer exists

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

gnome-media: changed scrollkeeper to rarian

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

gnome-core: changed scrollkeeper to rarian

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

gdm: changed scrollkeeper to rarian

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

bless: changed scrollkeeper to rarian

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

gnucash-docs: changed scrollkeeper to rarian

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

anjuta: changed scrollkeeper to rarian

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

sabayon: updated to 2.20.1 and fixed depends

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

xdg-user-dirs: updated to 0.9

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

goobox: updated to 1.9.2

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

rhythmbox: updated to 0.11.2

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

natuilus-sendto: updated to 0.12

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

cryptsetup-luks added building static cryptsetup for use in initrd's

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

gnome-themes-extras: updated to 2.20

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

gnome-games-extra-data: updated to 2.20.0

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

evolution-sharp: updated to 0.14.0.1

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

gnome-vfsmm: updated to 2.20.0

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

libgnomeuimm: updated to 2.20.0

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

libgnomecanvasmm: updated to 2.20.0

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

libgnomemm: updated to 2.20.0

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

gnutls 2.0.1

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

gtkmm2: updated to 2.12.0

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

glibmm: updated to 2.14.0

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

libsigc++: updated to 2.1.1

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

libxml++: updated to 2.20.0

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

sabayon: New Spell

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

pessulus: New Spell

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

New Spell: gnome2-apps/accerciser

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

gnome-python-extras: updated to 2.19.1

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

gnome-devel-docs: New Spell

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

glade3: updated to 3.4.0

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

goffice-0.5: New spell for gnumeric devel version

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

gnumeric: updated to 1.7.12

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

libgsf: updated to 1.14.7

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

gtk-engines2: updated to 2.12.1

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

gnome-media2: updated to 2.20.1

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

libgnomeprintui: updated to 2.18.1

commit fe44b202a76b20e42cc9a2b3e1d0cfb315804c6f
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

firefox: firefox script: removed obsolete xfeDoCommand code

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

libgnomeprint: updated to 2.18.2

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

mono: Updated to version 1.2.5.1

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

imagemagick: Updated to version 6.3.5-10

commit 641224096f1ad492f089908d781412c3c49bd68d
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

w3m: CONFIGURE question clarified.

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

kdebase-workspace4: Make sure /usr/share/xsessions is a directory before
copying

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

pidgin: Fails to compile with multiple make jobs

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

xfce4-mixer: Fails to compile with multiple make jobs

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

kdebase-workspace4: X11-SERVER dependency is redundant (see KDE_DEPENDS)

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

galago-sharp: Depends on xml-libxml and dbus-mono

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

xml-libxml: HISTORY date fix

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

xml-libxml: Fails to install with multiple make jobs

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

ppp: Requires group ppp to exist

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

totem: updated to 2.20.0

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

sound-juicer: updated to 2.20.0

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

tomboy: updated to 0.8.0

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

linux updated maintenance patches

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

gtk-sharp-2: updated to 2.10.2

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

orca: updated to 2.20.0

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

gucharmap: updated to 1.10.1

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

gok: updated to 1.3.4

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

gnome-system-tools: updated to 2.20.0

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

liboobs: updated to 2.20.0

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

system-tools-backends: updated to 2.4.0

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

gnome-power-manager: updated to 2.20.0

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

gnome-keyring-manager

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

gedit: updated to 2.20.0

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

gcalctool: upadated to 5.20.0

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

file-roller: removed blank line

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

file-roller: updated to 2.20.0

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

evolution: remove blank line

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

evolution-exchange: updated to 2.12.0

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

evolution: updated to 2.12.0

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

evince: updated to 2.20.0

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

epiphany-extensions: updated to 2.20.0

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

epiphany: updated to 2.20.0

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

eog2: remove blank line in HISTORY

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

eog2: updated to 2.20.0

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

deskbar-applet: updated to 2.20.0

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

bug-buddy2: updated to 2.20.0

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

zenity: updated to 2.20.0

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

yelp: updated to 2.20.0

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

vino: updated to 2.20.0

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

pygtksourceview: updated to 2.0.0

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

libgail-gnome: updated to 1.20.0

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

gtkhtml2: updated to 3.16.0

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

gnome2-user-docs: updated to 2.20.0

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

gnome-terminal: updated to 2.18.2

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

vte: updated to 0.16.9

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

gnome-system-monitor: updated to 2.20.0

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

gnome-session: updated to 2.20.0

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

gnome-screensaver: updated te 2.20.0

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

gnome-nettool: updated to 2.20.0

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

qjackctl: replace sed hack for configuring correct Qt4 bin path with
patch from cvs

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

pcre 7.4

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

specimen: moved ./bootstrap for SVN version from BUILD to PRE_BUILD

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

valgrind: fix build with glibc 2.6

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

phpmyadmin: Updated to version 2.11.1

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

mail/ssmtp: created, added openssl as a optional dep for SSL/TLS support

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

firefox: Hopefully at least now have a working firefox spell. Still
need to find the missing sig for firefox.gpg

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

Revert "firefox some of the lines in DETAILS were left commented,
uncommented
them". Reverting this and fixing the one left uncommented.

This reverts commit d5a05dd6cbcf1f6a4f7e73a7183c841a7710dfbf.

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

graphics/blender: fixed install process so scripts can actually be used,
added optional dependency on ffmpeg

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

linux-initramfs swapped out symlinks for hard links and removed some of
the symlinked dirs... no more /sbin or /usr/sbin just /bin and /usr/bin

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

gnome-mag: updated to 0.14.10

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

gnome-games2: updated to 2.20.0.1

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

gnome-python-desktop: updated to 2.20.0

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

gnome-media2: updated to 2.20.0

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

gtksourceview: updated to 2.0.0

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

libgtop2: updated to 2.20.0

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

nautilus-cd-burner: updated to 2.20.0

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

gnome-python2: updated to 2.20.0

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

gnome-control-center: updated to 2.20.0

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

libgnomekbd: updated to 2.20.0

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

metacity: updated to 2.20.0

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

nautilus2: updated to 2.20.0

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

gnome-icon-theme: updated to 2.20.0

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

icon-naming-utils: updated to 0.8.6

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

gnome-themes: updated to 2.20.0

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

gtk-engines2: updated to 2.12.0

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

gnome-backgrounds: updated to 2.20.0

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

gnome-applets2: removed blank line

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

gnome-applets2: updated to 2.20.0

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

kvm updated to 42

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

gdm2: updated to 2.20.0

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

gconf-editor: updated to 2.20.0

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

fast-user-switch-applet: updated to 2.20.0

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

gnome-panel: forgot DEPENDS change

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

gnome-panel: updated to 2.20.0.1

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

eel2: updated to 2.20.0

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

gnome-menus: updated to 2.20.0

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

pygtk2: updated to 2.12.0

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

gnome-desktop: updated to 2.20.0

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

gnome-doc-utils: correct added blank line

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

gnome-doc-utils: updated to 0.12.0

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

evolution-webcal: updated to 2.12.0

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

gnome-keyring: updated to 2.20.0

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

evolution-data-server: updated to 1.12.0

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

dasher: updated to 4.6.0

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

libwnck: updated to 2.20.0

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

startup-notification: updated to 0.9

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

rarian: updated to 0.6.0

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

boost-jam: Fix bjam segfault with gcc 4.2 which caused boost compile to
fail

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

pgpdump 0.26

commit 9adf2ef0ec74d3cca578bdd9d12a9f29556fe22b
Author: Eric Sandall <sandalle@webex-d630.(none)>
Commit: Eric Sandall <sandalle@webex-d630.(none)>

glibc: Fix Bug #14004 (fails to find acceptable grep)

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

kde4/kdeaddons4 - new spell

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

kde4/kdeaccessibility4: new spell

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

graphicsmagick-1.1.10

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

kvm updated to 41

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

linux updated pre 2.6 kernel patches

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

Oopse probably should reexport LD_PRELOAD for installwatch

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

libgnomeui: updated to 2.20.0

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

devhelp: updated to 0.16

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

libbonoboui: updated to 2.20.0

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

libgnomecanvas: updated to 2.20.0

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

libgnome: updated to 2.20.0

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

libbonobo: updated to 2.20.0

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

gnome-common2: updated to 2.20.0

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

gnome-vfs2: updated to 2.20.0

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

firefox some of the lines in DETAILS were left commented, uncommented them

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

oops, fixing incorrect optional_depends line

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

liferea: Updated to version 1.4.2b

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

gail: updated to 1.20.0

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

at-spi: updated to 1.20.0

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

atk: updated to 1.20.0

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

intltool: updated to 0.36.2

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

gconf2: updated to 2.20.0

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

orbit2: updated to 2.14.9

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

libidl: updated to 0.8.9

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

libxslt: updated to 1.1.22

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

pango: updated to 1.18.2

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

glib2: updated to 2.14.1

commit 4ab07c9a37b02c20d53c21da8157f1005f2e71e1
Author: root <root@wyndryder.(none)>
Commit: root <root@wyndryder.(none)>

gurus.gpg: added new key for Robin Cook

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

ace-5.6.1

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

tea 17.2.5

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

man-pages 2.65

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

init.d: made telinit work if a script exists in more than one runlevel

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

sylpheed 2.4.6

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

gnumeric: don't chain persistent_read with && or the spell fails if
gnumeric2 vars aren't set

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

photoprint - changed depends

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

firefox: Updated to version 2.0.0.7. SECURITY_PATCH++. New sig
not part of firefox.gpg. Added missing && in PRE_BUILD

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

qt4pas-V1.50_Qt4.3.1

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

updating mplayerplug-in to 3.45

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

a2ps dependency on tex is optional

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

a2ps dependency on tex is optional

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

cups-1.3.2

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

pxlib-0.6.2

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

a2ps dependency on tex is optional

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

linux updated latest mm patches

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

wpa_supplicant: Also work for non-associated off/any ESSIDs

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

ekiga: Updated to version 2.0.11. Fixed SOURCE_URL

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

opal: Updated to version 2.2.11. Fixed SOURCE_URL

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

pwlib: Updated to version 1.10.10. Updated SOURCE_URL's.

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

tora-1.3.22

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

seahorse 2.20

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

ntp-4.2.4p4

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

digikam - fix build with latest lcms

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

libkexiv2-0.1.6

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

kipi-plugins - add trigger

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

imagemagick: Updated to verison 6.3.5-9. SECURITY_PATCH++

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

icu-3.8

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

kdelibs4 - fix install

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

postgresql 8.2.5

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

claws-mail-extra-plugins 3.0.1

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

claws-mail 3.0.1

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

e/ecore: added possibility to build Ecore_Desktop module

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

partimage-0.6.7_beta1

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

ragel-5.24

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

mpich2: Updated to 1.0.6

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

bochs: Updated to 2.3.5

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

http/seamonkey:

DETAILS: PATCHLEVEL++
PRE_BUILD, cairo-fixes.patch: added patch from firefox spell
as seamonkey needs it too

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

According to the website for Virtualbox bin86 and dev86 work equally
well, so i changed the "dev86" to LD86.

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

pcsc-lite 1.4.4

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

bmpx 0.40.7

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

dejavu-ttf 2.20

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

transcode: updated to 1.0.4

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

mplayer: only support dvdnav in release version

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

kvm updated to version 40

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

libgnomedb3-3.1.1

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

libgda3-3.1.1

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

wxgtk: updated to 2.8.5, added bugfix for 2.6.4

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

tracker: support xdg-open

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

tracker: updated to 0.6.2

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

jackdmp: Added install of headers and pkgconfig file to enable building
packages against jackdmp.

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

liferea: Forgot to remove old sig file

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

liferea: Updated stable to version 1.4.1. Now always depends sqlite
Fixed build when chossing xulrunner for GECKO.

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

seedit fixe python install to use python2.5 instead of python2.4

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

gedit: Added depends pygtksourceview if optional_depends python

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

seedit updated to make it work hopefully

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

firefox patch for updated cairo

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

gedit updated to new 2.19.92 along with the rest of gnome beta

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

graphics-libs/rmagick:

DETAILS: updated to 2.0.0-beta3

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

qsynth: Added PRE_BUILD; need to sed the configure script so that it will
find Qt4's
qmake/moc/uic executables instead of Qt3's equivalent ones when both
libraries are
installed.

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

qjackctl: Re-added PRE_BUILD; we need to sed the configure script because
it detects the
Qt3 qmake/moc/uic executables instead of the Qt4 ones, so that the build
will fail if both
libraries are installed.

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

gzip should have been the gzip patch not the cpio one

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

gzip added internalization of futimens patch for glibc 2.6.1
compatability to gzip

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

cpio added glibc 2.6.1 futimens patch so it will compile with glibc 2.6.1

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

gail: Removed depends libgnomecanvas because it depends on gail, not
vice-versa.

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

libgnomecanvas: Added depends pango & gail, that's what ./configure says

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

gwenview-1.4.2

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

jack-cvs: Deleted PROVIDES because this spell is deprecated.

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

centerim: Updated to version 20070625

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

gtk+2: Updated to stable version 2.12.0

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

evince: updated to 2.19.92

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

qsynth 0.3.1

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

New Spell! Myththemes version 0.20.2

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

ksquirrel-0.7.1try4

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

cups: Updated to version 1.3.1

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

seedit new spell for editing selinux policies

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

fuse-python fixed hash sum for source

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

fuse-python updated to version 0.2

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

perl-fuse updated bindings for fuse in perl

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

graphics-libs/poppler:

DEPENDS: fixed annoying typo

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

simpleinit-msb added selinux patch for loading selinux policies

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

disk/cdrdao:

PREPARE, DETAILS: added autoupdate option

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

qjackctl 0.3.1a

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

pidgin: Updated to version 2.2.0

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

gimp-lqr-plugin: 0.2.0

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

p7zip-4.55

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

wine-0.9.45

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

Updated espeak to 1.29

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

coreutils fixed more selinux stuff from last night... need to stop coding
like mad when its too late

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

coreutils fixed PRE_BUILD check for enableing the patch or not

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

selinux/pam don't seem to like useradd/groupadd commands being run with
LD_PRELOAD on so back it up and execute the command

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

turbogears-1.0.4b1

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

Now we have curl 7.17.

Revert "libssh2: Revert "libssh2 0.17". Bug #13963. Will update to
0.17 once"

This reverts commit 7be57a70b64e8e56f52ff044c0ab4749c6d8a07d.

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

curl 7.17.0

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

xapian-core-1.0.2

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

Revert "xapian-core-1.0.2"

This reverts commit 908d60db73f373671838039953dae6acf634f7ba.
remove duplicate spell

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

qt4pas-V1.49_Qt4.3.1

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

paste-1.4.2

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

pastescript-1.3.6

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

turbokid-1.0.3

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

forgot about the default n placement in the function arguments

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

coreutils added glibc 2.6.1 fix for futimens function

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

coreutils added selinux option to the configure command

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

fixed selinux patch again... *sigh*

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

coreutils fixed selinux patch didn't apply cleanly against hostname patch

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

coreutils fixed name of selinux patch in PRE_BUILD oopse

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

coreutils added selinux patch

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

util-linux enabled selinux for ng stuff and added a little patch for when
LC_ALL doesn't seem to be defined

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

audit new spell for linux auditing system

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

kvm updated to 38

commit 2f5880d912c2bf79b30d02f2df2c66be8d9047ed
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Changelog entry for the new shorewall suite

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

bmpx 0.40.4

commit 31201a1c71d095c259ad2534481329020425ac77
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

iptables: update grsec patch to 1.3.5, it also applies to 1.3.8 with a
small hax
Added the small hax ;)

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

shorewall: Fixed PREPARE for reals this time

commit 9adc50bd20aa125fd03cb2ecc65a764e69fb22ae
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall: Had the wrong syntax for the PREPARE stuff

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

ntfs-3g-1.913

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

quill: 0.2.8

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

jackdmp: forgot HISTORY

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

jackdmp 0.65

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

moc 2.4.3

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

krb5: SECURITY_PATCH=5, CVE-2007-3999, CVE-2007-4000

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

xfe 1.04

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

strigi: fix a query

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

apache-mod_ssl 2.8.30-1.3.39

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

xapian-core-1.0.2

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

bisonc++-2.2.0

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

spelling/stardict:

DETAILS: PATCHLEVEL++
PRE_BUILD, tooltips.patch: added patch for building
with latest GTK+ 2

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

audio-soft/cuetools: New spell, cue/toc file utilities

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

audio-soft/shntool: version 3.0.4

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

ntfs-3g-1.910-RC

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

qca2-2.0.0-test4

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

qt4pas - add trigger

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

telepathy-sofiasip-0.3.29

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

telepathy-mission-control-4.37

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

telepathy-glib-0.5.14

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

libtelepathy-0.0.57

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

telepathy.gpg - add extra key

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

xrdp added some depends that's needed

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

xrdp updated to 0.4.0

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

poppler: updated to 0.6

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

poppler-data: new spell

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

graphics-libs/poppler:

DETAILS: fixed VERSION fields for CVS branch

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

samba 3.0.26a, SECURITY_PATCH=4

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

net-tools: patch so it works with vanilla kernel headers

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

xfsdump 2.2.46

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

attr 2.4.39

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

acl 2.2.45

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

myodbc-3.51.16r494

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

xfsprogs 2.9.4

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

specimen: Added SVN option.

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

rosegarden: Moved SOURCE_HASH to inside the VCS conditional.

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

tagua: new spell

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

dvgrab-3.0

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

shell-term-fm/sakura: updated to 1.2.1

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

linux updated pre 2.6 kernel patches

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

gnupg-exp 2.0.7

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

apache-mod_ssl 2.8.29-1.3.39, SECURITY_PATCH=1

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

audio-players/sonata:

DETAILS: updated to 1.2.3

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

apache2 2.0.61, SECURITY_PATCH=2

I have not tested it properly. I tested only apache22 (I use this).
It is security fix.

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

apache 1.3.39, SECURITY_PATCH=2

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

opensc 0.11.4

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

openct 0.6.14

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

ksquirrel-0.7.1try3

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

imagemagick - minor change

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

pstoedit-3.45

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

graphicsmagick-1.1.8

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

science/viking: new spell, a google/terraserv/openstreetmap map viewer

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

science/viking: new spell, a google/terraserv/openstreetmap map viewer

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

man-pages-fr-2.40.0

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

fpc-2.2.0

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

fpcsrc-2.2.0

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

libs/libidn: versions 1.1 (bug# 13857)

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

rtorrent: 0.7.8

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

libtorrent: 0.11.8

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

kde4-l10n-3.93.0

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

python-devel/python-markdown: new spell, a Python implementation of
Markdown

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

lighttpd: Updated to version 1.4.18. SECURITY_PATCH++

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

libs/ode:

DETAILS: updated to 0.8.1-rc1

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

Updated qloud to 0.22

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

apache22 2.2.6, SECURITY_PATCH=2

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

python-devel/soappy:

PRE_BUILD, import-error.patch: added to fix building errors

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

i18n/im-ja: Fixed XIM configure switch (bug# 13896)

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

pygtksourceview: really add new spell

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

aria2-0.11.3

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

ftp/ncftp: Fixed SOURCE_HASH
Verified source by comparing with an older release

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

devel/slang: version 2.1.2

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

linux-initramfs forgot to quiet the pushd/popd's and remove the cpio root

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

audio-soft/eyeD3: renamed (deprecated) spell to eyed3

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

kdegames4 -add optional ggz-client-libs

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

glpk - make gmp optional

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

kvm updated to version 37

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

man-pages-cs 0.17.20070905

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

t4pas-V1.48_Qt4.3.1

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

libgnomeui -extra depends

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

glpk-4.21

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

koffice2 1.9.93

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

ChangeLog: fix conflict

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

yelp: updated to 2.19.90

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

rarian: new spell replaces scrollkeeper

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

scrollkeeper: deprecated - replaced by rarian

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

vino: updated to 2.19.92

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

gnome-utils2: updated to 2.19.91

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

gnome-system-monitor: updated to 2.19.91.1

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

gnome-session: update to 2.19.92

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

gnome-screensaver: forgot to add the DEPENDS change to HISTORY

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

gnome-screensaver: updated to 2.19.7

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

gnome-nettool: updated to 2.19.90

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

gnome-mag: updated to 0.14.8

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

gtkhtml2: updated to 3.15.92

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

libgail-gnome: updated to 1.19.5

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

gnome-games2: updated to 2.19.92

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

gnome-python-desktop: updated to 2.19.2

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

nautilus-cd-burner: updated to 2.19.6

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

gtksourceview: updated to 1.90.4

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

gnome-control-center: renamed and updated to 2.19.92

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

nautilus2: updated to 2.19.91

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

libgnomekbd: updated to 2.19.91

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

gnome-themes: updated to 2.19.92

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

gnome-icon-theme: update to 2.19.91

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

gtk-engines2: updated to 2.11.7

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

eel2: updated to 2.19.90

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

metacity: update to 2.19.55

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

gnome-applets2: updated to 2.19.91

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

gnome-panel: updated to 2.19.92

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

gnome-menus: updated to 2.19.92

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

gnome-desktop: updated to 2.19.92

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

libxklavier: updated to 3.3

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

gdm2: updated to 2.19.7

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

librsvg2: updated to 2.18.2

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

gnome-doc-utils: updated to 0.11.2

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

gconf-editor: updated to 2.18.2

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

evolution-webcal: updated to 2.11.91

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

gnome-keyring: updated to 2.19.91

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

evolution-data-server: updated to 1.11.92

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

dasher: updated to 4.5.2

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

libwnck: updated to 2.19.92

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

libgtop2: updated to 2.19.92

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

control-center2: depricated as renamed to gnome-control-center

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

libgnomeui: updated to 2.19.1

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

libbonoboui: updated to 2.19.6

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

libgnomecanvas: updated to 2.19.2

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

libgnome: updated to 2.19.1

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

libbonobo: updated ot 2.19.6

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

gnome-vfs2: updated to 2.19.91

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

gconf2: updated to 2.19.1

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

at-spi: updated to 1.19.5

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

gail: updated to 1.19.6

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

atk: updated to 1.19.6

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

gtk+2: updated to 2.11.6

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

pango: updated to 1.18.1

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

i18n/scim: fixed SOURCE_HASh

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

audio-soft/eyeD3: new spell, Python id3(v2) tag program/library

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

kde-apps/kid3: version 0.9

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

totem: updated to 2.19.90

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

sound-juicer: updated to 2.19.3

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

gnome-system-monitor added depends on gtkmm2

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

glibmm updated for latest gnome beta to work

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

gtkmm2 updated to work with newer gnome2 beta version

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

linux-initramfs updated mkinitrd to use cpio instead of gen_init_cpio
from the kernel

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

gnokii: needs make_single

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

gnokii: 0.6.18 #13979

commit 9803d083415be2313f379143c1c99f93e9eafb26
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding prepare

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

fix bug #13987

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

fix bug #13987

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

ix bug #13987

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

libxml2 2.6.30

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

clamav - fix bug #13983

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

libpng-1.2.20

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

itools-0.16.8

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

kde4 - adjust depends

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

kdepim4 - 3.93.0

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

kdebase4 - update dpends

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

kdebase-workspace4 - fix typo

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

kdeedu4-3.93.0

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

openbabel-2.1.1

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

weechat: Updated to version 0.2.6

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

gnome2-apps/gazpacho: updated to 0.7.2

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

x11-toolkits/kiwi: updated to 1.9.16

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

Updated Mythmusic to 0.20.2

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

graphics/gimp-lqr-plugin: new spell, GIMP Liquid rescale plugin

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

Updated mythweb to 0.20.2

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

Updated to version .20.2. This will allow use of the Schedules Direct
grabber which replaces DataDirect.

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

kde4 - move stuff between kdebase4 and kdebase-workspace4, and adjust
dependencies

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

kdebase4 - install fixed

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

kdebase4 - fix typo

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

qimageblitz - fix typo

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

gnome-build: Updated to version 0.2.0

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

x11-toolkits/wxgtk/SUB_DEPENDS: quick fix of needless spaces

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

database/pgadmin3:

DETAILS: added SOURCE2_IGNORE
DEPENDS: needs DEV branch of wxgtk

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

x11-toolkits/wxgtk:

DETAILS: PATCLEVEL++
BUILD, INSTALL: fixed if statements in xrc skipping,
removed WXGTK_OPTS usage
SUB_DEPENDS, PRE_SUB_DEPENDS: switched to WX_CONTRIB,
added DEV sub_dependency

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

kdesdk4-3.93.0

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

kdegraphics4-3.93.0

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

kdegames4-3.93.0

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

slim: added pam support and use our CFLAGS

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

kdenetwork4-3.93.0

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

kde4-profile-4-3.93.0

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

kdemultimedia4-3.93.0

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

kdebase4-3.93.0

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

kdeutils4-3.93.0

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

kdebase-workspace4 - updated depends

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

kde4 - update depends

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

kdeadmin4-3.93.0

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

kdetoys4-3.93.0

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

dovecot: always install dev headers

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

dspam: added installation of pref.h

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

security/pam_skey: new spell, pam otp module

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

security/skey: new spell, skey lib and utilities

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

database/pgadmin3:

DETAILS: updated to 1.8.0-beta4, switched to
upstream key
DEPENDS: needs ogl too for wxgtk
pgadmin3.gpg: added key

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

qimageblitz-0.0.706674

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

Adding lignomecanvas to gtkpod DEPENDS

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

kdebase-workspace4-3.93.0

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

kdepimlibs4-3.93.0

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

kdelibs4-3.93.0

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

kernels/deskopt:

DEPENDS: added elementtree

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

sdl_net-1.2.7

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

windowmanagers/xmonad: updated to 0.3

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

haskell/haskell-x11-extras: updated to 0.3

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

squid: Updated to versin 2.6.STABLE16

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

net-tools updated patchlevel from previous commit

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

netconf added BRIDGE_PORTS variable

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

Revert "netconf added BRIDGE_PORTS variable to netconf"

Forgot HISTORY entry and patchlevel update

This reverts commit 457e51a5e379f43624ee08da6abcc6c1ec43114d.

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

kernels/deskopt: new spell, utility to tune kernel schedulers

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

x11-toolkits/wxgtk:

BUILD, PRE_SUB_DEPENDS: fixed bad list_find usage

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

database/pgadmin3:

DEPENDS: added sub_dependencies for wxgtk

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

x11-toolkits/wxgtk:

BUILD: moved opengl flag to DEPENDS, changed options handling,
made xrc optional
CONFIGURE: added xrc to WX_CONTRIB
DEPENDS: added flag to OPENGL
INSTALL: fixed xrc handling an added $WXGTK_OPTS to loop
SUB_DEPENDS, PRE_SUB_DEPENDS: added for sub_depending ;)

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

zziplib-0.13.49

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

goffice-dev: Revert "goffice-dev: Updated to version 0.5.0." This
version does not work with gnucash 2.2.1 and hopefully gnumeric devel
will be updated to work with goffice-dev 0.4.x

This reverts commit 09737fcf74011b32198ea608fe91ef94c2ac4466.

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

goffice-dev: Updated to version 0.5.0. Required for devel version of
gnumeric. 0.4.x doesn't work.

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

abiword: Updated devel version to 2.5.2

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

goffice-dev: Fix HISTORY typo

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

goffice-dev: Updated to version 0.4.3

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

libgsf: Updated to version 1.14.6

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

firebird-2.0.3.12981-0

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

database/pgadmin3:

DEPENDS: added libxml2 and libxslt

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

netconf added BRIDGE_PORTS variable to netconf

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

net-tools added BRIDGE_PORTS variable so that bridges can be created
around interfaces

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

openssh: Updated to version 4.7p1

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

sqlite: My error this should not have been updated.
Revert "sqlite: Updated to version 3.5.0"

This reverts commit b72234044fa4fe96094ab8ea3c61788d001a566c.

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

liferea: Updated devel to version 1.4.1

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

tea: Updated to version 17.2.1

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

imagemagick: Updated to version 6.3.5-8

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

video-libs/libdvdnav:

DETAILS: updated to 0.1.10, removed UPDATED

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

video-libs/libdvdread:

DETAILS: updated to 0.9.7
libdvdread-0.9.6-udfsymbols.patch: minor fix

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

rosegarden: Added svn version.

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

opencdk: added support for new 0.6 branch (0.6.4)
new gnutls 2.0.0 needs 0.6
old gnutls 1.6.3 needs 0.5

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

libtasn1 1.1
removed UP_TRIGGERS because it wants to rebuild almost all system
version number change from 0.3.10 to 1.1 but libraries are compatible
libtasn1.so.3.0.10 versus libtasn1.so.3.0.12

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

gnutls: added support for new stable 2.0 branch (2.0.0)
it wants some testing before it can be default, for now it looks OK

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

sqlite: Updated to version 3.5.0

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

disk/hdparm:

DETAILS: PATCHLEVEL++
INSTALL: install_rootifying
init.d/hdparm: changed RUNLEVEL to 1

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

seamonkey: Use check_if_xorg_modular_libs to ensure all cases
are covered. Bug #13976

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

git-1.5.3.1

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

xaralx-0.7r1780

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

mesalib: minor depends fixups to make it build properly

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

ksquirrel-0.7.1try2

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

ksquirrel-libs-0.7.1try2

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

linux updated latest pre 2.6 kernel

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

linux updated latest mm patches

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

sysstat 8.0.0

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

virtualbox 1.5.0

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

virtualbox-module 1.5.0

commit bc38dcbe38b520d77ff1a3eb336ccc57caf3d77c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

madwifi: bump to 0.9.3.2; making it build with linux-2.6.22

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

claws-mail-extra-plugins 3.0.0

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

claws-mail 3.0.0

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

libssh2: Revert "libssh2 0.17". Bug #13963. Will update to 0.17 once
curl 7.17 is released.

This reverts commit 74532852b2707e61a5e67de8c926f14dff0cac4b.

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

strongswan-4.1.6

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

madwifi: Added SOURCE_HINTS to get svn version working again

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

ipsec-tools 0.7

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

audio-drivers/alsa-lib:

PRE_BUILD: added to fix building with python

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

audio-drivers/pyalsa:

DETAILS: updated to 1.0.15rc1

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

audio-drivers/alsa-utils:

DETAILS: updated to 1.0.15rc1

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

audio-drivers/alsa-plugins:

DETAILS: updated to 1.0.15rc1

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

audio-drivers/alsa-lib:

DETAILS: updated to 1.0.15rc1

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

audio-drivers/alsa-firmware:

DETAILS: updated to 1.0.15rc1

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

audio-drivers/alsa-driver:

DETAILS: updated to 1.0.15rc1

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

opencdk: added backup SOURCE_URLs [Bug 13972]

commit 78c798d8e72dd21ff30fff549324b5913bdefee4
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: Moved the docs depends to the shorewall spell

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

shorewall: Transforming the spell into a profile spell
Makes casting shorewall still work, and will still work for upgrades

commit 5fe013da2d4de751fbf2e4b134d8156fee11f0b7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: making it conflict with shorewall-lite

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

Revert "crypto/opencdk: Old SOURCE_URL was no longer valid"

This reverts commit ece787c070a9b4f1e86f3af96a82431e5e7ca060.

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

shorewall-lite: dOH! needs to be executable

commit 4ea8275e0bde62b95605b112629e8a889e5f1bf9
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-lite: adding a conflicts with shorewall-common

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

python-devel/django: remade installation of bash completion

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

shorewall-docs-html: fixing RELEASE variable

commit 194a466238df6164b081c46b773df23489f121cf
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: fixing RELEASE variable

commit 4e4b6c8c144911bbb9ad413dbd4d770c437f8314
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-docs-xml: Fixing RELEASE variable

commit 4ad4119d8a613530186ecb107ef1b45767d499c8
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-perl: fixing RELEASE variable

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

shorewall-shell: fixing RELEASE variable

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

shorewall-lite: DOH! fixing RELEASE value so it can download

commit 68db0aa08aea8aecd894f13d7441e9ebf3bd4924
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-lite: fixing download URLs

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

shorewall-docs-xml: Fixing download URLs

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

shorewall-docs-html: fixing download URLs

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

shorewall-shell: fixing download URLs

commit 26dca87c85b79feb616fa0da075f37bd8cab7ce3
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: fixing SOURCE_URLs

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

shorewall-perl: fixed the download URLs

commit 2786f54bfdae7c5517bda3ab6cefea4f22c1c831
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-perl: only needs to depend on perl

commit 5e2a24c710f8b5cc3f24c8c860961b395d9ee9e0
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-shell: heh, don't need to depend on all this.

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

Adding spell shorewall-lite

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

Adding spell shorewall-docs-xml

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

Adding spell shorewall-docs-html

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

Adding spell shorewall-perl

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

crypto/opencdk: Old SOURCE_URL was no longer valid

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

Adding spell shorewall-shell

commit 64d0ec1ec14f9e28c854aec4544721f0d1e9a6b2
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-common

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

disk/parted: fixed compile error when warnings were treated as errors

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

samba: run python_install only when python was chosen, a mistake from the
previous commit

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

pidgin-otr: Updated to version 3.1.0. Updated SOURCE_URL

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

libotr: Updated to version 3.1.0

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

bitlbee: Updated to version 1.0.4

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

openldap: Updated to version 2.3.38. Removed non-working SOURCE_URL's.

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

tesseract - apply upstream patch

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

postgresql: updated broken pgcluster patch. Something that needs to
be check on version updates.

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

python-devel/django: added option to install bash completion

commit 3ac30891706fa7324b685fe666d30919b02a3ada
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

bash: needs autoconf

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

sqlalchemy-0.4.0beta5

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

git: Updated to version 1.5.3

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

gnupod: version update 0.99.3

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

amsn: Fix problems introducted with abouter's commit.

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

seahorse 2.19.91

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

soundtracker: removed the now standard BUILD

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

gnucash: made texinfo an optional dep

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

soundtracker: version 0.6.8 and added explanation for alsa

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

k9copy: 1.1.3, patch from Julien "KaZe" ROZO #13971

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

afterstep: Update to version 2.2.7

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

i wonder why this was left out of my prev commit...

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

dovecot: create a dovecot account for the default config

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

amsn: version bumped to 0.97RC1

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

tesseract-2.01

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

dazuko-2.3.4-pre2

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

p7zip-4.53

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

samba: added python_install target, the final nail for #13967

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

net-tools: fixed typo #13970

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

imagemagick: Updated to version 6.3.5-7

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

lftp: Updated to version 3.5.14

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

ktorrent: Updated to version 2.2.2

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

agg: new spell, a graphics library

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

tor: version updates for both devel and stable

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

pilot-link: upstream sigs, various cleanups and revamps, tcl option
doesn't build so disabled it for now

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

netatalk: Updated to version 2.0.3. Fixed compiles problems with
newer version of db. Bug #11524. Added patches from gentoo for
this problem. Cleaned up DETAILS and fixed bug that spell was
using variable OPTS in CONFIGURE.

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

squid: Updated to version 2.6.STABLE15

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

liferea: Updated devel to version 1.4.0 and stable to 1.2.23

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

ayttm: Updated to version 0.5.0-10. Removed workaournd in
BUILD

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

devel/darcs: updated to 1.0.9, added some missing dependencies

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

vala: updated to 0.1.3

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

mono: Updated to version 1.2.5

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

net/samba: fix python bindings failing to cast (Bug #13967)

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

nekobee 0.1.6

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

linux 2.6.22.6

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

gtklp-1.2.5

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

ksquirrel-0.7.1

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

sylpheed 2.4.5, SECURITY_PATCH=1, SA26550

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

ksquirrel-libs-0.7.1

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

libedit-20070831-2.10

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

audio-players/audacious: removed audacious-plugins dependency (Bug #13958)

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

iso-codes 1.4

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

pdfedit 0.3.2
From Cahnelog:
Fixed bug when doxygen would overwrite /dev/null device if run under root

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

video/ffmpeg-svn: forgot some stuff tnx Jaka

commit 1c2b8bf215d9ccae5b029164a03e51b679fef02a
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

rsnapshot: New spell, a filesystem snapshot utility

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

gnash: update to 0.8.1, upstream gpg, other fixups/revamping

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

ffmpeg-svn: sync the DEPENDS file with regular ffmpeg spell

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

php 5.2.4, SECURITY_PATCH=5

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

Revert "nasm-0.99.01"
which broke lame
This reverts commit 0f1e739e1df35b4dc8499164e7fb1b719c9d2f15.

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

jakarta-log4j: Fix missing parameters for grimoire dependency

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

jakarta-regexp: Fix missing parameters for grimoire dependency

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

tomcat: Missing dependency on z-rejected for some packages

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

pkgconfig: removed our pc-path hacks, upstream works fine

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

gtk+2: compile with cups 1.3

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

lighttpd: Updated to version 1.4.17

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

ardour2: New spell, professional Digital Audio Workstation.

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

lilypond: 2.10.29

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

samba: added some && to fail properly [Bug 13967]

commit 055c85f6dd1988925a2ec715ffa4d9f70c6d54fb
Author: root <root@omega.(none)>
Commit: root <root@omega.(none)>

fusepod: minor fixups

commit 97d5906884232fdd5d8e3ef9a69e40e9642d9ced
Author: root <root@omega.(none)>
Commit: root <root@omega.(none)>

fusepod: new spell fuse FS for iPod access

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

libgphoto2 - update camera list

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

util-linux updated testing version to 2.13, not sure if this is
considered testing anymore... :\

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

binutils 2.18

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

libtasn1 0.3.10

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

amarok: TRIGGERS: added flac

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

kst: 1.4.0

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

intltool-0.36.1

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

dbi-1.59

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

opencdk-0.5.13

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

nasm-0.99.01

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

pcre-7.3

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

libidn: Use sedit vice patch file. Appears file can be created
correctly on some systems. Suspect with newer glibc it is
created correctly.

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

dialog-1.1-20070704

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

euphoria: moved from cvs to git

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

collab/subversion: updated to 1.4.5

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

fontforge-20070808

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

ruby-esmart: moved form subversion to git

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

ruby-edje: moved from subversion to git

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

ruby-ecore: moved from subversion to git

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

ruby-evas: moved from subversion to git

please, could some git specialist test this SOURCE_URL
it works but when I repeat "summon -d ruby-evas" just get:
mv: cannot move `ruby-evas' to `ruby-evas-svn/ruby-evas': Directory not
empty

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

popt-1.12

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

pan: fixed svn SOURCE_DIRECTORY
i tested new version of subversion and found out this bug

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

subversion 1.4.5
fixed security issue on Microsoft Windows clients
on linux no security problems
http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=69413

commit b0c134185f284495b31e6bb7abef6860849c0dc7
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

tar: added upstream patch, SECURITY_PATCH++, bug 13957

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

dazuko-2.3.4-pre1

commit c2bde5d40b7c3920d723ea21807470eac9aa249f
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

star: Updated to 1.15a84, SECURITY_PATCH++, Bug 13957

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

openct 0.6.13

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

smgl-ledger 0.07, IP address has been changed

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

utils/helpdeco: new spell

commit 2d21233e7d00d75c0865d2304074c5cd1098666d
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

amanda: Added missing guru signature file

commit 8000aefac5f89f3971202dc61cfde572f0af213a
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

gurus.gpg: Added my key (0x6B750C1F)

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

linux updated pre 2.6 patches

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

beagle: Updated to version 0.2.18

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

squirrelmail-gpg 2.1

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

/xine-lib-1.1.8

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

libtunepimp: updated UP_TRIGGERS, last version change is also a breaker

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

loudmouth: forgot HISTORY entery for added depends libidn

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

gossip: Updated to version 0.27

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

loudmouth: Updated to version 1.2.3

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

libidn: Fix for bug 13857.

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

postgres: added optional dep on openldap

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

grep: made texinfo optional

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

jwm: separated the menu from the config and added session files for the
login-managers

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

squirrelmail-notes: fixed install

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

enthrall: version 0.6, added jwm support

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

devel/jruby:

INSTALL: changed installation directory to ANT_HOME actually

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

kino-1.1.1

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

qca2-2.0.0-test1

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

removed across BUILD/INSTALL push and pop directory operations. sorcery
guarantee's the pwd across build/install but not the directory stack hasn't
been this way for a long time.

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

devel/jruby:

DETAILS: updated to 1.0.1
INSTALL: changed installation directory to versionless symlink

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

linux updated latest mm patches

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

backup-manager: update to 0.7.6

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

udev: only run coldplugging if udev is used

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

device-mapper 1.02.22

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

lvm 2.02.28

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

newt-0.52.7-3.fc8

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

fox: optional_depends libxft only if xorg-modular

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

heyu2-2.1.0

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

jfsutils 1.1.12

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

Merge

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

firebird 2.0.2.12964-0

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

brasero: updated to 0.6.1

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

ntfs-3g-1.826

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

swfdec-mozilla: updated to 0.5.2

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

swfdec: updated to 0.5.2

commit 64e4c83cd080e6676880a54398e7e7deabb8d6cc
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk: added zaptel as optional_depends

commit cbb3a7520d59bee43a9ffdaacbc3f9362880e5c3
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

zaptel: updated to 1.4.5.1, rework of DETAILS, BUILD and INSTALL

commit 3db733c6dfa824ff4c9b83124a6bdda292d8c13b
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk: updated to 1.4.11 and applied upstream patch. SECURITY_PATCH++

commit be7454b7255551daa4ba9c209feac59f1769cf19
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk.gpg: Added two upstream keys to the keyring.

Key 1FFB181A was signed by 2 of the 6 already existing upstream keys,
key 8D0CAA72 was signed by 4 of the 6 already existing upstream keys.

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

haskell/haskell-html: new spell, a Haskell HTML combinator library

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

haskell/haskell-quickcheck: a library for automatic testing of Haskell
programs

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

haskell/haskell-x11-extras:
POST_REMOVE: Added to unregister package with ghc-pkg
PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
also register package with ghc-pkg

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

haskell/haskell-x11:
POST_REMOVE: Added to unregister package with ghc-pkg
PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
also register package with ghc-pkg

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

haskell/haskell-mtl:
POST_REMOVE: Added to unregister package with ghc-pkg
PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
also register package with ghc-pkg

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

devel/ghc: Added PRE_RESURRECT, POST_RESURRECT to protect package.conf

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

haskell/FUNCTIONS: Modified default_install to install *.cabal files
haskell/HASKELL_{POST_REMOVE,PRE_RESURRECT,POST_RESURRECT}:
Added to fix many possible problems.

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

protected, volatiles: Added ghc's package.conf

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

gscan2pdf: Cleaned up DEPENDS and added missing

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

unpaper: added new spell

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

utils/bochs: updated to 2.3

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

readline: Updated with latest upstream patches.

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

gscan2pdf: Added new spell

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

perl-gtk2-simple-list: Added new spell.

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

compress-zlib: Added depends compress-raw-zlib, io-compress-zlib

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

pdf-api2: Added depends compress-zlib

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

perl-gtk2-1.146

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

imagemagick: Added optional depends for perl

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

pdf-api2: Updated to version 0.62

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

lame - extra depends

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

lame-3.97

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

octave-forge: temporary commit, it is still as broken as before
looks like we'll have to install these using the octave pkg managment

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

octave: forgot to include a fix

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

octave-forge: updated to match octave

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

spelling/stardict:

PRE_BUILD: fixed building with espeak

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

octave-devel: synced from octave

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

dar-2.3.5

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

octave: updated to 2.9.13

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

octave-forge: fix #12395

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

ginac: 1.3.7

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

mdadm: Updated to 2.6.3

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

cimg-1.2.3

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

bash: Updated to current upstream patches. PATCHLEVEL++

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

banshee: Updated to version 0.13.1

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

confuse: fixed #13956

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

wine-0.9.44

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

libassuan 1.0.3

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

soundtracker: re-enabled alsa

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

fox: added optional_depends libxft (xfe 1.00 needs it)

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

xfe 1.00

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

re2c-0.13.1

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

udev 115

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

thunderbird: missing dep on gnome-panel

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

mrxvt 0.5.3

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

rsbac-admin 1.3.5

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

doc/evince: upstream wants specifically 0.5.9, we have 0.5.91 and no
versioned spells, so sedit the requirement and it worked fine.

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

counter-linux: Added an installer for the Counter Linux.org script

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

Add forgotten polyester GPG signature and fix ChangeLog entry for kcpufreq

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

qtcurve-kde3: New widget style for QT/KDE3

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

linux 2.6.22.5

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

linux 2.6.22.4

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

libs/lrmi: install vbetest utility that comes with lrmi

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

polyester: Updated to 1.0.2

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

kcpufreq: A KDE CPUfreq applet

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

kmplayer - update depends

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

tea: Updated to version 17.2.0

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

lftp: Updated to version 3.5.13

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

phpmyadmin: Updated to version 2.11.0

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

qt4pas-V1.47_Qt4.3.1

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

perl-cpan: terminally deleted old sigs

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

lwp-5.808

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

io-compress-zlib 2.005

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

io-compress-base 2.005

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

compress-raw-zlib 2.005

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

mp3-tag: added missing deps, fixes #11810

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

uds: forgot the dep

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

uds: fixed source url

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

uds: fixed #11737

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

liboil-0.3.12

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

cairomm-1.4.4

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

poppler-0.5.91

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

sqlalchemy-0.4.0beta4

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

audio-creation/espeak:

DETAILS: updated to 1.28

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

editors/transfig: updated to 3.2.5

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

editors/xfig: updated to 3.2.5

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

utils/gnuplot: fixed installation of lua terminal

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

utils/gnuplot: added optional support for a lua terminal

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

latex/pgf: updated to 1.18

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

pear-xml_serializer: fixed known bugs

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

kdebase - security fix 13950

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

kdelibs - security fix 13950

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

delete obsolete signature

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

gtkpod-0.99.10

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

ibgpod-0.5.2

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

x264-20070821-2245

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

devel/graphviz: updated to 2.14.1

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

gnome2-libs/java-access-bridge: fixed broken check for X11-LIBS in DEPENDS

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

ayttm: Updated to version 0.5.0-6. Adjusted DEPENDS, BUILD

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

samba: Updated to version 3.0.25c

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

pidgin: Updated to version 2.1.1

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

gnucash: Updated to version 2.2.1. No upstream sig for this versions.
Switched to hash.

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

New spell: fwknop, a port knocking and single packet authorization
server/client. Fwknop has its own perl install script, which makes
writing a proper spell difficult. Here are some known bugs in this first
commit:
- won't use $INSTALL_ROOT
- will attempt to kill an existing fwknopd daemon on updates (and might
fail, making the cast break)
- will do its own config file merging
Proceed with caution and please, please improve this spell if you can.

commit ab1af98f6c1a76355ea7818f98429d8f0cb92efd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird-2.0.2.12964-RC1-0

commit e7ba802e49dd6a132414acdeeffde4abfd003bb1
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

audio-players/ncmpc bumped to 0.11.1, applied wide char patch

commit c19e31b79a4fb2ae3cc6380d5ce8c913a95d3770
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/ogre: fixed BUILD

commit a56a3e111e8cf312459be2b833ee4dd1359fda70
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

clamav-0.91.2

commit b55db5bfdf9f8cff9f799632c7122c851af71a8f
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

gpac: new spell

commit ca9fa1191099cc88ced29fdb08da40026f44f647
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

gpac: new video spell

commit aa08a0abd98ad6ad76f88bdad3fd3addc83787ca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

clucene-0.9.20

commit 4e0398a90aca5d869817912252ac973cae6d7236
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

numpy-1.0.3.1

commit 1069f926542a5619faa0486e52f4354e407d7dfa
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

python-devel/django: new spell, a high-level Python Web framework

commit ad2a3ebf55d1380c6a9b02c834c9b830d4746ceb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

perl-cpan/file-tail: updated to 0.99.3

commit 306f1ccd68f19ceb1d317f30573eeb91c2db1bdc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

lirc-0.8.2

commit 06dbfeda504f2d2a29f8d05a1bf8ce85ea35fb30
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/xfce-utils:

DEPENDS: added dbus-glib as optional

commit c2cc5f0b343e7166880a5c51ba2293da72c5280f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/xfce4-session:

DEPENDS: added dbus as optional, fixed gconf2 flags
PRE_BUILD, gconf2.patch: removed, fixed by upstream

commit 010a80d4c99ff23b6734cca9a4d916b608749559
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/thunar:

DEPENDS: added dbus, gtk-doc, hal, libexif, pcre and
startup-notification as optional

commit a5079410c5d690b953d935b2645b211be60a48ce
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

graphics/gimp:

DEPENDS: added dbus-glib as optional for devel branch

commit 1b0007b9afba5ac65f07b45ed81edd1f8db61a14
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

chat-im/gajim:

DEPENDS: added dbus as optional

commit 5cbfc60f0a58f7b8f5b8f405a6848eb8a39ea64a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ed-0.8

commit 59d04ff3453aa7717e593efcf5da41236a2ce621
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

graphics/inkscape: added PyXML (Bug #13291) and numPy as optional
dependencies

commit 3b2f31b3adbb27cb3553b686fbfb3ad8e7d5d352
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/wvdial: updated version to 1.60, changed SOURCE_URL to match
upstream, changed gpg keyring name

commit 7d47eaeb6efd44995856f0797f303353ae4325fa
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/wvstreams: updated version to 4.4, changed SOURCE_URL and SOURCE2_URL
to match upstream, changed gpg keyring name

commit e79c8fcca756ff8261c9905278063335dc1372a6
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

ChangeLog, net/sfllaw.gpg, net/wlach.gpg: upstream maintainer change
(replaced keyrings)

commit 16e9e0cebc00a4f7f4e7619b96334ec6d3999df6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cherokee-0.6.0b863

commit faee35ee1780b123500495c7416cefd2f2bc5e26
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Uppdated stable to version 1.2.22

commit 5d988a82709b1cacd115c1942a141530d47afa05
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

yiff: DETAILS: delinting

commit 6673aae3881508d15a73a6d8eb05be7a5f608791
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dzen2: added svn version

commit ad0e561ad0d5e43ec50c68d4f28535bf2a304001
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libcap - use get_kernel_version

commit 1339184fd84dbd82843b497d260a7905b745d14c
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dzen2: version update 0.8.5

commit add928d62ce32c0a952d10ff230bcc55deda3acd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

rake-0.7.3

commit 8289aba1dcfd1e10f569fdf3aa5603ef3eead481
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

rubygems-0.9.4

commit cd7b069d0dc88aa9e94d1f927c91eaa482a6254f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng-1.2.19

commit 4d8ca0e71d6c1a74cb230cda48be76eeb5ce1f5d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kde4/kdetoys4-3.92.0

commit e35cb00d47a382c7b8faa573c2558eb1a93c5f9f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kde4/kdeedu4-3.92.0

commit db06bc24f41bd9277b42183172c543a0bc935182
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

kqemu: make it work with linux-2.6.22 (trivial patch)

commit c1f214773f70b1463be9ed12e0ac9d8ccc661731
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

icewm: Updated to version 1.2.32

commit d3b4b12bdf61c7614d1d5027433f42e250741b20
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

banshee: Updated to version 0.13.0

commit 81e49b34f89bfd0580b654bac9d458ea58c3a78c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

icewm: Updated to version 1.2.31

commit 4393c887168d008066ab7934921242fbcd7c0527
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

lyx: Updated to version 1.5.1. NOw uses qt4 for qt frontend.
Updated DEPENDS and BUILD.

commit 06c663e17d4e407cf9bf9b26f77a9a9be6ddb8b1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

webmin: Updated to version 1.360

commit 8a5d2ab1bc03e1f5a1cd6e5c14fa68bbe95ecf2e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

spamassassin: Updated to version 3.2.3

commit 9eadd0d2d32a0a9739db86ff41e5c70b73b8f707
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

snort: Updated to version 2.7.0.1

commit 3a52a6aa3184cc53fbd63719f8521b330a7ffc71
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

links-twibright 2.1pre30, SECURITY_PATCH=1

commit 068690d63a0d64951068010e445461ce4b466e44
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

rtorrent: 0.7.7

commit 86321f0c95c3f3591933ea052f875f2487c67c80
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libtorrent: 0.11.7

commit 7ac26e525af5c418a3fee5bb35dd2eb2b0d8460a
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

bubblemon-dockapp: DETAILS delint

commit 75b19d2598a8ece13469ace117502f3e4f06d26a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

guilib: REALLY removing BUILD

commit a17563b2dc83bf2c9767d71aea640d3f3ac3133f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

guilib: really remove patches and BUILD now, also not needed for alpha

commit af55ec8253335179830370bbd9c37245393360af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate printer/cups-drivers [replaced by ghostscript]

commit 4898b4927cb68fbc736a82f89400b86e5a053793
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ghostscript - deprecate gs-afpl

commit a1e8950af6251eaf4e0265548d53cb04f3630c80
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt4pas-V1.46_Qt4.3.0

commit 585179ff9cc6b188f09401f831e555fc1f8fc814
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cherrypy-3.0.2

commit 3d3aa78a618ebe25236141fa58b31bf250cae70c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

itools-0.16.6

commit d7f126138997ec3fd131818a1d0a80e3f5010e0f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

xfree86: Updated to version 4.7.0. PRE_BUILD removed unneeded patches.

commit 9191e2144b29cd264b7b783335187e23ff402a0e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sudo: Updated to 1.6.9p4

commit 6d915dc9156da1ded5c950984cc2a9fe481acb73
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Updated stable to version 1.2.21

commit 801f4c8a2e31ac08f425a72cd8a7034bb2dff6aa
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dovecot: updated MANAGESIEVE patch

commit 7ef9e00c3a27596273e005ae7c060a0eed0dd5d4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sqlalchemy-0.4.0beta3

commit a20110640207255f670630eaa3e9210d5e72ac4d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

freevo-1.7.3

commit bc1171690426698b36300703d352c1159bae19c4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

strigi - add a profile

commit ed5ea0ff99486d634e89e35d282e0c79d5254e9b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kde4 - update dpends

commit 386baa12c32125da23db3337299e819509059ff1
Author: Bearcat Sandor <sourcemage AT feline-soul.com>
Commit: Bearcat Sandor <sourcemage AT feline-soul.com>

MythTV: Updated CONFIGURE and BUILD to add DVB functionality

diff --git a/ChangeLog b/ChangeLog
index d9e30e6..d1b6d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,134 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * New spell gnome2-libs/goffice-0.5
+ * New spell gnome2-libs/gnome-devel-docs
+ * New spell gnome2-apps/accerciser
+ * New spell gnome2-apps/pessulus
+ * New spell gnome2-apps/sabayon
+
+2007-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kdeaddons4: new spell
+
+2007-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kdeaccessibility4: new spell
+
+2007-09-14 David Brown <dmlb2000 AT gmail.com>
+ * security/seedit: added new selinux policy editor spell
+
+2007-09-13 David Brown <dmlb2000 AT gmail.com>
+ * security/audit: added new linux security auditing system
+
+2007-09-13 David Kowis <dkowis AT shlrm.org>
+ * net/shorewall-{shell,perl,common,lite,docs-html,docs-xml,common}:
+ Added new spells for the latest version of the shorewall suite
+
+2007-09-12 Remko van der Vossen <wich AT stack.nl>
+ * audio-soft/cuetools: new spell, cue/toc file utilities
+
+2007-09-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/tagua: new spell, kde4 gaming framework
+
+2007-09-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * science/viking: new spell, a google/terraserv/openstreetmap map
+ viewer
+
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kde4-l10n: translations for kde4
+
+2007-09-10 Alexander Tsamutali <astsmtl AT gmail.com>
+ * python-devel/python-markdown: new spell, a Python implementation of
+ John Gruber's Markdown
+
+2007-09-09 Robin Cook <rcook AT wyrms.net>
+ * New Spell gnome2-libs/pygtksourceview
+
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * Renamed Spell audio-soft/eyeD3 to eyed3
+
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * science-libs/glpk: new spell: linear programming
+
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * audio-soft/eyeD3: new spell, Python id3(v2) tag program/library
+
+2007-09-08 Pol Vinogradov <vin.public AT gmail.com>
+ * graphics/gimp-lqr-plugin: new spell, GIMP Liquid rescale plugin
+
+2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * security/skey: new spell, skey lib and utilities
+ * security/pam_skey: new spell, pam otp module
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * New Spell gnome2-libs/rarian
+ * Renamed Spell gnome2-libs/control-center2 to gnome-control-center
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/qimageblitz: support spell for kde4
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kdebase-workspace4: new spell, part of kde4
+
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * kernels/deskopt: new spell, utility to tune kernel schedulers
+
+2007-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * accounts,groups: added a dovecot user
+
+2007-09-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * graphics-libs/agg: new spell, a graphics library
+
+2007-08-30 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * archive/rsnapshot: New spell, a filesystem snapshot utility
+
+2007-08-29 Juuso Alasuutari <iuso AT sourcemage.org>
+ * audio-creation/ardour2: New spell, professional Digital Audio
+ Workstation.
+
+2007-08-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * audio-soft/fusepod: new spell, fuse FS for iPod access
+
+2007-08-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * utils/helpdeco: new spell, a decompiler for windows .hlp files
+
+2007-08-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * wm-addons/xtrlock: a minimal X locking app
+
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * protected, volatiles: Added ghc's package.conf
+ * haskell/FUNCTIONS: Modified default_install to install *.cabal files
+ * haskell/HASKELL_{POST_REMOVE,PRE_RESURRECT,POST_RESURRECT}:
+ Added to fix many possible problems.
+ * haskell/haskell-quickcheck: a library for automatic testing of
+ Haskell programs
+ * haskell/haskell-html: a Haskell HTML combinator library
+
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * perl-cpan/perl-gtk2-simple-list: Added new cpan spell
+ * graphics/gscan2pdf: Added new spell
+ * graphics/unpaper: Added new spell
+
+2007-08-23 Eric Sandall <sandalle AT sourcemage.org>
+ * kde-apps/kcpufreq: Added KDE CPUFreq applet
+ * kde-apps/qtcurve-kd3: Added QT/KDE3 widget style
+ * utils/counter-linux: Added Counter Linux.org script
+
+2007-08-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * security/fwknop: New spell, port knocking and/or Single Packet
+ Authorization server/client.
+
+2007-08-21 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * video/gpac: new spell for creating/manipulating/playing mp4
+
+2007-08-21 Pol Vinogradov <vin.public AT gmail.com>
+ * python-devel/django: new spell, a high-level Python Web framework
+
+2007-08-18 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * net/sfllaw.gpg: removed, upstream maintainer changed
+ * net/wlach.gpg: added, new maintainer keyring from
http://alumnit.ca/wiki/index.php?page=wlach
+
+2007-08-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kdeedu4: new spell
+ * kde4/kdetoys4: new spell
+
2007-08-16 Elisamuel Resto <ryuji AT mages.ath.cx>
* utils/pfqueue: new spell, console-based tool for managing MTA
queued messages.

diff --git a/accounts b/accounts
index 297a342..0f788af 100755
--- a/accounts
+++ b/accounts
@@ -69,4 +69,5 @@ wnn:154:154
musicdaemon:155:29
iplog:156:156
davfs2:158:158
+dovecot:159:159
nobody:65534:65534
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index bf8c3e9..f48ca3c 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.91.1
+ VERSION=0.91.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-/}
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index 07a7d7c..6e6f6bb 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_REMOVE: fix bug #13983
+
+2007-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.91.2
+
2007-07-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.91.1

diff --git a/antivirus/clamav/PRE_REMOVE b/antivirus/clamav/PRE_REMOVE
index 3ad87b2..b466017 100755
--- a/antivirus/clamav/PRE_REMOVE
+++ b/antivirus/clamav/PRE_REMOVE
@@ -1,5 +1,3 @@
-#telinit disable clam-antivurus
-
#in case the virus database has been updated by clamfresh since
#the original installation
-rm /usr/share/clamav/*
+rm -r /usr/share/clamav/*
diff --git a/archive-libs/zziplib/DETAILS b/archive-libs/zziplib/DETAILS
index 70afccf..8e1e4b7 100755
--- a/archive-libs/zziplib/DETAILS
+++ b/archive-libs/zziplib/DETAILS
@@ -1,9 +1,9 @@
SPELL=zziplib
- VERSION=0.13.47
+ VERSION=0.13.49
+
SOURCE_HASH=sha512:d8ac1970966d89a36a6be78746ec7d1c321274d4166a105de0486a296f1e0d88488a6de750addd32e0f015ae8651b2054c7218729a5949ba7e294795988c5e47
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c27ba86472e6160287f901c27bb753c0e4e32c5b3bc0cc8cb22539b01e5533c5d78ecaddf612b5cba44ca0a34c66c8a9964db9db7dfca1f61dbbab665dd1bc08
WEB_SITE=http://zziplib.sourceforge.net/
ENTERED=20050309
LICENSE[0]=LGPL
diff --git a/archive-libs/zziplib/HISTORY b/archive-libs/zziplib/HISTORY
index c891424..a6781a2 100644
--- a/archive-libs/zziplib/HISTORY
+++ b/archive-libs/zziplib/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.13.49
+
2006-10-21 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated to 0.13.47, works with gcc4 now
* DEPENDS: works with gcc4
diff --git a/archive/amanda/amanda-2.5.2p1.tar.gz.sig
b/archive/amanda/amanda-2.5.2p1.tar.gz.sig
new file mode 100644
index 0000000..fb7c4de
Binary files /dev/null and b/archive/amanda/amanda-2.5.2p1.tar.gz.sig differ
diff --git a/archive/backup-manager/DETAILS b/archive/backup-manager/DETAILS
index 1a6ccaa..18bddb4 100755
--- a/archive/backup-manager/DETAILS
+++ b/archive/backup-manager/DETAILS
@@ -1,15 +1,18 @@
SPELL=backup-manager
if [[ $BACKUP_MANAGER_DEVEL == y ]]
then
- VERSION=0.7.5
-
SOURCE_HASH=sha512:3101e695d79c429e5a415a174c12b6217495aaefc0b44ee870bb492eea75ce07dacb766a45c60268a0f7da798d51b46f6d91f33b9d545360f09b92b61329bcef
+ VERSION=0.7.6
+
SOURCE_HASH=sha512:98e608d505d607c96a22a27fc01eec4ff1e764e485a6a2b363f4f96935b89165b068916fbfc227fb3d2017e59b00145c83eb0cde4bb9d473904d380bb0edf575
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL"
+5
else
VERSION=0.6.2
-
SOURCE_HASH=sha512:fb736eef0a4893ace5e1765dd3ca8c5d57956e458acb4450dca440a19ab6929b7a3cfd15432cdd1dccc85c1b3d4ebc7f5ef9c37711ba60e9ef9063be5bf2cc7e
+
SOURCE_HASH=sha512:fb736eef0a4893ace5e1765dd3ca8c5d57956e458acb4450dca440a19ab6929b7a3cfd15432cdd1dccc85c1b3d4ebc7f5ef9c37711ba60e9ef9063be5bf2cc7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
+e
fi
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=http://www.backup-manager.org/download/$SOURCE
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.backup-manager.org/
LICENSE[0]=GPL
ENTERED=20061102
diff --git a/archive/backup-manager/HISTORY b/archive/backup-manager/HISTORY
index 6570a94..eef23d6 100644
--- a/archive/backup-manager/HISTORY
+++ b/archive/backup-manager/HISTORY
@@ -1,2 +1,5 @@
+2007-08-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated BACKUP_MANAGER_DEVEL=y to 0.7.6
+
2006-11-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, PREPARE, BUILD, HISTORY: created spell
diff --git a/archive/cpio/HISTORY b/archive/cpio/HISTORY
index e523d98..40658d6 100644
--- a/archive/cpio/HISTORY
+++ b/archive/cpio/HISTORY
@@ -1,3 +1,8 @@
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added futimens patch
+ * cpio-futimens.patch: makes it so the futimens patch is internal
+ rather than conflicting with glibc 2.6.1 futimens
+
2007-05-31 Remko van der Vossen <wich AT stack.nl>
* DETAILS: Bumped version to 2.7
Removed UPDATED
diff --git a/archive/cpio/PRE_BUILD b/archive/cpio/PRE_BUILD
new file mode 100755
index 0000000..6f1d422
--- /dev/null
+++ b/archive/cpio/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/cpio-futimens.patch
diff --git a/archive/cpio/cpio-futimens.patch
b/archive/cpio/cpio-futimens.patch
new file mode 100644
index 0000000..6e490f3
--- /dev/null
+++ b/archive/cpio/cpio-futimens.patch
@@ -0,0 +1,27 @@
+diff -Nur cpio-2.7.org/lib/utimens.c cpio-2.7/lib/utimens.c
+--- cpio-2.7.org/lib/utimens.c 2006-09-27 08:06:57.000000000 +0000
++++ cpio-2.7/lib/utimens.c 2007-06-06 12:12:34.148446894 +0000
+@@ -73,7 +73,7 @@
+ Return 0 on success, -1 (setting errno) on failure. */
+
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
++cpio_futimens (int fd ATTRIBUTE_UNUSED,
+ char const *file, struct timespec const timespec[2])
+ {
+ /* There's currently no interface to set file timestamps with
+@@ -166,5 +166,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+- return futimens (-1, file, timespec);
++ return cpio_futimens (-1, file, timespec);
+ }
+diff -Nur cpio-2.7.org/lib/utimens.h cpio-2.7/lib/utimens.h
+--- cpio-2.7.org/lib/utimens.h 2004-11-23 20:59:50.000000000 +0000
++++ cpio-2.7/lib/utimens.h 2007-06-06 12:12:34.148446894 +0000
+@@ -1,3 +1,3 @@
+ #include &quot;timespec.h&quot;
+-int futimens (int, char const *, struct timespec const [2]);
++int cpio_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
diff --git a/archive/dar/DETAILS b/archive/dar/DETAILS
index 1fd50e2..272d352 100755
--- a/archive/dar/DETAILS
+++ b/archive/dar/DETAILS
@@ -1,6 +1,6 @@
SPELL=dar
- VERSION=2.3.4
-
SOURCE_HASH=sha512:4b8bab76cd02611493926a398cd5aaa73d68aaa186f46b75e091fe86a56033764eec6be45aff80c77de5c132354f0dbe315aa91248a9a4c1d3d049c4d365054f
+ VERSION=2.3.5
+
SOURCE_HASH=sha512:02110aa184c475d88e228d50a2337b163e9548f9e4ae76b4bbf36b576376ec85e4432164aa92b684a4acb932aa0fb522819cb2448d6e25cb30a5570a712a4e74
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/archive/dar/HISTORY b/archive/dar/HISTORY
index 9fc5076..2ddc38f 100644
--- a/archive/dar/HISTORY
+++ b/archive/dar/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.5
+
2007-07-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.4

diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 020a22b..91253f1 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,8 @@
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added futimens patch
+ * cpio-futimens.patch: makes it so the futimens patch is internal
+ rather than conflicting with glibc 2.6.1 futimens correct patch
+
2007-04-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: trigger man recast independent of gzip version always
if the path to gunzip in man.conf is wrong
diff --git a/archive/gzip/PRE_BUILD b/archive/gzip/PRE_BUILD
new file mode 100755
index 0000000..68eefbe
--- /dev/null
+++ b/archive/gzip/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gzip-futimens.patch
diff --git a/archive/gzip/gzip-futimens.patch
b/archive/gzip/gzip-futimens.patch
new file mode 100644
index 0000000..1a8353e
--- /dev/null
+++ b/archive/gzip/gzip-futimens.patch
@@ -0,0 +1,39 @@
+diff -Nur gzip-1.3.12.orig/gzip.c gzip-1.3.12.futimens/gzip.c
+--- gzip-1.3.12.orig/gzip.c 2007-05-18 20:33:26.000000000 +0300
++++ gzip-1.3.12.futimens/gzip.c 2007-05-18 20:33:26.000000000 +0300
+@@ -1643,7 +1643,7 @@
+ }
+ }
+
+- if (futimens (ofd, ofname, timespec) != 0)
++ if (gz_futimens (ofd, ofname, timespec) != 0)
+ {
+ int e = errno;
+ WARN ((stderr, &quot;%s: &quot;, program_name));
+diff -Nur gzip-1.3.12.orig/lib/utimens.c gzip-1.3.12.futimens/lib/utimens.c
+--- gzip-1.3.12.orig/lib/utimens.c 2007-01-18 10:33:34.000000000 +0200
++++ gzip-1.3.12.futimens/lib/utimens.c 2007-05-18 20:33:26.000000000 +0300
+@@ -75,7 +75,7 @@
+ Return 0 on success, -1 (setting errno) on failure. */
+
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
++gz_futimens (int fd ATTRIBUTE_UNUSED,
+ char const *file, struct timespec const timespec[2])
+ {
+ /* Some Linux-based NFS clients are buggy, and mishandle time stamps
+@@ -185,5 +185,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+- return futimens (-1, file, timespec);
++ return gz_futimens (-1, file, timespec);
+ }
+diff -Nur gzip-1.3.12.orig/lib/utimens.h gzip-1.3.12.futimens/lib/utimens.h
+--- gzip-1.3.12.orig/lib/utimens.h 2007-02-23 20:25:21.000000000 +0200
++++ gzip-1.3.12.futimens/lib/utimens.h 2007-05-18 20:33:26.000000000 +0300
+@@ -1,3 +1,3 @@
+ #include &lt;time.h&gt;
+-int futimens (int, char const *, struct timespec const [2]);
++int gz_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
diff --git a/archive/p7zip/DETAILS b/archive/p7zip/DETAILS
index a8d422e..39ddb68 100755
--- a/archive/p7zip/DETAILS
+++ b/archive/p7zip/DETAILS
@@ -1,6 +1,6 @@
SPELL=p7zip
- VERSION=4.51
-
SOURCE_HASH=sha512:8021e0f2667e27438ca54d89f7d1fe53c9edbedca6106841b1f8c718eca9e4e70043c78051364aabc839b7131e809dee0ccab0b59336a8cadcefaed3ad54dc2d
+ VERSION=4.55
+
SOURCE_HASH=sha512:53f9e2ffc7405ead69910dbc6446b75894fb1f3e1ab3959f2b0a6c1c2fa2e6e6b46de61be23c0fa40900488c596e5a8c25eeec892e9dd866aca4b12febde24db
SOURCE=${SPELL}_${VERSION}_src_all.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index 6382a98..77c071e 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,9 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.55
+
+2007-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.53
+
2007-07-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.51

diff --git a/archive/rsnapshot/BUILD b/archive/rsnapshot/BUILD
new file mode 100755
index 0000000..533101d
--- /dev/null
+++ b/archive/rsnapshot/BUILD
@@ -0,0 +1,12 @@
+OPTS="$OPTS --build=${BUILD}"
+
+ [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+ ./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ $OPTS &&
+make test &&
+make
diff --git a/archive/rsnapshot/DEPENDS b/archive/rsnapshot/DEPENDS
new file mode 100755
index 0000000..95994d6
--- /dev/null
+++ b/archive/rsnapshot/DEPENDS
@@ -0,0 +1,4 @@
+depends perl &&
+depends rsync &&
+
+optional_depends openssh "" "--without-ssh" "to make remote backup"
diff --git a/archive/rsnapshot/DETAILS b/archive/rsnapshot/DETAILS
new file mode 100755
index 0000000..bcd66d1
--- /dev/null
+++ b/archive/rsnapshot/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=rsnapshot
+ VERSION=1.3.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.${SPELL}.org/downloads/${SOURCE}
+
SOURCE_HASH=sha512:e2a263214704189b197eea2ee650557bfb4a01d52a881d727d9e3c08e820a75d44a41b0a45d00c0cddf9ce8b85d85a5d8e505e9267d25df9480f17a8f47d4159
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.rsnapshot.org/";
+ LICENSE[0]=GPL
+ ENTERED=20070829
+ KEYWORDS="archive"
+ SHORT="A filesystem snapshot utility."
+cat << EOF
+rsnapshot is a filesystem snapshot utility based on rsync. It makes it easy
+to make periodic snapshots of local machines, and remote machines over ssh.
It
+uses hard links whenever possible, to greatly reduce the disk space required.
+EOF
diff --git a/archive/rsnapshot/FINAL b/archive/rsnapshot/FINAL
new file mode 100755
index 0000000..96f6724
--- /dev/null
+++ b/archive/rsnapshot/FINAL
@@ -0,0 +1,4 @@
+message "${MESSAGE_COLOR}" &&
+message "After rsnapshot is installed, don't forget to copy" &&
+message "${INSTALL_ROOT}/etc/rsnapshot.conf.default to" &&
+message "${INSTALL_ROOT}/etc/rsnapshot.conf${DEFAULT_COLOR}"
diff --git a/archive/rsnapshot/HISTORY b/archive/rsnapshot/HISTORY
new file mode 100644
index 0000000..fdd1a9a
--- /dev/null
+++ b/archive/rsnapshot/HISTORY
@@ -0,0 +1,2 @@
+2007-08-29 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS, DEPENDS, BUILD, FINAL, HISTORY: created spell
diff --git a/archive/star/DETAILS b/archive/star/DETAILS
index 9472b0f..09c266e 100755
--- a/archive/star/DETAILS
+++ b/archive/star/DETAILS
@@ -1,11 +1,12 @@
SPELL=star
- VERSION=1.5a83
-
SOURCE_HASH=sha512:32b28e008ee28cbc02b3cbd87b1f81da57300c6724e0dd59aa50f10707e7a84bb9a629600723598a65912c45477c36ede33f03aa066f26ffa54c72198b29ccce
+ VERSION=1.5a84
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:022b0da3f9b9b26fa10ef7645f20fc3c529d962f3ea8c466c923fc24c2a19eab6d91abe5f034fc6aa2032a263d539e422e96cd96e7f8679115d392209ba0f59f
ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%a*}
SOURCE_URL[0]=ftp://ftp.berlios.de/pub/$SPELL/${ALPHA:+alpha/}$SOURCE
-
WEB_SITE=http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html
+ WEB_SITE=http://cdrecord.berlios.de/old/private/star.html
ENTERED=20040718
LICENSE[0]=GPL
SHORT='Unique standard tape archiver'
diff --git a/archive/star/HISTORY b/archive/star/HISTORY
index 80dd522..5146d1e 100644
--- a/archive/star/HISTORY
+++ b/archive/star/HISTORY
@@ -1,3 +1,8 @@
+2007-08-28 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.5a84
+ fixed WEB_SITE
+ SECURITY_PATCH++, Bug 13957
+
2007-07-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5a83

diff --git a/archive/tar/DETAILS b/archive/tar/DETAILS
index f041ed3..ff4c9c3 100755
--- a/archive/tar/DETAILS
+++ b/archive/tar/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/tar/tar.html
ENTERED=20010922
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
LICENSE[0]=GPL
KEYWORDS="archive"
SHORT="tar creates GNU tar archives."
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index 2f795e9..390b600 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,8 @@
+2007-08-28 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: SECURITY_PATCH++, Bug 13957
+ * PRE_BUILD: apply upstream patch
+ * contains_dot_dot.diff: added upstream patch
+
2007-06-30 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.18

diff --git a/archive/tar/PRE_BUILD b/archive/tar/PRE_BUILD
index f9749a9..d6cb202 100755
--- a/archive/tar/PRE_BUILD
+++ b/archive/tar/PRE_BUILD
@@ -5,4 +5,9 @@ source $GRIMOIRE/is_depends_enabled.function &&

if is_depends_enabled $SPELL lzma-utils; then
patch -p1 < $SPELL_DIRECTORY/tar_lzma.diff
-fi
+fi &&
+
+# The following patch is for bug 13957 and is probably included in 1.19
+cd $SOURCE_DIRECTORY/src &&
+patch -p0 < $SPELL_DIRECTORY/contains_dot_dot.diff &&
+cd $SOURCE_DIRECTORY
diff --git a/archive/tar/contains_dot_dot.diff
b/archive/tar/contains_dot_dot.diff
new file mode 100644
index 0000000..c457c10
--- /dev/null
+++ b/archive/tar/contains_dot_dot.diff
@@ -0,0 +1,15 @@
+--- names.c 2007/06/27 13:30:15 1.63
++++ names.c 2007/08/12 08:25:00 1.64
+@@ -1012,11 +1012,10 @@
+ if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+ return 1;
+
+- do
++ while (! ISSLASH (*p))
+ {
+ if (! *p++)
+ return 0;
+ }
+- while (! ISSLASH (*p));
+ }
+ }
diff --git a/asterisk.gpg b/asterisk.gpg
index fec1099..641c035 100644
Binary files a/asterisk.gpg and b/asterisk.gpg differ
diff --git a/audio-creation/ardour2/BUILD b/audio-creation/ardour2/BUILD
new file mode 100755
index 0000000..6122ac9
--- /dev/null
+++ b/audio-creation/ardour2/BUILD
@@ -0,0 +1,2 @@
+scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
+ $ARDOUR2_SYSLIBS $ARDOUR2_SURFACES $ARDOUR2_FFT_ANALYSIS
diff --git a/audio-creation/ardour2/CONFIGURE
b/audio-creation/ardour2/CONFIGURE
new file mode 100755
index 0000000..f09bd01
--- /dev/null
+++ b/audio-creation/ardour2/CONFIGURE
@@ -0,0 +1,20 @@
+message "${MESSAGE_COLOR} Warning: using system libraries cancels" \
+ "all support from Ardour developers!$DEFAULT_COLOR" &&
+
+config_query_option ARDOUR2_SYSLIBS \
+ "Use system libraries instead of internal ones?" \
+ n \
+ "SYSLIBS=1" \
+ "SYSLIBS=0" &&
+
+config_query_option ARDOUR2_SURFACES \
+ "Build support for control surfaces?" \
+ y \
+ "SURFACES=1" \
+ "SURFACES=0" &&
+
+config_query_option ARDOUR2_FFT_ANALYSIS \
+ "Include FFT analysis window?" \
+ n \
+ "FFT_ANALYSIS=1" \
+ "FFT_ANALYSIS=0"
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
new file mode 100755
index 0000000..ed35fdc
--- /dev/null
+++ b/audio-creation/ardour2/DEPENDS
@@ -0,0 +1,37 @@
+depends g++ &&
+depends scons &&
+depends python &&
+#depends gettext &&
+depends pkgconfig &&
+depends libtool &&
+depends libxml2 &&
+depends libxslt &&
+depends libart_lgpl &&
+depends raptor &&
+depends liblrdf &&
+depends glib2 &&
+depends gtk+2 &&
+depends libgnomecanvas &&
+depends liblo &&
+depends boost &&
+depends alsa-lib &&
+depends libsamplerate &&
+
+if [[ $ARDOUR2_SYSLIBS == 'SYSLIBS=1' ]]
+then
+ depends libsigc++3 &&
+ depends gtkmm2 &&
+ depends libgnomecanvasmm
+fi &&
+
+depends JACK-DRIVER &&
+
+optional_depends libusb \
+ "TRANZPORT=1" \
+ "TRANZPORT=0" \
+ "for TranzPort controller support" &&
+
+optional_depends gettext \
+ "NLS=1" \
+ "NLS=0" \
+ "for internationalization support"
diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
new file mode 100755
index 0000000..4234adf
--- /dev/null
+++ b/audio-creation/ardour2/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=ardour2
+ VERSION=2.0.5
+
SOURCE_HASH=sha512:1ef28bccfeb89b779c120cedea482257fc52d426b037555dd57b31d07c49741ce79cf0cf410413eb95c252b5aa5699d936a376f95dd7de3a9a460ace3291c917
+ SOURCE=ardour-$VERSION.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION"
+ SOURCE_URL[0]=http://ardour.org/files/releases/$SOURCE
+ WEB_SITE=http://ardour.org
+ ENTERED=20070829
+ LICENSE[0]=GPL
+ KEYWORDS="disk editors audio"
+ SHORT="A multi-track, professional Digital Audio Workstation."
+cat << EOF
+Ardour is a digital audio workstation. You can use it to record, edit and mix
+multi-track audio. You can produce your own CDs, mix video soundtracks, or
+just experiment with new ideas about music and sound.
+
+Ardour capabilities include: multichannel recording, non-destructive editing
+with unlimited undo/redo, full automation support, a powerful mixer,
unlimited
+tracks/busses/plugins, timecode synchronization, and hardware control from
+surfaces like the Mackie Control Universal. If you've been looking for a tool
+similar to ProTools, Nuendo, Pyramix, or Sequoia, you might have found it.
+EOF
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
new file mode 100644
index 0000000..1e0eba3
--- /dev/null
+++ b/audio-creation/ardour2/HISTORY
@@ -0,0 +1,2 @@
+2007-08-29 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, CONFIGURE, DEPENDS, BUILD, INSTALL: Created spell.
diff --git a/audio-creation/ardour2/INSTALL b/audio-creation/ardour2/INSTALL
new file mode 100755
index 0000000..b7e83d0
--- /dev/null
+++ b/audio-creation/ardour2/INSTALL
@@ -0,0 +1 @@
+scons install
diff --git a/audio-creation/espeak/DETAILS b/audio-creation/espeak/DETAILS
index 7dfc599..28b8b9d 100755
--- a/audio-creation/espeak/DETAILS
+++ b/audio-creation/espeak/DETAILS
@@ -1,8 +1,8 @@
SPELL=espeak
- VERSION=1.26
+ VERSION=1.29
SOURCE=espeak-${VERSION}-source.zip
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:5b8ea2aaafd6e2a0eb3a136b08eeb390822ff824f268315247589d457289662dce4b817f270e887afc49ed97364f5d15e501f2bbe9ab00130e06936dbdd87e7b
+
SOURCE_HASH=sha512:010a59bfa76b1ba45f997b7dc355906b275e7ce4113b90fa554b978e5ae23371e93da5fc1d4ab4c258d38ee94fc300b4ed2514613d9e0ba501d8c140abb306a5
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/espeak-${VERSION}-source
WEB_SITE=http://espeak.sourceforge.net/
LICENSE[0]=GPL
diff --git a/audio-creation/espeak/HISTORY b/audio-creation/espeak/HISTORY
index 8940018..6499a75 100644
--- a/audio-creation/espeak/HISTORY
+++ b/audio-creation/espeak/HISTORY
@@ -1,3 +1,9 @@
+2007-09-14 Bearcat M. Sandor ,sourcemage AT feline-soul.com>
+ *DETAILS: updated to 1.29
+
+2007-08-23 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.28
+
2007-06-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update 1.26
* INSTALL: uses make install so removed
diff --git a/audio-creation/gtkpod/DEPENDS b/audio-creation/gtkpod/DEPENDS
index fe60402..9c34016 100755
--- a/audio-creation/gtkpod/DEPENDS
+++ b/audio-creation/gtkpod/DEPENDS
@@ -6,6 +6,7 @@ depends libid3tag &&
depends libgpod &&
depends hal &&
depends libglade2 &&
+depends libgnomecanvas &&

optional_depends "xmms" \
"" \
diff --git a/audio-creation/gtkpod/DETAILS b/audio-creation/gtkpod/DETAILS
index bdea73d..fb82d17 100755
--- a/audio-creation/gtkpod/DETAILS
+++ b/audio-creation/gtkpod/DETAILS
@@ -1,11 +1,12 @@
SPELL=gtkpod
- VERSION=0.99.8
+ VERSION=0.99.10
+
SOURCE_HASH=sha512:04cea4c79c7c076955b4f0b266c7e53cad20954bac76a70b74806f6456ea9afa0142307bd96b0db1668ce753c01d455bb737834d024274f49ee659dc6d1955e7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://gtkpod.sourceforge.net/
ENTERED=20030508
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE=GPL
KEYWORDS="editors audio"
SHORT="gtkpod manages your iPod graphically"
diff --git a/audio-creation/gtkpod/HISTORY b/audio-creation/gtkpod/HISTORY
index 8ca12f2..b8220bc 100644
--- a/audio-creation/gtkpod/HISTORY
+++ b/audio-creation/gtkpod/HISTORY
@@ -1,3 +1,9 @@
+2007-09-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: adding libgnomecanvas new dependency
+
+2007-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.99.10
+
2007-01-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.99.8

diff --git a/audio-creation/gtkpod/gtkpod-0.99.8.tar.gz.sig
b/audio-creation/gtkpod/gtkpod-0.99.8.tar.gz.sig
deleted file mode 100644
index 70e5b3a..0000000
Binary files a/audio-creation/gtkpod/gtkpod-0.99.8.tar.gz.sig and /dev/null
differ
diff --git a/audio-creation/nekobee/DEPENDS b/audio-creation/nekobee/DEPENDS
index 33bf109..174bde5 100755
--- a/audio-creation/nekobee/DEPENDS
+++ b/audio-creation/nekobee/DEPENDS
@@ -1,14 +1,9 @@
-# for the gtk patch
-depends autoconf &&
-depends automake-1.9 &&
-depends libtool &&
-
depends pkgconfig &&
depends liblo &&
depends ladspa &&
depends dssi &&

optional_depends gtk+2 \
- "--with-gtk" \
+ "--with-gtk2" \
"--without-gtk2" \
"to build GTK+2 GUI"
diff --git a/audio-creation/nekobee/DETAILS b/audio-creation/nekobee/DETAILS
index 4697eb1..b4c0b4a 100755
--- a/audio-creation/nekobee/DETAILS
+++ b/audio-creation/nekobee/DETAILS
@@ -1,8 +1,8 @@
SPELL=nekobee
- VERSION=0.1.5
+ VERSION=0.1.6
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://static.nekosynth.co.uk/releases/$SOURCE
-
SOURCE_HASH=sha512:e3f20d6c737466728f6439b0408f028f5ea5a8c320980d12cd6e276440072840a515508b6284a6840a3bf46a82909ce3333ac77001298caaca87961f5398dae4
+ SOURCE_URL[0]=http://www.nekosynth.co.uk/releases/$SOURCE
+
SOURCE_HASH=sha512:b519927a2320c2b4e4f3bfb6c0768db3ecc7d5f00d0c666073094d25eb65da6459435e136690cad738c3df8a7e8ce6dd09dd378e9f604aa72ad73b40f9e8f063
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nekosynth.co.uk/wiki/nekobee
LICENSE[0]=GPL
diff --git a/audio-creation/nekobee/HISTORY b/audio-creation/nekobee/HISTORY
index 1e7b766..89bd538 100644
--- a/audio-creation/nekobee/HISTORY
+++ b/audio-creation/nekobee/HISTORY
@@ -1,2 +1,8 @@
+2007-08-31 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.1.6, updated SOURCE_URL.
+ * PRE_BUILD, nekobee_gtk.patch: Deleted, patch applied upstream.
+ * DEPENDS: Removed patch-specific dependencies, fixed typo in
+ gtk+2 enable flag.
+
2007-03-01 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, nekobee_gtk.patch: Created spell.
diff --git a/audio-creation/nekobee/PRE_BUILD
b/audio-creation/nekobee/PRE_BUILD
deleted file mode 100755
index 6d1a127..0000000
--- a/audio-creation/nekobee/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# don't check for GTK+, accidentally building against it will break
-patch -p1 < "$SCRIPT_DIRECTORY/nekobee_gtk.patch" &&
-autoconf
diff --git a/audio-creation/nekobee/nekobee_gtk.patch
b/audio-creation/nekobee/nekobee_gtk.patch
deleted file mode 100644
index a28344a..0000000
--- a/audio-creation/nekobee/nekobee_gtk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur nekobee-0.1.5~/configure.in nekobee-0.1.5/configure.in
---- nekobee-0.1.5~/configure.in 2006-07-21 22:50:59.000000000 +0000
-+++ nekobee-0.1.5/configure.in 2007-03-01 20:15:15.000000000 +0000
-@@ -28,10 +28,6 @@
- if test "x${try_gtk2}" = 'xyes'; then
- AM_PATH_GTK_2_0(2.0.0, with_gtk='yes (version 2.0)', with_gtk=no)
- fi
--dnl No GTK+ 2.x found, look for GTK+ 1.2 instead
--if test "x${with_gtk}" = 'xno'; then
-- AM_PATH_GTK(1.2.0, with_gtk='yes (version 1.2)', AC_MSG_WARN([GUI will
not be built because no version of GTK+ was found]))
--fi
- AM_CONDITIONAL(BUILD_GUI, test "x${with_gtk}" != 'xno')
- echo "GTK support: $with_gtk"
-
diff --git a/audio-creation/qsynth/BUILD b/audio-creation/qsynth/BUILD
new file mode 100755
index 0000000..3fd2dd5
--- /dev/null
+++ b/audio-creation/qsynth/BUILD
@@ -0,0 +1,3 @@
+PATH="$INSTALL_ROOT/usr/bin/qt4:$PATH" \
+OPTS="$QSYNTH_TRAY --with-fluidsynth=${INSTALL_ROOT}/usr $OPTS" \
+default_build
diff --git a/audio-creation/qsynth/CONFIGURE b/audio-creation/qsynth/CONFIGURE
new file mode 100755
index 0000000..c3fb020
--- /dev/null
+++ b/audio-creation/qsynth/CONFIGURE
@@ -0,0 +1,4 @@
+config_query_option QSYNTH_TRAY \
+ "Enable system tray?" y \
+ "--enable-system-tray" \
+ "--disable-system-tray"
diff --git a/audio-creation/qsynth/DEPENDS b/audio-creation/qsynth/DEPENDS
index fb4a6bd..6d26219 100755
--- a/audio-creation/qsynth/DEPENDS
+++ b/audio-creation/qsynth/DEPENDS
@@ -1,3 +1,11 @@
depends fluidsynth &&
-depends qt-x11 &&
-depends g++
+depends g++ &&
+depends qt4 &&
+
+. "$GRIMOIRE/FUNCTIONS" &&
+
+if check_if_xorg_modular_libs qt4
+then
+ depends libx11 &&
+ depends libxext
+fi
diff --git a/audio-creation/qsynth/DETAILS b/audio-creation/qsynth/DETAILS
index 1145327..0b246e1 100755
--- a/audio-creation/qsynth/DETAILS
+++ b/audio-creation/qsynth/DETAILS
@@ -1,19 +1,19 @@
SPELL=qsynth
- VERSION=0.2.5
+ VERSION=0.3.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:9cf5fee19ab6d62714b839d25e1f881565bd684b3e33a8c1b93602b50bbd3b154bd1ddfab1451c8230cdb60975e82ea3ed5460adc2f1fc1287d1db5cc40bf36a
+
SOURCE_HASH=sha512:cc6430acd7c6bbb666a7657c03dbf5dde7c4795a5839cb2fcf02f2946c78579cd1347b6690f0e9643b0bd5a4e90acefb0531039a69a334aab073d77fd7f7cc7b
WEB_SITE=http://qsynth.sourceforge.net/
ENTERED=20031119
LICENSE[0]=GPL
KEYWORDS="editors audio"
SHORT="A fluidsynth GUI front-end application."
cat << EOF
-QSynth is a fluidsynth GUI front-end application written in C++ around the
-Qt3 toolkit using Qt Designer. Eventually it may evolve into a softsynth
-management application allowing the user to control and manage a variety of
-command line softsynth but for the moment it wraps the excellent Fluidsynth.
-Fluidsynth is a command line software synthesiser based on the Soundfont
+Qsynth is a fluidsynth GUI front-end application written in C++ around the
+Qt4 toolkit using Qt Designer. Eventually it may evolve into a softsynth
+management application allowing the user to control and manage a variety of
+command line softsynth but for the moment it wraps the excellent FluidSynth.
+FluidSynth is a command line software synthesiser based on the Soundfont
specification.
EOF
diff --git a/audio-creation/qsynth/HISTORY b/audio-creation/qsynth/HISTORY
index 4471bde..e42e785 100644
--- a/audio-creation/qsynth/HISTORY
+++ b/audio-creation/qsynth/HISTORY
@@ -1,3 +1,14 @@
+2007-09-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.3.1.
+ * CONFIGURE: Added, query about system tray option.
+ * DEPENDS: Changed depends qt-x11 to qt4, added depends libx11
+ and libxext for xorg-modular.
+ * BUILD: Added, add system tray option to OPTS and fluidsynth
+ path to PATH.
+ * PRE_BUILD: Added, need to sed configure script so that it
+ finds qt4's qmake/moc/uic executables instead of qt-x11's
+ equivalent ones if both libraries are installed.
+
2006-09-05 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, UPDATED, and MAINTAINER. Edited
KEYWORDS and descriptions. Minor formatting fixes.
diff --git a/audio-creation/qsynth/PRE_BUILD b/audio-creation/qsynth/PRE_BUILD
new file mode 100755
index 0000000..8bc1b5c
--- /dev/null
+++ b/audio-creation/qsynth/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+local qt4_bin="$INSTALL_ROOT/usr/bin/qt4" &&
+
+sed -i "s|as_dir in \$ac_path|as_dir in \"$qt4_bin\" \$ac_path|" \
+ configure
diff --git a/audio-creation/rosegarden/DETAILS
b/audio-creation/rosegarden/DETAILS
index ff2a26f..ff0383f 100755
--- a/audio-creation/rosegarden/DETAILS
+++ b/audio-creation/rosegarden/DETAILS
@@ -1,9 +1,24 @@
SPELL=rosegarden
+if [[ $RG_VCS == y ]]
+then
+ if [[ $RG_VCS_AUTOUPDATE == y ]]
+ then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+
SOURCE_URL[0]=svn_http://$SPELL.svn.sourceforge.net/svnroot/$SPELL/trunk/$SPELL:$SPELL-svn
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
VERSION=1.5.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:856cd6788509added9b1b545ac9766860bd407580dacb7819ab3cc6410940d24aa05d68da14ea97662066c405b4a4f01ca70b56c4f2ed88fb8b4f02b1718e54f
+fi
WEB_SITE=http://www.rosegardenmusic.com/
ENTERED=20020514
LICENSE[0]=GPL
diff --git a/audio-creation/rosegarden/HISTORY
b/audio-creation/rosegarden/HISTORY
index cc92404..e91f546 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,10 @@
+2007-09-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Moved SOURCE_HASH to inside the VCS conditional.
+
+2007-09-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Added svn version.
+ * PREPARE: Added, query about devel version.
+
2007-03-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.5.1.

diff --git a/audio-creation/rosegarden/PREPARE
b/audio-creation/rosegarden/PREPARE
new file mode 100755
index 0000000..2e83397
--- /dev/null
+++ b/audio-creation/rosegarden/PREPARE
@@ -0,0 +1,6 @@
+config_query RG_VCS "Build latest version from development tree?" n &&
+
+if [[ $RG_VCS == y ]]; then
+ config_query RG_VCS_AUTOUPDATE \
+ "Update automatically on every system update?" n
+fi
diff --git a/audio-creation/soundtracker/BUILD
b/audio-creation/soundtracker/BUILD
deleted file mode 100755
index fbbc73f..0000000
--- a/audio-creation/soundtracker/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="$OPTS --disable-alsa"
-default_build
diff --git a/audio-creation/soundtracker/DEPENDS
b/audio-creation/soundtracker/DEPENDS
index d998120..8970e6c 100755
--- a/audio-creation/soundtracker/DEPENDS
+++ b/audio-creation/soundtracker/DEPENDS
@@ -2,6 +2,6 @@ depends gtk+ &&
optional_depends "gnome-libs" "" "--disable-gnome" "enable gnome1 support
(recommended)" &&
optional_depends "audiofile" "" "--disable-audiofile" "enable support for
various soundformats" &&
optional_depends "libsndfile" "" "--disable-sndfile" "for wav/aiff support"
&&
-#optional_depends "alsa-lib" "" "--disable-alsa" "for alsa support" &&
+optional_depends "alsa-lib" "--enable-alsa" "--disable-alsa" "for alsa
support (you need to use alsa OSS for alsa later than 0.5.x)" &&
optional_depends "esound" "" "--disable-esd --disable-esdtest" "for esound
support" &&
optional_depends "JACK-DRIVER" "" "--disable-jack" "for JACK support"
diff --git a/audio-creation/soundtracker/DETAILS
b/audio-creation/soundtracker/DETAILS
index 0b11099..9ebcaff 100755
--- a/audio-creation/soundtracker/DETAILS
+++ b/audio-creation/soundtracker/DETAILS
@@ -1,13 +1,12 @@
SPELL=soundtracker
- VERSION=0.6.7
+ VERSION=0.6.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.soundtracker.org/dl/v0.6/$SOURCE
WEB_SITE=http://www.soundtracker.org/
ENTERED=20020520
- UPDATED=20021010
-
SOURCE_HASH=sha512:de6edf698e32e3257df0173dbbcb501cab0012d42aa8e05c82efafee260142457ff49c68ce50ccfd12c1e71891b3e68277cfa6a7955c8e70d7b7c4cd1c0e8047
- LICENSE[0]=GPL
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
KEYWORDS="music editors audio"
SHORT="A music tracking tool for Unix/X11 similar to FastTracker
for DOS."
cat << EOF
diff --git a/audio-creation/soundtracker/HISTORY
b/audio-creation/soundtracker/HISTORY
index 8b9b286..e4e431b 100644
--- a/audio-creation/soundtracker/HISTORY
+++ b/audio-creation/soundtracker/HISTORY
@@ -1,3 +1,12 @@
+2007-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD: removed
+ * DEPENDS: added alsa warning
+ * desktop/soundtracker.desktop: added
+ * DETAILS: version 0.9.8 and switched to gpg sig
+
+2007-08-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: re-enabled alsa support
+
2006-12-20 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: disabled alsa question
it fails to start when compiled with alsa support.
diff --git a/audio-creation/soundtracker/soundtracker-0.6.8.tar.gz.sig
b/audio-creation/soundtracker/soundtracker-0.6.8.tar.gz.sig
new file mode 100644
index 0000000..80302d3
Binary files /dev/null and
b/audio-creation/soundtracker/soundtracker-0.6.8.tar.gz.sig differ
diff --git a/audio-creation/specimen/DEPENDS b/audio-creation/specimen/DEPENDS
index 85dde08..030fcae 100755
--- a/audio-creation/specimen/DEPENDS
+++ b/audio-creation/specimen/DEPENDS
@@ -6,4 +6,11 @@ depends libsndfile &&
depends libsamplerate &&
depends phat &&
depends alsa-lib &&
+
+if [[ $SPECIMEN_VCS == y ]]
+then
+ depends autoconf &&
+ depends automake
+fi &&
+
depends JACK-DRIVER
diff --git a/audio-creation/specimen/DETAILS b/audio-creation/specimen/DETAILS
index fb9a41b..7f081fb 100755
--- a/audio-creation/specimen/DETAILS
+++ b/audio-creation/specimen/DETAILS
@@ -1,9 +1,24 @@
SPELL=specimen
+if [[ $SPECIMEN_VCS == y ]]
+then
+ if [[ $SPECIMEN_VCS_AUTOUPDATE == y ]]
+ then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+ SOURCE_URL[0]=svn_http://zhevny.com/svn/$SPELL/trunk:$SPELL-svn
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
VERSION=0.5.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://zhevny.com/$SPELL/files/$SOURCE

SOURCE_HASH=sha512:768113dd800e8c46880fcbaf6798f8c6401b33d172a7d922682e6972996f13813631fc2552571887914c38396ee37bfa0b66d57bf254ca34c1dac6542fb7a988
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
WEB_SITE=http://zhevny.com/specimen/
ENTERED=20070320
LICENSE[0]=GPL
diff --git a/audio-creation/specimen/HISTORY b/audio-creation/specimen/HISTORY
index 98ab147..f6368f8 100644
--- a/audio-creation/specimen/HISTORY
+++ b/audio-creation/specimen/HISTORY
@@ -1,2 +1,10 @@
+2007-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Added, moved ./bootstrap for SVN version here.
+ * BUILD: Removed ./bootsrap.
+
+2007-09-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, BUILD, DEPENDS: Added SVN option.
+ * PREPARE: Added for SVN option query.
+
2007-03-20 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, DEPENDS, BUILD: Created spell.
diff --git a/audio-creation/specimen/PREPARE b/audio-creation/specimen/PREPARE
new file mode 100755
index 0000000..ebc33c5
--- /dev/null
+++ b/audio-creation/specimen/PREPARE
@@ -0,0 +1,6 @@
+config_query SPECIMEN_VCS "Build latest version from development tree?" n
&&
+
+if [[ $SPECIMEN_VCS == y ]]; then
+ config_query SPECIMEN_VCS_AUTOUPDATE \
+ "Update automatically on every system update?" n
+fi
diff --git a/audio-creation/specimen/PRE_BUILD
b/audio-creation/specimen/PRE_BUILD
new file mode 100755
index 0000000..6916117
--- /dev/null
+++ b/audio-creation/specimen/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $SPECIMEN_VCS == y ]]
+then
+ ./bootstrap
+fi
diff --git a/audio-drivers/alsa-driver/DETAILS
b/audio-drivers/alsa-driver/DETAILS
index 56ddd9e..b12d60f 100755
--- a/audio-drivers/alsa-driver/DETAILS
+++ b/audio-drivers/alsa-driver/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-driver
- VERSION=1.0.14
+ VERSION=1.0.15rc1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/driver/$SOURCE
-
SOURCE_HASH=sha512:f6eae8014a3b24c804c584ec9e5fe97999071e50c8abadd1b1040e8ff96deb631d0177d09f0e6f22bc28cc7ee5c38ce464744557a9896527af5dc949ee06018f
+
SOURCE_HASH=sha512:c51a66e6985e6f3546452bc297175d7802733ed9cc6f5a66df749d5d3930c071b8fc559e3417d2b16b9535598514e962b757398328bbc01615ef98a486dd16da
WEB_SITE=http://www.alsa-project.org/
ENTERED=20010922
ARCHIVE="off"
diff --git a/audio-drivers/alsa-driver/HISTORY
b/audio-drivers/alsa-driver/HISTORY
index af87937..858a9f4 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15rc1
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14

diff --git a/audio-drivers/alsa-firmware/DETAILS
b/audio-drivers/alsa-firmware/DETAILS
index d508173..8c7c08f 100755
--- a/audio-drivers/alsa-firmware/DETAILS
+++ b/audio-drivers/alsa-firmware/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-firmware
- VERSION=1.0.14
+ VERSION=1.0.15rc1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/firmware/$SOURCE
-
SOURCE_HASH=sha512:6e19086d952af59b939432a397bb883493f3161072a84686e566fa184b6d2e5efe02cf787e1df04d20f486fc88edb471f1112e31318fcdb2e2d8b48a27217039
+
SOURCE_HASH=sha512:21c4c21dd8d6004ad92de593754f63dc5e4d895794e2a2bad0c9ba6cafedb62740574851699eb30bfef48c0398dcde3afed79762d8ea356a519f826c87a7148b
WEB_SITE=http://www.alsa-project.org/
ENTERED=20031205
ARCHIVE="off"
diff --git a/audio-drivers/alsa-firmware/HISTORY
b/audio-drivers/alsa-firmware/HISTORY
index dcd4f8f..7aaa856 100644
--- a/audio-drivers/alsa-firmware/HISTORY
+++ b/audio-drivers/alsa-firmware/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15rc1
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14

diff --git a/audio-drivers/alsa-lib/DETAILS b/audio-drivers/alsa-lib/DETAILS
index 353b29d..12207d8 100755
--- a/audio-drivers/alsa-lib/DETAILS
+++ b/audio-drivers/alsa-lib/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-lib
- VERSION=1.0.14a
-
SOURCE_HASH=sha512:5a0702e5f95faa21ca084f3073295f8ac9749a648a5e2202fa95281de4ed3c581cdc53f8feb9727f189a06b6da14c77224afe9269dcc5a4d95348e25b306d3fe
+ VERSION=1.0.15rc1
+
SOURCE_HASH=sha512:d78028501b56a7f1da48cee178d7f65ea8e094cc9c9c03cb9718cc7a354acdac7e67e99c3b32087d01c1f88293bfa7a45d4795b57d1da30b2c9f7de6a2315d33
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 e648b50..acbb61c 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,7 @@
+2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15rc1
+ * PRE_BUILD: added to fix building with python
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14a

diff --git a/audio-drivers/alsa-lib/PRE_BUILD
b/audio-drivers/alsa-lib/PRE_BUILD
new file mode 100755
index 0000000..1aba793
--- /dev/null
+++ b/audio-drivers/alsa-lib/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if spell_ok python
+then
+ sedit "s:python/:python$(installed_version python | cut -c-3)/:"
modules/mixer/simple/python.c
+fi
diff --git a/audio-drivers/alsa-plugins/DETAILS
b/audio-drivers/alsa-plugins/DETAILS
index 6e7dea9..bc6cf26 100755
--- a/audio-drivers/alsa-plugins/DETAILS
+++ b/audio-drivers/alsa-plugins/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-plugins
- VERSION=1.0.14
+ VERSION=1.0.15rc1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/plugins/$SOURCE
-
SOURCE_HASH=sha512:ff63a8cc68343aa3939e16c1037726f6e6581162c0c44cb4a781fe520d1d351358363a1de99510cbdfd543b93b0aff13c526afabba9493d41b9e1224f01d3bba
+
SOURCE_HASH=sha512:d277f19f093a3d9798a1e2b7299483f76891ed8e2ebffe73f4135f622d0808c91c4d8d1dc4ac6187e1427f10b6907809d174ffeaf9bed2cb8aaa4c54a09ecaf9
WEB_SITE=http://www.alsa-project.org/
ENTERED=20061001
LICENSE[0]=GPL
diff --git a/audio-drivers/alsa-plugins/HISTORY
b/audio-drivers/alsa-plugins/HISTORY
index 3d628a9..65bc6b0 100644
--- a/audio-drivers/alsa-plugins/HISTORY
+++ b/audio-drivers/alsa-plugins/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15rc1
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14

diff --git a/audio-drivers/alsa-utils/DETAILS
b/audio-drivers/alsa-utils/DETAILS
index 6df194f..fa4adcd 100755
--- a/audio-drivers/alsa-utils/DETAILS
+++ b/audio-drivers/alsa-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-utils
- VERSION=1.0.14
-
SOURCE_HASH=sha512:2568a2260473d9a014a165aa04f81827ac8f6d726feb76f6e0699b3eacd3ae0b647bc051709df5ff6b5b18cdcdfbaa4d266d695621b54bcb525f06a762e399c2
+ VERSION=1.0.15rc1
+
SOURCE_HASH=sha512:541b320cf10b5db39969ee00dc2f96eecd1f27bad0639640e2e09023d53954268ca45928ae1e9da20d4ec2b43f4307d296955ed6584231528568c7b8c313da5d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/utils/$SOURCE
diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index 43bd402..629cf0b 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15rc1
+
2007-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.14

diff --git a/audio-drivers/jack-cvs/HISTORY b/audio-drivers/jack-cvs/HISTORY
index 01d7593..c6ef233 100644
--- a/audio-drivers/jack-cvs/HISTORY
+++ b/audio-drivers/jack-cvs/HISTORY
@@ -1,3 +1,6 @@
+2007-09-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PROVIDES: Deleted, not healthy to have in a deprecated spell.
+
2007-04-11 Juuso Alasuutari <iuso AT sourcemage.org>
* Deprecated, SVN support now in main jack spell.

diff --git a/audio-drivers/jack-cvs/PROVIDES b/audio-drivers/jack-cvs/PROVIDES
deleted file mode 100755
index 9873a4b..0000000
--- a/audio-drivers/jack-cvs/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-JACK-DRIVER
diff --git a/audio-drivers/jackdmp/DEPENDS b/audio-drivers/jackdmp/DEPENDS
index 585902e..8a5b455 100755
--- a/audio-drivers/jackdmp/DEPENDS
+++ b/audio-drivers/jackdmp/DEPENDS
@@ -1,2 +1,3 @@
-depends alsa-lib &&
+depends pkgconfig &&
+depends alsa-lib &&
depends g++
diff --git a/audio-drivers/jackdmp/DETAILS b/audio-drivers/jackdmp/DETAILS
index cb20859..ef66a16 100755
--- a/audio-drivers/jackdmp/DETAILS
+++ b/audio-drivers/jackdmp/DETAILS
@@ -1,9 +1,9 @@
SPELL=jackdmp
- VERSION=0.62
+ VERSION=0.65
SOURCE=${SPELL}_$VERSION.zip
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
SOURCE_URL[0]=http://www.grame.fr/~letz/$SOURCE
-
SOURCE_HASH=sha512:17aa6f04849e7a969f8ae491074e01e8c05b62ded3e063feec27b5e82c77b7d4dec939b0cc85cc562b12e3d56c549bb0b3e2f0504519e471429b16e315a60da7
+
SOURCE_HASH=sha512:333e5f2e1e2fecda321e07733b797bfee0b5d1ede1c7df2dd40a2a40b7d69083ed61f061f1e7f765f2df88596187fe64503160f065c0c4d618c0c72a7bc23121
WEB_SITE=http://www.grame.fr/~letz/
ENTERED=20070319
LICENSE[0]=GPL
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index 2b899a1..88bc9ff 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,12 @@
+2007-09-16 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Install headers and pkgconfig file; needed for building
+ stuff against jackdmp.
+ * jack.pc: Added, jackdmp package has no .pc file.
+ * DEPENDS: Added depends pkgconfig.
+
+2007-09-13 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.65.
+
2007-03-20 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: Added, provides JACK-DRIVER.

diff --git a/audio-drivers/jackdmp/INSTALL b/audio-drivers/jackdmp/INSTALL
index f75c8b7..9a4c0f9 100755
--- a/audio-drivers/jackdmp/INSTALL
+++ b/audio-drivers/jackdmp/INSTALL
@@ -1,6 +1,34 @@
+#
+# libs & daemon
+#
make DESTDIR="$INSTALL_ROOT" install &&

+#
+# symlink
+#
if [[ $JACKDMP_SYMLINK == y ]]
then
+ message "${MESSAGE_COLOR}Installing symlink$DEFAULT_COLOR" &&
ln -s "$INSTALL_ROOT/usr/bin/jackdmp" "$INSTALL_ROOT/usr/bin/jackd"
-fi
+fi &&
+
+#
+# headers
+#
+message "${MESSAGE_COLOR}Installing headers$DEFAULT_COLOR" &&
+cd "$SOURCE_DIRECTORY/src/common" &&
+mkdir -p "$INSTALL_ROOT/usr/include/jack" &&
+local file HEADERS="intclient jack ringbuffer statistics \
+ thread transport types" &&
+for file in $HEADERS
+do
+ cp "$file.h" "$INSTALL_ROOT/usr/include/jack/"
+done &&
+
+#
+# pkgconfig file
+#
+message "${MESSAGE_COLOR}Installing pkgconfig file$DEFAULT_COLOR" &&
+mkdir -p "$INSTALL_ROOT/usr/lib/pkgconfig" &&
+cp "$SCRIPT_DIRECTORY/jack.pc" \
+ "$INSTALL_ROOT/usr/lib/pkgconfig/"
diff --git a/audio-drivers/jackdmp/jack.pc b/audio-drivers/jackdmp/jack.pc
new file mode 100644
index 0000000..ceb2ce5
--- /dev/null
+++ b/audio-drivers/jackdmp/jack.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: jack
+Description: the Jack Audio Connection Kit for multi-processor machines
+Version: 0.99.0
+Libs: -L${libdir} -ljack -lpthread -lrt
+Cflags: -I${includedir}
diff --git a/audio-drivers/pyalsa/DETAILS b/audio-drivers/pyalsa/DETAILS
index 3bcb8c5..061ecc5 100755
--- a/audio-drivers/pyalsa/DETAILS
+++ b/audio-drivers/pyalsa/DETAILS
@@ -1,9 +1,9 @@
SPELL=pyalsa
- VERSION=1.0.14
+ VERSION=1.0.15rc1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:ca50f218109b6740ab94a1cb9fdb3f9bf192ab6d15078e41933e5dd12e46bef0583ec295c10f9e8ca1e69fe890406ede2d8b6d933e8540fd07724cb69608feca
+
SOURCE_HASH=sha512:c14d739be9e2aa11603b112362776a8438f8f10cb3807e4f291d9ad18520f9ad4c5797a9dff8a88775688e62a5fcda226a958604ae44e59d84abe1345f910155
WEB_SITE=http://www.alsa-project.org/
ENTERED=20070612
LICENSE[0]=GPL
diff --git a/audio-drivers/pyalsa/HISTORY b/audio-drivers/pyalsa/HISTORY
index c018958..40c66e0 100644
--- a/audio-drivers/pyalsa/HISTORY
+++ b/audio-drivers/pyalsa/HISTORY
@@ -1,2 +1,5 @@
+2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15rc1
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* BUILD, DEPENDS, DETAILS, INSTALL: created the spell
diff --git a/audio-drivers/yiff/DETAILS b/audio-drivers/yiff/DETAILS
index b1b6a2c..e2c795c 100755
--- a/audio-drivers/yiff/DETAILS
+++ b/audio-drivers/yiff/DETAILS
@@ -10,8 +10,8 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
KEYWORDS="drivers audio"
SHORT="a network transparent multiclient sound server"
cat << EOF
-YIFF is a network transparent multiclient sound server for Linux games and
applications.
-The YIFF server comes with a GUI interface and a documented library. It
gives you full
-control over the sound card, including explicit cycle rate tunning, mixers
if any, and
-buffer fragmentation sizes.
+YIFF is a network transparent multiclient sound server for Linux games and
+applications. The YIFF server comes with a GUI interface and a documented
+library. It gives you full control over the sound card, including explicit
+cycle rate tunning, mixers if any, and buffer fragmentation sizes.
EOF
diff --git a/audio-drivers/yiff/HISTORY b/audio-drivers/yiff/HISTORY
index 573c5e8..8fe2348 100644
--- a/audio-drivers/yiff/HISTORY
+++ b/audio-drivers/yiff/HISTORY
@@ -1,3 +1,6 @@
+2007-08-18 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: delinting (80-col)
+
2006-11-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: 2.14.5
* DEPENDS: made gtk+ optional, added optional alsa-lib
diff --git a/audio-libs/libgpod/DETAILS b/audio-libs/libgpod/DETAILS
index 5001d3c..13dc854 100755
--- a/audio-libs/libgpod/DETAILS
+++ b/audio-libs/libgpod/DETAILS
@@ -1,9 +1,10 @@
SPELL=libgpod
- VERSION=0.4.0
+ VERSION=0.5.2
+
SOURCE_HASH=sha512:ff07689df74c177d897a0ed961a5d96de5f8885056ab2bc16284e374607394548ad8c8d3b1d2e8a5526c8ec01cab6ef48a2abbd8f3615590f6b46e3b46c4bc31
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtkpod/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://www.gtkpod.org/
ENTERED=20051206
LICENSE[0]=GPL
diff --git a/audio-libs/libgpod/HISTORY b/audio-libs/libgpod/HISTORY
index 56e4601..60b679e 100644
--- a/audio-libs/libgpod/HISTORY
+++ b/audio-libs/libgpod/HISTORY
@@ -1,3 +1,6 @@
+2007-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.2
+
2007-03-24 David Kowis <dkowis AT shlrm.org>
* DEPENDS: fixed bug 11987

diff --git a/audio-libs/libgpod/libgpod-0.4.0.tar.gz.sig
b/audio-libs/libgpod/libgpod-0.4.0.tar.gz.sig
deleted file mode 100644
index 0ce1ba2..0000000
Binary files a/audio-libs/libgpod/libgpod-0.4.0.tar.gz.sig and /dev/null
differ
diff --git a/audio-libs/libtunepimp/DETAILS b/audio-libs/libtunepimp/DETAILS
index 7ada868..b887fc1 100755
--- a/audio-libs/libtunepimp/DETAILS
+++ b/audio-libs/libtunepimp/DETAILS
@@ -1,5 +1,6 @@
SPELL=libtunepimp
VERSION=0.5.3
+ PATCHLEVEL=1

SOURCE_HASH=sha512:77529a25148d12a6e269aa0986b09335a9158a7bdea698eaebdfbea775d4812cb4409d2c5119c84ffbcafa98adaad37345f3e58da63df3fabc257fd5317a4d47
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[1]=ftp://ftp.musicbrainz.org/pub/musicbrainz/$SOURCE
diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index d41bb53..702d10e 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,3 +1,7 @@
+2007-08-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: updated, last version change is also a breaker
+ * DETAILS: PATCHLEVEL++
+
2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.3
* DEPENDS: add libofa
diff --git a/audio-libs/libtunepimp/UP_TRIGGERS
b/audio-libs/libtunepimp/UP_TRIGGERS
index 7de597f..f5ca43a 100755
--- a/audio-libs/libtunepimp/UP_TRIGGERS
+++ b/audio-libs/libtunepimp/UP_TRIGGERS
@@ -1,9 +1,9 @@
-# up_trigger everything on update to 0.4.2 as soname was changed from
-# libtunepimp.so.2 to libtunepimp.so.3
+# up_trigger everything on update to 0.4.2 and 0.5.3 as soname was changed
from
+# libtunepimp.so.2 to libtunepimp.so.3 to .so.5 (0.5.3)

if spell_ok $SPELL; then
local OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ $OLD_SPELL_VERSION == "0.3.0" ]]; then
+ if [[ $OLD_SPELL_VERSION == "0.3.0" ]] || [[ $OLD_SPELL_VERSION == "0.4.2"
]]; then
for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libtunepimp.so.2"; then
diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS
index b9f5c09..e93d2c8 100755
--- a/audio-libs/lilypond/DETAILS
+++ b/audio-libs/lilypond/DETAILS
@@ -1,11 +1,11 @@
SPELL=lilypond
- VERSION=2.10.23
+ VERSION=2.10.29
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://download.linuxaudio.org/lilypond/sources/v${VERSION%.*}/$SOURCE
WEB_SITE=http://lilypond.org/web
ENTERED=20050210
-
SOURCE_HASH=sha512:94069eda7e2bb4b96f92cc0290d3801e13d6199dba7bc50269b1756cac5e12ad9d461f0e3b423f1ece4d2a3e69b0aa2299c841f98f87cc2f52914337e6e1e751
+
SOURCE_HASH=sha512:a9c60a9572bdd3ee48c98890ee1bd7480c2904c403f4b7f24d66c07566fc3ae5378f3ca416bd84323314beedb81a7ddd8af050b46737bb1d9539f76a90525199
LICENSE[0]=GPL
KEYWORDS="music audio libs"
SHORT="Format music notation beautifully"
diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY
index 6a628ef..14ab57b 100644
--- a/audio-libs/lilypond/HISTORY
+++ b/audio-libs/lilypond/HISTORY
@@ -1,3 +1,6 @@
+2007-08-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.29
+
2007-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 2.10.23

diff --git a/audio-libs/trm/HISTORY b/audio-libs/trm/HISTORY
index 6497496..74f942c 100644
--- a/audio-libs/trm/HISTORY
+++ b/audio-libs/trm/HISTORY
@@ -1,3 +1,8 @@
+2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply qualification.patch
+ * qualification.patch: Remove incorrect Metadata:: qualification
+ inside the class
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-libs/trm/PRE_BUILD b/audio-libs/trm/PRE_BUILD
new file mode 100755
index 0000000..3d64b0d
--- /dev/null
+++ b/audio-libs/trm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/qualification.patch
diff --git a/audio-libs/trm/qualification.patch
b/audio-libs/trm/qualification.patch
new file mode 100644
index 0000000..6dbc576
--- /dev/null
+++ b/audio-libs/trm/qualification.patch
@@ -0,0 +1,12 @@
+diff -Naur trm-0.2.1.orig/defs.h trm-0.2.1/defs.h
+--- trm-0.2.1.orig/defs.h 2007-09-23 09:12:39.560907369 -0700
++++ trm-0.2.1/defs.h 2007-09-23 09:13:18.694937228 -0700
+@@ -16,7 +16,7 @@
+ string fileName;
+ unsigned long duration;
+
+- Metadata::Metadata(void) { trackNum = 0; };
++ Metadata(void) { trackNum = 0; };
+ Metadata &operator=(const Metadata &other)
+ {
+ artist = other.artist;
diff --git a/audio-players/amarok/HISTORY b/audio-players/amarok/HISTORY
index e34dfd1..64a9b68 100644
--- a/audio-players/amarok/HISTORY
+++ b/audio-players/amarok/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * TRIGGERS: added flac
+
2007-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.7

diff --git a/audio-players/amarok/TRIGGERS b/audio-players/amarok/TRIGGERS
index ee20139..7fd2298 100755
--- a/audio-players/amarok/TRIGGERS
+++ b/audio-players/amarok/TRIGGERS
@@ -1 +1,2 @@
-on_cast kdelibs check_self
+on_cast kdelibs check_self &&
+on_cast flac check_self
diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index 44506d4..134003f 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -1,7 +1,6 @@
depends gtk+2 &&
depends glade2 &&
depends mcs &&
-depends audacious-plugins &&
optional_depends libsamplerate \
"--enable-samplerate" \
"" \
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index 2bc0f1f..2d21e20 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,6 @@
+2008-08-30 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DEPENDS: removed audacious-plugins dependency (Bug #13958)
+
2007-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS, HISTORY, desktop/audacious.desktop,
BUILD: created spell
diff --git a/audio-players/banshee/DETAILS b/audio-players/banshee/DETAILS
index b25f845..47a64fe 100755
--- a/audio-players/banshee/DETAILS
+++ b/audio-players/banshee/DETAILS
@@ -1,5 +1,5 @@
SPELL=banshee
- VERSION=0.12.1
+ VERSION=0.13.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://banshee-project.org/files/${SPELL}/${SOURCE}
diff --git a/audio-players/banshee/HISTORY b/audio-players/banshee/HISTORY
index 0ab71ec..e410a60 100644
--- a/audio-players/banshee/HISTORY
+++ b/audio-players/banshee/HISTORY
@@ -1,3 +1,9 @@
+2007-08-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.13.1
+
+2007-08-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.13.0
+
2007-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.12.1
Removed UPDATED
diff --git a/audio-players/banshee/banshee-0.12.1.tar.gz.sig
b/audio-players/banshee/banshee-0.12.1.tar.gz.sig
deleted file mode 100644
index 9b874c8..0000000
Binary files a/audio-players/banshee/banshee-0.12.1.tar.gz.sig and /dev/null
differ
diff --git a/audio-players/banshee/banshee-0.13.1.tar.gz.sig
b/audio-players/banshee/banshee-0.13.1.tar.gz.sig
new file mode 100644
index 0000000..57522e1
Binary files /dev/null and b/audio-players/banshee/banshee-0.13.1.tar.gz.sig
differ
diff --git a/audio-players/bmpx/DETAILS b/audio-players/bmpx/DETAILS
index f0358fe..97f57d2 100755
--- a/audio-players/bmpx/DETAILS
+++ b/audio-players/bmpx/DETAILS
@@ -1,10 +1,10 @@
SPELL=bmpx
- VERSION=0.40.1
+ VERSION=0.40.7
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=bmpx-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}

SOURCE_URL[0]=http://files.beep-media-player.org/releases/${BRANCH}/${SOURCE}
-
SOURCE_HASH=sha512:6879be3780aee88992dbbf35202e0d6483c2cc1afe8d945668f89106fde5b714c568991fb6a70f06d5bc9a586a3e550fe9a7ba4878c22330c2b49fd917087bdc
+
SOURCE_HASH=sha512:12f5a6492302ef0cdede2d3d20d8b35b8e723bf31e64e8d18f1bd9b605b8f3208d97a9dbbeb3e9db9c5cc09146261e7c3f1c4c6fa84837160f9b4179b88c03af
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
WEB_SITE=http://beep-media-player.org/index.php/BMPx_Homepage
diff --git a/audio-players/bmpx/HISTORY b/audio-players/bmpx/HISTORY
index 0d31bda..71b7878 100644
--- a/audio-players/bmpx/HISTORY
+++ b/audio-players/bmpx/HISTORY
@@ -1,3 +1,9 @@
+2007-09-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.40.7
+
+2007-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.40.4
+
2007-08-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.40.1

diff --git a/audio-players/lame/BUILD b/audio-players/lame/BUILD
deleted file mode 100755
index 46425fd..0000000
--- a/audio-players/lame/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dynamically link against libm
-LDFLAGS="$LDFLAGS -lm" &&
-
-default_build
diff --git a/audio-players/lame/DEPENDS b/audio-players/lame/DEPENDS
index 430cdd1..072cdcb 100755
--- a/audio-players/lame/DEPENDS
+++ b/audio-players/lame/DEPENDS
@@ -1,2 +1,2 @@
-depends automake &&
-depends libtool
+depends ncurses &&
+optional_depends nasm "--enable-nasm" "" "Allow the use of nasm"
diff --git a/audio-players/lame/DETAILS b/audio-players/lame/DETAILS
index af9ab4b..a3147ef 100755
--- a/audio-players/lame/DETAILS
+++ b/audio-players/lame/DETAILS
@@ -1,12 +1,11 @@
SPELL=lame
- VERSION=3.96.1
+ VERSION=3.97
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:fe1aa9a97ffca081be078381c528d4a25bee2d703871ecee3fd3d6055d0bccafb0590c9ff90ab2e3cce45bfcd23342f89180059c073ec9ddcb75eb8fbbafc82a
- WEB_SITE=http://www.sulaco.org/mp3
+
SOURCE_HASH=sha512:7386977d144f45d2f1c3116f2729e0236bc3cb65a60dbfeaad2554f47cd8f2ac07f54afa0a3c0a81571e3fe7092d0731d795ff57a783ec40451b21529a961c20
+ WEB_SITE=http://lame.sourceforge.net
ENTERED=20010922
- PATCHLEVEL=1
LICENSE[0]=LGPL
KEYWORDS="players audio"
SHORT="open source MP3 encoder and graphical frame analyzer"
diff --git a/audio-players/lame/HISTORY b/audio-players/lame/HISTORY
index 75f473b..f1422f9 100644
--- a/audio-players/lame/HISTORY
+++ b/audio-players/lame/HISTORY
@@ -1,3 +1,11 @@
+2007-08-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: new WEB_SITE
+ * DEPENDS: add use of nasm, ncurses
+
+2007-08-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.97
+ * PRE_BUILD, BUILD, DEPENDS: deleted
+
2006-09-19 Juuso Alasuutari <iuso AT sourcemage.org>
* BUILD: Added. Add "-lm" to LDFLAGS to dynamically link against
libm, fixes bug #13125.
diff --git a/audio-players/lame/PRE_BUILD b/audio-players/lame/PRE_BUILD
deleted file mode 100755
index a62591e..0000000
--- a/audio-players/lame/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit 's:AM_PATH_GTK.*::' configure.in &&
-for i in `find ./ -name Makefile.in`; do
- sedit 's:.*GTK_CFLAGS.*::' $i
-done &&
-sedit 's:@GTK_CFLAGS@::' frontend/Makefile.am &&
-libtoolize -c -f &&
-aclocal &&
-autoconf
diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
index 73f6e6b..d9581b5 100755
--- a/audio-players/moc/DETAILS
+++ b/audio-players/moc/DETAILS
@@ -1,13 +1,13 @@
SPELL=moc
if [ "$DEV" == "y" ]; then
- VERSION=2.4.1
+ VERSION=2.4.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
# SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/$SOURCE
#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-DEVEL
else
- VERSION=2.4.1
+ VERSION=2.4.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index fc34acb..d6083f4 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,6 @@
+2007-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.3
+
2006-10-12 George Sherwood <george AT beernabeer.com>
* DEPENDS: Chgd optional_depends ffmpeg-cvs to ffmpeg-svn. Bug #10376.

diff --git a/audio-players/ncmpc/DETAILS b/audio-players/ncmpc/DETAILS
index b5811f9..c1530cd 100755
--- a/audio-players/ncmpc/DETAILS
+++ b/audio-players/ncmpc/DETAILS
@@ -1,9 +1,9 @@
SPELL=ncmpc
- VERSION=0.11.0
+ VERSION=0.11.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://mercury.chem.pitt.edu/~shank/$SOURCE
-
SOURCE_HASH=sha512:ededf4fff5ba768707908660aa2b67d95c825c67cf5faf92aff13b103a9270aa5d99f565df29b60cedf7d945107a1330eb9e5e6798d5595bad6d1f88f04c35e3
+
SOURCE_HASH=sha512:c0d544d7a429cd4146d8b99128e1bb2b9d50b7b745a2606ad5d4fdc07bb69524b92c3b9776915aa0f99b395cde205384a957e0eb704fad76edcf437a2823d26e
WEB_SITE=http://www.musicpd.org
ENTERED=20040516
LICENSE[0]=GPL
diff --git a/audio-players/ncmpc/HISTORY b/audio-players/ncmpc/HISTORY
index 6f3194c..a062483 100644
--- a/audio-players/ncmpc/HISTORY
+++ b/audio-players/ncmpc/HISTORY
@@ -1,3 +1,7 @@
+2007-08-21 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: 0.11.1
+ * PRE_BUILD: wide character patch
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-players/ncmpc/PRE_BUILD b/audio-players/ncmpc/PRE_BUILD
new file mode 100755
index 0000000..7107e88
--- /dev/null
+++ b/audio-players/ncmpc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/ncmpc-wide-char.patch
diff --git a/audio-players/ncmpc/ncmpc-wide-char.patch
b/audio-players/ncmpc/ncmpc-wide-char.patch
new file mode 100644
index 0000000..7db74ed
--- /dev/null
+++ b/audio-players/ncmpc/ncmpc-wide-char.patch
@@ -0,0 +1,20 @@
+diff -Naur ncmpc-0.11.1.orig/src/list_window.c ncmpc-0.11.1/src/list_window.c
+--- ncmpc-0.11.1.orig/src/list_window.c 2005-01-23 18:37:42.000000000
+0100
++++ ncmpc-0.11.1/src/list_window.c 2007-07-27 10:17:00.000000000 +0200
+@@ -196,7 +196,7 @@
+ if( label )
+ {
+ int selected = lw->start+i == lw->selected;
+- size_t len = strlen(label);
++ size_t len, y;
+
+ if( highlight )
+ colors_use(lw->w, COLOR_LIST_BOLD);
+@@ -207,6 +207,7 @@
+ wattron(lw->w, A_REVERSE);
+
+ waddnstr(lw->w, label, lw->cols);
++ getyx(lw->w, y, len);
+ if( fill && len<lw->cols )
+ mvwhline(lw->w, i, len, ' ', lw->cols-len);
+
diff --git a/audio-players/rhythmbox/DETAILS b/audio-players/rhythmbox/DETAILS
index 1123f12..5e8cf4c 100755
--- a/audio-players/rhythmbox/DETAILS
+++ b/audio-players/rhythmbox/DETAILS
@@ -1,5 +1,5 @@
SPELL=rhythmbox
- VERSION=0.10.1
+ VERSION=0.11.2
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-players/rhythmbox/HISTORY b/audio-players/rhythmbox/HISTORY
index d0f1944..b9b9c0c 100644
--- a/audio-players/rhythmbox/HISTORY
+++ b/audio-players/rhythmbox/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.11.2
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.10.1

diff --git a/audio-players/rhythmbox/rhythmbox-0.10.1.tar.bz2.sig
b/audio-players/rhythmbox/rhythmbox-0.10.1.tar.bz2.sig
deleted file mode 100644
index 6150d04..0000000
Binary files a/audio-players/rhythmbox/rhythmbox-0.10.1.tar.bz2.sig and
/dev/null differ
diff --git a/audio-players/rhythmbox/rhythmbox-0.11.2.tar.bz2.sig
b/audio-players/rhythmbox/rhythmbox-0.11.2.tar.bz2.sig
new file mode 100644
index 0000000..00a8d06
Binary files /dev/null and
b/audio-players/rhythmbox/rhythmbox-0.11.2.tar.bz2.sig differ
diff --git a/audio-players/sonata/DETAILS b/audio-players/sonata/DETAILS
index dbb13cd..8562b9d 100755
--- a/audio-players/sonata/DETAILS
+++ b/audio-players/sonata/DETAILS
@@ -1,8 +1,8 @@
SPELL=sonata
- VERSION=1.2.2
+ VERSION=1.2.3
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:7256c75fe0253152bc04f4da2a5bd1e2b704aeb4398139d5a71c49998b2a867eb8dffb9992b772dceea3f095fb52aa8dd0aa5f3314b0362c86f0d5e2d483e5ab
+
SOURCE_HASH=sha512:70507fcc819971a77d2e193e5c5a5f6a513f0c081c390f9d33c192ba577b9afb0cab1ef26ac85b6c743839d69caf4182313d626a371d31b4452a7fd5c7e4f2a3
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://sonata.berlios.de/
LICENSE[0]=GPL
diff --git a/audio-players/sonata/HISTORY b/audio-players/sonata/HISTORY
index 9a3ddc4..8d9a904 100644
--- a/audio-players/sonata/HISTORY
+++ b/audio-players/sonata/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: Updated to version 1.2.3
+
2007-07-23 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.2.2

diff --git a/audio-players/sound-juicer/DETAILS
b/audio-players/sound-juicer/DETAILS
index 36de48e..25b4119 100755
--- a/audio-players/sound-juicer/DETAILS
+++ b/audio-players/sound-juicer/DETAILS
@@ -1,5 +1,5 @@
SPELL=sound-juicer
- VERSION=2.16.4
+ VERSION=2.20.0
BRANCH=$(echo $VERSION|cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-players/sound-juicer/HISTORY
b/audio-players/sound-juicer/HISTORY
index 2719795..197f1c1 100644
--- a/audio-players/sound-juicer/HISTORY
+++ b/audio-players/sound-juicer/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.3
+
2007-04-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.16.4
* DEPENDS: added option depends on xdg-user-dirs
diff --git a/audio-players/sound-juicer/sound-juicer-2.16.4.tar.gz.sig
b/audio-players/sound-juicer/sound-juicer-2.16.4.tar.gz.sig
deleted file mode 100644
index b253ffa..0000000
Binary files a/audio-players/sound-juicer/sound-juicer-2.16.4.tar.gz.sig and
/dev/null differ
diff --git a/audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig
b/audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig
new file mode 100644
index 0000000..8831391
Binary files /dev/null and
b/audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig differ
diff --git a/audio-soft/cuetools/DETAILS b/audio-soft/cuetools/DETAILS
new file mode 100755
index 0000000..34f3687
--- /dev/null
+++ b/audio-soft/cuetools/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=cuetools
+ VERSION=1.3.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://developer.berlios.de/projects/$SPELL/
+ SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:b1c3f782ea07743f765af5c03f6fbaaad1baa9fc93de1020406afa2b2a14ef5ab67db6647af5c855590102caab6061189744d4fb15eee92ecafd4b69fad338a2
+ LICENSE[0]=GPL
+ ENTERED=20070912
+ KEYWORDS="audio cue"
+ SHORT="cuetools is a set of utilities for working with cue files
and toc files."
+cat << EOF
+cuetools is a set of utilities for working with cue files and toc files.
+EOF
diff --git a/audio-soft/cuetools/HISTORY b/audio-soft/cuetools/HISTORY
new file mode 100644
index 0000000..5aaab99
--- /dev/null
+++ b/audio-soft/cuetools/HISTORY
@@ -0,0 +1,2 @@
+2007-09-12 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: Created spell
diff --git a/audio-soft/eyeD3/BUILD b/audio-soft/eyeD3/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-soft/eyeD3/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-soft/eyeD3/DEPENDS b/audio-soft/eyeD3/DEPENDS
new file mode 100755
index 0000000..e1771f9
--- /dev/null
+++ b/audio-soft/eyeD3/DEPENDS
@@ -0,0 +1 @@
+depends eyed3
diff --git a/audio-soft/eyeD3/DETAILS b/audio-soft/eyeD3/DETAILS
new file mode 100755
index 0000000..61c8fb2
--- /dev/null
+++ b/audio-soft/eyeD3/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=eyeD3
+ VERSION=0.6.14
+# SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://eyed3.nicfit.net/
+# SOURCE_URL[0]=http://eyed3.nicfit.net/releases/$SOURCE
+#
SOURCE_HASH=sha512:b328a85f031ab61849212247bd180b07abb16113b9e50aa335e8699e3a6480a9cf1d79168e4939b4548f4301195eb8310650574c9598afd77fa9c54cfa50c429
+ PATCH_LEVEL=1
+ LICENSE[0]=GPL
+ ENTERED=20070908
+ KEYWORDS="id3 audio"
+ SHORT="eyeD3 is a Python module and program for processing ID3
tags."
+cat << EOF
+eyeD3 is a Python module and program for processing ID3 tags. Information
about
+mp3 files (i.e bit rate, sample frequency, play time, etc.) is also provided.
+The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
+EOF
diff --git a/audio-soft/eyeD3/HISTORY b/audio-soft/eyeD3/HISTORY
new file mode 100644
index 0000000..240de76
--- /dev/null
+++ b/audio-soft/eyeD3/HISTORY
@@ -0,0 +1,5 @@
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * Deprecated because of uppercase in spell name
+
+2007-09-08 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS, DEPENDS: Created spell.
diff --git a/audio-soft/eyeD3/INSTALL b/audio-soft/eyeD3/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-soft/eyeD3/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-soft/eyeD3/PRE_BUILD b/audio-soft/eyeD3/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-soft/eyeD3/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-soft/eyeD3/TRIGGERS b/audio-soft/eyeD3/TRIGGERS
new file mode 100755
index 0000000..111b9d9
--- /dev/null
+++ b/audio-soft/eyeD3/TRIGGERS
@@ -0,0 +1 @@
+on_cast eyeD3 dispel_self
diff --git a/audio-soft/eyed3/CONFLICTS b/audio-soft/eyed3/CONFLICTS
new file mode 100755
index 0000000..520f847
--- /dev/null
+++ b/audio-soft/eyed3/CONFLICTS
@@ -0,0 +1 @@
+conflicts eyeD3 y
diff --git a/audio-soft/eyed3/DEPENDS b/audio-soft/eyed3/DEPENDS
new file mode 100755
index 0000000..a86d429
--- /dev/null
+++ b/audio-soft/eyed3/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/audio-soft/eyed3/DETAILS b/audio-soft/eyed3/DETAILS
new file mode 100755
index 0000000..d260f72
--- /dev/null
+++ b/audio-soft/eyed3/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=eyed3
+ VERSION=0.6.14
+ SOURCE=eyeD3-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/eyeD3-$VERSION
+ WEB_SITE=http://eyed3.nicfit.net/
+ SOURCE_URL[0]=http://eyed3.nicfit.net/releases/$SOURCE
+
SOURCE_HASH=sha512:b328a85f031ab61849212247bd180b07abb16113b9e50aa335e8699e3a6480a9cf1d79168e4939b4548f4301195eb8310650574c9598afd77fa9c54cfa50c429
+ LICENSE[0]=GPL
+ ENTERED=20070908
+ KEYWORDS="id3 audio"
+ SHORT="eyeD3 is a Python module and program for processing ID3
tags."
+cat << EOF
+eyeD3 is a Python module and program for processing ID3 tags. Information
about
+mp3 files (i.e bit rate, sample frequency, play time, etc.) is also provided.
+The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
+EOF
diff --git a/audio-soft/eyed3/HISTORY b/audio-soft/eyed3/HISTORY
new file mode 100644
index 0000000..b804deb
--- /dev/null
+++ b/audio-soft/eyed3/HISTORY
@@ -0,0 +1,2 @@
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS, DEPENDS: Created spell.
diff --git a/audio-soft/fusepod/DEPENDS b/audio-soft/fusepod/DEPENDS
new file mode 100755
index 0000000..cf89afe
--- /dev/null
+++ b/audio-soft/fusepod/DEPENDS
@@ -0,0 +1,5 @@
+depends pkgconfig &&
+depends libgpod &&
+depends taglib &&
+depends g++ &&
+depends fuse
diff --git a/audio-soft/fusepod/DETAILS b/audio-soft/fusepod/DETAILS
new file mode 100755
index 0000000..92554a4
--- /dev/null
+++ b/audio-soft/fusepod/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=fusepod
+ VERSION=0.5.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/fusepod/$SOURCE
+ WEB_SITE=http://sourceforge.net/projects/fusepod/
+ ENTERED=20070821
+ LICENSE[0]=GPL
+
SOURCE_HASH[0]=sha512:a3c0c3ba1fea80656a067d61a9b274a20522d0940db9c505a5268cd2f607bf0cf8e990f02de7fb80e3e9c71ddae482e163d4d22f6b57f0867f45a86076492a33
+ KEYWORDS="disk ipod"
+ SHORT="FUSEPod is a userspace filesystem which mounts your iPod"
+cat << EOF
+FUSEPod is a userspace filesystem which mounts your iPod into a directory
+for easy browsing of your songs on your iPod. It features a configurable
+directory layout, read/write support, read support for playlists and finds
+where your iPod is.
+EOF
diff --git a/audio-soft/fusepod/HISTORY b/audio-soft/fusepod/HISTORY
new file mode 100644
index 0000000..fbc9ab9
--- /dev/null
+++ b/audio-soft/fusepod/HISTORY
@@ -0,0 +1,7 @@
+2007-08-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: minor fixups here and there
+ * DEPENDS: missing a pile of them
+
+2007-08-20 Julien "_kaze_" Rozo <julien AT rozo.org>
+ * DETAILS, DEPENDS, HISTORY: created this spell, version 0.5.2
+
diff --git a/audio-soft/gnupod/3A2F207A.gpg b/audio-soft/gnupod/3A2F207A.gpg
new file mode 100644
index 0000000..c4d024a
Binary files /dev/null and b/audio-soft/gnupod/3A2F207A.gpg differ
diff --git a/audio-soft/gnupod/DETAILS b/audio-soft/gnupod/DETAILS
index f1764e4..46e92da 100755
--- a/audio-soft/gnupod/DETAILS
+++ b/audio-soft/gnupod/DETAILS
@@ -1,8 +1,11 @@
SPELL=gnupod
- VERSION=0.99.2
+ VERSION=0.99.3
SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.blinkenlights.ch/${SPELL}-dist/stable/${SOURCE}
-
SOURCE_HASH=sha512:591c7d1354795d2ac0937c6da85c21c7440fc78945b47cb140c91e9d545bc8ee2c398d977fa32b2fa3b55d794056c4d64bccfae24d6795fbda9483a40da7121b
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=3A2F207A.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://blinkenlights.ch/cgi-bin/fm.pl?get=ipode "
LICENSE[0]=GPL
diff --git a/audio-soft/gnupod/HISTORY b/audio-soft/gnupod/HISTORY
index 3522581..d6fbe15 100644
--- a/audio-soft/gnupod/HISTORY
+++ b/audio-soft/gnupod/HISTORY
@@ -1,2 +1,7 @@
+2007-09-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * 3A2F207A.gpg: added gpg keyring
+ * DETAILS: updated spell to 0.99.3
+ converted to upstream signature checking
+
2007-05-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, HISTORY: created spell
diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index 03b2656..f48c53e 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1 +1,3 @@
-OPTS="$QJCTL_TRAY $OPTS" default_build
+OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS \
+ --with-qt=${INSTALL_ROOT}/usr/bin/qt4" \
+default_build
diff --git a/audio-soft/qjackctl/CONFIGURE b/audio-soft/qjackctl/CONFIGURE
index 28d4d53..f5e0506 100755
--- a/audio-soft/qjackctl/CONFIGURE
+++ b/audio-soft/qjackctl/CONFIGURE
@@ -1,5 +1,9 @@
-# QJackCtl 0.2.22's ./configure treats --enable as --disable
config_query_option QJCTL_TRAY \
"Enable system tray?" y \
- "" \
- "--disable-system-tray"
+ "--enable-system-tray" \
+ "--disable-system-tray" &&
+
+config_query_option QJCTL_JACK_MIDI \
+ "Enable JACK MIDI support?" y \
+ "--enable-jack-midi" \
+ "--disable-jack-midi"
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index b466e8f..83d9aff 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -1,9 +1,14 @@
-depends g++ &&
-depends qt-x11 &&
+#
+# only needed for qt4_bin_path_fix.diff
+#
+depends autoconf &&
+
+depends g++ &&
+depends qt4 &&

. "$GRIMOIRE/FUNCTIONS" &&

-if check_if_xorg_modular_libs qt-x11
+if check_if_xorg_modular_libs qt4
then
depends libx11 &&
depends libxext
@@ -11,8 +16,7 @@ fi &&

depends JACK-DRIVER &&

-# QJackCtl 0.2.22's ./configure treats --enable as --disable
optional_depends alsa-lib \
- "" \
+ "--enable-alsa-seq" \
"--disable-alsa-seq" \
"for ALSA/MIDI sequencer support"
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 794a5e2..d04fc20 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -1,23 +1,22 @@
SPELL=qjackctl
- VERSION=0.2.22
+ VERSION=0.3.1a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:e4c75e5341142e8d2663c42d21022f4852ec65a4803d8b1bec2d9206584dfd117d0306333ac861fad4abd69c9569cd98ff8a353e59ed89bb5de9b9365217d546
+
SOURCE_HASH=sha512:0b6863b30e600d689e43832416083a6d020963c174adb02f2585e295420259c1d5bcf10bc0c3d787d889658780ff541d1d1736375149733a5cce1d108fc4bd7e
WEB_SITE=http://qjackctl.sf.net
ENTERED=20031215
LICENSE[0]=GPL
KEYWORDS="jack qt tools audio"
- SHORT="A simple Qt application to control the JACK sound server
daemon."
+ SHORT="A Qt application to control the JACK sound server daemon."
cat << EOF
-Qjackctl is a simple Qt application to control the JACK sound server daemon,
+QjackCtl is a simple Qt application to control the JACK sound server daemon,
specific for the Linux Audio Desktop infrastructure.
-
-Written in C++ around the Qt3 toolkit for X11, most exclusively using Qt
+Written in C++ around the Qt4 toolkit for X11, most exclusively using Qt
Designer.
-
-Provides a simple GUI dialog for setting several JACK daemon parameters,
which
-are properly saved between sessions, and a way control of the status of the
-audio server daemon. With time, this primordial interface has become richer
by
-including a enhanced patchbay and connection control features.
+Provides a simple GUI dialog for setting several JACK daemon parameters,
+which are properly saved between sessions, and a way control of the status
+of the audio server daemon. With time, this primordial interface has become
+richer by including a enhanced patchbay and connection control features.
EOF
+
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index d367716..f91ce36 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,22 @@
+2007-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Replaced sed hack with patch from upstream.
+ * qt4_bin_path_fix.diff: Added.
+ * DEPENDS: Added depends autoconf for patching.
+ * BUILD: Removed unnecessary PATH modification, added --with-qt
+ flag to make use of the patch.
+
+2007-09-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.3.1a.
+ * DEPENDS: Changed depends qt-x11 to qt4.
+ * CONFIGURE, DEPENDS: Re-added --enable flags.
+ * CONFIGURE, BUILD: Added JACK MIDI option.
+ * BUILD: Added $INSTALL_ROOT/usr/bin/qt4 to PATH so that qmake
+ can be found during build.
+ * PRE_BUILD: Removed, unnecessary with qt4.
+ * PRE_BUILD: Re-added, need to sed configure script so that
+ it finds qt4's qmake/moc/uic executables instead of qt-x11's
+ equivalent ones if both libraries are installed.
+
2007-04-06 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFIGURE, DEPENDS: Removed --enable flags, ./configure treats
them as if they were --disable.
diff --git a/audio-soft/qjackctl/PRE_BUILD b/audio-soft/qjackctl/PRE_BUILD
index 1c5939e..38c9fcb 100755
--- a/audio-soft/qjackctl/PRE_BUILD
+++ b/audio-soft/qjackctl/PRE_BUILD
@@ -1,9 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
#
-# QTDIR needs to be set
+# fix ./configure not finding Qt4 build utils
#
-if [[ -z $QTDIR ]]
-then
- . "$TRACK_ROOT/etc/profile.d/qt.sh"
-fi &&
-
-default_pre_build
+patch -p0 < "$SCRIPT_DIRECTORY/qt4_bin_path_fix.diff" &&
+autoconf
diff --git a/audio-soft/qjackctl/qt4_bin_path_fix.diff
b/audio-soft/qjackctl/qt4_bin_path_fix.diff
new file mode 100644
index 0000000..7593cca
--- /dev/null
+++ b/audio-soft/qjackctl/qt4_bin_path_fix.diff
@@ -0,0 +1,12 @@
+--- configure.ac~ 2007-07-19 11:12:18.000000000 +0300
++++ configure.ac 2007-09-21 22:52:50.000000000 +0300
+@@ -89,6 +89,9 @@
+ if test -d $X/bin; then
+ ac_path="$X/bin:$ac_path"
+ fi
++ if test -x $X/qmake; then
++ ac_path="$X:$ac_path"
++ fi
+ if test -d $X/include; then
+ for Y in qt qt4; do
+ if test -d $X/include/$Y; then
diff --git a/audio-soft/qloud/DETAILS b/audio-soft/qloud/DETAILS
index 1887b4d..24d8d04 100755
--- a/audio-soft/qloud/DETAILS
+++ b/audio-soft/qloud/DETAILS
@@ -1,8 +1,8 @@
SPELL=qloud
- VERSION=0.19
+ VERSION=0.22
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://gaydenko.com/$SPELL/download/$SOURCE
-
SOURCE_HASH=sha512:408f1b38ae48320a1c48fc83b48da25c3df2c2ed215481479d6f1afcb639e522a36bb7aaecf273ff56dab5245156a7e629a3be77d0601b9a48e26ae43c3def31
+
SOURCE_HASH=sha512:9e13d1860a6bb021884432bc900b71e245d7e76b65fe793b2029872afde895498f2fb22fb4f95955c70f331263859c869e1eb680f944cc9dfa12f1c354d81a67
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
WEB_SITE=http://gaydenko.com/qloud/
ENTERED=20060818
diff --git a/audio-soft/qloud/HISTORY b/audio-soft/qloud/HISTORY
index 50b097c..b71d0f3 100644
--- a/audio-soft/qloud/HISTORY
+++ b/audio-soft/qloud/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ *DETAILS: Updated to 0.22
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Changed jack to JACK-DRIVER.

diff --git a/audio-soft/shntool/DETAILS b/audio-soft/shntool/DETAILS
index 3568ec8..bcfedae 100755
--- a/audio-soft/shntool/DETAILS
+++ b/audio-soft/shntool/DETAILS
@@ -1,8 +1,8 @@
SPELL=shntool
- VERSION=2.0.3
+ VERSION=3.0.4
SOURCE=shntool-${VERSION}.tar.gz
-
SOURCE_URL[1]=http://www.etree.org/shnutils/shntool/source/${SPELL}-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:f3755fc5cf4fc4936dc7bd9c04aedc4a1751a59e1c67156e988d0dfd4c6c755b9bcfe2074c48c6ac88f5354472fda0f63b43ce9fdbaa1651984432172d264fb9
+
SOURCE_URL[1]=http://www.etree.org/shnutils/shntool/dist/src/${SPELL}-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:07e0a547e694f83c3bf18eedc0fe72c67756ffffe88012f86c715313968bd4786cf8bda20c17314db05d49ccacbb095f985a5b9d3d377948cfc4e33683d5219d
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.etree.org/shnutils/shntool/
ENTERED=20050306
diff --git a/audio-soft/shntool/HISTORY b/audio-soft/shntool/HISTORY
index 7373bf7..d38b2f3 100644
--- a/audio-soft/shntool/HISTORY
+++ b/audio-soft/shntool/HISTORY
@@ -1,3 +1,6 @@
+2007-09-12 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: 3.0.4
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/chat-im/amsn/DETAILS b/chat-im/amsn/DETAILS
index e922583..0f4c76e 100755
--- a/chat-im/amsn/DETAILS
+++ b/chat-im/amsn/DETAILS
@@ -1,15 +1,17 @@
SPELL=amsn
- VERSION=0.96
+ VERSION=0.97RC1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/amsn/$SOURCE
WEB_SITE=http://amsn.sourceforge.net
ENTERED=20021220
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE="GPL"
KEYWORDS="messaging chat msn"
- SHORT="99.99% identical to MSN messenger, no ads and GPL licensed"
+ SHORT="MSN messenger clone, no ads and GPL licensed"
cat << EOF
-AMSN is an MSN messanger, it's using tk as the base, if you don't want
-to use gaim like me, you could try this program :))
-good luck
+A very nice MSN compatible messenger application, aMSN Messenger is a
+multiplatform MSN messenger clone. Works pretty much like its Windows based
+counterpart. Perfect for keeping in touch with those friends who have not
yet
+seen the light.
EOF
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index db9d7e3..61c4fb6 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,3 +1,7 @@
+2007-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: Updated to 0.97RC1
+ Changes description to what's on the website
+
2006-11-26 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 0.96

diff --git a/chat-im/amsn/amsn-0.96.tar.bz2.sig
b/chat-im/amsn/amsn-0.96.tar.bz2.sig
deleted file mode 100644
index 01b5cb3..0000000
Binary files a/chat-im/amsn/amsn-0.96.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/amsn/amsn-0.97RC1.tar.bz2.sig
b/chat-im/amsn/amsn-0.97RC1.tar.bz2.sig
new file mode 100644
index 0000000..2cd2e76
Binary files /dev/null and b/chat-im/amsn/amsn-0.97RC1.tar.bz2.sig differ
diff --git a/chat-im/ayttm/BUILD b/chat-im/ayttm/BUILD
index 85d6606..62f685a 100755
--- a/chat-im/ayttm/BUILD
+++ b/chat-im/ayttm/BUILD
@@ -2,14 +2,9 @@
patch -p0 < $SCRIPT_DIRECTORY/fixinstall.diff &&
./gen
fi &&
-# if [ "$CVS" == "yes" ]; then
-# export MAKE_NJOBS=1 &&
-# patch -p0 < $SCRIPT_DIRECTORY/fixinstall.diff &&
-# ./gen
-# fi &&
+
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
- --enable-xft \
$OPTS &&
make
diff --git a/chat-im/ayttm/DEPENDS b/chat-im/ayttm/DEPENDS
index 679a475..51be37e 100755
--- a/chat-im/ayttm/DEPENDS
+++ b/chat-im/ayttm/DEPENDS
@@ -1,6 +1,14 @@
-depends gcc34 &&
depends libtool &&
depends autoconf &&
depends audiofile &&
-depends gtk+ &&
-optional_depends "jasper" "" "" "For webcam support"
+depends gtk+2 &&
+depends glib2 &&
+optional_depends arts \
+ "--enable-arts" \
+ "--disable-arts" \
+ "For ARTS Support" &&
+optional_depends gpgme &&
+optional_depends jasper \
+ "--enable-webcam" \
+ "--disable-webcam" \
+ "For webcam support"
diff --git a/chat-im/ayttm/DETAILS b/chat-im/ayttm/DETAILS
index 482ee25..291312d 100755
--- a/chat-im/ayttm/DETAILS
+++ b/chat-im/ayttm/DETAILS
@@ -1,10 +1,10 @@
SPELL=ayttm
if [ "$CVS" = "n" ] ; then
- VERSION=0.4.6-17
+ VERSION=0.5.0-10
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.4.6
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/ayttm/$SOURCE
- MD5[0]='4a98188074d0c02d5a2e792898b97ef4'
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig"
else [ "$CVS" = "y" ]
VERSION=cvs
FORCE_DOWNLOAD=1
@@ -13,9 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT ayttm.cvs.sourceforge.net:/cvsroot/$SPELL:$SPELL
SOURCE_IGNORE=volatile
fi
- GCC_VERSION=3.4
WEB_SITE=http://ayttm.sourceforge.net
- BUILD_API=2
ENTERED=20030504
PATCHLEVEL=1
LICENSE[0]=GPL
diff --git a/chat-im/ayttm/HISTORY b/chat-im/ayttm/HISTORY
index bfa70b2..1df34ce 100644
--- a/chat-im/ayttm/HISTORY
+++ b/chat-im/ayttm/HISTORY
@@ -1,3 +1,14 @@
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.5.0-10.
+ * Build: Removed -L/usr/X11R6/lib from LDFLAG
+
+2007-08-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.5.0-6. Removed use gcc34.
+ Removed BUILD_API=2, PATCHLEVEL=1
+ * DEPENDS: Added depends gtk+2, glib2, optional_depends gpgme
+ Removed gcc34 and gtk+
+ * BUILD: Added -L/usr/X11R6/lib to LDFLAGS
+
2007-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: removed invoke_gcc #10641

diff --git a/chat-im/ayttm/ayttm-0.5.0-10.tar.bz2.sig
b/chat-im/ayttm/ayttm-0.5.0-10.tar.bz2.sig
new file mode 100644
index 0000000..398cb5e
Binary files /dev/null and b/chat-im/ayttm/ayttm-0.5.0-10.tar.bz2.sig differ
diff --git a/chat-im/centerim/DETAILS b/chat-im/centerim/DETAILS
index cb332f3..7613f73 100755
--- a/chat-im/centerim/DETAILS
+++ b/chat-im/centerim/DETAILS
@@ -1,5 +1,5 @@
SPELL=centerim
- VERSION=20070618
+ VERSION=20070625
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-4.22.1
SOURCE_URL[0]=http://www.centerim.org/download/$SOURCE
diff --git a/chat-im/centerim/HISTORY b/chat-im/centerim/HISTORY
index d4b34ef..2863174 100644
--- a/chat-im/centerim/HISTORY
+++ b/chat-im/centerim/HISTORY
@@ -1,3 +1,6 @@
+2007-09-15 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 20070625
+
2007-06-23 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 20070618

diff --git a/chat-im/centerim/centerim-20070618.tar.gz.sig
b/chat-im/centerim/centerim-20070618.tar.gz.sig
deleted file mode 100644
index 036040e..0000000
Binary files a/chat-im/centerim/centerim-20070618.tar.gz.sig and /dev/null
differ
diff --git a/chat-im/centerim/centerim-20070625.tar.gz.sig
b/chat-im/centerim/centerim-20070625.tar.gz.sig
new file mode 100644
index 0000000..7a2837f
Binary files /dev/null and b/chat-im/centerim/centerim-20070625.tar.gz.sig
differ
diff --git a/chat-im/ekiga/DETAILS b/chat-im/ekiga/DETAILS
index fe0d91b..7818506 100755
--- a/chat-im/ekiga/DETAILS
+++ b/chat-im/ekiga/DETAILS
@@ -7,9 +7,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
- VERSION=2.0.9
+ VERSION=2.0.11
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/$SOURCE
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/2.0/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
diff --git a/chat-im/ekiga/HISTORY b/chat-im/ekiga/HISTORY
index 70aed6e..e6a283a 100644
--- a/chat-im/ekiga/HISTORY
+++ b/chat-im/ekiga/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 2.0.11. Fixed SOURCE_URL
+
2007-04-13 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.0.9

diff --git a/chat-im/ekiga/ekiga-2.0.11.tar.gz.sig
b/chat-im/ekiga/ekiga-2.0.11.tar.gz.sig
new file mode 100644
index 0000000..67dd8ab
Binary files /dev/null and b/chat-im/ekiga/ekiga-2.0.11.tar.gz.sig differ
diff --git a/chat-im/ekiga/ekiga-2.0.9.tar.gz.sig
b/chat-im/ekiga/ekiga-2.0.9.tar.gz.sig
deleted file mode 100644
index 694f469..0000000
Binary files a/chat-im/ekiga/ekiga-2.0.9.tar.gz.sig and /dev/null differ
diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index f02b99e..8e4dad6 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -1,4 +1,5 @@
depends pygtk2 &&
depends pysqlite &&
depends intltool &&
+optional_depends dbus '--enable-remote' '--disable-remote' 'for remote
control via DBus' &&
optional_depends gtkspell '--enable-gtkspell' '--disable-gtkspell' 'To add
spelling checking'
diff --git a/chat-im/gajim/DETAILS b/chat-im/gajim/DETAILS
index 852bd7f..557efa8 100755
--- a/chat-im/gajim/DETAILS
+++ b/chat-im/gajim/DETAILS
@@ -1,5 +1,5 @@
SPELL=gajim
- VERSION=0.11.1
+ VERSION=0.11.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[1]=http://www.gajim.org/downloads/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 4e9319a..c9ea835 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,9 @@
+2007-09-24 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.11.2
+
+2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added dbus as optional
+
2007-02-19 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 0.11.1

diff --git a/chat-im/gajim/gajim-0.11.1.tar.bz2.sig
b/chat-im/gajim/gajim-0.11.1.tar.bz2.sig
deleted file mode 100644
index f8d3ba1..0000000
Binary files a/chat-im/gajim/gajim-0.11.1.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/gajim/gajim-0.11.2.tar.bz2.sig
b/chat-im/gajim/gajim-0.11.2.tar.bz2.sig
new file mode 100644
index 0000000..9bee298
Binary files /dev/null and b/chat-im/gajim/gajim-0.11.2.tar.bz2.sig differ
diff --git a/chat-im/gossip/DETAILS b/chat-im/gossip/DETAILS
index cc7817a..a389b44 100755
--- a/chat-im/gossip/DETAILS
+++ b/chat-im/gossip/DETAILS
@@ -1,5 +1,5 @@
SPELL=gossip
- VERSION=0.26
+ VERSION=0.27
BRANCH=$(echo $VERSION | cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/chat-im/gossip/HISTORY b/chat-im/gossip/HISTORY
index c9e36a2..954e280 100644
--- a/chat-im/gossip/HISTORY
+++ b/chat-im/gossip/HISTORY
@@ -1,3 +1,6 @@
+2007-08-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.27
+
2007-06-09 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 0.26

diff --git a/chat-im/gossip/gossip-0.26.tar.bz2.sig
b/chat-im/gossip/gossip-0.26.tar.bz2.sig
deleted file mode 100644
index 0dbc4ac..0000000
Binary files a/chat-im/gossip/gossip-0.26.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/gossip/gossip-0.27.tar.bz2.sig
b/chat-im/gossip/gossip-0.27.tar.bz2.sig
new file mode 100644
index 0000000..f537daa
Binary files /dev/null and b/chat-im/gossip/gossip-0.27.tar.bz2.sig differ
diff --git a/chat-im/pidgin-otr/DETAILS b/chat-im/pidgin-otr/DETAILS
index 4731947..0716780 100755
--- a/chat-im/pidgin-otr/DETAILS
+++ b/chat-im/pidgin-otr/DETAILS
@@ -1,7 +1,7 @@
SPELL=pidgin-otr
- VERSION=3.0.1
+ VERSION=3.1.0
SOURCE="$SPELL-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.cyberdyne.org/~icebrkr/files/${SOURCE}
+ SOURCE_URL[0]=http://www.cypherpunks.ca/otr/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-${VERSION}"
WEB_SITE="http://www.cypherpunks.ca/otr/";
diff --git a/chat-im/pidgin-otr/HISTORY b/chat-im/pidgin-otr/HISTORY
index 92d0758..d916e7a 100644
--- a/chat-im/pidgin-otr/HISTORY
+++ b/chat-im/pidgin-otr/HISTORY
@@ -1,2 +1,5 @@
+2007-09-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.1.0. Updated SOURCE_URL.
+
2007-06-09 George Sherwood <george AT beernabeer.com>
* DETAILS, HISTORY: created spell
diff --git a/chat-im/pidgin-otr/pidgin-otr-3.0.1.tar.gz.sig
b/chat-im/pidgin-otr/pidgin-otr-3.0.1.tar.gz.sig
deleted file mode 100644
index 6ed36ac..0000000
Binary files a/chat-im/pidgin-otr/pidgin-otr-3.0.1.tar.gz.sig and /dev/null
differ
diff --git a/chat-im/pidgin-otr/pidgin-otr-3.1.0.tar.gz.sig
b/chat-im/pidgin-otr/pidgin-otr-3.1.0.tar.gz.sig
new file mode 100644
index 0000000..a8d2751
Binary files /dev/null and b/chat-im/pidgin-otr/pidgin-otr-3.1.0.tar.gz.sig
differ
diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD
index b3a3c2c..5f756dc 100755
--- a/chat-im/pidgin/BUILD
+++ b/chat-im/pidgin/BUILD
@@ -1,5 +1,6 @@
### had to cook up some pkg-config files for nss and nspr
CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include"
export
PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr"
&&
+make_single &&
default_build &&
cd $SOURCE_DIRECTORY
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 428ec00..223cf1c 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,5 +1,5 @@
SPELL=pidgin
- VERSION=2.1.0
+ VERSION=2.2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index dc8e41f..4c67ea5 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,12 @@
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fails to compile with multiple make jobs
+
+2007-09-14 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.2.0
+
+2007-08-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 2.1.1
+
2007-08-13 Elisamuel Resto <ryuji AT mages.ath.cx>
* DETAILS: updated to 2.1.0

@@ -21,3 +30,4 @@
2007-04-30 George Sherwood <george AT beernabeer.com>
* DETAILS, PREPARE, DEPENDS, PRE_BUILD, BUILD:
Created spell from gaim spell
+
diff --git a/chat-im/pidgin/pidgin-2.1.0.tar.bz2.sig
b/chat-im/pidgin/pidgin-2.1.0.tar.bz2.sig
deleted file mode 100644
index 4aa6a2d..0000000
Binary files a/chat-im/pidgin/pidgin-2.1.0.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/pidgin/pidgin-2.2.0.tar.bz2.sig
b/chat-im/pidgin/pidgin-2.2.0.tar.bz2.sig
new file mode 100644
index 0000000..19a3987
Binary files /dev/null and b/chat-im/pidgin/pidgin-2.2.0.tar.bz2.sig differ
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index 64d6577..54a689a 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -2,14 +2,13 @@
if [ "$BITLBEE_DEVEL" == "y" ]; then
VERSION=1.1dev
else
- VERSION=1.0.3
+ VERSION=1.0.4
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
WEB_SITE=http://www.bitlbee.org
ENTERED=20031024
- UPDATED=20050825
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
KEYWORDS="irc chat"
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 69b9e5f..40cfcaf 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,6 @@
+2007-09-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated stable to version 1.0.4
+
2007-02-25 George Sherwood <george AT beernabeer.com>
* DETAILS: Added a devel version 1.1
* PREPARE: Added for devel version query
diff --git a/chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig
b/chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig
deleted file mode 100644
index 72784a6..0000000
Binary files a/chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig and /dev/null differ
diff --git a/chat-irc/bitlbee/bitlbee-1.0.4.tar.gz.sig
b/chat-irc/bitlbee/bitlbee-1.0.4.tar.gz.sig
new file mode 100644
index 0000000..f930f9f
Binary files /dev/null and b/chat-irc/bitlbee/bitlbee-1.0.4.tar.gz.sig differ
diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index 0d002c5..4d7990b 100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
@@ -19,7 +19,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-devel
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=0.2.5
+ VERSION=0.2.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index 05195ef..a5f209d 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,7 +1,10 @@
+2007-09-08 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.2.6
+
2007-06-09 Jiri Golembiovsky <golemj AT gmail.com>
- * DETAILS: updated to 0.2.5
- * BUILD, DEPENDS, DETAILS, PREPARE: added cvs version
- * BUILD, DEPENDS, INSTALL, PREPARE: added cmake
+ * DETAILS: updated to 0.2.5
+ * BUILD, DEPENDS, DETAILS, PREPARE: added cvs version
+ * BUILD, DEPENDS, INSTALL, PREPARE: added cmake

2007-03-31 George Sherwood <george AT beernabeer.com>
* DETAILS: updated to 0.2.4
diff --git a/chat-irc/weechat/weechat-0.2.5.tar.bz2.sig
b/chat-irc/weechat/weechat-0.2.5.tar.bz2.sig
deleted file mode 100644
index dd456b9..0000000
Binary files a/chat-irc/weechat/weechat-0.2.5.tar.bz2.sig and /dev/null differ
diff --git a/chat-irc/weechat/weechat-0.2.6.tar.bz2.sig
b/chat-irc/weechat/weechat-0.2.6.tar.bz2.sig
new file mode 100644
index 0000000..bd90418
Binary files /dev/null and b/chat-irc/weechat/weechat-0.2.6.tar.bz2.sig differ
diff --git a/chat-libs/libotr/DETAILS b/chat-libs/libotr/DETAILS
index 217b1bc..f3bc0b2 100755
--- a/chat-libs/libotr/DETAILS
+++ b/chat-libs/libotr/DETAILS
@@ -1,8 +1,8 @@
SPELL=libotr
- VERSION=3.0.0
+ VERSION=3.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.cypherpunks.ca/otr/${SOURCE}
-
SOURCE_HASH=sha512:f4a9dd30c5b2b1e51f463fdb4116c3b1469f5a59c8ec93e1b06c72111be6150c4240d465b1422d90c21be0c2b5feb94a0eb9cb1321ca89291e137c827f438a0d
+
SOURCE_HASH=sha512:f14fa466646830322a400df978d19e01e7edc404dc0c2191b3e96064495f48deb2be97f91b1534f7e73572f91d7641214b98c5c38473ccee86ee9c064bc1c0c3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.cypherpunks.ca/otr/";
LICENSE[0]=GPL
diff --git a/chat-libs/libotr/HISTORY b/chat-libs/libotr/HISTORY
index 92d0758..e729d2b 100644
--- a/chat-libs/libotr/HISTORY
+++ b/chat-libs/libotr/HISTORY
@@ -1,2 +1,5 @@
+2007-09-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated version to 3.1.0
+
2007-06-09 George Sherwood <george AT beernabeer.com>
* DETAILS, HISTORY: created spell
diff --git a/chat-libs/loudmouth/DEPENDS b/chat-libs/loudmouth/DEPENDS
index b65de57..fe2bd08 100755
--- a/chat-libs/loudmouth/DEPENDS
+++ b/chat-libs/loudmouth/DEPENDS
@@ -1,4 +1,5 @@
depends glib2 &&
+depends libidn &&
optional_depends "gnutls" \
"" \
"--without-ssl" \
diff --git a/chat-libs/loudmouth/DETAILS b/chat-libs/loudmouth/DETAILS
index ac2e022..94ddf7c 100755
--- a/chat-libs/loudmouth/DETAILS
+++ b/chat-libs/loudmouth/DETAILS
@@ -1,5 +1,5 @@
SPELL=loudmouth
- VERSION=1.2.2
+ VERSION=1.2.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://ftp.imendio.com/pub/imendio/$SPELL/src/$SOURCE
diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index af119e5..09b5e99 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,7 @@
+2007-08-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 1.2.3
+ * DEPENDS: Added depends libidn
+
2007-04-30 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.2.2

diff --git a/chat-libs/loudmouth/loudmouth-1.2.2.tar.bz2.sig
b/chat-libs/loudmouth/loudmouth-1.2.2.tar.bz2.sig
deleted file mode 100644
index 0e2d103..0000000
Binary files a/chat-libs/loudmouth/loudmouth-1.2.2.tar.bz2.sig and /dev/null
differ
diff --git a/chat-libs/loudmouth/loudmouth-1.2.3.tar.bz2.sig
b/chat-libs/loudmouth/loudmouth-1.2.3.tar.bz2.sig
new file mode 100644
index 0000000..9730bfa
Binary files /dev/null and b/chat-libs/loudmouth/loudmouth-1.2.3.tar.bz2.sig
differ
diff --git a/chat-libs/opal/DETAILS b/chat-libs/opal/DETAILS
index 8664a5b..be3c833 100755
--- a/chat-libs/opal/DETAILS
+++ b/chat-libs/opal/DETAILS
@@ -7,9 +7,9 @@ if [ "$CVS" == "y" ]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
else
- VERSION=2.2.8
+ VERSION=2.2.11
SOURCE=${SPELL}-${VERSION}.tar.gz
-
SOURCE_URL[0]=http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/$SOURCE
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/2.2/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
fi
diff --git a/chat-libs/opal/HISTORY b/chat-libs/opal/HISTORY
index de72393..7108e9e 100644
--- a/chat-libs/opal/HISTORY
+++ b/chat-libs/opal/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated to 2.2.11. Fixed SOURCE_URL
+
2007-04-13 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.2.8

diff --git a/chat-libs/opal/opal-2.2.11.tar.gz.sig
b/chat-libs/opal/opal-2.2.11.tar.gz.sig
new file mode 100644
index 0000000..9d29118
Binary files /dev/null and b/chat-libs/opal/opal-2.2.11.tar.gz.sig differ
diff --git a/chat-libs/opal/opal-2.2.8.tar.gz.sig
b/chat-libs/opal/opal-2.2.8.tar.gz.sig
deleted file mode 100644
index 847cbff..0000000
Binary files a/chat-libs/opal/opal-2.2.8.tar.gz.sig and /dev/null differ
diff --git a/chat-libs/pwlib/DETAILS b/chat-libs/pwlib/DETAILS
index 0d4cd0b..7543793 100755
--- a/chat-libs/pwlib/DETAILS
+++ b/chat-libs/pwlib/DETAILS
@@ -7,10 +7,9 @@ if [ "$CVS" == "y" ]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
else
- VERSION=1.10.7
+ VERSION=1.10.10
SOURCE=${SPELL}-${VERSION}.tar.gz
-
SOURCE_URL[0]=http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${SOURCE}
- SOURCE_URL[1]=${SOURCEFORGE_URL}/openh323/${SOURCE}
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/1.10/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
fi
diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY
index 66a5428..3db1184 100644
--- a/chat-libs/pwlib/HISTORY
+++ b/chat-libs/pwlib/HISTORY
@@ -1,3 +1,7 @@
+2007-09-18 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 1.10.10. Fixed SOURCE_URL[0].
+ Removed SOURCE_URL[1]
+
2007-04-13 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.10.7

diff --git a/chat-libs/pwlib/pwlib-1.10.10.tar.gz.sig
b/chat-libs/pwlib/pwlib-1.10.10.tar.gz.sig
new file mode 100644
index 0000000..72fe282
Binary files /dev/null and b/chat-libs/pwlib/pwlib-1.10.10.tar.gz.sig differ
diff --git a/chat-libs/pwlib/pwlib-1.10.7.tar.gz.sig
b/chat-libs/pwlib/pwlib-1.10.7.tar.gz.sig
deleted file mode 100644
index 1522125..0000000
Binary files a/chat-libs/pwlib/pwlib-1.10.7.tar.gz.sig and /dev/null differ
diff --git a/cluster/mpich2/DETAILS b/cluster/mpich2/DETAILS
index c0853b3..77ab3b3 100755
--- a/cluster/mpich2/DETAILS
+++ b/cluster/mpich2/DETAILS
@@ -1,13 +1,13 @@
SPELL=mpich2
- VERSION=1.0.3
+ VERSION=1.0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.mcs.anl.gov/pub/mpi/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
- WEB_SITE=http://www-unix.mcs.anl.gov/mpi/${SPELL}
- ENTERED=20031030
LICENSE[0]=http://www-unix.mcs.anl.gov/mpi/mpich2/license.htm
+ WEB_SITE=http://www-unix.mcs.anl.gov/mpi/${SPELL}
KEYWORDS="cluster"
+ ENTERED=20031030
SHORT="Portable implementation of MPICH with MPI-2 extensions"
cat << EOF
MPI (Message Passing Interface) is a specification for a standard library
for message passing that was defined by the MPI Forum, a broadly based group
of parallel computer vendors, library writers, and applications specialists.
MPICH is unique among existing implementations in its design goal of
combining portability with high performance. Contains the MPI-2 extensions.
diff --git a/cluster/mpich2/HISTORY b/cluster/mpich2/HISTORY
index b9f5b1b..dde7c67 100644
--- a/cluster/mpich2/HISTORY
+++ b/cluster/mpich2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.0.6
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/cluster/mpich2/mpich2-1.0.3.tar.gz.sig
b/cluster/mpich2/mpich2-1.0.3.tar.gz.sig
deleted file mode 100644
index ee7d6db..0000000
Binary files a/cluster/mpich2/mpich2-1.0.3.tar.gz.sig and /dev/null differ
diff --git a/cluster/mpich2/mpich2-1.0.6.tar.gz.sig
b/cluster/mpich2/mpich2-1.0.6.tar.gz.sig
new file mode 100644
index 0000000..4775690
Binary files /dev/null and b/cluster/mpich2/mpich2-1.0.6.tar.gz.sig differ
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index bad971a..3c489fa 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,19 +1,16 @@
SPELL=openldap
- VERSION=2.3.37
-
SOURCE_HASH=sha512:a1b26e7d29e299a1f776d4eabd0cae82470d5db6625724df1ddce1ac2e5c3f4978ceb561034b9bda2d167d19600ee8867ec288b473506b8a52d723772b66f007
+ VERSION=2.3.38
+
SOURCE_HASH=sha512:c2e2a1eb82b0a059d8a1ee3e6139152e8866c982d2cdf850501bf8a924750fe97a740798707da471ebeab7736ddcd413e618f76f7217d30d5a283d8471cf7683
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=$SPELL-release/$SOURCE
SOURCE_URL[0]=ftp://ftp.openldap.org/pub/OpenLDAP/$SOURCE_URI
SOURCE_URL[1]=ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/$SOURCE_URI
- SOURCE_URL[2]=ftp://ftp.matrix.com.br/pub/$SPELL/$SOURCE_URI
- SOURCE_URL[3]=ftp://ftp.ucr.ac.cr/pub/Unix/$SPELL/$SOURCE_URI
- SOURCE_URL[4]=ftp://ftp.plig.org/pub/OpenLDAP/$SOURCE_URI
+ SOURCE_URL[2]=ftp://ftp.ucr.ac.cr/pub/Unix/$SPELL/$SOURCE_URI
WEB_SITE=http://www.openldap.org/
ENTERED=20010922
LICENSE[0]=http://www.openldap.org/software/release/license.html
KEYWORDS="ldap collab"
- PATCHLEVEL=0
SECURITY_PATCH=1
SHORT="Fully featured open source LDAP software suite"
cat << EOF
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index a74a9d2..a01c264 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,7 @@
+2007-09-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.3.38
+ Removed non-working SOURCE_URL[2] and SOURCE_URL[3]
+
2007-07-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.37

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index dc73b07..519d0af 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.4.4
+ VERSION=1.4.5
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
@@ -9,14 +9,14 @@ if [[ "$SVN_HEAD" == y ]]; then
else
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:f2a4499e58ceaad94618b4ecfe73527e707c49fd39f50c7608491b5e694975e3b7d2aca142419678353edd76d9c3d3919f82fda6271fc84accbe98999bc76a5d
+
SOURCE_HASH=sha512:a0bf098a55be560ef058ef2be018d9c15babbc45ad315cfd9b4cff569f44ad278a959d824b7f0f44d278b49b707d618472c2b7c0d2e9b5ceb37761deb05bb622
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://subversion.tigris.org/
ENTERED=20020528
LICENSE[0]=APACHE
DOCS='doc/*'
- PATCHLEVEL=1
+ PATCHLEVEL=0
KEYWORDS="cvs collab"
SHORT='Compelling replacement for CVS'
cat << EOF
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 941456a..b0286a0 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.5
+
2007-06-10 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.4.4

diff --git a/collab/webmin/DETAILS b/collab/webmin/DETAILS
index 744cc68..b121446 100755
--- a/collab/webmin/DETAILS
+++ b/collab/webmin/DETAILS
@@ -1,9 +1,9 @@
SPELL=webmin
- VERSION=1.350
+ VERSION=1.360
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/webadmin/$SOURCE
-
SOURCE_HASH=sha512:64e8a7fb1c3ae17a54b5a9d92c74a999a36c6ec8e05ee4d349388c479584abe59d561487ba314e1a1d8c2d62caf69366f53d3ff05a1a77895169fc98c8ec0d66
+
SOURCE_HASH=sha512:03aa58f0915ae0489660e4efac662cb2e2ebe5af9ca0d5838abc9253f2071153e2dba24910ad933c54bc40c2f0e18f93bd760c8284d921e1be7faebf749dd9a7
WEB_SITE=http://www.webmin.com/
ENTERED=20020415
ARCHIVE="off"
diff --git a/collab/webmin/HISTORY b/collab/webmin/HISTORY
index 5793781..f220bee 100644
--- a/collab/webmin/HISTORY
+++ b/collab/webmin/HISTORY
@@ -1,3 +1,6 @@
+2007-08-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.360
+
2007-06-01 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.350

diff --git a/crypto/cryptsetup-luks/BUILD b/crypto/cryptsetup-luks/BUILD
new file mode 100755
index 0000000..ad28868
--- /dev/null
+++ b/crypto/cryptsetup-luks/BUILD
@@ -0,0 +1,5 @@
+default_build &&
+pushd ${SOURCE_DIRECTORY}.static &&
+OPTS="$OPTS --enable-static --program-suffix=.static" &&
+default_build &&
+popd
diff --git a/crypto/cryptsetup-luks/FINAL b/crypto/cryptsetup-luks/FINAL
new file mode 100755
index 0000000..8fa77c3
--- /dev/null
+++ b/crypto/cryptsetup-luks/FINAL
@@ -0,0 +1 @@
+rm_source_dir ${SOURCE_DIRECTORY}.static
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index 4b2b0bc..3215f27 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: added building of static cryptsetup for initrd's
+ * FINAL: added removal of static build environment
+ * INSTALL: added install of static cryptsetup
+ * PRE_BUILD: added setup for static build environment
+
2007-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.5, SOURCE cryptsetup-luks -> cryptsetup

diff --git a/crypto/cryptsetup-luks/INSTALL b/crypto/cryptsetup-luks/INSTALL
new file mode 100755
index 0000000..3b8abe1
--- /dev/null
+++ b/crypto/cryptsetup-luks/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+pushd ${SOURCE_DIRECTORY}.static &&
+default_install &&
+popd
diff --git a/crypto/cryptsetup-luks/PRE_BUILD
b/crypto/cryptsetup-luks/PRE_BUILD
new file mode 100755
index 0000000..8b13e86
--- /dev/null
+++ b/crypto/cryptsetup-luks/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+mk_source_dir ${SOURCE_DIRECTORY}.static &&
+cp -a ${SOURCE_DIRECTORY}/* ${SOURCE_DIRECTORY}.static/
diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index 24a3e1a..c6b8827 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg-exp
- VERSION=2.0.6
+ VERSION=2.0.7
SECURITY_PATCH=4
PATCHLEVEL=0

diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index de92449..776465c 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,6 @@
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.7
+
2007-08-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.6

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 4abca7b..d890286 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -39,6 +39,11 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_HASH=sha512:9e610752f14d9fe02d8ef7e9d7bb7ad7c61d68215284e98d8d297a0234dd73a1d8318bf3fda92d2b4df748a42f20fa16beb996d23d3659f15e3dbfeeade837ba
;;
+ 2.0)
+ VERSION=2.0.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:3a799cf02bd834281cdb31b3983008c64f3cba21b611b644ae07edf9a9c439bb6b7be8f665da69d8a9545829990d173896df67cb4982c74f8f5ce950b25e77de
+ ;;
esac


diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 38853a1..a16f9f0 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.1
+
+2007-09-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, PREPARE: added support for new stable 2.0 branch (2.0.0)
+
2007-07-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3

diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 43641cd..4493758 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -13,4 +13,4 @@ if [ "$GNUTLS_OLD" == "n" ]; then
persistent_remove GNUTLS_OLD
fi

-config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to
build?" DEFAULT 1.0 1.2 1.4 1.6
+config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to
build?" DEFAULT 1.0 1.2 1.4 1.6 2.0
diff --git a/crypto/krb5/BUILD b/crypto/krb5/BUILD
index 14d1206..d585d01 100755
--- a/crypto/krb5/BUILD
+++ b/crypto/krb5/BUILD
@@ -6,6 +6,9 @@ fi

cd $SPELL-$VERSION/src &&

+# Kerberos Security Advisories
+patch -p1 < $SCRIPT_DIRECTORY/MITKRB5-SA-2007-006.txt &&
+
./configure --enable-dns-for-kdc \
--enable-dns-for-realm \
--infodir=/usr/share/info \
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index 9a3ed44..51dd835 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.6/krb5-1.6/doc/krb5-install.html#Copyright
PATCHLEVEL=0
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
KEYWORDS="security crypto"
SHORT="Kerberos 5 network security protocol"
cat << EOF
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index d445d3d..e228521 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,7 @@
+2007-09-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SECURITY_PATCH=5, CVE-2007-3999, CVE-2007-4000
+ * BUILD, MITKRB5-SA-2007-006.txt: added security patch
+
2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2
* BUILD, MITKRB5-SA-2007-00[45].txt: removed patches
diff --git a/crypto/krb5/MITKRB5-SA-2007-006.txt
b/crypto/krb5/MITKRB5-SA-2007-006.txt
new file mode 100644
index 0000000..979f9ed
--- /dev/null
+++ b/crypto/krb5/MITKRB5-SA-2007-006.txt
@@ -0,0 +1,294 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+ MIT krb5 Security Advisory 2007-006
+
+Original release: 2007-09-04
+Last update: 2007-09-05
+
+Topic: kadmind RPC lib buffer overflow, uninitialized pointer
+
+[CVE-2007-3999/VU#883632]
+RPC library buffer overflow
+
+CVSSv2 Vector: AV:N/AC:L/Au:N/C:C/I:C/A:C/E:POC/RL:OF/RC:C
+
+CVSSv2 Base Score: 10
+
+Access Vector: Network
+Access Complexity: Low
+Authentication: None
+Confidentiality Impact: Complete
+Integrity Impact: Complete
+Availability Impact: Complete
+
+CVSSv2 Temporal Score: 7.8
+
+Exploitability: Proof-of-Concept
+Remediation Level: Official Fix
+Report Confidence: Confirmed
+
+[CVE-2007-4000/VU#377544]
+kadmind uninitialized pointer
+
+CVSSv2 Vector: AV:N/AC:H/Au:S/C:C/I:C/A:C/E:POC/RL:OF/RC:C
+
+See DETAILS for the expanded CVSSv2 metrics for this vulnerability.
+
+SUMMARY
+=======
+
+This advisory concerns two vulnerabilities. CVE-2007-3999 is much
+easier to exploit than CVE-2007-4000.
+
+[CVE-2007-3999]
+
+The MIT krb5 Kerberos administration daemon (kadmind) is vulnerable to
+a stack buffer overflow in the RPCSEC_GSS authentication flavor of the
+RPC library. Third-party applications using the RPC library provided
+with MIT krb5 may also be affected.
+
+We have received a proof-of-concept exploit that does not appear to
+execute malicious code, and we believe that this exploit is not
+publicly circulated.
+
+This is a bug in the RPC library in MIT krb5. It is not a bug in the
+Kerberos protocol.
+
+[CVE-2007-4000]
+
+The MIT krb5 Kerberos administration daemon (kadmind) can write data
+through an uninitialized pointer. We know of no working exploit code
+for this vulnerability, and do not believe that any exploit code for
+this vulnerability is circulating.
+
+This is a bug in the kadmind in MIT krb5. It is not a bug in the
+Kerberos protocol.
+
+IMPACT
+======
+
+[CVE-2007-3999] An unauthenticated remote user may be able to cause a
+host running kadmind to execute arbitrary code.
+
+[CVE-2007-4000] An authenticated user with "modify policy" privilege
+may be able to cause a host running kadmind to execute arbitrary code.
+
+Successful exploitation of either vulnerability can compromise the
+Kerberos key database and host security on the KDC host. (kadmind
+typically runs as root.) Unsuccessful exploitation attempts will
+likely result in kadmind crashing.
+
+Third-party applications calling the RPC library provided with MIT
+krb5 may be vulnerable to CVE-2007-3999.
+
+AFFECTED SOFTWARE
+=================
+
+[CVE-2007-3999]
+
+* kadmind in MIT releases krb5-1.4 through krb5-1.6.2
+
+* third-party RPC server programs linked against the RPC library
+ included in MIT releases krb5-1.4 through krb5-1.6.2
+
+* MIT releases prior to krb5-1.4 did not contain the vulnerable code
+
+[CVE-2007-4000]
+
+* kadmind in MIT releases krb5-1.5 through krb5-1.6.2
+
+* MIT releases prior to krb5-1.5 did not contain the vulnerable code
+
+FIXES
+=====
+
+* The patch for CVE-2007-3999 has been revised; the patch originally
+ released for svc_auth_gss.c allowed a 32-byte overflow. Depending
+ on the compilation environment and machine architecture, this may or
+ may not be a significant continued vulnerability. The new patch
+ below correctly checks the buffer length.
+
+* The upcoming krb5-1.6.3 release, as well as the upcoming krb5-1.5.5
+ maintenance release, will contain fixes for this vulnerability.
+
+Prior to that release you may apply the following patch. Note that
+releases prior to krb5-1.5 will not need the svr_policy.c patch.
+
+*** src/lib/kadm5/srv/svr_policy.c (revision 20254)
+- --- src/lib/kadm5/srv/svr_policy.c (local)
+***************
+*** 211,218 ****
+ if((mask & KADM5_POLICY))
+ return KADM5_BAD_MASK;
+
+! ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
+! if( ret && (cnt==0) )
+ return KADM5_UNK_POLICY;
+
+ if ((mask & KADM5_PW_MAX_LIFE))
+- --- 211,219 ----
+ if((mask & KADM5_POLICY))
+ return KADM5_BAD_MASK;
+
+! if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p,
&cnt)))
+! return ret;
+! if (cnt != 1)
+ return KADM5_UNK_POLICY;
+
+ if ((mask & KADM5_PW_MAX_LIFE))
+*** src/lib/rpc/svc_auth_gss.c (revision 20474)
+- --- src/lib/rpc/svc_auth_gss.c (local)
+***************
+*** 355,360 ****
+- --- 355,369 ----
+ memset(rpchdr, 0, sizeof(rpchdr));
+
+ /* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
++ oa = &msg->rm_call.cb_cred;
++ if (oa->oa_length > MAX_AUTH_BYTES)
++ return (FALSE);
++
++ /* 8 XDR units from the IXDR macro calls. */
++ if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT +
++ RNDUP(oa->oa_length)))
++ return (FALSE);
++
+ buf = (int32_t *)(void *)rpchdr;
+ IXDR_PUT_LONG(buf, msg->rm_xid);
+ IXDR_PUT_ENUM(buf, msg->rm_direction);
+***************
+*** 362,368 ****
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
+ IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
+- - oa = &msg->rm_call.cb_cred;
+ IXDR_PUT_ENUM(buf, oa->oa_flavor);
+ IXDR_PUT_LONG(buf, oa->oa_length);
+ if (oa->oa_length) {
+- --- 371,376 ----
+
+ This patch is also available at
+
+ http://web.mit.edu/kerberos/advisories/2007-006-patch.txt
+
+ A PGP-signed patch is available at
+
+ http://web.mit.edu/kerberos/advisories/2007-006-patch.txt.asc
+
+REFERENCES
+==========
+
+This announcement is posted at:
+
+ http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2007-006.txt
+
+This announcement and related security advisories may be found on the
+MIT Kerberos security advisory page at:
+
+ http://web.mit.edu/kerberos/advisories/index.html
+
+The main MIT Kerberos web page is at:
+
+ http://web.mit.edu/kerberos/index.html
+
+CVSSv2:
+
+ http://www.first.org/cvss/cvss-guide.html
+ http://nvd.nist.gov/cvss.cfm?calculator&adv&version=2
+
+CVE: CVE-2007-3999
+http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3999
+
+CERT: VU#883632
+http://www.kb.cert.org/vuls/id/883632
+
+CVE: CVE-2007-4000
+http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4000
+
+CERT: VU#377544
+http://www.kb.cert.org/vuls/id/377544
+
+ACKNOWLEDGMENTS
+===============
+
+Thanks to Kevin Coffman (UMich), Will Fiveash (Sun), and Nico Williams
+(Sun) for discovering the bug in the initial CVE-2007-3999 patch and
+for help with developing the revised patch for CVE-2007-3999.
+
+CVE-2007-3999 was discovered by Tenable Network Security and reported
+to MIT Kerberos Team by the Zero Day Initiative (ZDI) of the
+TippingPoint division of 3Com.
+
+CVE-2007-4000 was discovered by Garrett Wollman of MIT CSAIL.
+
+DETAILS
+=======
+
+[CVE-2007-3999]
+
+The implementation of the RPCSEC_GSS authentication flavor copies
+untrusted data having an inadequately-validated length into a buffer
+on the stack. In the function svcauth_gss_validate() in
+src/lib/rpc/svc_auth_gss.c, which authenticates the incoming RPC
+message, a memcpy() invocation copies a number of bytes into the
+128-byte stack buffer "rpchdr". The length provided to this memcpy()
+invocation comes from the RPC header and may be maliciously chosen.
+The invocation of xdr_callmsg(), which provides the decoded rpc_msg
+structure used by svcauth_gss_validate(), ensures that the provided
+length does not exceed MAX_AUTH_BYTES, which is 400, but destination
+buffer is smaller than this size, and can be trivially overflowed.
+
+The vulnerable code executes prior to the completion of authentication
+of the RPC message, and therefore requires no authentication to
+exploit.
+
+Exploitation of stack buffer overflows is trivial on many platforms.
+
+[CVE-2007-4000]
+
+CVSSv2 Vector: AV:N/AC:H/Au:S/C:C/I:C/A:C/E:POC/RL:OF/RC:C
+
+CVSSv2 Base Score: 7.1
+
+Access Vector: Network
+Access Complexity: High
+Authentication: Single
+Confidentiality Impact: Complete
+Integrity Impact: Complete
+Availability Impact: Complete
+
+CVSSv2 Temporal Score: 5.6
+
+Exploitability: Proof-of-Concept
+Remediation Level: Official Fix
+Report Confidence: Confirmed
+
+The function kadm5_modify_policy_internal() in
+src/lib/kadm5/srv/svr_policy.c, does not check return values from
+krb5_db_get_policy() correctly. When the policy does not exist,
+krb5_db_get_policy() returns zero but sets the count retrieved records
+to zero without initializing the output pointer. Subsequent code in
+kadm5_modify_policy_internal() can attempt to write data through this
+pointer, causing memory corruption.
+
+This vulnerability was not present in MIT releases prior to krb5-1.5.
+In the krb5-1.5 release, changes related to the implementation of the
+Database Abstraction Layer introduced this vulnerability.
+
+REVISION HISTORY
+================
+
+2007-09-05 CVE-2007-3999 patch revised due to 32-byte overflow
+2007-09-04 original release
+
+Copyright (C) 2007 Massachusetts Institute of Technology
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (SunOS)
+
+iQCVAwUBRt8QzKbDgE/zdoE9AQKdeAQAsXljmcOJpFHYISth3PZcVWQrrWI4u9PH
+F4CAC+3z9xd5KnOHAqqmxpK5XSDX0P9MCdibOYA/WG46U410pCNAkqV0RapUnivO
+fcU82CvXLDGoz4Z2+ldZpUYmL3mZ6ydTLutBAsz1XkkAILYfaP14+x0OXyyiMgeM
+tH18QwV9ccI=
+=TRxx
+-----END PGP SIGNATURE-----
diff --git a/crypto/libassuan/DETAILS b/crypto/libassuan/DETAILS
index 21b1279..c77d031 100755
--- a/crypto/libassuan/DETAILS
+++ b/crypto/libassuan/DETAILS
@@ -1,5 +1,5 @@
SPELL=libassuan
- VERSION=1.0.2
+ VERSION=1.0.3

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libassuan/$SOURCE
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index f2a55bb..0430753 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.3
+
2007-07-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.2

diff --git a/crypto/opencdk/DETAILS b/crypto/opencdk/DETAILS
index bb76e4c..d1a1a3c 100755
--- a/crypto/opencdk/DETAILS
+++ b/crypto/opencdk/DETAILS
@@ -1,12 +1,28 @@
SPELL=opencdk
- VERSION=0.5.11

+if [ -z "$OPENCDK_BRANCH" ] || [ "$OPENCDK_BRANCH" == "DEFAULT" ]; then
+ OPENCDK_BRANCH="0.5"
+fi
+
+case $OPENCDK_BRANCH in
+ 0.5)
+ VERSION=0.5.13
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=ftp://ftp.gnutls.org/pub/gnutls/$SPELL/$SOURCE
SOURCE_GPG="gnu.gpg:$SOURCE.sig:UPSTREAM_KEY"
+ ;;
+ 0.6)
+ VERSION=0.6.4
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="opencdk.gpg:$SOURCE.sig:UPSTREAM_KEY"
+ ;;
+esac
+
+ SOURCE_URL[0]=ftp://ftp.gnutls.org/pub/gnutls/$SPELL/$SOURCE
+ SOURCE_URL[1]=http://www.gnu.org/software/gnutls/releases/$SPELL/$SOURCE

SOURCE2=$SOURCE.sig
- SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE2_IGNORE=signature

SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/opencdk/HISTORY b/crypto/opencdk/HISTORY
index 98a3a64..02bb006 100644
--- a/crypto/opencdk/HISTORY
+++ b/crypto/opencdk/HISTORY
@@ -1,3 +1,13 @@
+2007-09-04 Ladislav Hagara <hgr AT vabo.cz>
+ * PREPARE, DETAILS: added support for new 0.6 branch (0.6.4)
+ * opencdk.gpg: added, 0.6.4 is signed by key ID BF3DF9B4
+
+2007-09-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: added backup SOURCE_URLs [Bug 13972]
+
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.13
+
2006-12-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.11

diff --git a/crypto/opencdk/PREPARE b/crypto/opencdk/PREPARE
new file mode 100755
index 0000000..49d24e0
--- /dev/null
+++ b/crypto/opencdk/PREPARE
@@ -0,0 +1 @@
+config_query_list OPENCDK_BRANCH "Which branch of OpenCDK do you want to
build?" DEFAULT 0.5 0.6
diff --git a/crypto/opencdk/opencdk.gpg b/crypto/opencdk/opencdk.gpg
new file mode 100644
index 0000000..d20d78f
Binary files /dev/null and b/crypto/opencdk/opencdk.gpg differ
diff --git a/crypto/openct/DETAILS b/crypto/openct/DETAILS
index f30ec85..6aa75bd 100755
--- a/crypto/openct/DETAILS
+++ b/crypto/openct/DETAILS
@@ -1,10 +1,10 @@
SPELL=openct
- VERSION=0.6.12
+ VERSION=0.6.14
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.opensc-project.org/files/${SPELL}/${SOURCE}

-
SOURCE_HASH=sha512:0514cfa0acd9024c8fbe662ec574c75e32645f75590a04e13e7c4a3bcc656c0d39be8c1e68be06f92ef5b7e6c8d73b11c1a1153e031d56c717a3f108c99fc8a8
+
SOURCE_HASH=sha512:7fe1a7e49904fa891e70919c5ae51b00f63627c54d62a7eacd578bc854da7abc3bc3156892ef97aba9640962a1058500e831982058e671a4c032fd49256eaf6e
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

LICENSE[0]=BSD
diff --git a/crypto/openct/HISTORY b/crypto/openct/HISTORY
index 0f59104..d589c97 100644
--- a/crypto/openct/HISTORY
+++ b/crypto/openct/HISTORY
@@ -1,3 +1,9 @@
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.14
+
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.13
+
2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.12

diff --git a/crypto/opensc/DETAILS b/crypto/opensc/DETAILS
index 1617d08..7c8d179 100755
--- a/crypto/opensc/DETAILS
+++ b/crypto/opensc/DETAILS
@@ -1,10 +1,10 @@
SPELL=opensc
- VERSION=0.11.3
+ VERSION=0.11.4
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.opensc-project.org/files/opensc/${SOURCE}

-
SOURCE_HASH=sha512:c8914f50023ffa26a1663ff24eddb88d1f59761d26e308490f96edb4514776622124acca1a9b1dc4040e7be7d177f358119af8d2c2d62ec6f59d0a85a9034337
+
SOURCE_HASH=sha512:5dcedfb5dbdc52c79c9572cb336f4bdb2058d31c69ce1e301e642589b5823483c7727cc00ea28f29be46e8a6e1fe80fbe0194674d7c44ef1a3aab75ebd1289bb
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

WEB_SITE=http://www.opensc-project.org
diff --git a/crypto/opensc/HISTORY b/crypto/opensc/HISTORY
index 07333e0..347c999 100644
--- a/crypto/opensc/HISTORY
+++ b/crypto/opensc/HISTORY
@@ -1,3 +1,6 @@
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.11.4
+
2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11.3

diff --git a/crypto/openssh/DETAILS b/crypto/openssh/DETAILS
index f67b9f0..6cef2c0 100755
--- a/crypto/openssh/DETAILS
+++ b/crypto/openssh/DETAILS
@@ -1,11 +1,10 @@
SPELL=openssh
- VERSION=4.6p1
+ VERSION=4.7p1
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$SOURCE
- SOURCE_URL[1]=ftp://ftp.tux.org/bsd/openbsd/OpenSSH/portable/$SOURCE
SOURCE2_URL[0]=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG="openssh.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 481cddd..15a6899 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.7p1. Remvoed non-working SOURCE_URL[1]
+
2007-03-10 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 4.6p1

diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index 2144990..1dc970b 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
- VERSION=1.4.3
-
SOURCE_HASH=sha512:26003acc8595c0b4233e3e0dc7a814548ecca42bc5d592482a97a0960d08a6349e10abcd3601b054d679eaa8726e26d63a105f2e42e9d8d4d4196f55f3a5e630
+ VERSION=1.4.4
+
SOURCE_HASH=sha512:345e33504aa779bc0c08f5b64adade94c885d29a894ce3f97898f2992032dd987008175ec3671f06b7e2c2e8de6b36a6cc3b26dfa58deb7ca00717b4568ae84e
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/2041/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/2106/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=BSD
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 0f7bffe..7790960 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2007-09-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.4
+
2007-06-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.3

diff --git a/crypto/pgpdump/DETAILS b/crypto/pgpdump/DETAILS
index 8887ddd..a4eccb8 100755
--- a/crypto/pgpdump/DETAILS
+++ b/crypto/pgpdump/DETAILS
@@ -1,11 +1,11 @@
SPELL=pgpdump
- VERSION=0.25
+ VERSION=0.26
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://pgp.iijlab.net/pgpdump/$SOURCE
- WEB_SITE=http://pgp.iijlab.net/pgpdump.html
+ SOURCE_URL[0]=http://www.mew.org/~kazu/proj/pgpdump/$SOURCE
+ WEB_SITE=http://www.mew.org/~kazu/proj/pgpdump/
ENTERED=20050818
-
SOURCE_HASH=sha512:da6b32bba09da756f48d2b26241f40ef0e981c83e1718517e7eff9be6a5b3482eb955a8a932aff5d32a08675d5319f0a634e2dd4f23bd1037fae31720688df6a
+
SOURCE_HASH=sha512:a0c76e68f02ad5d151d998045ed1c4dea376c9079ba6e97c6cee82b2fb5f6512777eb37ba334de0291e91204cf5519fb2eeafc0ca96e7014d9ba21752cc2c7ac
KEYWORDS="crypto"
SHORT="PGP packet visualizer"
cat << EOF
diff --git a/crypto/pgpdump/HISTORY b/crypto/pgpdump/HISTORY
index cc46715..ffdf539 100644
--- a/crypto/pgpdump/HISTORY
+++ b/crypto/pgpdump/HISTORY
@@ -1,3 +1,6 @@
+2007-09-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.26, new WEB_SITE and SOURCE_URL
+
2006-10-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.25

diff --git a/crypto/qca2/DETAILS b/crypto/qca2/DETAILS
index 6f54762..0deaf54 100755
--- a/crypto/qca2/DETAILS
+++ b/crypto/qca2/DETAILS
@@ -1,9 +1,9 @@
SPELL=qca2
- VERSION=2.0.0-beta7
-
SOURCE_HASH=sha512:eefc3c268fa3e06a6de305eed6acd487787965f7b28959fba0ae4b6e99b65328720398af58f125397975aac67b1f9e73e6af2256bc326d5c0a203161ddb2480a
+ VERSION=2.0.0-test4
+
SOURCE_HASH=sha512:1ba92b313e473457d9b80ea0ca895d77ef9a98c21e9ec69e1bdfcd9862760a6e5c66101ed123eae9ee9f6bf81935c1fca62841f7b80dd994c328bd7fdb00d1e1
SOURCE=qca-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-$VERSION
- SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/beta7/$SOURCE
+ SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/test4/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://delta.affinix.com/qca
ENTERED=20050101
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 2e383cd..71b7af5 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.0.0-test4
+
+2007-08-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.0.0-test1
+
2007-07-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.0.0-beta7
* DEPENDS: add cmake
diff --git a/crypto/seahorse/DETAILS b/crypto/seahorse/DETAILS
index ba8d3b4..da2dd77 100755
--- a/crypto/seahorse/DETAILS
+++ b/crypto/seahorse/DETAILS
@@ -1,13 +1,13 @@
SPELL=seahorse

if [ "$SEAHORSE_DEVEL" == "y" ];then
- VERSION=2.19.90
+ VERSION=2.20
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:4d120024cc607db0d3907a87d87b6d044be7dbbfdbd08e2c739a6a8c1becde246d72f67b0e3282ad52b0dc212a5d27a8ba8a9b5ad5973f3ac4fecafba2885c25
+
SOURCE_HASH=sha512:0a8c6098868ba872c20985b7397c68feead33b6cfa56b2051dd85d6e179e1ee7b084a671c3064bd984229b89fd42c78e148e72fb96ba984054199cf005464603
else
- VERSION=1.0.1
+ VERSION=2.20
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:bc8dabd5beb0ba83c0d461a38fad9aca05765431966e80ed733beeda90315d35acccd90e25a1979e6c6d021d7be7eb9c5d8e9eed40151077e3ec14d2764a8ef9
+
SOURCE_HASH=sha512:0a8c6098868ba872c20985b7397c68feead33b6cfa56b2051dd85d6e179e1ee7b084a671c3064bd984229b89fd42c78e148e72fb96ba984054199cf005464603
fi

BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/crypto/seahorse/HISTORY b/crypto/seahorse/HISTORY
index dfaefe5..36c1c96 100644
--- a/crypto/seahorse/HISTORY
+++ b/crypto/seahorse/HISTORY
@@ -1,3 +1,9 @@
+2007-09-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.20 (both stable and devel)
+
+2007-09-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.19.91 (devel)
+
2007-08-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.19.90 (devel)

diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index a0a7bad..64b4b7c 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -17,12 +17,11 @@ case $FB_VER in
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION}
;;
*)
- VERSION=2.0.1.12855
+ VERSION=2.0.3.12981-0
SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:0662fb2e2c30a2a3665ae6b79b40378f9871adc6bd58d7c8fb260f7017c323cd591b2fd0269c59bf480c4b7f52400ccfa0cae6984ec0300494c75c681b94ba0f
- SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/$SOURCE
-# SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION}
+
SOURCE_HASH=sha512:feed7f72281ec5b4aa6b8902781a43c16c8d3349281e8fc636a6a6a77df592ce39bc757920847caad97d0148702937dce25830dc1e8a2b12045c3f310938b83f
+ SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-RC?/}
;;
esac
WEB_SITE=http://www.firebirdsql.org
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 1ff0194..772d02d 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,16 @@
+2007-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.3.12981-0
+ from prelease url, as 2.0.2 was withdrawn
+ * fb2.0.patch.bz2: updated
+
+2007-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.2.12964-0 ( no longer RC)
+ use sourceforge url
+
+2007-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.2.12964-RC1-0
+ * PREPARE: fix typo
+
2007-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* PREPARE, DETAILS, PRE_BUILD, DEPENDS: remove fb1.5 support
it is considered obsolete by the Firebird project
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index a9b64c7..8530b29 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -14,7 +14,7 @@ if spell_ok firebird;then
local FB_PREV
FB_PREV=`installed_version firebird | cut -d. -f-2`

- if [[ $FB_PREV !=$FB_VER ]];then
+ if [[ $FB_PREV != $FB_VER ]];then
case $FB_VER in
2.0)
cat <<EOF
diff --git a/database/firebird/fb2.0.patch.bz2
b/database/firebird/fb2.0.patch.bz2
index 9094ca1..3fdbfd5 100644
Binary files a/database/firebird/fb2.0.patch.bz2 and
b/database/firebird/fb2.0.patch.bz2 differ
diff --git a/database/pgadmin3/DEPENDS b/database/pgadmin3/DEPENDS
index e31fb1c..df764f0 100755
--- a/database/pgadmin3/DEPENDS
+++ b/database/pgadmin3/DEPENDS
@@ -1,4 +1,6 @@
depends g++ &&
+depends libxml2 &&
+depends libxslt &&
depends postgresql &&
depends openssl &&
-depends wxgtk
+depends -sub "DEV OGL STC XRC" wxgtk
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index 2daab20..1d75f33 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,9 +1,12 @@
SPELL=pgadmin3
- VERSION=1.6.3
-
SOURCE_HASH=sha512:b4778524e252766d827072fbdcbbfa4d8c450d01b8774ca82a83e380ad07534ad9351c85bea7a814129f5f40c023894ecd91e319750c0e40404445e00f27e3b6
+ VERSION=1.8.0-beta4
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/pgadmin3/release/v$VERSION/src/$SOURCE
+
SOURCE2_URL[0]=ftp://ftp.postgresql.org/pub/pgadmin3/release/v$VERSION/src/$SOURCE2
+ SOURCE_GPG="pgadmin3.gpg:${SOURCE}.sig:UPSTREAM_KEY"
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.pgadmin.org/
ENTERED=20030704
LICENSE[0]=ART
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index b5e33bb..4ada0de 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,10 +1,26 @@
+2007-09-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: added SOURCE2_IGNORE
+ * DEPENDS: needs DEV branch of wxgtk
+
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.8.0-beta4, switched to
+ upstream key
+ * DEPENDS: needs ogl too for wxgtk
+ * pgadmin3.gpg: added key
+
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added sub_dependencies for wxgtk
+
+2007-09-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added libxml2 and libxslt
+
2007-05-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3

2007-01-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2

-2006-11-16 Treeve Jelbert <>treeve AT sourcemage.org
+2006-11-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.0

2006-07-22 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/database/pgadmin3/pgadmin3.gpg b/database/pgadmin3/pgadmin3.gpg
new file mode 100644
index 0000000..ae3ea9e
Binary files /dev/null and b/database/pgadmin3/pgadmin3.gpg differ
diff --git a/database/postgresql/DEPENDS b/database/postgresql/DEPENDS
index 562da51..4840229 100755
--- a/database/postgresql/DEPENDS
+++ b/database/postgresql/DEPENDS
@@ -33,6 +33,11 @@ optional_depends unixodbc \
"--without-unixodbc" \
"for unixODBC support" &&

+optional_depends openldap \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for LDAP support" &&
+
optional_depends openssl \
"--with-openssl" \
"--without-openssl" \
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index adc5816..851e166 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=8.2.4
-
SOURCE_HASH=sha512:90f51c736eb9367124614b5132b884674e11e0e192e5428cebda48805dd685bace1073ce69f95b3758df5ef9998a6304c03828fac870d9b52ef347bb322a22a7
+ VERSION=8.2.5
+
SOURCE_HASH=sha512:a407a0535048234f69f996a56e4bd462240c7265f19cad9f1e816d343164575108e1d2f7cdcff1a7e32f2ba3de3f92cd420bd37f1eb05a30827db7f29f284db4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=v$VERSION/$SOURCE
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.postgresql.org/
DOCS=""
SECURITY_PATCH=4
- PATCHLEVEL=1
+ PATCHLEVEL=0
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index f2553b3..10d533f 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,15 @@
+2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 8.2.5
+
+2007-09-02 George Sherwood <george AT beernabeer.com>
+ * PRE_BUILD: Updated for latest pgcluster patch.
+ * pgcluster-1.7.0rc7.patch.tar.gz: Added latest patch
+ * pgcluster-1.7.0rc3-patch.tar.gz: Removed old patch
+
+2007-08-26 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing optional dep on openldap
+ * DETAILS: patchlevel++
+
2007-06-12 Arjan Bouter <abouter AT sourcemage.org>
* init.d/*: made the logfile optional
* DETAILS: patchlevel++
diff --git a/database/postgresql/PRE_BUILD b/database/postgresql/PRE_BUILD
index 86f2b83..1d2ff68 100755
--- a/database/postgresql/PRE_BUILD
+++ b/database/postgresql/PRE_BUILD
@@ -2,6 +2,6 @@ create_account postgres &&
default_pre_build &&
cd $SOURCE_DIRECTORY &&
if [ "$PGSQL_CLUSTER" = "y" ]; then
- tar zxvf $SCRIPT_DIRECTORY/pgcluster-1.7.0rc1-patch.tar.gz &&
- patch -p1 < $SOURCE_DIRECTORY/pgcluster-1.7.0rc1-patch
+ tar zxvf $SCRIPT_DIRECTORY/pgcluster-1.7.0rc7.patch.tar.gz &&
+ patch -p1 < $SOURCE_DIRECTORY/pgcluster-1.7.0rc7.patch
fi
diff --git a/database/postgresql/pgcluster-1.7.0rc3-patch.tar.gz
b/database/postgresql/pgcluster-1.7.0rc3-patch.tar.gz
deleted file mode 100644
index 38d0306..0000000
Binary files a/database/postgresql/pgcluster-1.7.0rc3-patch.tar.gz and
/dev/null differ
diff --git a/database/postgresql/pgcluster-1.7.0rc7.patch.tar.gz
b/database/postgresql/pgcluster-1.7.0rc7.patch.tar.gz
new file mode 100644
index 0000000..77ea516
Binary files /dev/null and
b/database/postgresql/pgcluster-1.7.0rc7.patch.tar.gz differ
diff --git a/database/pxlib/DETAILS b/database/pxlib/DETAILS
index 107919e..6a6e59c 100755
--- a/database/pxlib/DETAILS
+++ b/database/pxlib/DETAILS
@@ -1,13 +1,12 @@
SPELL=pxlib
- VERSION=0.6.1
-
SOURCE_HASH=sha512:654314fe66e3cf85ddc38e9c328968af41b0fc45bb1f64dc5ad62d34bc2ad958c70d4b92bd78ce4c86583b84a3e6b1f004297fe483ed67a611f5b912508a13ca
+ VERSION=0.6.2
+
SOURCE_HASH=sha512:413c1814b8fd77c3536e11d78d01f078e4f553100f455565819d4369a9b15aec21806a64615389f3e716af6c829d5c62051d66ad8eed758c936577e171ad72c6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pxlib.sourceforge.net/
SOURCE_URL[0]=$SOURCEFORGE_URL/pxlib/$SOURCE
LICENSE=GPL
ENTERED=20031130
- UPDATED=20040721
# DOCS="ChangeLog README doc/*"
KEYWORDS="db database"
SHORT="pxlib is a small C library to read and write Paradox DB files"
diff --git a/database/pxlib/HISTORY b/database/pxlib/HISTORY
index e97dd2a..3dbef8c 100644
--- a/database/pxlib/HISTORY
+++ b/database/pxlib/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.2
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/database/tora/DETAILS b/database/tora/DETAILS
index d15e7f6..9ee514d 100755
--- a/database/tora/DETAILS
+++ b/database/tora/DETAILS
@@ -1,6 +1,6 @@
SPELL=tora
- VERSION=1.3.22svn
-
SOURCE_HASH=sha512:fd792c679bf45b5e57fbcc8f177b41b268fcd7e847391ecf4d2aea18e7bcc31074ffd0b0733d417f144d095aeeac6d3535d9502138ee257ba0fd845e8905c670
+ VERSION=1.3.22
+
SOURCE_HASH=sha512:e3419d396cdbf0432cf7a6fc6bfdb4b479befdc4213f6035863400d4aafe2fe4dbc27d895dbe63de2b63c76242ea5ccdc4a5c1cf4aa93abb516ebdd151ca135e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://tora.sourceforge.net/
diff --git a/database/tora/HISTORY b/database/tora/HISTORY
index 60d4cf3..b4cfe12 100644
--- a/database/tora/HISTORY
+++ b/database/tora/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.22
+
2007-01-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.22svn

diff --git a/devel/anjuta/DEPENDS b/devel/anjuta/DEPENDS
index aa2495f..fae79b1 100755
--- a/devel/anjuta/DEPENDS
+++ b/devel/anjuta/DEPENDS
@@ -22,7 +22,7 @@ if [ "$CVS_CHECKOUT" == "y" ]; then
fi &&


-optional_depends scrollkeeper \
+optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
"Update scrollkeeper database?" &&
diff --git a/devel/anjuta/HISTORY b/devel/anjuta/HISTORY
index 7865dc2..91226f3 100644
--- a/devel/anjuta/HISTORY
+++ b/devel/anjuta/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-06-26 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.2.0
* CONFIGURE: added queries for valgrind and scintilla
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index 1e47667..e33de80 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=binutils
- VERSION=2.17
+ VERSION=2.18
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://sources.redhat.com/binutils
ENTERED=20010922
- UPDATED=20050710
KEYWORDS="devel"
SHORT="binutils is an essential collection of binary utilities."
cat << EOF
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index e955bc4..33dd7ae 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2007-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.18
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/devel/bisonc++/DETAILS b/devel/bisonc++/DETAILS
index 270b9f7..06a6c72 100755
--- a/devel/bisonc++/DETAILS
+++ b/devel/bisonc++/DETAILS
@@ -1,6 +1,6 @@
SPELL=bisonc++
- VERSION=2.0.0
-
SOURCE_HASH=sha512:cabc1320023cfe7f9c91342ac0193d94837d6e180f9847d8bbd8940872762c48b95f0796a1525f3a03b6a186dc9544ab9ca1343874fed30371e2cdc2f3eb9f35
+ VERSION=2.2.0
+
SOURCE_HASH=sha512:0748b421bb81fa3e363a28d5c45a71a6a2bea5a1703173b5a6866f02d3c5edb6cfe1daecc17e2547ca01a1c771d6f8a63a507bdf8593289de2a3b5fecc7a627c
SOURCE=${SPELL}_${VERSION//-?/}.orig.tar.gz
# SOURCE2=${SPELL}_${VERSION}.diff.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION//-?}
diff --git a/devel/bisonc++/HISTORY b/devel/bisonc++/HISTORY
index d704b06..872bea8 100644
--- a/devel/bisonc++/HISTORY
+++ b/devel/bisonc++/HISTORY
@@ -1,3 +1,6 @@
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.0
+
2007-08-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.0

diff --git a/devel/boost-jam/HISTORY b/devel/boost-jam/HISTORY
index db330ce..faf8582 100644
--- a/devel/boost-jam/HISTORY
+++ b/devel/boost-jam/HISTORY
@@ -1,3 +1,8 @@
+2007-09-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Added, apply patch to fix gcc 4.2 bug
+ (http://svn.boost.org/trac/boost/ticket/977).
+ * gcc_42_fix.diff: Added.
+
2007-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.14

diff --git a/devel/boost-jam/PRE_BUILD b/devel/boost-jam/PRE_BUILD
new file mode 100755
index 0000000..c98a44f
--- /dev/null
+++ b/devel/boost-jam/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p3 < "$SCRIPT_DIRECTORY/gcc_42_fix.diff"
diff --git a/devel/boost-jam/gcc_42_fix.diff b/devel/boost-jam/gcc_42_fix.diff
new file mode 100644
index 0000000..aa8e716
--- /dev/null
+++ b/devel/boost-jam/gcc_42_fix.diff
@@ -0,0 +1,11 @@
+--- tools/jam/src/build.jam.orig 2007-07-07 21:34:09.000000000 +0000
++++ tools/jam/src/build.jam 2007-07-07 21:36:19.000000000 +0000
+@@ -153,7 +153,7 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+ : -pedantic
+- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
++ [ opt --release : [ opt --symbols : -g : -s ] -O3 -fno-strict-aliasing ]
+ [ opt --debug : -g -O0 -fno-inline ]
+ -I$(--python-include) -Wno-long-long
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
diff --git a/devel/darcs/DEPENDS b/devel/darcs/DEPENDS
index d1930b6..7fdfd6b 100755
--- a/devel/darcs/DEPENDS
+++ b/devel/darcs/DEPENDS
@@ -1 +1,4 @@
-depends GHC
+depends GHC &&
+depends haskell-quickcheck &&
+depends haskell-mtl &&
+depends haskell-html
diff --git a/devel/darcs/DETAILS b/devel/darcs/DETAILS
index c60dc24..51fb4ce 100755
--- a/devel/darcs/DETAILS
+++ b/devel/darcs/DETAILS
@@ -1,10 +1,10 @@
SPELL=darcs
- VERSION=1.0.9rc2
+ VERSION=1.0.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.darcs.net/$SOURCE
SOURCE_URL[1]=http://abridgegame.org/darcs/$SOURCE
-
SOURCE_HASH=sha512:e1461bda51bbe8c1e082f09684d09761fb41bb2e337694ae448a8042cc3d75d9119c3e5950f1a69fd4a7ad65683ef56e8f0007c40f7931862428b30b4753fb71
+
SOURCE_HASH=sha512:2ca6e81c204da3f9b5cd7a5e58f86a549fe34901f1708f923a537d0e3c63bde111b60ccdb9c26fa61298dce8e9ccfbc9bfee72e575616770e81954870b84cbb1
WEB_SITE=http://www.darcs.net/
ENTERED=20041206
LICENSE[0]=GPL
diff --git a/devel/darcs/HISTORY b/devel/darcs/HISTORY
index 88996ed..20bc7f9 100644
--- a/devel/darcs/HISTORY
+++ b/devel/darcs/HISTORY
@@ -1,3 +1,7 @@
+2007-08-31 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: Updated to 1.0.9
+ * DEPENDS: Added some missing dependencies
+
2007-01-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 1.0.9rc2

diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 24db1ea..3c8a120 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,8 +1,8 @@
SPELL=fpc
- VERSION=2.1.4
-
SOURCE_HASH=sha512:5343255d4e1d71cf0dc570a33b6bcbd0fea6c12af614ada2a887cf7f27a1f0d117a44c4e3efd9cf2459e4773374eb430eea8f27d1793e4f2331c2ffc6a87bc04
+ VERSION=2.2.0
+
SOURCE_HASH=sha512:c6873e373fe24e850f20744826ce02af2cc04007359f82a28c3dc48b61a513807965630c61bae623197647c1d16aae1cb43faa313305acd2da46de882a91ca81
SOURCE=$SPELL-$VERSION.source.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
WEB_SITE=http://www.freepascal.org

diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index fb57de8..d350679 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.0
+
2007-07-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.4
* PRE_BUILD, INSTALL: directory layout changes
diff --git a/devel/fpcsrc/DETAILS b/devel/fpcsrc/DETAILS
index 4088291..13ceac0 100755
--- a/devel/fpcsrc/DETAILS
+++ b/devel/fpcsrc/DETAILS
@@ -1,9 +1,9 @@
SPELL=fpcsrc
- VERSION=2.1.4
+ VERSION=2.2.0
+
SOURCE_HASH=sha512:c6873e373fe24e850f20744826ce02af2cc04007359f82a28c3dc48b61a513807965630c61bae623197647c1d16aae1cb43faa313305acd2da46de882a91ca81
SOURCE=fpc-$VERSION.source.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
-
SOURCE_HASH=sha512:5343255d4e1d71cf0dc570a33b6bcbd0fea6c12af614ada2a887cf7f27a1f0d117a44c4e3efd9cf2459e4773374eb430eea8f27d1793e4f2331c2ffc6a87bc04
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/fpc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/fpc-$VERSION
WEB_SITE=http://www.freepascal.org
LICENSE[0]=GPL
ENTERED=20050521
diff --git a/devel/fpcsrc/HISTORY b/devel/fpcsrc/HISTORY
index 5f7eff8..0ce1bbb 100644
--- a/devel/fpcsrc/HISTORY
+++ b/devel/fpcsrc/HISTORY
@@ -1,4 +1,7 @@
-2007-07-10Treeve Jelbert <treeve AT sourcemage.org>
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.0
+
+2007-07-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.4
* PRE_BUILD, INSTALL: adapt directory structure

diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 3ad75df..3f50438 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf
+
2007-08-04 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: Updated to 6.6.1

diff --git a/devel/ghc/POST_RESURRECT b/devel/ghc/POST_RESURRECT
new file mode 100755
index 0000000..8b7998d
--- /dev/null
+++ b/devel/ghc/POST_RESURRECT
@@ -0,0 +1,7 @@
+# We need to restore package.conf and package.conf.old after resurrection.
+
+message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
+GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
+GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
+mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
+mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
diff --git a/devel/ghc/PRE_RESURRECT b/devel/ghc/PRE_RESURRECT
new file mode 100755
index 0000000..96595c8
--- /dev/null
+++ b/devel/ghc/PRE_RESURRECT
@@ -0,0 +1,7 @@
+# We need to backup package.conf and package.conf.old before resurrection
+
+message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
+GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
+GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
+cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
+cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index c528ed7..4ca5e9f 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.5.2.5
+ VERSION=1.5.3.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -27,7 +27,6 @@ fi
WEB_SITE=http://git.or.cz/
KEYWORDS="scm devel"
ENTERED=20050506
- PATCHLEVEL=0
SHORT="SCM used by the kernel developers"
DOCS="$DOCS Documentation"
cat << EOF
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 0a22799..5bc57d3 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2007-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.3.1
+
+2007-09-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.5.3
+
2007-08-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.5.2.5

diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS
index a22a18a..6e9459f 100755
--- a/devel/graphviz/DEPENDS
+++ b/devel/graphviz/DEPENDS
@@ -24,6 +24,11 @@ optional_depends guile '--enable-guile' '--disable-guile'
'for Guile bindings' &
optional_depends lua '--enable-lua' '--disable-lua' 'for Lua bindings' &&
optional_depends tcl '--enable-tcl' '--disable-tcl' 'for TCL bindings' &&

+optional_depends fontconfig \
+ '--with-fontconfig' \
+ '--without-fontconfig' \
+ 'for better fonts' &&
+
optional_depends freetype2 \
'--with-freetype' \
'--without-freetype' \
diff --git a/devel/graphviz/DETAILS b/devel/graphviz/DETAILS
index a0fdb93..73c2eb9 100755
--- a/devel/graphviz/DETAILS
+++ b/devel/graphviz/DETAILS
@@ -1,6 +1,6 @@
SPELL=graphviz
- VERSION=2.12
-
SOURCE_HASH=sha512:e8796fe9e0b0dc026618ce4682117f423be23fff7d9b1c630826b739ad3cdc12e425dc0da1c48c17d52fad3151b4a7e3e9a6408766faa86fcc6122c3189535bf
+ VERSION=2.14.1
+
SOURCE_HASH=sha512:f657d03985177378d64c871f010425f39f5638407c8ada25c37918b8411a8d0c6de5746e4dff774223a648cbbf52523455c77476e935a87bd87e85c0e8fc6de5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.graphviz.org/pub/graphviz/ARCHIVE/$SOURCE
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 6e095e1..8b89044 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,7 @@
+2007-08-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, DETAILS: updated to 2.14.1
+ * DEPENDS: added optional dependency on fontconfig
+
2007-04-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, PRE_BUILD: moved patching and autogen to PRE_BUILD,
removed BUILD
diff --git a/devel/graphviz/PRE_BUILD b/devel/graphviz/PRE_BUILD
index a0c25c9..4499a16 100755
--- a/devel/graphviz/PRE_BUILD
+++ b/devel/graphviz/PRE_BUILD
@@ -5,10 +5,6 @@
# This patch removes said hack.
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/no_postscript_alias.diff &&
-cd $SOURCE_DIRECTORY/contrib/diffimg &&
-patch -p0 < $SCRIPT_DIRECTORY/diffimg.patch &&
-cd $SOURCE_DIRECTORY &&
find -name Makefile.in | while read _LINE; do
sedit "s|html/info|$SPELL|g" "$_LINE"
done &&
diff --git a/devel/graphviz/diffimg.patch b/devel/graphviz/diffimg.patch
deleted file mode 100644
index 2421a33..0000000
--- a/devel/graphviz/diffimg.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig 2007-04-04 16:13:16.000000000 -0700
-+++ Makefile.am 2007-04-04 16:14:13.000000000 -0700
-@@ -12,11 +12,13 @@
- diffimg_SOURCES = diffimg.c
-
- if WITH_LIBGD
-+if WITH_MYLIBGD
- diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
- @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
- else
- diffimg_LDADD = @GD_LIBS@
- endif
-+endif
-
- GRAPH = "digraph G { hello -> world }"
-
diff --git a/devel/graphviz/no_postscript_alias.diff
b/devel/graphviz/no_postscript_alias.diff
deleted file mode 100644
index d9ff3b1..0000000
--- a/devel/graphviz/no_postscript_alias.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN graphviz-2.8/config.h.in graphviz/config.h.in
---- graphviz-2.8/config.h.in 2006-02-03 17:33:53.000000000 -0500
-+++ graphviz/config.h.in 2006-03-29 17:16:49.000000000 -0500
-@@ -315,8 +315,8 @@
- /* Define if no fpu error exception handling is required. */
- #undef NO_FPERR
-
--/* Alias PostScript font names to URW type 1 fonts */
--#undef NO_POSTSCRIPT_ALIAS
-+/* Do not alias PostScript font names to URW type 1 fonts */
-+#define NO_POSTSCRIPT_ALIAS 1
-
- /* Name of package */
- #undef PACKAGE
diff --git a/devel/jruby/DETAILS b/devel/jruby/DETAILS
index 90f9d6f..bd86939 100755
--- a/devel/jruby/DETAILS
+++ b/devel/jruby/DETAILS
@@ -1,8 +1,8 @@
SPELL=jruby
- VERSION=1.0
+ VERSION=1.0.1
SOURCE=$SPELL-src-$VERSION.tar.gz
SOURCE_URL[0]=http://dist.codehaus.org/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:948b3a34d4a5ff655298634e5684712b1c5b312e0e7d0724637557a72580ab2f0690a03d033f3a74fff4eeb84f2768eb8fe058d34bf32770c9592efdd8800725
+
SOURCE_HASH=sha512:a5ee55991c7d2d15d0cc2c971cddce26860c92675f26a3acf4f9acfb5ee75f171e02f4030f974ac6aad67801e33734457c145cd6909c69041f27cc088180cb05
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
WEB_SITE=http://jruby.codehaus.org/Home
LICENSE[0]=GPL
diff --git a/devel/jruby/HISTORY b/devel/jruby/HISTORY
index 40403a5..0151c2c 100644
--- a/devel/jruby/HISTORY
+++ b/devel/jruby/HISTORY
@@ -1,3 +1,7 @@
+2007-08-27 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.1
+ * INSTALL: changed installation directory to ANT_HOME actually
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0

diff --git a/devel/jruby/INSTALL b/devel/jruby/INSTALL
index 02746e3..3eed67b 100755
--- a/devel/jruby/INSTALL
+++ b/devel/jruby/INSTALL
@@ -1 +1 @@
-install lib/jruby.jar ${INSTALL_ROOT}/usr/lib/jdk$(installed_version JAVA)
+install lib/jruby.jar ${INSTALL_ROOT}/opt/ant
diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index f2ff850..47c46b6 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -1,14 +1,13 @@
SPELL=mono
- VERSION=1.2.4
+ VERSION=1.2.5.1
BRANCH=`echo ${VERSION} | cut -f 1,2 -d .`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://go-mono.com/sources/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:00f8dac56597709a9a78cdad984f14361eaefd3518aeb481b08584e9a361fdc18f1f3c466c9b552f60fd421245d4cfaa1e22cefb5f00fd74a9c28b82a318d5af
+
SOURCE_HASH=sha512:e1f9ed9d88b3a94398ce11b4a61fa5bb8833f481ed0a6b7bee440342d31c2df90897a1de20080f8f0ed676e87155b7624b8afc02523e1b4bffe1aa8bb5859a5f
WEB_SITE=http://www.mono-project.com
ENTERED=20020625
LICENSE[0]=LGPL
- PATCHLEVEL=2
KEYWORDS="microsoft mono devel"
SHORT="The Mono implementation of the Microsoft .NET runtime"
cat << EOF
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index 8c4654b..7d1fc49 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.2.5.1
+
+2007-08-31 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 1.2.5
+
2007-05-20 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.2.4

diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index eddae56..bd4d513 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
SPELL=phpmyadmin
- VERSION=2.10.3
+ VERSION=2.11.1
SECURITY_PATCH=7
-
SOURCE_HASH=sha512:1a32cbef60373ce8063f8f38e0f2eb363c85f0eb3ee446c45ebeb091f2496bd160bf24fc76b7f0ed201901f4be9844848d1f7ab301f038bbe43a8d41eabf0380
+
SOURCE_HASH=sha512:c47f529e0f4de9bdf38633a1fff15c9a0f8f27a2ccd30f93a46a447f7df29f578291787ef3f6199b976c207d148a8495e3584b5a2ce9bf4f932b99c09028303c
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 b6823e9..271bbab 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.11.1
+
+2007-08-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 2.11.0
+
2007-07-21 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.10.3

diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
deleted file mode 100755
index 910967d..0000000
--- a/devel/pkgconfig/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="--with-pc-path=/usr/lib/pkgconfig $OPTS" &&
-default_build
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 96f88b5..06c2e12 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2007-08-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, INSTALL, profile.d/pkgconfig.sh: removed, the default pc-path
+ works now and those simply break it
+
2007-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.22

diff --git a/devel/pkgconfig/INSTALL b/devel/pkgconfig/INSTALL
deleted file mode 100755
index ea118ad..0000000
--- a/devel/pkgconfig/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-default_install &&
-
-if install_config_file ${SCRIPT_DIRECTORY}/profile.d/pkgconfig.sh \
- ${INSTALL_ROOT}/etc/profile.d/pkgconfig.sh; then
- chmod 0755 ${INSTALL_ROOT}/etc/profile.d/pkgconfig.sh
-fi
diff --git a/devel/pkgconfig/profile.d/pkgconfig.sh
b/devel/pkgconfig/profile.d/pkgconfig.sh
deleted file mode 100755
index 695dbe7..0000000
--- a/devel/pkgconfig/profile.d/pkgconfig.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# First check if this variable is already set
-# then if not set, check it (maybe), then set it
-
-if [ -z "$PKG_CONFIG_PATH" ] ; then
- PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig"
-fi
-export PKG_CONFIG_PATH
diff --git a/devel/qt4pas/DETAILS b/devel/qt4pas/DETAILS
index da754b0..fce94e1 100755
--- a/devel/qt4pas/DETAILS
+++ b/devel/qt4pas/DETAILS
@@ -1,6 +1,6 @@
SPELL=qt4pas
- VERSION=V1.45_Qt4.3.0
-
SOURCE_HASH=sha512:e0d755523602140d613322e11cdbd51f35482e21e57ac0fb01a3d98e2227e9e29504743923d0846858042d6d11a385ff1621dc50513c3ad1388431a0cc4da0cb
+ VERSION=V1.50_Qt4.3.1
+
SOURCE_HASH=sha512:615488d1f9a6fc7c2f0ee7f19db2d068949c54971e920b78d11c11a12f3a52418ef2fd1a637ebc67911d8c0e8065a66aab0ef448213774a0ea815dc902f68529
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://users.pandora.be/Jan.Van.hijfte/qtforfpc/$SOURCE
diff --git a/devel/qt4pas/HISTORY b/devel/qt4pas/HISTORY
index 42071dd..0e3a805 100644
--- a/devel/qt4pas/HISTORY
+++ b/devel/qt4pas/HISTORY
@@ -1,3 +1,21 @@
+2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.50_Qt4.3.1
+
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.49_Qt4.3.1
+
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * TRIGGERS: added
+
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.48_Qt4.3.1
+
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.47_Qt4.3.1
+
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.46_Qt4.3.0
+
2007-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version V1.45_Qt4.3.0

diff --git a/devel/qt4pas/TRIGGERS b/devel/qt4pas/TRIGGERS
new file mode 100755
index 0000000..4e91256
--- /dev/null
+++ b/devel/qt4pas/TRIGGERS
@@ -0,0 +1 @@
+on_cast qt4 cast_self
diff --git a/devel/ragel/DETAILS b/devel/ragel/DETAILS
index f12527e..f268fbd 100755
--- a/devel/ragel/DETAILS
+++ b/devel/ragel/DETAILS
@@ -1,5 +1,5 @@
SPELL=ragel
- VERSION=5.23
+ VERSION=5.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.cs.queensu.ca/~thurston/ragel/
diff --git a/devel/ragel/HISTORY b/devel/ragel/HISTORY
index 13023ed..cc4ff64 100644
--- a/devel/ragel/HISTORY
+++ b/devel/ragel/HISTORY
@@ -1,3 +1,6 @@
+2007-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.24
+
2007-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.23

diff --git a/devel/rake/DETAILS b/devel/rake/DETAILS
index d24e002..692e94c 100755
--- a/devel/rake/DETAILS
+++ b/devel/rake/DETAILS
@@ -1,9 +1,9 @@
SPELL=rake
- VERSION=0.7.1
+ VERSION=0.7.3
+
SOURCE_HASH=sha512:28688895fe0c01ead64c2e04a1b28ca7b71922f5818ed2709d070f0d04c04244990342bb7549f204126615a2821e99f06eaf82dbf708d6f04bb89d2671fde3c2
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://rubyforge.org/frs/download.php/9499/$SOURCE
-
SOURCE_HASH=sha512:aca75385a3f93c95f3cf6981e4ebb10455a706250ffdb2e8f05bf7b8fda9548f38def8cdba4992d6b87bf6099b50f1651a94d8f20a309fbe2f2fbe9d061fcfd2
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/19879/$SOURCE
WEB_SITE=http://rake.rubyforge.org/
ENTERED=20050524
LICENSE[0]=MIT
diff --git a/devel/rake/HISTORY b/devel/rake/HISTORY
index 6c7c95a..ad7350a 100644
--- a/devel/rake/HISTORY
+++ b/devel/rake/HISTORY
@@ -1,3 +1,6 @@
+2007-08-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/re2c/DETAILS b/devel/re2c/DETAILS
index 203a0fc..d98aa26 100755
--- a/devel/re2c/DETAILS
+++ b/devel/re2c/DETAILS
@@ -1,6 +1,6 @@
SPELL=re2c
- VERSION=0.13.0
-
SOURCE_HASH=sha512:1fd3b02b3296044dd87d90dd70745791800c5f9f20c225c7963305d4c48fb4b077300cd0dea351635d3f51dba94ff0e2212430e4a09933ff6a40b02c6d41b77b
+ VERSION=0.13.1
+
SOURCE_HASH=sha512:2f30132166b0c43fc2ced5fb8c838ca97b4800a7941c2e0ba4de4de31a067b5268b776bd517892de60287b56b63bebcac9993ebb5385c139bc5b1a47c63c91ce
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/re2c/HISTORY b/devel/re2c/HISTORY
index 15cd8f4..644e4a6 100644
--- a/devel/re2c/HISTORY
+++ b/devel/re2c/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.13.1
+
2007-06-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.13.0

diff --git a/devel/ruby-ecore/DEPENDS b/devel/ruby-ecore/DEPENDS
index 2100b8e..fab3ba1 100755
--- a/devel/ruby-ecore/DEPENDS
+++ b/devel/ruby-ecore/DEPENDS
@@ -1,4 +1,4 @@
depends ecore &&
depends rake &&
depends ruby-evas &&
-depends subversion
+depends git
diff --git a/devel/ruby-ecore/DETAILS b/devel/ruby-ecore/DETAILS
index eb98e08..1552095 100755
--- a/devel/ruby-ecore/DETAILS
+++ b/devel/ruby-ecore/DETAILS
@@ -7,11 +7,10 @@ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
FORCE_DOWNLOAD=ON
- SOURCE_HINTS=old_svn_compat
-
SOURCE_URL[0]=svn://code-monkey.de/svn/devel/ruby-ecore/trunk:ruby-ecore-svn
+ SOURCE_URL[0]=git://code-monkey.de/ruby-ecore.git:ruby-ecore
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- WEB_SITE=http://code-monkey.de/pages/ruby-efl.html
+ WEB_SITE=http://code-monkey.de/pages/ruby-efl
ENTERED=20050530
KEYWORDS="ruby devel"
SHORT="Ruby bindings for Ecore"
diff --git a/devel/ruby-ecore/HISTORY b/devel/ruby-ecore/HISTORY
index def2f0f..ff48a22 100644
--- a/devel/ruby-ecore/HISTORY
+++ b/devel/ruby-ecore/HISTORY
@@ -1,3 +1,7 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: svn -> git, fixed WEB_SITE
+ * DEPENDS: subversion -> git
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/ruby-edje/DEPENDS b/devel/ruby-edje/DEPENDS
index 98a9934..9373cfe 100755
--- a/devel/ruby-edje/DEPENDS
+++ b/devel/ruby-edje/DEPENDS
@@ -1,4 +1,4 @@
depends edje &&
depends rake &&
depends ruby-evas &&
-depends subversion
+depends git
diff --git a/devel/ruby-edje/DETAILS b/devel/ruby-edje/DETAILS
index 8be13f1..e74a07d 100755
--- a/devel/ruby-edje/DETAILS
+++ b/devel/ruby-edje/DETAILS
@@ -7,11 +7,10 @@ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
FORCE_DOWNLOAD=ON
- SOURCE_HINTS=old_svn_compat
- SOURCE_URL[0]=svn://code-monkey.de/svn/devel/ruby-edje/trunk:ruby-edje-svn
+ SOURCE_URL[0]=git://code-monkey.de/ruby-edje.git:ruby-edje
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- WEB_SITE=http://code-monkey.de/pages/ruby-efl.html
+ WEB_SITE=http://code-monkey.de/pages/ruby-efl
ENTERED=20050530
KEYWORDS="ruby devel"
SHORT="Ruby bindings for Edje"
diff --git a/devel/ruby-edje/HISTORY b/devel/ruby-edje/HISTORY
index 9a895af..7d51f0a 100644
--- a/devel/ruby-edje/HISTORY
+++ b/devel/ruby-edje/HISTORY
@@ -1,3 +1,7 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: svn -> git, fixed WEB_SITE
+ * DEPENDS: subversion -> git
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/ruby-esmart/DEPENDS b/devel/ruby-esmart/DEPENDS
index f4fef67..20fc51f 100755
--- a/devel/ruby-esmart/DEPENDS
+++ b/devel/ruby-esmart/DEPENDS
@@ -2,4 +2,4 @@ depends esmart &&
depends rake &&
depends ruby-ecore &&
depends ruby-evas &&
-depends subversion
+depends git
diff --git a/devel/ruby-esmart/DETAILS b/devel/ruby-esmart/DETAILS
index 06e559d..137b7a1 100755
--- a/devel/ruby-esmart/DETAILS
+++ b/devel/ruby-esmart/DETAILS
@@ -7,11 +7,10 @@ fi
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
FORCE_DOWNLOAD=ON
- SOURCE_HINTS=old_svn_compat
-
SOURCE_URL[0]=svn://code-monkey.de/svn/devel/ruby-esmart/trunk:ruby-esmart-svn
+ SOURCE_URL[0]=git://code-monkey.de/ruby-esmart.git:ruby-esmart
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- WEB_SITE=http://code-monkey.de/pages/ruby-efl.html
+ WEB_SITE=http://code-monkey.de/pages/ruby-efl
ENTERED=20050530
KEYWORDS="ruby devel"
SHORT="Ruby bindings for Esmart"
diff --git a/devel/ruby-esmart/HISTORY b/devel/ruby-esmart/HISTORY
index 14ff166..5f67839 100644
--- a/devel/ruby-esmart/HISTORY
+++ b/devel/ruby-esmart/HISTORY
@@ -1,3 +1,7 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: svn -> git, fixed WEB_SITE
+ * DEPENDS: subversion -> git
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/ruby-evas/DEPENDS b/devel/ruby-evas/DEPENDS
index 5f0eed3..e2252a7 100755
--- a/devel/ruby-evas/DEPENDS
+++ b/devel/ruby-evas/DEPENDS
@@ -1,3 +1,3 @@
depends evas &&
depends rake &&
-depends subversion
+depends git
diff --git a/devel/ruby-evas/DETAILS b/devel/ruby-evas/DETAILS
index 544564d..6d3f46f 100755
--- a/devel/ruby-evas/DETAILS
+++ b/devel/ruby-evas/DETAILS
@@ -7,11 +7,10 @@ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
FORCE_DOWNLOAD=ON
- SOURCE_HINTS=old_svn_compat
- SOURCE_URL[0]=svn://code-monkey.de/svn/devel/ruby-evas/trunk:ruby-evas-svn
+ SOURCE_URL[0]=git://code-monkey.de/ruby-evas.git:ruby-evas
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- WEB_SITE=http://code-monkey.de/pages/ruby-efl.html
+ WEB_SITE=http://code-monkey.de/pages/ruby-efl
ENTERED=20050525
KEYWORDS="ruby devel"
SHORT="Ruby bindings for Evas"
diff --git a/devel/ruby-evas/HISTORY b/devel/ruby-evas/HISTORY
index 9565b7d..8895b7d 100644
--- a/devel/ruby-evas/HISTORY
+++ b/devel/ruby-evas/HISTORY
@@ -1,3 +1,7 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: svn -> git, fixed WEB_SITE
+ * DEPENDS: subversion -> git
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/rubygems/DETAILS b/devel/rubygems/DETAILS
index 70f5575..71a298a 100755
--- a/devel/rubygems/DETAILS
+++ b/devel/rubygems/DETAILS
@@ -1,8 +1,8 @@
SPELL=rubygems
- VERSION=0.9.0
-
SOURCE_HASH=sha512:60449c1bc2854def1c36765b65ebf53e03c992f46f6ab584a3867ff7fa592e846adfa588db4bfdc4814de976a74cde6d6a3cf8a94de4538db9ca12d82af0408c
+ VERSION=0.9.4
+
SOURCE_HASH=sha512:1c2d293a2ea3f81c94fea1ddc995f9e630527809f7657799cdbf711e110fd8b8c1f8af0b173515b36b5434e8136427c9f719631e8dc0afcf94f80df1082e5236
SOURCE=${SPELL}-${VERSION}.tgz
- SOURCE_URL[0]=http://rubyforge.org/frs/download.php/11289/$SOURCE
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/20989/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://docs.$SPELL.org
ENTERED=20051216
diff --git a/devel/rubygems/HISTORY b/devel/rubygems/HISTORY
index 1b9a9e2..4d0a4fd 100644
--- a/devel/rubygems/HISTORY
+++ b/devel/rubygems/HISTORY
@@ -1,3 +1,6 @@
+2007-08-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.4
+
2006-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.0

diff --git a/devel/slang/DETAILS b/devel/slang/DETAILS
index ecd9b85..8446ded 100755
--- a/devel/slang/DETAILS
+++ b/devel/slang/DETAILS
@@ -1,5 +1,5 @@
SPELL=slang
- VERSION=2.1.1
+ VERSION=2.1.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/devel/slang/HISTORY b/devel/slang/HISTORY
index 9588eaa..1065242 100644
--- a/devel/slang/HISTORY
+++ b/devel/slang/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: version 2.1.2
+
2007-07-03 Remko van der Vossen <wich AT stack.nl>
* DETAILS: version 2.1.1

diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 01e8132..ed994e5 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,5 +1,5 @@
SPELL=vala
- VERSION=0.1.2
+ VERSION=0.1.3
BRANCH=${VERSION/%.?/}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 38f7b77..b85f905 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2007-08-31 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.1.3
+
2007-07-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.1.2

diff --git a/devel/vala/vala-0.1.2.tar.bz2.sig
b/devel/vala/vala-0.1.2.tar.bz2.sig
deleted file mode 100644
index 83f4528..0000000
Binary files a/devel/vala/vala-0.1.2.tar.bz2.sig and /dev/null differ
diff --git a/devel/vala/vala-0.1.3.tar.bz2.sig
b/devel/vala/vala-0.1.3.tar.bz2.sig
new file mode 100644
index 0000000..047c574
Binary files /dev/null and b/devel/vala/vala-0.1.3.tar.bz2.sig differ
diff --git a/devel/valgrind/DEPENDS b/devel/valgrind/DEPENDS
index 5ecc1a8..be283f1 100755
--- a/devel/valgrind/DEPENDS
+++ b/devel/valgrind/DEPENDS
@@ -2,4 +2,10 @@ if [[ $VALGRIND_SVN == y ]]
then
depends automake &&
depends subversion
+else
+ #
+ # only needed for glibc_2.6_fix.diff
+ #
+ depends autoconf &&
+ depends automake-1.9
fi
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index d91e8fb..db66973 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,8 @@
+2007-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Added patch to fix build with glibc 2.6.
+ * glibc_2.6_fix.diff: Added.
+ * DEPENDS: Added depends autoconf & automake-1.9 for above patch.
+
2007-04-11 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 3.2.3, updated descriptions.
* PRE_INSTALL: Deleted, since 2.4.0 Valgrind no longer features
diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index e0c30a1..fe682d1 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -4,4 +4,11 @@ cd "$SOURCE_DIRECTORY" &&
if [[ $VALGRIND_SVN == y ]]
then
NOCONFIGURE=Y ./autogen.sh
+else
+ #
+ # to fix build with glibc 2.6
+ #
+ patch -p1 < "$SCRIPT_DIRECTORY/glibc_2.6_fix.diff" &&
+ autoconf &&
+ automake-1.9
fi
diff --git a/devel/valgrind/glibc_2.6_fix.diff
b/devel/valgrind/glibc_2.6_fix.diff
new file mode 100644
index 0000000..4499db5
--- /dev/null
+++ b/devel/valgrind/glibc_2.6_fix.diff
@@ -0,0 +1,266 @@
+--- a/configure.in 2007-01-29 21:42:52.000000000 +0200
++++ b/configure.in 2007-09-21 21:51:26.000000000 +0300
+@@ -359,6 +359,16 @@
+ ],
+ glibc="2.5")
+
++AC_EGREP_CPP([GLIBC_26], [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6)
++ GLIBC_26
++ #endif
++#endif
++],
++glibc="2.6")
++
+ AC_MSG_CHECKING([the glibc version])
+
+ case "${glibc}" in
+@@ -386,9 +396,15 @@
+ DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
+ ;;
+
++ 2.6)
++ AC_MSG_RESULT(2.6 family)
++ AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x])
++ DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
++ ;;
++
+ *)
+ AC_MSG_RESULT(unsupported version)
+- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
+ ;;
+ esac
+
+--- a/glibc-2.6.supp 1970-01-01 02:00:00.000000000 +0200
++++ b/glibc-2.6.supp 2007-09-21 21:44:01.000000000 +0300
+@@ -0,0 +1,216 @@
++
++##----------------------------------------------------------------------##
++
++# Errors to suppress by default with glibc 2.4.x
++
++# Format of this file is:
++# {
++# name_of_suppression
++# tool_name:supp_kind
++# (optional extra info for some suppression types)
++# caller0 name, or /name/of/so/file.so
++# caller1 name, or ditto
++# (optionally: caller2 name)
++# (optionally: caller3 name)
++# }
++#
++# For Memcheck, the supp_kinds are:
++#
++# Param Value1 Value2 Value4 Value8 Value16
++# Free Addr1 Addr2 Addr4 Addr8 Addr16
++# Cond (previously known as Value0)
++#
++# and the optional extra info is:
++# if Param: name of system call param
++# if Free: name of free-ing fn)
++
++{
++ dl-hack1
++ Memcheck:Cond
++ fun:_dl_start
++ fun:_start
++}
++
++{
++ dl-hack2
++ Memcheck:Cond
++ obj:/lib*/ld-2.6*.so
++ obj:/lib*/ld-2.6*.so
++ obj:/lib*/ld-2.6*.so
++ obj:/lib*/ld-2.6*.so
++}
++
++{
++ dl-hack3
++ Memcheck:Cond
++ obj:/lib*/ld-2.6*so*
++ obj:/lib*/ld-2.6*so*
++ obj:/lib*/ld-2.6*so*
++}
++
++##----------------------------------------------------------------------##
++{
++ glibc-2.5.x-on-SUSE-10.2-(PPC)-1
++ Memcheck:Cond
++ fun:_dl_start_final
++ fun:_dl_start
++ fun:_start
++}
++{
++ glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
++ Memcheck:Cond
++ fun:index
++ obj:*ld-2.6.*.so
++}
++{
++ glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
++ Memcheck:Addr4
++ fun:index
++ fun:expand_dynamic_string_token
++}
++{
++ glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
++ Memcheck:Addr4
++ fun:index
++ obj:*ld-2.6.*.so
++}
++{
++ glibc-2.3.5-on-SuSE-10.1-(PPC)-3
++ Memcheck:Addr4
++ fun:*wordcopy_fwd_dest_aligned*
++ fun:mem*cpy
++ obj:*lib*2.6.*.so
++}
++
++##----------------------------------------------------------------------##
++## Various structure padding things on SUSE 10.2
++##
++{
++ X11-64bit-padding-1a
++ Memcheck:Param
++ write(buf)
++ fun:__write_nocancel
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++ fun:X*
++}
++{
++ X11-64bit-padding-1b
++ Memcheck:Param
++ write(buf)
++ fun:__write_nocancel
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++ fun:_X*
++}
++{
++ X11-64bit-padding-1c
++ Memcheck:Param
++ write(buf)
++ fun:__write_nocancel
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++}
++{
++ X11-64bit-padding-1d
++ Memcheck:Param
++ write(buf)
++ fun:__write_nocancel
++ obj:/usr/lib*/libICE.so*
++ obj:/usr/lib*/libICE.so*
++ obj:/usr/lib*/libICE.so*
++}
++{
++ X11-64bit-padding-2a
++ Memcheck:Param
++ writev(vector[...])
++ fun:do_writev
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++}
++{
++ X11-64bit-padding-2b
++ Memcheck:Param
++ writev(vector[...])
++ fun:do_writev
++ fun:writev
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++}
++
++{
++ glibc24-64bit-padding-1a
++ Memcheck:Param
++ socketcall.sendto(msg)
++ fun:send
++ fun:get_mapping
++ fun:__nscd_get_map_ref
++ fun:nscd*
++}
++{
++ glibc24-64bit-padding-1b
++ Memcheck:Param
++ socketcall.sendto(msg)
++ fun:__sendto_nocancel
++ obj:/*libc-2.6.so
++ obj:/*libc-2.6.so
++ obj:/*libc-2.6.so
++}
++{
++ glibc24-64bit-padding-1c
++ Memcheck:Param
++ socketcall.send(msg)
++ fun:send
++ fun:__nscd_get_map_ref
++ fun:nscd_get*_r
++ fun:*nscd*
++ obj:/*libc-2.6.so
++}
++
++
++{
++ X11-64bit-padding-3a
++ Memcheck:Param
++ write(buf)
++ obj:/*libpthread-2.4.so*
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++ obj:/usr/lib*/libX11.so*
++}
++
++{
++ X11-64bit-padding-4a
++ Memcheck:Param
++ socketcall.sendto(msg)
++ fun:send
++ obj:/*libc-2.6.so
++ obj:/*libc-2.6.so
++ obj:/*libc-2.6.so
++}
++{
++ X11-64bit-padding-4b
++ Memcheck:Param
++ socketcall.send(msg)
++ fun:send
++ obj:/*libc-2.6.so
++ obj:/*libc-2.6.so
++ obj:/*libc-2.6.so
++}
++
++##----------------------------------------------------------------------##
++# MontaVista Linux 4.0.1 on ppc32
++{
++ MVL-401-linuxthreads-pthread_create
++ Memcheck:Param
++ write(buf)
++ fun:pthread_create
++}
++{
++ MVL-401-linuxthreads-pthread_create
++ Memcheck:Param
++ write(buf)
++ obj:/lib/libpthread-0.10.so
++ fun:pthread_create
++}
+--- a/Makefile.am 2007-01-02 16:52:30.000000000 +0200
++++ b/Makefile.am 2007-09-21 21:44:01.000000000 +0300
+@@ -17,7 +17,7 @@
+ DIST_SUBDIRS = $(SUBDIRS)
+
+ SUPP_FILES = \
+- glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
++ glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp
glibc-2.6.supp \
+ xfree-3.supp xfree-4.supp
+
+ dist_val_DATA = $(SUPP_FILES) default.supp
diff --git a/disk/acl/DETAILS b/disk/acl/DETAILS
index 8f5259d..159d8e9 100755
--- a/disk/acl/DETAILS
+++ b/disk/acl/DETAILS
@@ -1,10 +1,10 @@
SPELL=acl
- VERSION=2.2.44
+ VERSION=2.2.45
SOURCE=${SPELL}_${VERSION}-1.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/${SOURCE}
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
SOURCE_HASH=sha512:96035cb58736a20860616a944d99702a6ccbe242bb3d2d03f12861670b951dc255357cf0583bc46753891f02c471e0c0f825e02e80a7ad1241ede6c2e6c6aab0
+
SOURCE_HASH=sha512:f1be15eb59718e5575995275edec3925ea5e27063fa7d1eb849c92c640687deba4425cef3c41334c84365d45f7a2281407f394ca9caf3d2e7783e655dd0a7b81
LICENSE[0]=GPL
KEYWORDS="disk"
WEB_SITE=http://oss.sgi.com/projects/xfs/
diff --git a/disk/acl/HISTORY b/disk/acl/HISTORY
index 583c27e..2750231 100644
--- a/disk/acl/HISTORY
+++ b/disk/acl/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.45
+
2007-05-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.44

diff --git a/disk/attr/DETAILS b/disk/attr/DETAILS
index 6a0f68e..22f0e58 100755
--- a/disk/attr/DETAILS
+++ b/disk/attr/DETAILS
@@ -1,12 +1,12 @@
SPELL=attr
- VERSION=2.4.38
+ VERSION=2.4.39
SOURCE=${SPELL}_$VERSION-1.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/$SOURCE
SOURCE_URL[1]=ftp://ftp.silug.org/pub/xfs/cmd_tars/$SOURCE
SOURCE_URL[2]=ftp://sunsite.dk/mirrors/xfs/cmd_tars/$SOURCE
SOURCE_URL[3]=http://spirit.bentel.sk/xfs/cmd_tars/$SOURCE
-
SOURCE_HASH=sha512:92674e205a9865fb020d556808103df90fd59918f256cf11f02b2111cbd1ee9abf585a0f1f0bc41d8b2270c7401b6474316f7daa5e980dfaf8cd73198a36ff6f
+
SOURCE_HASH=sha512:9d119914a836ce4fc6540d35a973d2aae8b32da2141166b39c7f8b931b535d552dc847ab61103e9639a75047f17922c447f2aaf5865ed1bedb084507d0cea12b
WEB_SITE=http://oss.sgi.com/projects/xfs/
ENTERED=20020219
LICENSE[0]=GPL
diff --git a/disk/attr/HISTORY b/disk/attr/HISTORY
index e2db70e..13772da 100644
--- a/disk/attr/HISTORY
+++ b/disk/attr/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.39
+
2007-05-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.38

diff --git a/disk/brasero/DEPENDS b/disk/brasero/DEPENDS
index 51b90d1..7c45c74 100755
--- a/disk/brasero/DEPENDS
+++ b/disk/brasero/DEPENDS
@@ -2,6 +2,8 @@ depends nautilus-cd-burner &&
depends gnome-vfs2 &&
depends gst-plugins-good &&
depends hal &&
+optional_depends CD-BURN-UTILITY "" "" "to burn CDs" &&
+optional_depends dvd+rw-tools "" "" "to burn DVDs" &&
optional_depends totem "--enable-playlist" "--disable-playlist" "For
playlist pane" &&
optional_depends beagle "--enable-search" "--disable-search" "For search
pane" &&
optional_depends gdl "--enable-gdl" "--disable-gdl" "For a customizable GUI"
&&
diff --git a/disk/brasero/DETAILS b/disk/brasero/DETAILS
index 1150c67..4fb60b4 100755
--- a/disk/brasero/DETAILS
+++ b/disk/brasero/DETAILS
@@ -1,7 +1,8 @@
SPELL=brasero
- VERSION=0.5.1
+ VERSION=0.6.1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$SOURCEFORGE_URL/bonfire/$SOURCE
+ BRANCH=${VERSION/%.?/}
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://perso.wanadoo.fr/bonfire/
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index 4949f51..00ad662 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,7 @@
+2007-08-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.1, changed to use gnome ftp for download
+ * DEPENDS: added optional depends on CD-BURN-UTILITY and dvd+rw-tools
+
2007-02-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFLICTS: removed, deprecation complete

diff --git a/disk/brasero/brasero-0.5.1.tar.bz2.sig
b/disk/brasero/brasero-0.5.1.tar.bz2.sig
deleted file mode 100644
index 2d2a46d..0000000
Binary files a/disk/brasero/brasero-0.5.1.tar.bz2.sig and /dev/null differ
diff --git a/disk/brasero/brasero-0.6.1.tar.bz2.sig
b/disk/brasero/brasero-0.6.1.tar.bz2.sig
new file mode 100644
index 0000000..a11e0b8
Binary files /dev/null and b/disk/brasero/brasero-0.6.1.tar.bz2.sig differ
diff --git a/disk/cdrdao/DETAILS b/disk/cdrdao/DETAILS
index 9bc264f..f3d5ca3 100755
--- a/disk/cdrdao/DETAILS
+++ b/disk/cdrdao/DETAILS
@@ -1,10 +1,14 @@
SPELL=cdrdao
VERSION=${VERSION:=1.2.2}
if [ "$CVS" == "y" ]; then
+ if [ "$CDRDAO_CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
VERSION=sfcvs
+ fi
FORCE_DOWNLOAD=1
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE=$SPELL-sfcvs.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT cdrdao.cvs.sourceforge.net:/cvsroot/cdrdao:cdrdao
SOURCE_IGNORE=volatile
else
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 1d6a345..29f868d 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,6 @@
+2007-09-15 Pol Vinogradov <vin.public AT gmail.com>
+ * PREPARE, DETAILS: added autoupdate option
+
2006-09-22 Flavien Bridault <vlaaad AT sourcemage.org>
*

diff --git a/disk/cdrdao/PREPARE b/disk/cdrdao/PREPARE
index 328e023..d54d1c1 100755
--- a/disk/cdrdao/PREPARE
+++ b/disk/cdrdao/PREPARE
@@ -1 +1,7 @@
config_query CVS "Use the CVS version?" n
+
+if [ "$CVS" == "y" ]; then
+ config_query CDRDAO_CVS_AUTOUPDATE \
+ "Update to the latest CVS automatically on every cast?" \
+ n
+fi
diff --git a/disk/fuse-python/BUILD b/disk/fuse-python/BUILD
index 27ba77d..3d7f60b 100755
--- a/disk/fuse-python/BUILD
+++ b/disk/fuse-python/BUILD
@@ -1 +1 @@
-true
+python setup.py build
diff --git a/disk/fuse-python/DETAILS b/disk/fuse-python/DETAILS
index 91eb77f..866f4c4 100755
--- a/disk/fuse-python/DETAILS
+++ b/disk/fuse-python/DETAILS
@@ -1,10 +1,10 @@
SPELL=fuse-python
- VERSION=0.1
- SOURCE=$SPELL.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=http://richard.jones.name/google-hacks/gmail-filesystem/$SOURCE
+ VERSION=0.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/fuse/$SPELL-$VERSION.tar.gz

WEB_SITE=http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html
- MD5[0]=dd533399f35621c625ad4b1eb1d297de
+
SOURCE_HASH=sha512:c8b44c0cd98dfb3730f067dc3fae790a6b61f0b745eca2a25defa456bdd75d845ba1a66c3e3ad72bfdf012ff68c1186db196e6bb6023a9b99b239fda9589786f
LICENSE=GPL
KEYWORDS="disk python"
SHORT="Python bindings for fuse"
diff --git a/disk/fuse-python/HISTORY b/disk/fuse-python/HISTORY
index 60013e4..e6e3e26 100644
--- a/disk/fuse-python/HISTORY
+++ b/disk/fuse-python/HISTORY
@@ -1,3 +1,8 @@
+2007-09-14 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 0.2 and to sf.net url and fixed hash
+ * BUILD: build here
+ * INSTALL: install here not 'build and install'
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/fuse-python/INSTALL b/disk/fuse-python/INSTALL
index 8087cd3..762d43b 100755
--- a/disk/fuse-python/INSTALL
+++ b/disk/fuse-python/INSTALL
@@ -1,2 +1 @@
-python setup.py build &&
python setup.py install
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index f5d65b5..bf42090 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -5,7 +5,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://sourceforge.net/projects/hdparm/
- PATCHLEVEL=0
+ PATCHLEVEL=1
LICENSE[0]=BSD
ENTERED=20010922
KEYWORDS="disk"
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index b1f22ff..bf10495 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,8 @@
+2007-09-04 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: install_rootifying
+ * init.d/hdparm: changed RUNLEVEL to 1
+
2007-08-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.7

diff --git a/disk/hdparm/INSTALL b/disk/hdparm/INSTALL
index 8233104..0c532ba 100755
--- a/disk/hdparm/INSTALL
+++ b/disk/hdparm/INSTALL
@@ -1,4 +1,4 @@
- make destdir=/usr \
- sbindir=/sbin \
- mandir=/usr/share/man \
+ make destdir=${INSTALL_ROOT}/usr \
+ sbindir=${INSTALL_ROOT}/sbin \
+ mandir=${INSTALL_ROOT}/usr/share/man \
install
diff --git a/disk/hdparm/init.d/hdparm b/disk/hdparm/init.d/hdparm
index 97d0ebb..9dcc370 100755
--- a/disk/hdparm/init.d/hdparm
+++ b/disk/hdparm/init.d/hdparm
@@ -2,8 +2,7 @@

PROGRAM=/sbin/hdparm
ARGS=""
-RUNLEVEL=DEV
-NEEDS="devices"
+RUNLEVEL=1

. /etc/sysconfig/hdparm
. /etc/init.d/smgl_init
diff --git a/disk/jfsutils/DETAILS b/disk/jfsutils/DETAILS
index ab182a4..368e0fc 100755
--- a/disk/jfsutils/DETAILS
+++ b/disk/jfsutils/DETAILS
@@ -1,9 +1,10 @@
SPELL=jfsutils
- VERSION=1.1.11
+ VERSION=1.1.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://jfs.sourceforge.net/project/pub/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:aea3d94e0fc42eec22235589729d18d9a56498287a1e33c655f72d1aedfe98a7bc5394eb0754f339cdea98bced1d7def92ae52c1f3663508496ec2a335104f16
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://jfs.sourceforge.net/
ENTERED=20020821
LICENSE[0]=GPL
diff --git a/disk/jfsutils/HISTORY b/disk/jfsutils/HISTORY
index 85d1aac..4cc8042 100644
--- a/disk/jfsutils/HISTORY
+++ b/disk/jfsutils/HISTORY
@@ -1,3 +1,6 @@
+2007-08-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.12
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/disk/jfsutils/jfsutils-1.1.11.tar.gz.sig
b/disk/jfsutils/jfsutils-1.1.11.tar.gz.sig
deleted file mode 100644
index 9b47c78..0000000
Binary files a/disk/jfsutils/jfsutils-1.1.11.tar.gz.sig and /dev/null differ
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index dadd618..0d0c573 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
SPELL=lvm
- VERSION=2.02.26
+ VERSION=2.02.28
SOURCE=LVM2.$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE

-
SOURCE_HASH=sha512:e7de4b442cc95e93f3d872bdf26e5bd886a1c935fba6a5c3f490b0d173caf6b973fee92f1d1cdafc4b8a09f0ac7a95ea51ea4f56bc9f49183508921610e7557b
+
SOURCE_HASH=sha512:063b7c78205472f2262e28c1c10ddf8aea7ab77b77891158f08d4dc26cc42f7a7d6e8af94ee9cd2d386bc0e9e19156bddfe6740e4e997b40cd3710b5ff03f1e6
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"

WEB_SITE=http://www.sistina.com/products_lvm.htm
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 38c50f8..934d34a 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2007-08-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.02.28
+
2007-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.26

diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index 4080055..1b9a1be 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,16 +1,14 @@
SPELL=mdadm
- VERSION=2.6.2
+ VERSION=2.6.3
SOURCE=${SPELL}-${VERSION}.tgz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://neilb.web.cse.unsw.edu.au/source/mdadm/${SOURCE}
-
-
SOURCE_HASH=sha512:1cc83f18473c903f10f16d2f1c995661cc1252dcce9affd1e35c486f64d737f7d65f551cc80bed838c2cc41d6762e6a66890420984b7e9551fe4e9361a5dbfea
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
- WEB_SITE=http://neil.brown.name/blog/mdadm
+#
SOURCE_HASH=sha512:1cc83f18473c903f10f16d2f1c995661cc1252dcce9affd1e35c486f64d737f7d65f551cc80bed838c2cc41d6762e6a66890420984b7e9551fe4e9361a5dbfea
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
- ENTERED=20040805
+ WEB_SITE=http://neil.brown.name/blog/mdadm
KEYWORDS="disk"
+ ENTERED=20040805
SHORT="softraid management"
cat << EOF
mdadm is a tool for creating, maintaining, and monitoring Linux "md" device
arrays, also known as Software RAID.
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 8f6f8ee..3eb340c 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.6.3
+
2007-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.2, new WEB_SITE

diff --git a/disk/mdadm/mdadm-2.6.3.tgz.sig b/disk/mdadm/mdadm-2.6.3.tgz.sig
new file mode 100644
index 0000000..539b94c
Binary files /dev/null and b/disk/mdadm/mdadm-2.6.3.tgz.sig differ
diff --git a/disk/netatalk/BUILD b/disk/netatalk/BUILD
index e6a05ed..43fb2fd 100755
--- a/disk/netatalk/BUILD
+++ b/disk/netatalk/BUILD
@@ -1,3 +1,3 @@
-OPTS="--enable-redhat --enable-fhs" &&
+OPTS="--enable-redhat --enable-fhs $NETATALK_OPTS" &&

default_build
diff --git a/disk/netatalk/CONFIGURE b/disk/netatalk/CONFIGURE
index a86c952..42dcf86 100755
--- a/disk/netatalk/CONFIGURE
+++ b/disk/netatalk/CONFIGURE
@@ -1,89 +1,89 @@
-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable admin group?" y \
"--enable-admin-group" \
"--disable-admin-group" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable timelord (time server)?" n \
"--enable-timelord" \
"--disable-timelord" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable valid shell check?" y \
"--enable-shell-check" \
"--disable-shell-check" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable filename mangling?" y \
"--with-mangling" \
"--without-mangling" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable Andrew FileSystem support?" n \
"--enable-afs" \
"--disable-afs" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable DDP?" y \
"--enable-ddp" \
"--disable-ddp" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable AFP 3.x calls?" y \
"--enable-afp3" \
"--disable-afp3" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable the EXPERIMENTAL dropbox fix (INSECURE!)?" n \
"--enable-dropkludge" \
"--disable-dropkludge"
&&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable Apple2 boot server?" n \
"--enable-a2boot" \
"--disable-a2boot" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable debug code?" n \
"--enable-debug1" \
"--disable-debug1" &&

-config_query_option OPTS
\
+config_query_option NETATALK_OPTS
\
"Enable CNID with Concurrent DBD Data Store (cdb)?" y
\
"--with-cnid-cdb-backend"
\
"--without-cnid-cdb-backend"
&&

-config_query_option OPTS
\
+config_query_option NETATALK_OPTS
\
"Enable CNID with Database Daemon Data Store (dbd)?" y
\
"--with-cnid-dbd-backend"
\
"--without-cnid-dbd-backend"
&&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable transaction support for dbd backend?" n \
"--with-cnid-dbd-txn" \
"--without-cnid-dbd-txn" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable CNID with transactional BDB Data Store?" n \
"--with-cnid-db3-backend" \
"--without-cnid-db3-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable LAST CNID scheme?" y \
"--with-cnid-last-backend" \
"--without-cnid-last-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable HASH CNID scheme?" n \
"--with-cnid-hash-backend" \
"--without-cnid-hash-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable DID CNID scheme?" n \
"--with-cnid-tdb-backend" \
"--without-cnid-tdb-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable MTAB CNID scheme?" n \
"--with-mtab-backend" \
"--without-mtab-backend"
diff --git a/disk/netatalk/DETAILS b/disk/netatalk/DETAILS
index 3fd83c0..3c1a4c3 100755
--- a/disk/netatalk/DETAILS
+++ b/disk/netatalk/DETAILS
@@ -1,14 +1,20 @@
SPELL=netatalk
- VERSION=2.0.2
+ VERSION=2.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- MD5[0]=9c51a84c3a8d2f97ad5191e3251aa685
+
SOURCE_HASH=sha512:28067912c440663213ddfbb71406daa0ecb7bd9d4e06f66978d259afd0eec2b3f01c7784432a3a991b9e39f784fef150bbf82dc4e63b9256cd582426954a35b4
WEB_SITE=http://netatalk.sourceforge.net/
ENTERED=20020321
- UPDATED=20030822
LICENSE[0]=GPL
SHORT="Seamless file and print services to AppleShare clients"
cat << EOF
-Netatalk is a freely-available, kernel level implementation of the AppleTalk
Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
running netatalk is capable of serving many macintosh clients simultaneously
as an AppleTalk router, AppleShare file server, *NIX/*BSD print server, and
for accessing AppleTalk printers via Printer Access Protocol (PAP). Included
are a number of minor printing and debugging utilities. Since full support
requires AppleTalk to be compiled into your kernel, this release only sets up
Apple filesharing over tcp/ip.
+Netatalk is a freely-available, kernel level implementation of the AppleTalk
+Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
+running netatalk is capable of serving many macintosh clients simultaneously
+as an AppleTalk router, AppleShare file server, *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP).
+Included are a number of minor printing and debugging utilities. Since
+full support requires AppleTalk to be compiled into your kernel, this
+release only sets up Apple filesharing over tcp/ip.
EOF
diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY
index 425273c..69f6fbf 100644
--- a/disk/netatalk/HISTORY
+++ b/disk/netatalk/HISTORY
@@ -1,3 +1,13 @@
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.3. Removed UPDATED
+ * CONFIGURE: Changed variable from OPTS to NETATALK_OPTS
+ * BUILD: Added NETATALK_OPTS to OPTS
+ * PREB_BUILD: Added to patch for newer db versions. Fixed Bug #11524
+ * netatalk-2.0.3-db43.patch: Added gentoo patch from
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/netatalk/files
+ * netatalk-2.0.3-newerdb.patch: Added gentoo patch from
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/netatalk/files
+
2006-06-25 George Sherwood <george AT beernabeer.com>
* DEPENDS: Changed to CUPS from cups

diff --git a/disk/netatalk/PRE_BUILD b/disk/netatalk/PRE_BUILD
new file mode 100755
index 0000000..d42601d
--- /dev/null
+++ b/disk/netatalk/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/netatalk-2.0.3-db43.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/netatalk-2.0.3-newerdb.patch
diff --git a/disk/netatalk/netatalk-2.0.3-db43.patch
b/disk/netatalk/netatalk-2.0.3-db43.patch
new file mode 100644
index 0000000..93d3e4b
--- /dev/null
+++ b/disk/netatalk/netatalk-2.0.3-db43.patch
@@ -0,0 +1,32 @@
+Index: netatalk-2.0.3/bin/cnid/cnid_index.c
+===================================================================
+--- netatalk-2.0.3.orig/bin/cnid/cnid_index.c
++++ netatalk-2.0.3/bin/cnid/cnid_index.c
+@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
+ DB_BTREE_STAT *sp;
+ DB *db = db_table[dbi].db;
+
++#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >=
3 )
++ ret = db->stat(db, db_txn, &sp, 0);
++#else
+ ret = db->stat(db, &sp, 0);
++#endif
+
+ if (ret) {
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on
database: %s", db_strerror(errno));
+Index: netatalk-2.0.3/etc/cnid_dbd/dbif.c
+===================================================================
+--- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c
++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c
+@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t
+ DB_BTREE_STAT *sp;
+ DB *db = db_table[dbi].db;
+
++#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >=
3 )
++ ret = db->stat(db, db_txn, &sp, 0);
++#else
+ ret = db->stat(db, &sp, 0);
++#endif
+
+ if (ret) {
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on
database: %s", db_strerror(errno));
diff --git a/disk/netatalk/netatalk-2.0.3-newerdb.patch
b/disk/netatalk/netatalk-2.0.3-newerdb.patch
new file mode 100644
index 0000000..f64c8cf
--- /dev/null
+++ b/disk/netatalk/netatalk-2.0.3-newerdb.patch
@@ -0,0 +1,28 @@
+Index: netatalk-2.0.3/macros/db3-check.m4
+===================================================================
+--- netatalk-2.0.3.orig/macros/db3-check.m4
++++ netatalk-2.0.3/macros/db3-check.m4
+@@ -115,6 +115,14 @@ int main(void) {
+ AC_DEFUN([NETATALK_BERKELEY_LINK],
+ [
+ atalk_cv_lib_db=no
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_4,[-ldb-4.4])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db44,[-ldb44])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_44,[-ldb-44])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_4,[-ldb-4-4])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db43,[-ldb43])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_43,[-ldb-43])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_3,[-ldb-4-3])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
+@@ -134,7 +142,7 @@ AC_DEFUN([AC_PATH_BDB],
+ trybdbdir=""
+ dobdbsearch=yes
+ bdb_search_dirs="/usr/local/include /usr/include"
+- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
++ search_subdirs="/db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41
/db4 /"
+
+ dnl required BDB version
+ DB_MAJOR_REQ=4
diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index a8d8439..fb260c4 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,6 +1,6 @@
SPELL=ntfs-3g
- VERSION=1.810
-
SOURCE_HASH=sha512:522f0c6ac769a38833bac82fe49180a42a2fccfe556a91ab5f273ce6cf4ca33fecd91a4dc097554c0b696942c944434a62cefb451c2f0a1a6724d65b55f47e42
+ VERSION=1.913
+
SOURCE_HASH=sha512:ff57a639d7361116efe20e62c5af38d0521b7cbe234305636e64b04d05967e567dcd94a57a27c0939f040d92e952c73402a454c1c89f7ab1f4dbcaa9b5a4b194
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ntfs-3g.org/
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index dab6576..a988152 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,12 @@
+2007-09-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.913
+
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.910-RC
+
+2007-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.826
+
2007-08-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.810

diff --git a/disk/parted/BUILD b/disk/parted/BUILD
new file mode 100755
index 0000000..7756d19
--- /dev/null
+++ b/disk/parted/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS --disable-Werror"
+default_build
diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index bdd9112..a5b11f8 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,3 +1,6 @@
+2007-09-02 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * BUILD: Added. Disabled treating of warnings as errors
+
2007-08-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.8

diff --git a/disk/partimage/DETAILS b/disk/partimage/DETAILS
index e71c457..4e6fdea 100755
--- a/disk/partimage/DETAILS
+++ b/disk/partimage/DETAILS
@@ -1,6 +1,6 @@
SPELL=partimage
- VERSION=0.6.6
-
SOURCE_HASH=sha512:51b610e072904b622004af4ebbbd66c11f13139609b411c9f3365021f3c80ab0cbc136e223c97b15da076cc8cfdd5b4152c16f48ce24ec04e1dfe4e9acef60be
+ VERSION=0.6.7_beta1
+
SOURCE_HASH=sha512:c7c20b09de7a95b41320bac6e3cff88f6b8d6c94e388955c69551b76c7150391a02063c19838a06839acb255f00c21eee0df1537913045d1f59dc882378e1c20
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/partimage/HISTORY b/disk/partimage/HISTORY
index d449f4e..ca1ef7d 100644
--- a/disk/partimage/HISTORY
+++ b/disk/partimage/HISTORY
@@ -1,3 +1,6 @@
+2007-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.7_beta1
+
2007-08-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.6

diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index e6db0db..8a1980d 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,6 @@
SPELL=udev
- VERSION=114
+ VERSION=115
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 4d76183..d4cc29a 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,11 @@
+2007-08-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * init.d/coldplug: only run the coldplugging stuff if udev is used for
+ /dev management, bug #13807
+ * DETAILS: PATCHLEVEL++
+
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 115
+
2007-08-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 114

diff --git a/disk/udev/init.d/coldplug b/disk/udev/init.d/coldplug
index 66ca154..aee9a67 100755
--- a/disk/udev/init.d/coldplug
+++ b/disk/udev/init.d/coldplug
@@ -7,14 +7,17 @@ NEEDS="udevd"

# source function library
. /etc/init.d/smgl_init
+. /etc/sysconfig/devices

start()
{
- echo "Triggering kernel device uevents..."
- /sbin/udevtrigger
- evaluate_retval
- echo "Waiting for all events to be handled..."
- /sbin/udevsettle --timeout=60
+ if [[ $DEVICES = udev ]]; then
+ echo "Triggering kernel device uevents..."
+ /sbin/udevtrigger
+ evaluate_retval
+ echo "Waiting for all events to be handled..."
+ /sbin/udevsettle --timeout=60
+ fi
evaluate_retval
}

diff --git a/disk/xfsdump/DETAILS b/disk/xfsdump/DETAILS
index b33fc1f..d3e2d03 100755
--- a/disk/xfsdump/DETAILS
+++ b/disk/xfsdump/DETAILS
@@ -1,10 +1,10 @@
SPELL=xfsdump
- VERSION=2.2.45
+ VERSION=2.2.46
SOURCE=${SPELL}_${VERSION}-1.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/${SOURCE}
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
SOURCE_HASH=sha512:86d8e3ee17cd486a7a757d49fa3af2780f30cdbff8c9c8a64c4263e9b3e664d381586eb6ea9080de4904dfa54d7a6640a23b2c43deee23690f88c0cc4710b823
+
SOURCE_HASH=sha512:8ddfc6d381d5de3f49013ac7830e1df6c54c5d6dbf06b85148acc4920dd16957f02b7e39553384beb0ed06702958367641c81371f3b4089e7288361d1c24387b
LICENSE[0]=GPL
KEYWORDS="disk"
WEB_SITE=http://oss.sgi.com/projects/xfs/
diff --git a/disk/xfsdump/HISTORY b/disk/xfsdump/HISTORY
index fbdefca..ffcbdbb 100644
--- a/disk/xfsdump/HISTORY
+++ b/disk/xfsdump/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.46
+
2007-05-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.45

diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index af88859..ef47f02 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,10 +1,10 @@
SPELL=xfsprogs
- VERSION=2.9.3
+ VERSION=2.9.4
SOURCE=${SPELL}_${VERSION}-1.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/${SOURCE}
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
SOURCE_HASH=sha512:77945e41abd2ad477554edc8953697208a4c367a852ac511e2ac5931214c35747a67b21c00a1b7fe0f3f229f4bfa2ee756d7f54e80f12838e1da1a3ea38e9ce2
+
SOURCE_HASH=sha512:f2f9ad6aac00105ba4f13cfc48d780648d589c50185f869bb052c7e3e261672657d79527c144c8e8eefd9cc6916c88e9f922fa8580da6e50b42734a2e71b0ce3
MAKE_NJOBS=1
LICENSE[0]=GPL
WEB_SITE=http://oss.sgi.com/projects/xfs
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index 6af249d..f342a53 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.9.4
+
2007-07-28 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.9.3

diff --git a/doc/devhelp/DETAILS b/doc/devhelp/DETAILS
index b07dad4..49179c0 100755
--- a/doc/devhelp/DETAILS
+++ b/doc/devhelp/DETAILS
@@ -1,5 +1,5 @@
SPELL=devhelp
- VERSION=0.15
+ VERSION=0.16
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/devhelp/HISTORY b/doc/devhelp/HISTORY
index 34c9984..2c7d674 100644
--- a/doc/devhelp/HISTORY
+++ b/doc/devhelp/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.16
+
2007-06-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.15

diff --git a/doc/devhelp/devhelp-0.15.tar.bz2.sig
b/doc/devhelp/devhelp-0.15.tar.bz2.sig
deleted file mode 100644
index e3e81af..0000000
Binary files a/doc/devhelp/devhelp-0.15.tar.bz2.sig and /dev/null differ
diff --git a/doc/devhelp/devhelp-0.16.tar.bz2.sig
b/doc/devhelp/devhelp-0.16.tar.bz2.sig
new file mode 100644
index 0000000..a9d0a79
Binary files /dev/null and b/doc/devhelp/devhelp-0.16.tar.bz2.sig differ
diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index f9b9c1d..532ed1f 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -8,7 +8,7 @@ depends gnome-keyring &&

optional_depends dbus-glib "--enable-dbus-glib" "--disable-dbus-glib" "for
DBUS (will be used when there, no disabling here)" &&

-optional_depends POSTSCRIPT-INTERPRETER \
+optional_depends ghostscript \
"--enable-ps" \
"--disable-ps" \
"for postscript support" &&
diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index c298ae8..1cc8334 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,5 +1,5 @@
SPELL=evince
- VERSION=0.8.3
+ VERSION=2.20.0
BRANCH=$(echo $VERSION | cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 0092609..533ffb7 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,14 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 2.19.92
+ * DEPENDS: replaced POSTSCRIPT-INTERPRETER by ghostscript
+
+2007-08-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * PRE_BUILD: upstream wants specifically 0.5.9, we have 0.5.91 and no
versioned
+ spells, so sedit the requirement and it worked fine. Upstream are
picky.
+
2007-07-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.8.3

diff --git a/doc/evince/PRE_BUILD b/doc/evince/PRE_BUILD
new file mode 100755
index 0000000..642225b
--- /dev/null
+++ b/doc/evince/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# Upstream wants a specific version, we don't have versioned spells.
+# This compiled fine on my x86 P4 prescott with poppler 0.5.91 --ryuji
+sedit 's|POPPLER_MAX_REQUIRED=0.5.9|POPPLER_MAX_REQUIRED=0.5.91|' configure
&&
+sedit 's|POPPLER_MAX_REQUIRED=0.5.9|POPPLER_MAX_REQUIRED=0.5.91|'
configure.ac
diff --git a/doc/evince/evince-0.8.3.tar.bz2.sig
b/doc/evince/evince-0.8.3.tar.bz2.sig
deleted file mode 100644
index deddc53..0000000
Binary files a/doc/evince/evince-0.8.3.tar.bz2.sig and /dev/null differ
diff --git a/doc/evince/evince-2.20.0.tar.bz2.sig
b/doc/evince/evince-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..a33b4c1
Binary files /dev/null and b/doc/evince/evince-2.20.0.tar.bz2.sig differ
diff --git a/doc/gnucash-docs/DEPENDS b/doc/gnucash-docs/DEPENDS
index 52ca605..38976e5 100755
--- a/doc/gnucash-docs/DEPENDS
+++ b/doc/gnucash-docs/DEPENDS
@@ -1,3 +1,3 @@
-depends scrollkeeper &&
-depends libxslt &&
+depends rarian &&
+depends libxslt &&
depends docbook-xsl
diff --git a/doc/gnucash-docs/HISTORY b/doc/gnucash-docs/HISTORY
index 586b84a..a13c32f 100644
--- a/doc/gnucash-docs/HISTORY
+++ b/doc/gnucash-docs/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/doc/man-pages-cs/DETAILS b/doc/man-pages-cs/DETAILS
index a55678d..601ece0 100755
--- a/doc/man-pages-cs/DETAILS
+++ b/doc/man-pages-cs/DETAILS
@@ -1,9 +1,9 @@
SPELL=man-pages-cs
- VERSION=0.17.20070715
+ VERSION=0.17.20070905
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://man-pages-cs-wiki.homelinux.net/man-pages-cs/$SOURCE
-
SOURCE_HASH=sha512:b97e9ca25b4d60c57064d58e5c51a5aec74dae5b61db4d140fb310e54e92744e6cbbf8fd9bec62f3242eca7c356f3f753bc48fc64349c2a488463431ae9739d8
+
SOURCE_HASH=sha512:1e1aaef752c3f292936309a57ba1a78312d304ca6a89d25c3fcefabeda00772f28309d3c26646f1d845a379b237e9e997e99765a6d40ab1cf79a1b541e2cd478
WEB_SITE=http://sweb.cz/tropikhajma/man-pages-cs/
ENTERED=20021204
ARCHIVE="off"
diff --git a/doc/man-pages-cs/HISTORY b/doc/man-pages-cs/HISTORY
index 21b5176..e7ca4a3 100644
--- a/doc/man-pages-cs/HISTORY
+++ b/doc/man-pages-cs/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.17.20070905
+
2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.17.20070715

diff --git a/doc/man-pages-fr/DETAILS b/doc/man-pages-fr/DETAILS
index 0729e30..6b59982 100755
--- a/doc/man-pages-fr/DETAILS
+++ b/doc/man-pages-fr/DETAILS
@@ -1,10 +1,10 @@
SPELL=man-pages-fr
- VERSION=1.59.0
+ VERSION=2.40.0
+
SOURCE_HASH=sha512:9c70feae935cb8190b7e085547dae742e0ef500f1680c7173d9bcf44f2f0cbe23ca595e53dfb5c500cc4e197569ad61ca4d9428ef2e715e970812e90eb5652ce
ARCHIVE=off
- SOURCE=man-fr-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/man-fr-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://manpagesfr.free.fr/download/$SOURCE
-
SOURCE_HASH=sha512:cea7c1d54b91c69f1cdff4a060ebf5eeeeb0c766058bc2d2b6992a69bd52dd3c81942b3ebb7f028f952e8e12414b6303a78b92da54a8e24a252ad9559412a30c
WEB_SITE=http://manpagesfr.free.fr/
ENTERED=20050619
LICENSE[0]=GPL
diff --git a/doc/man-pages-fr/HISTORY b/doc/man-pages-fr/HISTORY
index f4d036e..c4c0235 100644
--- a/doc/man-pages-fr/HISTORY
+++ b/doc/man-pages-fr/HISTORY
@@ -1,3 +1,6 @@
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.40.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 40eaff8..8993a02 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,5 +1,5 @@
SPELL=man-pages
- VERSION=2.64
+ VERSION=2.65
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 94f5fe3..7f959bf 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.65
+
2007-08-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.64

diff --git a/doc/pstoedit/DEPENDS b/doc/pstoedit/DEPENDS
index d8690f8..541ba6e 100755
--- a/doc/pstoedit/DEPENDS
+++ b/doc/pstoedit/DEPENDS
@@ -1,2 +1,11 @@
-depends imagemagick &&
-depends POSTSCRIPT-INTERPRETER
+depends g++ &&
+depends pkgconfig &&
+depends POSTSCRIPT-INTERPRETER &&
+optional_depends imagemagick '--with-magick' \
+ '--without-magick' \
+ '' &&
+#optional_depends plotlib '--with-libplot' \
+# '--without-libplot'\
+# 'plotting support' &&
+optional_depends gd '' '' '' &&
+optional_depends libpng '' '' 'PNG support'
diff --git a/doc/pstoedit/DETAILS b/doc/pstoedit/DETAILS
index 71a9e6e..0d4acc0 100755
--- a/doc/pstoedit/DETAILS
+++ b/doc/pstoedit/DETAILS
@@ -1,10 +1,10 @@
SPELL=pstoedit
- VERSION=3.40
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=3.45
+
SOURCE_HASH=sha512:9f2eaff530c94c6f79d4d1a7df8258e0af619197c4e0129b5b84918eaac77e5239c35ff0eb7fc34bccb2200ef484c4ab53f0dd94a5c7173a1124c6bbb5a8ba20
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.helga-glunz.homepage.t-online.de/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://www.pstoedit.net/pstoedit
-
SOURCE_HASH=sha512:c6f432bbf5b07ead65d71979469495ca6d6e8f205cddaf875a6b87dfa8431237b03ad885513429d7f5237b2697d11bb9e86d183ade720d0e41c6151a78fc58b0
LICENSE[0]=GPL
ENTERED=20030730
KEYWORDS="pdf postscript doc"
diff --git a/doc/pstoedit/HISTORY b/doc/pstoedit/HISTORY
index b479bc2..1db5153 100644
--- a/doc/pstoedit/HISTORY
+++ b/doc/pstoedit/HISTORY
@@ -1,3 +1,9 @@
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.41
+ new URL
+ * DEPENDS: add g++, gd, libpng, pkgconfig
+ imagemagick is optional
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/e/e-emotion/DEPENDS b/e/e-emotion/DEPENDS
index f920494..edbb5dd 100755
--- a/e/e-emotion/DEPENDS
+++ b/e/e-emotion/DEPENDS
@@ -1,6 +1,16 @@
depends edje &&
depends xine-lib &&

+optional_depends 'gst-ffmpeg' \
+ '' \
+ '--disable-gstreamer' \
+ 'for GStreamer backend support' &&
+
+optional_depends -sub 'LIBCDIO' 'gst-plugins-good' \
+ '' \
+ '' \
+ 'for CDDA support' &&
+
if [ "$EEMOTION_CVS" == "y" ]; then
depends CVS
fi
diff --git a/e/e-emotion/HISTORY b/e/e-emotion/HISTORY
index a83feef..b892b4a 100644
--- a/e/e-emotion/HISTORY
+++ b/e/e-emotion/HISTORY
@@ -1,3 +1,7 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on gst-ffmpeg for a backend
+ Optionally depends on gst-plugins-good (built with libcdio) for CDDA
+
2006-03-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: new SOURCE_URL, CVS is no longer hosted on SF

diff --git a/e/e_dbus/DEPENDS b/e/e_dbus/DEPENDS
index ede0678..73d9987 100755
--- a/e/e_dbus/DEPENDS
+++ b/e/e_dbus/DEPENDS
@@ -1 +1,2 @@
-depends dbus
+depends dbus &&
+depends ecore
diff --git a/e/e_dbus/HISTORY b/e/e_dbus/HISTORY
index 045f79d..3a43143 100644
--- a/e/e_dbus/HISTORY
+++ b/e/e_dbus/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ecore
+
2006-06-17 Philippe "Puppet_Master" Caseirol <puppetmaster AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD: Created

diff --git a/e/e_modules/DEPENDS b/e/e_modules/DEPENDS
index b59ab55..c598e98 100755
--- a/e/e_modules/DEPENDS
+++ b/e/e_modules/DEPENDS
@@ -23,11 +23,6 @@ optional_depends e_module-deskshow \
'' \
'to iconify/uniconify all E17 windows' &&

-optional_depends e_module-devian \
- '' \
- '' \
- 'for an E17 module to display images and RSS feeds' &&
-
optional_depends e_module-evolume \
'' \
'' \
diff --git a/e/e_modules/HISTORY b/e/e_modules/HISTORY
index 5edf40c..5dd385c 100644
--- a/e/e_modules/HISTORY
+++ b/e/e_modules/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: e_module-devian no longer exists
+
2006-11-16 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: e_module-eveil renamed to e_module-alarm

diff --git a/e/ecore/BUILD b/e/ecore/BUILD
new file mode 100755
index 0000000..24f8e65
--- /dev/null
+++ b/e/ecore/BUILD
@@ -0,0 +1,2 @@
+OPTS="${ECORE_DESKTOP} $OPTS" &&
+default_build
diff --git a/e/ecore/CONFIGURE b/e/ecore/CONFIGURE
new file mode 100755
index 0000000..ce994a2
--- /dev/null
+++ b/e/ecore/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option ECORE_DESKTOP "Build Ecore_Desktop module?" n \
+ "--enable-ecore-desktop" \
+ "--disable-ecore-desktop"
diff --git a/e/ecore/HISTORY b/e/ecore/HISTORY
index c67ec00..3226715 100644
--- a/e/ecore/HISTORY
+++ b/e/ecore/HISTORY
@@ -1,3 +1,6 @@
+2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFIGURE, BUILD: added possibility to build Ecore_Desktop module
+
2007-07-10 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Ecore now requires dbus (Bug #13871)

diff --git a/e/euphoria/DEPENDS b/e/euphoria/DEPENDS
index 00a4dd8..f377bcc 100755
--- a/e/euphoria/DEPENDS
+++ b/e/euphoria/DEPENDS
@@ -1,4 +1,4 @@
-depends CVS &&
+depends git &&
depends rake &&
depends ecore &&
depends edje &&
diff --git a/e/euphoria/DETAILS b/e/euphoria/DETAILS
index f4a13d0..ee1d7ab 100755
--- a/e/euphoria/DETAILS
+++ b/e/euphoria/DETAILS
@@ -6,7 +6,7 @@ else
fi
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/apps/$SPELL
+ SOURCE_URL[0]=git://code-monkey.de/euphoria.git:euphoria
FORCE_DOWNLOAD="on"
SOURCE_IGNORE=volatile
LICENSE[0]=BSD
diff --git a/e/euphoria/HISTORY b/e/euphoria/HISTORY
index 5e39064..d7d9c33 100644
--- a/e/euphoria/HISTORY
+++ b/e/euphoria/HISTORY
@@ -1,3 +1,7 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: new SOURCE_URL, cvs -> git
+ * DEPENDS: CVS -> git
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/editors/bless/DEPENDS b/editors/bless/DEPENDS
index f5b592c..f483172 100755
--- a/editors/bless/DEPENDS
+++ b/editors/bless/DEPENDS
@@ -1,6 +1,6 @@
depends gtk-sharp-2 &&
depends pkgconfig &&
-optional_depends "scrollkeeper" \
+optional_depends "rarian" \
"--with-scrollkeeper" \
"--without-scrollkeeper" \
"Register documentation with scrollkeeper?"
diff --git a/editors/bless/HISTORY b/editors/bless/HISTORY
index ed9b25a..a9bc3f1 100644
--- a/editors/bless/HISTORY
+++ b/editors/bless/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-06-06 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 0.5.1
* DEPENDS: now depends gtk-sharp-2 and optional_depends scrollkeeper
diff --git a/editors/ed/DETAILS b/editors/ed/DETAILS
index 7c22c49..278f172 100755
--- a/editors/ed/DETAILS
+++ b/editors/ed/DETAILS
@@ -1,5 +1,5 @@
SPELL=ed
- VERSION=0.7
+ VERSION=0.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/editors/ed/HISTORY b/editors/ed/HISTORY
index a82572f..a5b90d9 100644
--- a/editors/ed/HISTORY
+++ b/editors/ed/HISTORY
@@ -1,3 +1,6 @@
+2007-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8
+
2007-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7

diff --git a/editors/lyx/BUILD b/editors/lyx/BUILD
index 3e6c8fc..ecd6438 100755
--- a/editors/lyx/BUILD
+++ b/editors/lyx/BUILD
@@ -1,9 +1,11 @@
CFLAGS=${CFLAGS/-O3/-O2} &&
CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
if [ "${LYX_GUI}" == "xforms" ]
-then OPTS="${OPTS} --with-frontend=xforms"
-else OPTS="${OPTS} --with-frontend=qt \
- --with-qt-includes=/usr/include/qt \
- --with-qt-libraries=/usr/lib/qt"
+ then
+ OPTS="${OPTS} --with-frontend=xforms"
+ else
+ OPTS="${OPTS} --with-frontend=qt4 \
+ --with-qt-libraries=/usr/lib/qt4" &&
+ PATH=$QTDIR/bin/qt4:$PATH
fi
default_build
diff --git a/editors/lyx/DEPENDS b/editors/lyx/DEPENDS
index df7c7b5..3e53739 100755
--- a/editors/lyx/DEPENDS
+++ b/editors/lyx/DEPENDS
@@ -20,7 +20,7 @@ depends g++ &&
if [ "$LYX_GUI" = "xforms" ]; then
depends xforms
elif [ "$LYX_GUI" = "qt-x11" ]; then
- depends qt-x11
+ depends qt4
fi &&

optional_depends python \
diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index 1a87639..bdc37a4 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,5 +1,5 @@
SPELL=lyx
- VERSION=1.4.4
+ VERSION=1.5.1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/$SOURCE
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${SOURCE}
SOURCE_URL[3]=http://gd.tuwien.ac.at/publishing/tex/lyx/stable/${SOURCE}
SOURCE_URL[4]=ftp://ftp.lip6.fr/pub/lyx/stable/${SOURCE}
-
SOURCE_HASH=sha512:a261ab074a707c952abe3dfed7a89e448a73c7aa03fd37aa3e56c4de74dcf63d05b80006f2cd285ad1784ccca63dd01b2be0e7fa954a02622bd48f4a35f4a379
+
SOURCE_HASH=sha512:e701ed98fb0eb7c3189fe7de5a3d206aa6a241ba43bc0d1a968bc8f02403f4335551d30b191addfeb84fe89023806f5a6ecc1b567f7fd471fbf7badd5a1ef868
WEB_SITE=http://www.lyx.org/
LICENSE[0]=GPL
ENTERED=20020330
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index 5ca823a..82de9ba 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,8 @@
+2007-08-17 George Sherwood <george AT beernbeer.com>
+ * DETAILS: Updated to version 1.5.1
+ * BUILD: Updated to build correctly with qt4
+ * DEPENDS: removed depends qt-x11 and add depends qt4
+
2007-02-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 1.4.4

diff --git a/editors/pdfedit/DETAILS b/editors/pdfedit/DETAILS
index a33b976..92b6a98 100755
--- a/editors/pdfedit/DETAILS
+++ b/editors/pdfedit/DETAILS
@@ -1,7 +1,7 @@
SPELL=pdfedit
- VERSION=0.3.1
+ VERSION=0.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:6e632b4ccff24d831a6abed39e86acbe38bafecae75fdee6183d21da806a4dc4cd97faedd41245bc92ece0454481af1321ef7d867542e4da40174c494ce09e2b
+
SOURCE_HASH=sha512:b92aa79fdd6ca5a4b7c51dc324f7b87429483d20dff147a811ec75b2e55759d758292a3cc9ffe0b9f13b1676f3481768a0a359d12c6b0a948b8ed0c91a37c8d1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=GPL
diff --git a/editors/pdfedit/HISTORY b/editors/pdfedit/HISTORY
index 52247a0..8271e93 100644
--- a/editors/pdfedit/HISTORY
+++ b/editors/pdfedit/HISTORY
@@ -1,3 +1,7 @@
+2007-08-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.3.2
+ * PRE_BUILD: removed
+
2007-06-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: added so this bastard doesn't delete /dev/null [Bug
13827]

diff --git a/editors/pdfedit/PRE_BUILD b/editors/pdfedit/PRE_BUILD
deleted file mode 100755
index e5f1524..0000000
--- a/editors/pdfedit/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-
-sed -i '/doxygen -w/d' $SOURCE_DIRECTORY/doc/Makefile
diff --git a/editors/tea/DETAILS b/editors/tea/DETAILS
index 201d4cb..ece5a9b 100755
--- a/editors/tea/DETAILS
+++ b/editors/tea/DETAILS
@@ -1,9 +1,9 @@
SPELL=tea
- VERSION=17.1.4
+ VERSION=17.2.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=$SOURCEFORGE_URL/tea-editor/$SOURCE
-
SOURCE_HASH=sha512:91d6cde82a1f7a5905b2e565b84908b137bbb4d675f0ea4a42604f01e7238cda590fda000923c0631278cdcbcd4e670df0372ae49b658e7c029985d8a30f31b3
+
SOURCE_HASH=sha512:2db9cdb393735b84848816dee8b9f845688512653c8e27878d8aacbec4d9aa88e399b9bb0f9bcd8ad350beadb619e0717e10144931384899f198b4f0ad73362b
WEB_SITE=http://tea-editor.sourceforge.net/
ENTERED=20070302
LICENSE[0]=GPL
diff --git a/editors/tea/HISTORY b/editors/tea/HISTORY
index 23491c3..52e6edf 100644
--- a/editors/tea/HISTORY
+++ b/editors/tea/HISTORY
@@ -1,3 +1,12 @@
+2007-09-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.2.5
+
+2007-09-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 17.2.1
+
+2007-08-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated spell to 17.2.0
+
2007-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 17.1.4

diff --git a/editors/transfig/BUILD b/editors/transfig/BUILD
index 06e5432..901c93a 100755
--- a/editors/transfig/BUILD
+++ b/editors/transfig/BUILD
@@ -1,8 +1,5 @@
sed -i "s|/local||" fig2dev/Imakefile &&

- if [ "$DEVEL" == "n" ];then
- patch -p0 < $SCRIPT_DIRECTORY/transfig.patch
- fi &&
xmkmf &&
make Makefiles &&
make
diff --git a/editors/transfig/DETAILS b/editors/transfig/DETAILS
index 5f2b989..a4c3ec3 100755
--- a/editors/transfig/DETAILS
+++ b/editors/transfig/DETAILS
@@ -5,10 +5,10 @@ if [ "$DEVEL" == "y" ];then
SOURCE_URL[0]=ftp://epb.lbl.gov/xfig/alpha/${SOURCE}
MD5[0]=edbca0601bfd9fef520cfa751e39a5e4
else
- VERSION=3.2.4
+ VERSION=3.2.5
SOURCE=${SPELL}.${VERSION}.tar.gz
SOURCE_URL[0]=ftp://www-epb.lbl.gov/xfig/${SOURCE}
-
SOURCE_HASH=sha512:fc89f7dc96207cb184b4d7f38fabfae1ee21c9179987b28e3cf2274aa8b7eb3cc23485d0de7415ddb242a8ec963037b20f4ce121fac1b08db4f0be0291056f1f
+
SOURCE_HASH=sha512:78577b094a985ae46238435153de02772783988ec7a96661388d1f066fac100623aba3120428cad57cc0126185433e28d3c85e1b6c3055579c94fcb2a01f5f8a
fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}.${VERSION}
WEB_SITE=http://epb.lbl.gov/xfig/
diff --git a/editors/transfig/HISTORY b/editors/transfig/HISTORY
old mode 100755
new mode 100644
index 05f20b7..641cb1f
--- a/editors/transfig/HISTORY
+++ b/editors/transfig/HISTORY
@@ -1,3 +1,7 @@
+2007-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD: updated to 3.2.5
+ * transfig.patch: removed
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.

diff --git a/editors/transfig/transfig.patch b/editors/transfig/transfig.patch
deleted file mode 100644
index d5ef946..0000000
--- a/editors/transfig/transfig.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- fig2dev/fig2dev.h~ 2002-12-18 15:45:28.000000000 -0700
-+++ fig2dev/fig2dev.h 2003-07-15 16:33:42.000000000 -0600
-@@ -22,7 +22,7 @@
- #include <sys/file.h>
- #include <signal.h>
- #include <string.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <pwd.h>
- #include <errno.h>
- #include <time.h>
---- fig2dev/dev/gensvg.c~ 2003-07-15 16:49:40.000000000 -0600
-+++ fig2dev/dev/gensvg.c 2003-07-15 16:51:17.000000000 -0600
-@@ -692,7 +692,7 @@
- if (t->angle != 0) {
- fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
- (int) (t->base_x * mag), (int) (t->base_y * mag), degrees
(t->angle));
-- fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"
font-family=\"%s\"
-+ fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"
font-family=\"%s\" \
- font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
- rgbColorVal (t->color), family[(int) ceil ((t->font + 1) /
4)],
- (t->font % 2 == 0 ? "normal" : "italic"),
-@@ -700,7 +700,7 @@
- anchor[t->type]);
- }
- else
-- fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\"
-+ fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\" \
- font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
- (int) (t->base_x * mag), (int) (t->base_y * mag),
rgbColorVal (t->color),
- family[(int) ceil ((t->font + 1) / 4)],
diff --git a/editors/xfig/DETAILS b/editors/xfig/DETAILS
index c417ff6..902eb26 100755
--- a/editors/xfig/DETAILS
+++ b/editors/xfig/DETAILS
@@ -1,10 +1,10 @@
SPELL=xfig
- VERSION=3.2.4
+ VERSION=3.2.5
GCC_VERSION=3.4
SOURCE=${SPELL}.${VERSION}.full.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}.${VERSION}
SOURCE_URL[0]=ftp://www-epb.lbl.gov/xfig/${SOURCE}
-
SOURCE_HASH=sha512:8b0101832e7a790edf0bdeafceea4f6a8d9769a0816ba1268e770a32a00be8385b2529c98e07ce9c8a8bc314057873c28621e2af201a30b8a0946c444f681bea
+
SOURCE_HASH=sha512:366fbd608ea96dee431279c58abb5653921092e5359ee204fd97a4fe70719ede3f20a14a5bb04c40dd9203d45d457c98e50e9da7c65d968aa09cf97817f445a9
WEB_SITE=http://www.xfig.org
ENTERED=20020210
UPDATED=20050420
diff --git a/editors/xfig/HISTORY b/editors/xfig/HISTORY
index 8dde469..41767f1 100755
--- a/editors/xfig/HISTORY
+++ b/editors/xfig/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 3.2.5
+
2007-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: removed invoke_gcc #10641

diff --git a/fonts/dejavu-ttf/DETAILS b/fonts/dejavu-ttf/DETAILS
index 30be0a4..78f4924 100755
--- a/fonts/dejavu-ttf/DETAILS
+++ b/fonts/dejavu-ttf/DETAILS
@@ -1,7 +1,7 @@
SPELL=dejavu-ttf
PACKAGE=${SPELL%-*}
- VERSION=2.19
-
SOURCE_HASH=sha512:43aa7ff484507cadc9763d3c60a065ce303c74fd6fab472649e33fe7800613d88fd03ed69a3da0f63cd8d0ce2617fd619f67e82c0893e48b1bcdcdb05130a41d
+ VERSION=2.20
+
SOURCE_HASH=sha512:cfef541811c17cd719f29b8a3a70bfad3350860e686eb2b60150afa473381c5d34564fc06838ab0b05044f14778d480eae83ecf9050a18b63fadf0d53313fdd2
SOURCE="$SPELL-$VERSION.tar.bz2"
DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
SOURCE_URL[0]="$SOURCEFORGE_URL/$PACKAGE/$SOURCE"
diff --git a/fonts/dejavu-ttf/HISTORY b/fonts/dejavu-ttf/HISTORY
index fbd90a7..20be136 100644
--- a/fonts/dejavu-ttf/HISTORY
+++ b/fonts/dejavu-ttf/HISTORY
@@ -1,3 +1,6 @@
+2007-09-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.20
+
2007-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.19

diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index 41c90f9..b106d18 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtorrent
- VERSION=0.11.6
+ VERSION=0.11.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20050117
LICENSE[0]=GPL
BUILD_API=2
-
SOURCE_HASH=sha512:6701e3287189c57f2a780ee8631bee53e1e2a5614eaa1b1a5f09ca6220c7d504534fc55425f8ce399412c331af413a4d6ffd58b0818bf785b28186574235ff18
+
SOURCE_HASH=sha512:0d01b63b423802c66f4f91d37350bddead345054893e646ac04db532de44e798b77ff961a861e87354fe055bc2920f882d68ab9e5ab52d5ad61b0b369e1f5d90
KEYWORDS="bittorrent ftp libs"
SHORT='LibTorrent is a BitTorrent library written in C++ for
*nix.'
cat << EOF
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index 236a068..d578a9d 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,9 @@
+2007-09-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 0.11.8
+
+2007-08-16 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 0.11.7
+
2007-08-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.11.6

diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index 2c080d4..648b436 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
SPELL=aria2
- VERSION=0.11.2
-
SOURCE_HASH=sha512:8ecdc2e2604ce9b47ff5b0c11e9c9cee934d037d4ba1e3a8f5a651974380a07b9f0f70ad3f08de5a5dd80c478b49f08c4cca13b3e0f3700626482122f2c14c6d
+ VERSION=0.11.3
+
SOURCE_HASH=sha512:80b78b06b38e961880c3274f16116acb1ac0c4e0f497b47332a1e48e2413747a5520f95817cb75faa40df78f24151157160f7d7fbc9a17780232416d0040d47d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 3f0baa1..1826188 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.11.3
+
2007-08-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.11.2

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 682ed83..8b0c97c 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,12 +1,12 @@
SPELL=curl
- VERSION=7.16.4
+ VERSION=7.17.0
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://curl.haxx.se/download/$SOURCE
SOURCE_URL[1]=ftp://ftp.sunet.se/pub/www/utilities/$SPELL/$SOURCE
SOURCE_URL[2]=ftp://ftp.rge.com/pub/networking/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:1a9398462388689c10a935f4b642bb523cdb5597b0bc6144f132a8283355b64659079ad25ffea9e946b7149f8512abd2aee4f65b35d70e53e458d3d824915e6f
+
SOURCE_HASH=sha512:969faaa05d583f8b97bd32690f3e062daa140d4284fccd15417e5271373b3edfd394347610f44d7f02d85df0c86e989af99d4c7e7ffd07c1ee9e8e857ed30ee4
WEB_SITE=http://curl.haxx.se/
ENTERED=20010922
LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 4cc45b5..5cb2ea4 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2007-09-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.17.0
+
2007-07-11 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: SECURITY_PATCH++

diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 11d1b7d..9d74502 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=3.5.12
+ VERSION=3.5.14
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 f80d81b..1942873 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,9 @@
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.5.14
+
+2007-08-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated spell to 3.5.13
+
2007-07-28 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 3.5.12

diff --git a/ftp/ncftp/DETAILS b/ftp/ncftp/DETAILS
index 753de63..c77cb6d 100755
--- a/ftp/ncftp/DETAILS
+++ b/ftp/ncftp/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
-
SOURCE_HASH=sha512:bd21ce53bc226d0557d3a0103fe833d9f69a0bd5722ef8b7d3c5083a702ee21304eb73b88a1d8be9c03fbb2df967fe3738a56d8dc805e5ee7b759904c6c2b57a
+
SOURCE_HASH=sha512:4f5c391e2d3d9410b42061d2d70b8c931e2c730a2806570b6b1b37c5bf44d970b378b98036b5b8839ec7db5141e2671513ad3fa53df7320b8b1d2b5c03f89c57
WEB_SITE=http://www.ncftp.com/
ENTERED=20010922
LICENSE[0]=UNKNOWN
diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index 4a96740..5c69538 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,7 @@
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: Fixed SOURCE_HASH
+ Verified source by comparing with an older release
+
2007-08-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.1

diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index a3f541d..ca8c4ab 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -1,5 +1,5 @@
SPELL=rtorrent
- VERSION=0.7.6
+ VERSION=0.7.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
UPDATED=20050214
LICENSE[0]=GPL
BUILD_API=2
-
SOURCE_HASH=sha512:e2f40138b6cebb67bcbd274b8493ffcb6c969a628b445c0181a7eba8fba4c6ca3eec2a7e593e62b551213c75f5a5f7db989785886bed3855f05d5fb3834615f9
+
SOURCE_HASH=sha512:7c0a7238c1051735b898131c99e385f80de40b71f769b749ef9222561d5c69ad8588fb5c9fb7f487617587b65e5e630ae72ff44d539bca46a026d6aac1731bd9
KEYWORDS="bittorrent ftp"
SHORT='Rtorrent is a bittorrent client using libTorrent.'
cat << EOF
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index 0d9861f..5004d00 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,9 @@
+2007-09-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: version update to 0.7.8
+
+2007-08-16 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: version update to 0.7.7
+
2007-08-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: version update to 0.7.6

diff --git a/gnome1-libs/gdm/DEPENDS b/gnome1-libs/gdm/DEPENDS
index b5fa87c..05942a1 100755
--- a/gnome1-libs/gdm/DEPENDS
+++ b/gnome1-libs/gdm/DEPENDS
@@ -1,7 +1,7 @@
-depends perl &&
-depends libglade &&
-depends gnome-libs &&
-depends gdk-pixbuf &&
-depends scrollkeeper &&
+depends perl &&
+depends libglade &&
+depends gnome-libs &&
+depends gdk-pixbuf &&
+depends rarian &&
optional_depends "linux-pam" "" "" "for PAM authentication" &&
optional_depends "shadow" "" "" "To use shadow passwords"
diff --git a/gnome1-libs/gdm/HISTORY b/gnome1-libs/gdm/HISTORY
index 6a27a3e..55d0ac9 100644
--- a/gnome1-libs/gdm/HISTORY
+++ b/gnome1-libs/gdm/HISTORY
@@ -1,4 +1,7 @@
-20074-03-18 Robin Cook <rcook AT wyrms.net>
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-03-18 Robin Cook <rcook AT wyrms.net>
* BUILD: use sorcery function to create account (BUG 13629)

2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
diff --git a/gnome1-libs/gnome-core/DEPENDS b/gnome1-libs/gnome-core/DEPENDS
index 5b0d303..973523e 100755
--- a/gnome1-libs/gnome-core/DEPENDS
+++ b/gnome1-libs/gnome-core/DEPENDS
@@ -3,4 +3,4 @@ depends gnome-libs &&
depends control-center &&
depends libglade &&
depends gtk-engines &&
-depends scrollkeeper
+depends rarian
diff --git a/gnome1-libs/gnome-core/HISTORY b/gnome1-libs/gnome-core/HISTORY
index 5b9a19b..d451a64 100644
--- a/gnome1-libs/gnome-core/HISTORY
+++ b/gnome1-libs/gnome-core/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.

diff --git a/gnome1-libs/gnome-media/DEPENDS b/gnome1-libs/gnome-media/DEPENDS
index 73925e8..80e8a30 100755
--- a/gnome1-libs/gnome-media/DEPENDS
+++ b/gnome1-libs/gnome-media/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-libs &&
-depends scrollkeeper
+depends gnome-libs &&
+depends rarian
diff --git a/gnome1-libs/gnome-media/HISTORY b/gnome1-libs/gnome-media/HISTORY
index 6a36633..484bad4 100644
--- a/gnome1-libs/gnome-media/HISTORY
+++ b/gnome1-libs/gnome-media/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/gnome1-libs/gnome-user-docs/DEPENDS
b/gnome1-libs/gnome-user-docs/DEPENDS
index 51cb381..fc72265 100755
--- a/gnome1-libs/gnome-user-docs/DEPENDS
+++ b/gnome1-libs/gnome-user-docs/DEPENDS
@@ -1 +1 @@
-depends scrollkeeper
+depends rarian
diff --git a/gnome1-libs/gnome-user-docs/HISTORY
b/gnome1-libs/gnome-user-docs/HISTORY
index 2d22cc6..f55ea2f 100644
--- a/gnome1-libs/gnome-user-docs/HISTORY
+++ b/gnome1-libs/gnome-user-docs/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/gnome1-libs/libgda/DEPENDS b/gnome1-libs/libgda/DEPENDS
index 3c82bc8..e308029 100755
--- a/gnome1-libs/libgda/DEPENDS
+++ b/gnome1-libs/libgda/DEPENDS
@@ -1,9 +1,9 @@
-depends gtk+ &&
-depends orbit &&
-depends gconf &&
-depends bonobo &&
-depends gdbm &&
-depends scrollkeeper &&
+depends gtk+ &&
+depends orbit &&
+depends gconf &&
+depends bonobo &&
+depends gdbm &&
+depends rarian &&

optional_depends libxslt \
"" \
diff --git a/gnome1-libs/libgda/HISTORY b/gnome1-libs/libgda/HISTORY
index 9551476..7e6d114 100644
--- a/gnome1-libs/libgda/HISTORY
+++ b/gnome1-libs/libgda/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-10-09 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added

diff --git a/gnome1-libs/nautilus/DEPENDS b/gnome1-libs/nautilus/DEPENDS
index aa8179e..fe83f49 100755
--- a/gnome1-libs/nautilus/DEPENDS
+++ b/gnome1-libs/nautilus/DEPENDS
@@ -4,4 +4,4 @@ depends gnome-vfs &&
depends bonobo &&
depends eel &&
depends libghttp &&
-depends scrollkeeper
+depends rarian
diff --git a/gnome1-libs/nautilus/HISTORY b/gnome1-libs/nautilus/HISTORY
index 6ba0fb0..4cc3a6f 100644
--- a/gnome1-libs/nautilus/HISTORY
+++ b/gnome1-libs/nautilus/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 3b737db..fcf8e2f 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,6 +1,6 @@
SPELL=abiword
if [ "$DEVEL" == "y" ] ;then
- VERSION=2.5.1
+ VERSION=2.5.2
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/abiword/$VERSION/source/$SOURCE
else
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 9f39594..c7be95e 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated devel version to 2.5.2
+
2007-02-25 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel version to 2.5.1
* BUILD: Added conditional for non-devel version
diff --git a/gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig
deleted file mode 100644
index 527b6bc..0000000
Binary files a/gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/abiword/abiword-2.5.2.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.5.2.tar.gz.sig
new file mode 100644
index 0000000..0c780d8
Binary files /dev/null and b/gnome2-apps/abiword/abiword-2.5.2.tar.gz.sig
differ
diff --git a/gnome2-apps/accerciser/BUILD b/gnome2-apps/accerciser/BUILD
new file mode 100755
index 0000000..811c8e6
--- /dev/null
+++ b/gnome2-apps/accerciser/BUILD
@@ -0,0 +1,3 @@
+OPTS="--without-pyreqs ${OPTS}" &&
+
+default_build
diff --git a/gnome2-apps/accerciser/DEPENDS b/gnome2-apps/accerciser/DEPENDS
new file mode 100755
index 0000000..d1c0ed1
--- /dev/null
+++ b/gnome2-apps/accerciser/DEPENDS
@@ -0,0 +1,5 @@
+depends python &&
+depends pygtk2 &&
+depends pyorbit &&
+depends rarian &&
+depends at-spi
diff --git a/gnome2-apps/accerciser/DETAILS b/gnome2-apps/accerciser/DETAILS
new file mode 100755
index 0000000..6e07c54
--- /dev/null
+++ b/gnome2-apps/accerciser/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=accerciser
+ VERSION=1.0.0
+ BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://gnome.org/
+ ENTERED=20070922
+ KEYWORDS="gnome2"
+ SHORT="Interactive accessibility explorer"
+cat << EOF
+Accerciser is an interactive Python accessibility explorer for the GNOME
+desktop. It uses AT-SPI to inspect and control widgets, allowing you to
check if
+an application is providing correct information to assistive technologies
and
+automated test frameworks. Accerciser has a simple plugin framework which
+you can use to create custom views of accessibility information.
+EOF
diff --git a/gnome2-apps/accerciser/HISTORY b/gnome2-apps/accerciser/HISTORY
new file mode 100644
index 0000000..6d1030e
--- /dev/null
+++ b/gnome2-apps/accerciser/HISTORY
@@ -0,0 +1,2 @@
+2007-02-28 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, BUILD, HISTORY
diff --git a/gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig
b/gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..7177383
Binary files /dev/null and
b/gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig differ
diff --git a/gnome2-apps/balsa/DEPENDS b/gnome2-apps/balsa/DEPENDS
index b5c6bfa..ca5f937 100755
--- a/gnome2-apps/balsa/DEPENDS
+++ b/gnome2-apps/balsa/DEPENDS
@@ -2,7 +2,7 @@ depends gmime
&&
depends libgnomeprintui &&
depends libesmtp &&
depends aspell &&
-depends scrollkeeper &&
+depends rarian &&

optional_depends "libgtkhtml" \
"" \
diff --git a/gnome2-apps/balsa/HISTORY b/gnome2-apps/balsa/HISTORY
index 855a4c2..9bd2939 100644
--- a/gnome2-apps/balsa/HISTORY
+++ b/gnome2-apps/balsa/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: renamed from balsa2 to balsa
* CONFLICTS: conflict to balsa2 instead of balsa
diff --git a/gnome2-apps/deskbar-applet/DETAILS
b/gnome2-apps/deskbar-applet/DETAILS
index 6bd5fd3..6e37f83 100755
--- a/gnome2-apps/deskbar-applet/DETAILS
+++ b/gnome2-apps/deskbar-applet/DETAILS
@@ -1,5 +1,5 @@
SPELL=deskbar-applet
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-apps/deskbar-applet/HISTORY
b/gnome2-apps/deskbar-applet/HISTORY
index 026717f..6b618f0 100644
--- a/gnome2-apps/deskbar-applet/HISTORY
+++ b/gnome2-apps/deskbar-applet/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: changed evolution2 to evolution, galeon2 to galeon

diff --git a/gnome2-apps/deskbar-applet/deskbar-applet-2.18.1.tar.bz2.sig
b/gnome2-apps/deskbar-applet/deskbar-applet-2.18.1.tar.bz2.sig
deleted file mode 100644
index 5c7b953..0000000
Binary files a/gnome2-apps/deskbar-applet/deskbar-applet-2.18.1.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig
b/gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..72541d2
Binary files /dev/null and
b/gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-apps/eog2/DEPENDS b/gnome2-apps/eog2/DEPENDS
index 7d9a953..1435d87 100755
--- a/gnome2-apps/eog2/DEPENDS
+++ b/gnome2-apps/eog2/DEPENDS
@@ -2,7 +2,7 @@ depends lcms &&
depends libgnomeui &&
depends librsvg2 &&
depends libgnomeprintui &&
-depends scrollkeeper &&
+depends rarian &&

optional_depends libexif \
"--with-libexif" \
diff --git a/gnome2-apps/eog2/DETAILS b/gnome2-apps/eog2/DETAILS
index 15f820c..8520939 100755
--- a/gnome2-apps/eog2/DETAILS
+++ b/gnome2-apps/eog2/DETAILS
@@ -1,5 +1,5 @@
SPELL=eog2
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=eog-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/eog-$VERSION
diff --git a/gnome2-apps/eog2/HISTORY b/gnome2-apps/eog2/HISTORY
index 7077a32..24f79ac 100644
--- a/gnome2-apps/eog2/HISTORY
+++ b/gnome2-apps/eog2/HISTORY
@@ -1,3 +1,7 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/gnome2-apps/eog2/eog-2.18.2.tar.bz2.sig
b/gnome2-apps/eog2/eog-2.18.2.tar.bz2.sig
deleted file mode 100644
index 010b96e..0000000
Binary files a/gnome2-apps/eog2/eog-2.18.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig
b/gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..398243f
Binary files /dev/null and b/gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-apps/epiphany-extensions/DETAILS
b/gnome2-apps/epiphany-extensions/DETAILS
index 5f6fac5..c1a636d 100755
--- a/gnome2-apps/epiphany-extensions/DETAILS
+++ b/gnome2-apps/epiphany-extensions/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany-extensions
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany-extensions/HISTORY
b/gnome2-apps/epiphany-extensions/HISTORY
index 6d8454f..e342957 100644
--- a/gnome2-apps/epiphany-extensions/HISTORY
+++ b/gnome2-apps/epiphany-extensions/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-07-01 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig
deleted file mode 100644
index e4d65eb..0000000
Binary files
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..19d285b
Binary files /dev/null and
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index e40786b..0d64e70 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index c6adeaa..a71dec7 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-08-16 Thomas Orgis <sobukus AT sourcemage.org>
* SUB_DEPENDS: fix the subdep to gnome-python2

diff --git a/gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig
deleted file mode 100644
index e6b208c..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..73e82fc
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index ac50c1e..3ce2446 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -1,10 +1,11 @@
-depends psmisc &&
-depends libsoup &&
-depends gal2 &&
-depends gtkhtml2 &&
-depends gnome-spell &&
-depends scrollkeeper &&
-depends libgnomeprintui &&
+depends psmisc &&
+depends libsoup &&
+depends -sub python libxml2 &&
+depends gal2 &&
+depends gtkhtml2 &&
+depends gnome-spell &&
+depends rarian &&
+depends libgnomeprintui &&
depends evolution-data-server &&

optional_depends "gnupg" \
diff --git a/gnome2-apps/evolution/DETAILS b/gnome2-apps/evolution/DETAILS
index 487e11c..eb520f6 100755
--- a/gnome2-apps/evolution/DETAILS
+++ b/gnome2-apps/evolution/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution
- VERSION=2.10.3
+ VERSION=2.12.0
BRANCH=${VERSION:0:4}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 5dfdbbd..58228d1 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,12 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libxml2 built with python support, otherwise
+ you receive this error when compiling:
+ ImportError: No module named libxml2
+
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.0
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.3

diff --git a/gnome2-apps/evolution/evolution-2.10.3.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.10.3.tar.bz2.sig
deleted file mode 100644
index 9798cc1..0000000
Binary files a/gnome2-apps/evolution/evolution-2.10.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig
new file mode 100644
index 0000000..dca7216
Binary files /dev/null and
b/gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig differ
diff --git a/gnome2-apps/file-roller/DEPENDS b/gnome2-apps/file-roller/DEPENDS
index fa8014c..9ec8458 100755
--- a/gnome2-apps/file-roller/DEPENDS
+++ b/gnome2-apps/file-roller/DEPENDS
@@ -1,4 +1,4 @@
depends libgnomeui &&
-depends scrollkeeper &&
+depends rarian &&
depends nautilus2

diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS
index 51b86c8..de02e5e 100755
--- a/gnome2-apps/file-roller/DETAILS
+++ b/gnome2-apps/file-roller/DETAILS
@@ -1,5 +1,5 @@
SPELL=file-roller
- VERSION=2.18.4
+ VERSION=2.20.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index 7c7d01a..306d8e6 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,7 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-07-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: fix fat finger in SOURCE_DIRECTORY

diff --git a/gnome2-apps/file-roller/file-roller-2.18.4.tar.gz.sig
b/gnome2-apps/file-roller/file-roller-2.18.4.tar.gz.sig
deleted file mode 100644
index eb3aaae..0000000
Binary files a/gnome2-apps/file-roller/file-roller-2.18.4.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig
b/gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig
new file mode 100644
index 0000000..3e5b17a
Binary files /dev/null and
b/gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig differ
diff --git a/gnome2-apps/gazpacho/DETAILS b/gnome2-apps/gazpacho/DETAILS
index a12bac6..73f09ef 100755
--- a/gnome2-apps/gazpacho/DETAILS
+++ b/gnome2-apps/gazpacho/DETAILS
@@ -1,9 +1,9 @@
SPELL=gazpacho
- VERSION=0.7.1
+ VERSION=0.7.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:22212597a56bdcfbccd1ef99c59398ae45a39f2ad411d61d83948918689da445685188614de669d5c4c7f7e1c3713f5cdf23608fc26c451bff55d8bde86dde96
+
SOURCE_HASH=sha512:112e66f04cc06a87218f659874677144a2a38525e4086a1d1089f3f4470d9525f703fe153301686543609200ea8301f0f7e0da851105857a9231948991f31b47
WEB_SITE=http://gazpacho.sicem.biz/
ENTERED=20070113
LICENSE[0]=LGPL
diff --git a/gnome2-apps/gazpacho/HISTORY b/gnome2-apps/gazpacho/HISTORY
index 1dc742f..aa63e7a 100644
--- a/gnome2-apps/gazpacho/HISTORY
+++ b/gnome2-apps/gazpacho/HISTORY
@@ -1,3 +1,6 @@
+2007-09-08 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.7.2
+
2007-04-21 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: Updated to 0.7.1

diff --git a/gnome2-apps/gcalctool/DEPENDS b/gnome2-apps/gcalctool/DEPENDS
index 60e3e19..a59cad2 100755
--- a/gnome2-apps/gcalctool/DEPENDS
+++ b/gnome2-apps/gcalctool/DEPENDS
@@ -1,2 +1,2 @@
depends libgnomeui &&
-depends scrollkeeper
+depends rarian
diff --git a/gnome2-apps/gcalctool/DETAILS b/gnome2-apps/gcalctool/DETAILS
index cb367ef..8be843f 100755
--- a/gnome2-apps/gcalctool/DETAILS
+++ b/gnome2-apps/gcalctool/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcalctool
- VERSION=5.9.14
+ VERSION=5.20.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gcalctool/HISTORY b/gnome2-apps/gcalctool/HISTORY
index 0615972..b128d3b 100644
--- a/gnome2-apps/gcalctool/HISTORY
+++ b/gnome2-apps/gcalctool/HISTORY
@@ -1,3 +1,7 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 5.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 5.9.14

diff --git a/gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig
b/gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig
new file mode 100644
index 0000000..02ef148
Binary files /dev/null and
b/gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig differ
diff --git a/gnome2-apps/gcalctool/gcalctool-5.9.14.tar.gz.sig
b/gnome2-apps/gcalctool/gcalctool-5.9.14.tar.gz.sig
deleted file mode 100644
index 9dbdd24..0000000
Binary files a/gnome2-apps/gcalctool/gcalctool-5.9.14.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-apps/gedit-plugins/DEPENDS
b/gnome2-apps/gedit-plugins/DEPENDS
index 1d9bad3..7121d0b 100755
--- a/gnome2-apps/gedit-plugins/DEPENDS
+++ b/gnome2-apps/gedit-plugins/DEPENDS
@@ -1,5 +1,5 @@
depends gedit &&
-depends scrollkeeper &&
+depends rarian &&

optional_depends python \
"--enable-python" \
diff --git a/gnome2-apps/gedit-plugins/HISTORY
b/gnome2-apps/gedit-plugins/HISTORY
index 62947fe..1927f73 100644
--- a/gnome2-apps/gedit-plugins/HISTORY
+++ b/gnome2-apps/gedit-plugins/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: changed gedit2 to gedit

diff --git a/gnome2-apps/gedit/DEPENDS b/gnome2-apps/gedit/DEPENDS
index f63d09b..01f8769 100755
--- a/gnome2-apps/gedit/DEPENDS
+++ b/gnome2-apps/gedit/DEPENDS
@@ -19,7 +19,7 @@ optional_depends python \
"--disable-python" \
"to enable python support" &&

-optional_depends scrollkeeper \
+optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
"to make updates to the scrollkeeper database" &&
@@ -37,5 +37,6 @@ source "$GRIMOIRE/is_depends_enabled.function" &&
if is_depends_enabled $SPELL python; then
depends gnome-python-desktop &&
depends pygobject &&
- depends pygtk2
+ depends pygtk2 &&
+ depends pygtksourceview
fi
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index 558f9d5..195e512 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,5 +1,5 @@
SPELL=gedit
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 78afd4e..632fb30 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,13 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: change scrollkeeper to rarian
+
+2007-09-16 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Added pygtksourceview as depends if python is selected
+
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 2.19.92 along with rest of gnome
+
2007-07-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/gnome2-apps/gedit/gedit-2.18.2.tar.bz2.sig
b/gnome2-apps/gedit/gedit-2.18.2.tar.bz2.sig
deleted file mode 100644
index 5e600f9..0000000
Binary files a/gnome2-apps/gedit/gedit-2.18.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gedit/gedit-2.20.0.tar.bz2.sig
b/gnome2-apps/gedit/gedit-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..f580e42
Binary files /dev/null and b/gnome2-apps/gedit/gedit-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-apps/ggv/DEPENDS b/gnome2-apps/ggv/DEPENDS
index 0acc622..972cabc 100755
--- a/gnome2-apps/ggv/DEPENDS
+++ b/gnome2-apps/ggv/DEPENDS
@@ -1,4 +1,4 @@
depends POSTSCRIPT-INTERPRETER &&
depends libgnomeprintui &&
depends libgnomeui &&
-depends scrollkeeper
+depends rarian
diff --git a/gnome2-apps/ggv/HISTORY b/gnome2-apps/ggv/HISTORY
index ef3f94d..f6df72b 100644
--- a/gnome2-apps/ggv/HISTORY
+++ b/gnome2-apps/ggv/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: renamed from ggv2 to ggv
* CONFLICTS: conflict to ggv2 instead of ggv
diff --git a/gnome2-apps/glabels2/DEPENDS b/gnome2-apps/glabels2/DEPENDS
index f946ee1..0d51d61 100755
--- a/gnome2-apps/glabels2/DEPENDS
+++ b/gnome2-apps/glabels2/DEPENDS
@@ -9,5 +9,4 @@ depends libgnome &&
depends libbonobo &&
depends libbonoboui &&
depends libglade2 &&
-depends scrollkeeper
-
+depends rarian
diff --git a/gnome2-apps/glabels2/HISTORY b/gnome2-apps/glabels2/HISTORY
index 152d683..803fdd8 100644
--- a/gnome2-apps/glabels2/HISTORY
+++ b/gnome2-apps/glabels2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-07-06 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: libglade -> libglade2

diff --git a/gnome2-apps/glade2/DEPENDS b/gnome2-apps/glade2/DEPENDS
index ba69ad2..163cbb4 100755
--- a/gnome2-apps/glade2/DEPENDS
+++ b/gnome2-apps/glade2/DEPENDS
@@ -1,8 +1,8 @@
-depends libxml2 &&
-depends gtk+2 &&
-depends atk &&
-depends pango &&
-depends scrollkeeper &&
+depends libxml2 &&
+depends gtk+2 &&
+depends atk &&
+depends pango &&
+depends rarian &&

optional_depends libgnomeprintui \
'' \
diff --git a/gnome2-apps/glade2/HISTORY b/gnome2-apps/glade2/HISTORY
index 579f69a..6068b21 100644
--- a/gnome2-apps/glade2/HISTORY
+++ b/gnome2-apps/glade2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/gnome2-apps/glade3/DETAILS b/gnome2-apps/glade3/DETAILS
index f10f970..bb507ed 100755
--- a/gnome2-apps/glade3/DETAILS
+++ b/gnome2-apps/glade3/DETAILS
@@ -1,5 +1,5 @@
SPELL=glade3
- VERSION=3.2.2
+ VERSION=3.4.0
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
diff --git a/gnome2-apps/glade3/HISTORY b/gnome2-apps/glade3/HISTORY
index e76ddb7..a6b3fd1 100644
--- a/gnome2-apps/glade3/HISTORY
+++ b/gnome2-apps/glade3/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.4.0
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 3.2.2

diff --git a/gnome2-apps/glade3/glade3-3.2.2.tar.bz2.sig
b/gnome2-apps/glade3/glade3-3.2.2.tar.bz2.sig
deleted file mode 100644
index ae085aa..0000000
Binary files a/gnome2-apps/glade3/glade3-3.2.2.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/glade3/glade3-3.4.0.tar.bz2.sig
b/gnome2-apps/glade3/glade3-3.4.0.tar.bz2.sig
new file mode 100644
index 0000000..10dc3da
Binary files /dev/null and b/gnome2-apps/glade3/glade3-3.4.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/gnome-build/DETAILS b/gnome2-apps/gnome-build/DETAILS
index 2eac410..1e4fb65 100755
--- a/gnome2-apps/gnome-build/DETAILS
+++ b/gnome2-apps/gnome-build/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-build
- VERSION=0.1.7
+ VERSION=0.2.0
BRANCH=$(echo ${VERSION} | cut -d. -f1,2)
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/gnome-build/HISTORY b/gnome2-apps/gnome-build/HISTORY
index b16044d..7f158cf 100644
--- a/gnome2-apps/gnome-build/HISTORY
+++ b/gnome2-apps/gnome-build/HISTORY
@@ -1,3 +1,6 @@
+2007-09-07 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.2.0
+
2007-06-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.1.7

diff --git a/gnome2-apps/gnome-build/gnome-build-0.1.7.tar.bz2.sig
b/gnome2-apps/gnome-build/gnome-build-0.1.7.tar.bz2.sig
deleted file mode 100644
index 791c0ec..0000000
Binary files a/gnome2-apps/gnome-build/gnome-build-0.1.7.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/gnome-build/gnome-build-0.2.0.tar.bz2.sig
b/gnome2-apps/gnome-build/gnome-build-0.2.0.tar.bz2.sig
new file mode 100644
index 0000000..a9e5b1d
Binary files /dev/null and
b/gnome2-apps/gnome-build/gnome-build-0.2.0.tar.bz2.sig differ
diff --git a/gnome2-apps/gnome-keyring-manager/DETAILS
b/gnome2-apps/gnome-keyring-manager/DETAILS
index 169ba65..7d312a0 100755
--- a/gnome2-apps/gnome-keyring-manager/DETAILS
+++ b/gnome2-apps/gnome-keyring-manager/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-keyring-manager
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gnome-keyring-manager/HISTORY
b/gnome2-apps/gnome-keyring-manager/HISTORY
index 435e15c..1316e41 100644
--- a/gnome2-apps/gnome-keyring-manager/HISTORY
+++ b/gnome2-apps/gnome-keyring-manager/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-03-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git
a/gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.18.0.tar.bz2.sig
b/gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.18.0.tar.bz2.sig
deleted file mode 100644
index d0bb6cf..0000000
Binary files
a/gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.18.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.20.0.tar.bz2.sig
b/gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..0ccf3a2
Binary files /dev/null and
b/gnome2-apps/gnome-keyring-manager/gnome-keyring-manager-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/gnome-power-manager/DETAILS
b/gnome2-apps/gnome-power-manager/DETAILS
index 270a2ea..f1687d8 100755
--- a/gnome2-apps/gnome-power-manager/DETAILS
+++ b/gnome2-apps/gnome-power-manager/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-power-manager
- VERSION=2.18.3
+ VERSION=2.20.0
SOURCE=${SPELL}-${VERSION}.tar.gz
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE_URL[0]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-apps/gnome-power-manager/HISTORY
b/gnome2-apps/gnome-power-manager/HISTORY
index 85eb11b..7f015b8 100644
--- a/gnome2-apps/gnome-power-manager/HISTORY
+++ b/gnome2-apps/gnome-power-manager/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-05-24 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git
a/gnome2-apps/gnome-power-manager/gnome-power-manager-2.18.3.tar.gz.sig
b/gnome2-apps/gnome-power-manager/gnome-power-manager-2.18.3.tar.gz.sig
deleted file mode 100644
index 92e251b..0000000
Binary files
a/gnome2-apps/gnome-power-manager/gnome-power-manager-2.18.3.tar.gz.sig and
/dev/null differ
diff --git
a/gnome2-apps/gnome-power-manager/gnome-power-manager-2.20.0.tar.gz.sig
b/gnome2-apps/gnome-power-manager/gnome-power-manager-2.20.0.tar.gz.sig
new file mode 100644
index 0000000..7303ab9
Binary files /dev/null and
b/gnome2-apps/gnome-power-manager/gnome-power-manager-2.20.0.tar.gz.sig differ
diff --git a/gnome2-apps/gnome-system-tools/DETAILS
b/gnome2-apps/gnome-system-tools/DETAILS
index b880a4c..ea50b50 100755
--- a/gnome2-apps/gnome-system-tools/DETAILS
+++ b/gnome2-apps/gnome-system-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-system-tools
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/gnome-system-tools/HISTORY
b/gnome2-apps/gnome-system-tools/HISTORY
index 62bc6ef..d725745 100644
--- a/gnome2-apps/gnome-system-tools/HISTORY
+++ b/gnome2-apps/gnome-system-tools/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-04-27 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git
a/gnome2-apps/gnome-system-tools/gnome-system-tools-2.18.1.tar.bz2.sig
b/gnome2-apps/gnome-system-tools/gnome-system-tools-2.18.1.tar.bz2.sig
deleted file mode 100644
index 4d34a11..0000000
Binary files
a/gnome2-apps/gnome-system-tools/gnome-system-tools-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/gnome-system-tools/gnome-system-tools-2.20.0.tar.bz2.sig
b/gnome2-apps/gnome-system-tools/gnome-system-tools-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..5fe37c0
Binary files /dev/null and
b/gnome2-apps/gnome-system-tools/gnome-system-tools-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-apps/gnucash/DEPENDS b/gnome2-apps/gnucash/DEPENDS
index 00e6021..69dd8ae 100755
--- a/gnome2-apps/gnucash/DEPENDS
+++ b/gnome2-apps/gnucash/DEPENDS
@@ -10,7 +10,11 @@ depends perl &&
depends pkgconfig &&
depends slib &&
depends swig &&
-depends texinfo &&
+
+optional_depends texinfo \
+ '' \
+ '' \
+ 'to build the documentation' &&

optional_depends bzip2 \
'--with-bz2' \
diff --git a/gnome2-apps/gnucash/DETAILS b/gnome2-apps/gnucash/DETAILS
index fc1e701..41fa8b3 100755
--- a/gnome2-apps/gnucash/DETAILS
+++ b/gnome2-apps/gnucash/DETAILS
@@ -1,12 +1,13 @@
SPELL=gnucash
- VERSION=2.2.0
+ VERSION=2.2.1
SOURCE=${SPELL/2/}-$VERSION.tar.gz
- SOURCE2=${SPELL/2/}-$VERSION.tar.gz.sig
+# SOURCE2=${SPELL/2/}-$VERSION.tar.gz.sig
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL/2/}/${SOURCE}
SOURCE_URL[1]=http://www.gnucash.org/pub/gnucash/sources/stable/${SOURCE}
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE2_IGNORE=signature
- SOURCE_GPG=gnucash-pubkey.key:$SOURCE2:UPSTREAM_KEY
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+# SOURCE2_IGNORE=signature
+# SOURCE_GPG=gnucash-pubkey.key:$SOURCE2:UPSTREAM_KEY
+
SOURCE_HASH=sha512:391416523aa70d651abaf33d83f911d2a965c5a29d9e68440cf1c97b67a35025af70e7676a1ad762dce4bf0261f02e058d246418f96a7899e4af052d1ff6c7c9
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/2/}-$VERSION
WEB_SITE=http://www.gnucash.org
ENTERED=20011105
diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY
index 8fd56e5..51e2e3e 100644
--- a/gnome2-apps/gnucash/HISTORY
+++ b/gnome2-apps/gnucash/HISTORY
@@ -1,3 +1,9 @@
+2007-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made texinfo optional
+
+2007-08-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.2.1
+
2007-07-15 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.2.0
* configure-fix.diff: Updated for version 2.2.0
diff --git a/gnome2-apps/gnumeric/CONFIGURE b/gnome2-apps/gnumeric/CONFIGURE
index 07f9de6..204d7ff 100755
--- a/gnome2-apps/gnumeric/CONFIGURE
+++ b/gnome2-apps/gnumeric/CONFIGURE
@@ -1,11 +1,11 @@
-if [[ -z $SSCONVERT ]]; then
-# not configured yet, get old config data from gnumeric2 spell
- persistent_read gnumeric2 SSCONVERT SSCONVERT &&
- persistent_read gnumeric2 SSINDEX SSINDEX &&
- persistent_read gnumeric2 SOLVER SOLVER &&
- persistent_read gnumeric2 LONGDOUBLE LONGDOUBLE &&
- persistent_add SSCONVERT SSINDEX SOLVER LONGDOUBLE
-fi &&
+#if [[ -z $SSCONVERT ]]; then
+## not configured yet, get old config data from gnumeric2 spell
+# persistent_read gnumeric2 SSCONVERT SSCONVERT
+# persistent_read gnumeric2 SSINDEX SSINDEX
+# persistent_read gnumeric2 SOLVER SOLVER
+# persistent_read gnumeric2 LONGDOUBLE LONGDOUBLE
+# persistent_add SSCONVERT SSINDEX SOLVER LONGDOUBLE
+#fi &&
config_query SSCONVERT "Build ssconvert (cmd line sreadsheet conversion
tool)?" y &&
config_query SSINDEX "Build ssindex (spreadsheet indexer for beagle)?" n
&&
config_query SOLVER "Compile the solver?" y
&&
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index a78f0ea..e50cf11 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,11 +1,11 @@
-depends libole2-2 &&
-depends gal2 &&
-depends scrollkeeper &&
-depends libgsf &&
+depends libole2-2 &&
+depends gal2 &&
+depends rarian &&
+depends libgsf &&


if [[ "${GNUMERIC_DEVEL}" == "y" ]]; then
- depends goffice-dev
+ depends goffice-0.5
depends libxml2
else
depends goffice
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index 0eaeaaa..ec646ef 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,6 +1,6 @@
SPELL=gnumeric
if [[ "${GNUMERIC_DEVEL}" == "y" ]]; then
- VERSION=1.7.11
+ VERSION=1.7.12
else
VERSION=1.6.3
PATCHLEVEL=2
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 2103fab..abc3235 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,15 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.7.12
+ * DEPENDS: change scrollkeeper to rarian
+ changed goffice-dev to goffice-0.5
+ * CONFIGURE: commented out the rename code as causing the spell to
ignore -r
+ * PREPARE: commented out the rename code as causing the spell to
ignore -r
+
+2007-09-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE, PREPARE: removed the && after the persistent_reads, they
+ return false if the variable isn't set, which is not an error for
+ us, bug #14001
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.7.11
* Note: I had to comment the "if [[ -z" sections in PREPARE and
diff --git a/gnome2-apps/gnumeric/PREPARE b/gnome2-apps/gnumeric/PREPARE
index 2387152..5803f92 100755
--- a/gnome2-apps/gnumeric/PREPARE
+++ b/gnome2-apps/gnumeric/PREPARE
@@ -1,5 +1,5 @@
-if [[ -z $GNUMERIC_DEVEL ]]; then
- persistent_read gnumeric2 GNUMERIC_DEVEL GNUMERIC_DEVEL &&
- persistent_add GNUMERIC_DEVEL
-fi &&
+#if [[ -z $GNUMERIC_DEVEL ]]; then
+# persistent_read gnumeric2 GNUMERIC_DEVEL GNUMERIC_DEVEL
+# persistent_add GNUMERIC_DEVEL
+#fi &&
config_query GNUMERIC_DEVEL "Build devel (unstable) version?" n
diff --git a/gnome2-apps/gnumeric/gnumeric-1.7.11.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.7.11.tar.bz2.sig
deleted file mode 100644
index db0c48e..0000000
Binary files a/gnome2-apps/gnumeric/gnumeric-1.7.11.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig
new file mode 100644
index 0000000..a1a35f9
Binary files /dev/null and b/gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig
differ
diff --git a/gnome2-apps/gok/DEPENDS b/gnome2-apps/gok/DEPENDS
index a3cba15..f665d80 100755
--- a/gnome2-apps/gok/DEPENDS
+++ b/gnome2-apps/gok/DEPENDS
@@ -3,7 +3,7 @@ depends libwnck &&
depends esound &&
depends at-spi &&
depends gnome-speech &&
-depends scrollkeeper &&
+depends rarian &&
depends expat &&

optional_depends gtk-doc \
diff --git a/gnome2-apps/gok/DETAILS b/gnome2-apps/gok/DETAILS
index 89f8da9..2846b4a 100755
--- a/gnome2-apps/gok/DETAILS
+++ b/gnome2-apps/gok/DETAILS
@@ -1,5 +1,5 @@
SPELL=gok
- VERSION=1.2.3
+ VERSION=1.3.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gok/HISTORY b/gnome2-apps/gok/HISTORY
index 89e990a..793701a 100644
--- a/gnome2-apps/gok/HISTORY
+++ b/gnome2-apps/gok/HISTORY
@@ -1,3 +1,7 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.3.4
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-03-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.2.3

diff --git a/gnome2-apps/gok/gok-1.2.3.tar.bz2.sig
b/gnome2-apps/gok/gok-1.2.3.tar.bz2.sig
deleted file mode 100644
index d447164..0000000
Binary files a/gnome2-apps/gok/gok-1.2.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gok/gok-1.3.4.tar.bz2.sig
b/gnome2-apps/gok/gok-1.3.4.tar.bz2.sig
new file mode 100644
index 0000000..0b9cdf2
Binary files /dev/null and b/gnome2-apps/gok/gok-1.3.4.tar.bz2.sig differ
diff --git a/gnome2-apps/goobox/DEPENDS b/gnome2-apps/goobox/DEPENDS
index 6c55dd7..913ef75 100755
--- a/gnome2-apps/goobox/DEPENDS
+++ b/gnome2-apps/goobox/DEPENDS
@@ -12,7 +12,7 @@ depends gst-plugins-base &&
depends libmusicbrainz &&
depends gnome-doc-utils &&

-optional_depends scrollkeeper \
+optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
"Update scrollkeeper database?" &&
diff --git a/gnome2-apps/goobox/DETAILS b/gnome2-apps/goobox/DETAILS
index ef8e22e..b026f06 100755
--- a/gnome2-apps/goobox/DETAILS
+++ b/gnome2-apps/goobox/DETAILS
@@ -1,5 +1,5 @@
SPELL=goobox
- VERSION=1.9.1
+ VERSION=1.9.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/goobox/HISTORY b/gnome2-apps/goobox/HISTORY
index 3fadcdc..bb04c14 100644
--- a/gnome2-apps/goobox/HISTORY
+++ b/gnome2-apps/goobox/HISTORY
@@ -1,3 +1,7 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.9.2
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-06-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.9.1
* DEPENDS: removed gnome-media2
diff --git a/gnome2-apps/goobox/goobox-1.9.1.tar.bz2.sig
b/gnome2-apps/goobox/goobox-1.9.1.tar.bz2.sig
deleted file mode 100644
index 4b95aa2..0000000
Binary files a/gnome2-apps/goobox/goobox-1.9.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/goobox/goobox-1.9.2.tar.bz2.sig
b/gnome2-apps/goobox/goobox-1.9.2.tar.bz2.sig
new file mode 100644
index 0000000..e3944a6
Binary files /dev/null and b/gnome2-apps/goobox/goobox-1.9.2.tar.bz2.sig
differ
diff --git a/gnome2-apps/gramps/DEPENDS b/gnome2-apps/gramps/DEPENDS
index fcb6ed2..5b64abc 100755
--- a/gnome2-apps/gramps/DEPENDS
+++ b/gnome2-apps/gramps/DEPENDS
@@ -1,7 +1,7 @@
depends libgnomeui &&
depends -sub NUMPY pygtk2 &&
depends gnome-python2 &&
-depends scrollkeeper &&
+depends rarian &&
depends gnome-doc-utils &&

optional_depends reportlab \
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 41b7807..418e3d8 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-06-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.8

diff --git a/gnome2-apps/gthumb2/DEPENDS b/gnome2-apps/gthumb2/DEPENDS
index fcff655..9ba7d70 100755
--- a/gnome2-apps/gthumb2/DEPENDS
+++ b/gnome2-apps/gthumb2/DEPENDS
@@ -1,7 +1,7 @@
depends X11-LIBS &&
depends libgnomeprintui &&

-optional_depends scrollkeeper \
+optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
"Enable use of scrollkeeper?" &&
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index b4577ec..62459e0 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-06-25 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.5

diff --git a/gnome2-apps/gucharmap/DETAILS b/gnome2-apps/gucharmap/DETAILS
index cf2cdb7..1f11b1d 100755
--- a/gnome2-apps/gucharmap/DETAILS
+++ b/gnome2-apps/gucharmap/DETAILS
@@ -1,5 +1,5 @@
SPELL=gucharmap
- VERSION=1.10.0
+ VERSION=1.10.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gucharmap/HISTORY b/gnome2-apps/gucharmap/HISTORY
index 48c0673..9f3cc07 100644
--- a/gnome2-apps/gucharmap/HISTORY
+++ b/gnome2-apps/gucharmap/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.10.1
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.10.0

diff --git a/gnome2-apps/gucharmap/gucharmap-1.10.0.tar.bz2.sig
b/gnome2-apps/gucharmap/gucharmap-1.10.0.tar.bz2.sig
deleted file mode 100644
index 54c7451..0000000
Binary files a/gnome2-apps/gucharmap/gucharmap-1.10.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/gucharmap/gucharmap-1.10.1.tar.bz2.sig
b/gnome2-apps/gucharmap/gucharmap-1.10.1.tar.bz2.sig
new file mode 100644
index 0000000..782d5ce
Binary files /dev/null and
b/gnome2-apps/gucharmap/gucharmap-1.10.1.tar.bz2.sig differ
diff --git a/gnome2-apps/orca/DETAILS b/gnome2-apps/orca/DETAILS
index e852dc2..7aecb54 100755
--- a/gnome2-apps/orca/DETAILS
+++ b/gnome2-apps/orca/DETAILS
@@ -1,5 +1,5 @@
SPELL=orca
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/orca/HISTORY b/gnome2-apps/orca/HISTORY
index e46d362..d4351a8 100644
--- a/gnome2-apps/orca/HISTORY
+++ b/gnome2-apps/orca/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-04-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-apps/orca/orca-2.18.1.tar.bz2.sig
b/gnome2-apps/orca/orca-2.18.1.tar.bz2.sig
deleted file mode 100644
index 4811034..0000000
Binary files a/gnome2-apps/orca/orca-2.18.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/orca/orca-2.20.0.tar.bz2.sig
b/gnome2-apps/orca/orca-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..a471919
Binary files /dev/null and b/gnome2-apps/orca/orca-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-apps/pan/DETAILS b/gnome2-apps/pan/DETAILS
index 495353f..4a264b3 100755
--- a/gnome2-apps/pan/DETAILS
+++ b/gnome2-apps/pan/DETAILS
@@ -9,7 +9,7 @@ if [ "$REL" == "cvs" ]; then
SOURCE_URL[0]=svn://svn.gnome.org/svn/pan2/trunk:pan2
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan2-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
elif [ "$REL" == "devel" ]; then
VERSION=0.132
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-apps/pan/HISTORY b/gnome2-apps/pan/HISTORY
index 21c25e1..957b8c9 100644
--- a/gnome2-apps/pan/HISTORY
+++ b/gnome2-apps/pan/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: fixed svn SOURCE_DIRECTORY
+
2007-08-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.132

diff --git a/gnome2-apps/pessulus/DEPENDS b/gnome2-apps/pessulus/DEPENDS
new file mode 100755
index 0000000..2a77c15
--- /dev/null
+++ b/gnome2-apps/pessulus/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends pygtk2
diff --git a/gnome2-apps/pessulus/DETAILS b/gnome2-apps/pessulus/DETAILS
new file mode 100755
index 0000000..b78565b
--- /dev/null
+++ b/gnome2-apps/pessulus/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=pessulus
+ VERSION=2.16.3
+ BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://gnome.org/
+ ENTERED=20070922
+ KEYWORDS="gnome2"
+ SHORT="Lockdown editor for GNOME"
+cat << EOF
+pessulus is a lockdown editor for GNOME, written in python.
+
+Pessulus enables administrators to set mandatory settings in GConf. The users
+can not change these settings.
+
+Use of pessulus can be useful on computers that are open to use by everyone,
+e.g. in an internet cafe.
+EOF
diff --git a/gnome2-apps/pessulus/HISTORY b/gnome2-apps/pessulus/HISTORY
new file mode 100644
index 0000000..895f473
--- /dev/null
+++ b/gnome2-apps/pessulus/HISTORY
@@ -0,0 +1,2 @@
+2007-02-28 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, HISTORY
diff --git a/gnome2-apps/pessulus/pessulus-2.16.3.tar.bz2.sig
b/gnome2-apps/pessulus/pessulus-2.16.3.tar.bz2.sig
new file mode 100644
index 0000000..e594fad
Binary files /dev/null and b/gnome2-apps/pessulus/pessulus-2.16.3.tar.bz2.sig
differ
diff --git a/gnome2-apps/sabayon/BUILD b/gnome2-apps/sabayon/BUILD
new file mode 100755
index 0000000..90ee103
--- /dev/null
+++ b/gnome2-apps/sabayon/BUILD
@@ -0,0 +1,3 @@
+OPTS="--with-distro=smgl ${OPTS}" &&
+default_build
+
diff --git a/gnome2-apps/sabayon/DEPENDS b/gnome2-apps/sabayon/DEPENDS
new file mode 100755
index 0000000..8fa4c36
--- /dev/null
+++ b/gnome2-apps/sabayon/DEPENDS
@@ -0,0 +1,8 @@
+depends python &&
+depends pygobject &&
+depends pygtk2 &&
+depends intltool &&
+depends xml-parser-expat &&
+depends gdm2
+
+
diff --git a/gnome2-apps/sabayon/DETAILS b/gnome2-apps/sabayon/DETAILS
new file mode 100755
index 0000000..fac13c8
--- /dev/null
+++ b/gnome2-apps/sabayon/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=sabayon
+ VERSION=2.20.1
+ BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://gnome.org/
+ ENTERED=20070922
+ KEYWORDS="gnome2"
+ SHORT="System administration tool to manage GNOME desktop
settings"
+cat << EOF
+Sabayon is a system administration tool to manage GNOME desktop settings.
+Sabayon provides a sane way to edit GConf defaults and GConf mandatory keys:
+the same way you edit your desktop. Sabayon launches profiles in an Xnest
+window. Any changes you make in the Xnest window are saved back to the
+profile file, which can then be applied to user's accounts.
+EOF
diff --git a/gnome2-apps/sabayon/HISTORY b/gnome2-apps/sabayon/HISTORY
new file mode 100644
index 0000000..7af4c13
--- /dev/null
+++ b/gnome2-apps/sabayon/HISTORY
@@ -0,0 +1,2 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, PRE_BUILD, BUILD, HISTORY
diff --git a/gnome2-apps/sabayon/PRE_BUILD b/gnome2-apps/sabayon/PRE_BUILD
new file mode 100755
index 0000000..9b9ef67
--- /dev/null
+++ b/gnome2-apps/sabayon/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < ${SCRIPT_DIRECTORY}/sabayon-configure.diff
diff --git a/gnome2-apps/sabayon/sabayon-2.20.1.tar.bz2.sig
b/gnome2-apps/sabayon/sabayon-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..d93285e
Binary files /dev/null and b/gnome2-apps/sabayon/sabayon-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-apps/sabayon/sabayon-configure.diff
b/gnome2-apps/sabayon/sabayon-configure.diff
new file mode 100644
index 0000000..79ed82a
--- /dev/null
+++ b/gnome2-apps/sabayon/sabayon-configure.diff
@@ -0,0 +1,32 @@
+diff -u -r sabayon-orig/configure sabayon-2.19.2/configure
+--- sabayon-orig/configure 2007-09-22 13:37:34.000000000 -0500
++++ sabayon-2.19.2/configure 2007-09-22 13:40:48.000000000 -0500
+@@ -24739,6 +24739,12 @@
+ install_xinitrc_script="yes"
+ XINITRC_SYSCONFDIR="X11/xinit/xinitrc.d"
+ ;;
++ smgl)
++ XSESSION="/etc/gdm/Xsession"
++ SESSION_NAME="gnome"
++ install_xinitrc_script="no"
++ XINITRC_SYSCONFDIR=""
++ ;;
+ *)
+ echo "Your distribution (${with_distro}) is not yet supported!
(patches welcome)"
+ exit 1
+diff -u -r sabayon-orig/configure.ac sabayon-2.19.2/configure.ac
+--- sabayon-orig/configure.ac 2007-09-22 13:37:34.000000000 -0500
++++ sabayon-2.19.2/configure.ac 2007-09-22 13:41:32.000000000 -0500
+@@ -162,6 +162,12 @@
+ install_xinitrc_script="yes"
+ XINITRC_SYSCONFDIR="X11/xinit/xinitrc.d"
+ ;;
++ smgl)
++ XSESSION="/etc/gdm/Xsession"
++ SESSION_NAME="gnome"
++ install_xinitrc_script="no"
++ XINITRC_SYSCONFDIR=""
++ ;;
+ *)
+ echo "Your distribution (${with_distro}) is not yet supported!
(patches welcome)"
+ exit 1
diff --git a/gnome2-apps/system-tools-backends/DETAILS
b/gnome2-apps/system-tools-backends/DETAILS
index 81e483f..fafc524 100755
--- a/gnome2-apps/system-tools-backends/DETAILS
+++ b/gnome2-apps/system-tools-backends/DETAILS
@@ -1,5 +1,5 @@
SPELL=system-tools-backends
- VERSION=2.2.1
+ VERSION=2.4.0
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/system-tools-backends/HISTORY
b/gnome2-apps/system-tools-backends/HISTORY
index e897af6..75fd5ba 100644
--- a/gnome2-apps/system-tools-backends/HISTORY
+++ b/gnome2-apps/system-tools-backends/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.4.0
+
2007-04-27 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.2.1

diff --git
a/gnome2-apps/system-tools-backends/system-tools-backends-2.2.1.tar.bz2.sig
b/gnome2-apps/system-tools-backends/system-tools-backends-2.2.1.tar.bz2.sig
deleted file mode 100644
index 599bf7d..0000000
Binary files
a/gnome2-apps/system-tools-backends/system-tools-backends-2.2.1.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-apps/system-tools-backends/system-tools-backends-2.4.0.tar.bz2.sig
b/gnome2-apps/system-tools-backends/system-tools-backends-2.4.0.tar.bz2.sig
new file mode 100644
index 0000000..396b15f
Binary files /dev/null and
b/gnome2-apps/system-tools-backends/system-tools-backends-2.4.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/tomboy/DETAILS b/gnome2-apps/tomboy/DETAILS
index 20b2fa3..d34510d 100755
--- a/gnome2-apps/tomboy/DETAILS
+++ b/gnome2-apps/tomboy/DETAILS
@@ -1,5 +1,5 @@
SPELL=tomboy
- VERSION=0.6.3
+ VERSION=0.8.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
diff --git a/gnome2-apps/tomboy/HISTORY b/gnome2-apps/tomboy/HISTORY
index 4f7d2b3..d1c7497 100644
--- a/gnome2-apps/tomboy/HISTORY
+++ b/gnome2-apps/tomboy/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.0
+
2007-04-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.6.3

diff --git a/gnome2-apps/tomboy/tomboy-0.6.3.tar.gz.sig
b/gnome2-apps/tomboy/tomboy-0.6.3.tar.gz.sig
deleted file mode 100644
index e547186..0000000
Binary files a/gnome2-apps/tomboy/tomboy-0.6.3.tar.gz.sig and /dev/null differ
diff --git a/gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig
b/gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig
new file mode 100644
index 0000000..f811e44
Binary files /dev/null and b/gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig differ
diff --git a/gnome2-libs/at-spi/DETAILS b/gnome2-libs/at-spi/DETAILS
index 41940e6..ea02f79 100755
--- a/gnome2-libs/at-spi/DETAILS
+++ b/gnome2-libs/at-spi/DETAILS
@@ -1,5 +1,5 @@
SPELL=at-spi
- VERSION=1.18.1
+ VERSION=1.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/at-spi/HISTORY b/gnome2-libs/at-spi/HISTORY
index 7c13298..2717d39 100644
--- a/gnome2-libs/at-spi/HISTORY
+++ b/gnome2-libs/at-spi/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.19.5
+
2007-06-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: source $GRIMOIRE/FUNCTIONS not $GRIMOIRE_DIR/FUNCTIONS

diff --git a/gnome2-libs/at-spi/at-spi-1.18.1.tar.bz2.sig
b/gnome2-libs/at-spi/at-spi-1.18.1.tar.bz2.sig
deleted file mode 100644
index cbfbd0d..0000000
Binary files a/gnome2-libs/at-spi/at-spi-1.18.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig
b/gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig
new file mode 100644
index 0000000..4cf5703
Binary files /dev/null and b/gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/atk/DETAILS b/gnome2-libs/atk/DETAILS
index d3208e7..7ad1c5f 100755
--- a/gnome2-libs/atk/DETAILS
+++ b/gnome2-libs/atk/DETAILS
@@ -1,5 +1,5 @@
SPELL=atk
- VERSION=1.18.0
+ VERSION=1.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/atk/HISTORY b/gnome2-libs/atk/HISTORY
index 2a00a32..017e120 100644
--- a/gnome2-libs/atk/HISTORY
+++ b/gnome2-libs/atk/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.19.6
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.18.0

diff --git a/gnome2-libs/atk/atk-1.18.0.tar.bz2.sig
b/gnome2-libs/atk/atk-1.18.0.tar.bz2.sig
deleted file mode 100644
index 7362a7d..0000000
Binary files a/gnome2-libs/atk/atk-1.18.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/atk/atk-1.20.0.tar.bz2.sig
b/gnome2-libs/atk/atk-1.20.0.tar.bz2.sig
new file mode 100644
index 0000000..c3dd773
Binary files /dev/null and b/gnome2-libs/atk/atk-1.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/bug-buddy2/DEPENDS b/gnome2-libs/bug-buddy2/DEPENDS
index 77fff65..3bdda32 100755
--- a/gnome2-libs/bug-buddy2/DEPENDS
+++ b/gnome2-libs/bug-buddy2/DEPENDS
@@ -3,6 +3,7 @@ depends libgnomeui &&
depends libglade2 &&
depends libgtop2 &&
depends libsoup &&
-depends scrollkeeper &&
+depends elfutils &&
+depends rarian &&
depends gnome-desktop &&
depends gnome-menus
diff --git a/gnome2-libs/bug-buddy2/DETAILS b/gnome2-libs/bug-buddy2/DETAILS
index c2ab9d8..8a38b9f 100755
--- a/gnome2-libs/bug-buddy2/DETAILS
+++ b/gnome2-libs/bug-buddy2/DETAILS
@@ -1,5 +1,5 @@
SPELL=bug-buddy2
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=bug-buddy-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/bug-buddy-$VERSION
diff --git a/gnome2-libs/bug-buddy2/HISTORY b/gnome2-libs/bug-buddy2/HISTORY
index 8c4f69a..c82f0d3 100644
--- a/gnome2-libs/bug-buddy2/HISTORY
+++ b/gnome2-libs/bug-buddy2/HISTORY
@@ -1,3 +1,8 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+ added elfutils
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/bug-buddy2/bug-buddy-2.18.1.tar.bz2.sig
b/gnome2-libs/bug-buddy2/bug-buddy-2.18.1.tar.bz2.sig
deleted file mode 100644
index 0bb6342..0000000
Binary files a/gnome2-libs/bug-buddy2/bug-buddy-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig
b/gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..182c9d4
Binary files /dev/null and
b/gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/control-center2/BUILD
b/gnome2-libs/control-center2/BUILD
index feceeab..27ba77d 100755
--- a/gnome2-libs/control-center2/BUILD
+++ b/gnome2-libs/control-center2/BUILD
@@ -1,3 +1 @@
-make_single &&
-default_build &&
-make_normal
+true
diff --git a/gnome2-libs/control-center2/DEPENDS
b/gnome2-libs/control-center2/DEPENDS
index 88fd4bc..a915d36 100755
--- a/gnome2-libs/control-center2/DEPENDS
+++ b/gnome2-libs/control-center2/DEPENDS
@@ -1,44 +1 @@
-depends gnome-desktop &&
-depends gnome-menus &&
-depends gconf2 &&
-depends gtk+2 &&
-depends libbonobo &&
-depends libbonoboui &&
-depends libglade2 &&
-depends libgnomeui &&
-depends esound &&
-depends metacity &&
-depends libxklavier &&
-depends libgnomekbd &&
-depends gst-plugins-base &&
-
-optional_depends nautilus2 \
- "--enable-vfs-methods" \
- "--disable-vfs-methods" \
- "Enable nautilus support" &&
-
-optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
- "Enable alsa support" &&
-
-optional_depends gstreamer \
- "--enable-gstreamer=0.10" \
- "--disable-gstreamer" \
- "for gstreamer volume control support" &&
-
-optional_depends hal \
- "--enable-hal" \
- "--disable-hal" \
- "for hardware detection" &&
-
-optional_depends evolution-data-server \
- "--enable-aboutme" \
- "--disable-aboutme" \
- "for aboutme capplet" &&
-
-optional_depends xscreensaver \
- '' \
- '' \
- 'for X-ScreenSaver daemon'
-
+depends gnome-control-center
diff --git a/gnome2-libs/control-center2/DETAILS
b/gnome2-libs/control-center2/DETAILS
index 2bcd87e..96431dd 100755
--- a/gnome2-libs/control-center2/DETAILS
+++ b/gnome2-libs/control-center2/DETAILS
@@ -1,10 +1,11 @@
SPELL=control-center2
VERSION=2.18.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=control-center-$VERSION.tar.bz2
+# SOURCE=control-center-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/control-center-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/control-center/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_URL[0]=$GNOME_URL/sources/control-center/$BRANCH/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ PATCHLEVEL=1
LICENSE[0]=GPL
WEB_SITE=http://www.gnome.org
ENTERED=20020510
diff --git a/gnome2-libs/control-center2/HISTORY
b/gnome2-libs/control-center2/HISTORY
index 5c12c3d..3315cd4 100644
--- a/gnome2-libs/control-center2/HISTORY
+++ b/gnome2-libs/control-center2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * Depricated as spell renamed to gnome-control-center
+
2007-05-02 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DEPENDS: added gst-plugins-base as dependency, bug #13747

diff --git a/gnome2-libs/control-center2/INSTALL
b/gnome2-libs/control-center2/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/control-center2/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/control-center2/PRE_BUILD
b/gnome2-libs/control-center2/PRE_BUILD
index 8881a5b..27ba77d 100755
--- a/gnome2-libs/control-center2/PRE_BUILD
+++ b/gnome2-libs/control-center2/PRE_BUILD
@@ -1,7 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# lower the xft version requirement, our xft providers are patched to work
-# correctly
-sedit 's/2.1.7/2.0/g' configure &&
-# Path to gzip is now harcoded, change it to fit our gzip install
-sedit 's#/bin/gzip#/usr/bin/gzip#'
capplets/theme-switcher/gnome-theme-installer.c
+true
diff --git a/gnome2-libs/control-center2/TRIGGERS
b/gnome2-libs/control-center2/TRIGGERS
new file mode 100755
index 0000000..a72de4b
--- /dev/null
+++ b/gnome2-libs/control-center2/TRIGGERS
@@ -0,0 +1 @@
+on_cast control-center2 dispel_self
diff --git a/gnome2-libs/dasher/DETAILS b/gnome2-libs/dasher/DETAILS
index e81fb71..adbd0f8 100755
--- a/gnome2-libs/dasher/DETAILS
+++ b/gnome2-libs/dasher/DETAILS
@@ -1,5 +1,5 @@
SPELL=dasher
- VERSION=4.4.2
+ VERSION=4.6.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/dasher/HISTORY b/gnome2-libs/dasher/HISTORY
index 008ee30..1380bdd 100644
--- a/gnome2-libs/dasher/HISTORY
+++ b/gnome2-libs/dasher/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 4.6.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 4.5.2
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 4.4.2

diff --git a/gnome2-libs/dasher/dasher-4.4.2.tar.bz2.sig
b/gnome2-libs/dasher/dasher-4.4.2.tar.bz2.sig
deleted file mode 100644
index 2e3264a..0000000
Binary files a/gnome2-libs/dasher/dasher-4.4.2.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig
b/gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig
new file mode 100644
index 0000000..4ca2ad2
Binary files /dev/null and b/gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/eel2/DETAILS b/gnome2-libs/eel2/DETAILS
index 306734e..3350a63 100755
--- a/gnome2-libs/eel2/DETAILS
+++ b/gnome2-libs/eel2/DETAILS
@@ -1,5 +1,5 @@
SPELL=eel2
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=eel-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/eel-$VERSION
diff --git a/gnome2-libs/eel2/HISTORY b/gnome2-libs/eel2/HISTORY
index 18e3c2e..40f8038 100644
--- a/gnome2-libs/eel2/HISTORY
+++ b/gnome2-libs/eel2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.90
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/eel2/eel-2.18.3.tar.bz2.sig
b/gnome2-libs/eel2/eel-2.18.3.tar.bz2.sig
deleted file mode 100644
index 9b521b1..0000000
Binary files a/gnome2-libs/eel2/eel-2.18.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/eel2/eel-2.20.0.tar.bz2.sig
b/gnome2-libs/eel2/eel-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..ba3e541
Binary files /dev/null and b/gnome2-libs/eel2/eel-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/evolution-data-server/DETAILS
b/gnome2-libs/evolution-data-server/DETAILS
index 3778692..796070b 100755
--- a/gnome2-libs/evolution-data-server/DETAILS
+++ b/gnome2-libs/evolution-data-server/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-data-server
- VERSION=1.10.3.1
+ VERSION=1.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index ddf8772..3fed51a 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.12.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.11.92
+
2007-07-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.10.3.1

diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-1.10.3.1.tar.bz2.sig

b/gnome2-libs/evolution-data-server/evolution-data-server-1.10.3.1.tar.bz2.sig
deleted file mode 100644
index 5e9822a..0000000
Binary files
a/gnome2-libs/evolution-data-server/evolution-data-server-1.10.3.1.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
new file mode 100644
index 0000000..b7253c7
Binary files /dev/null and
b/gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/evolution-exchange/DETAILS
b/gnome2-libs/evolution-exchange/DETAILS
index d50658f..7e0f4fb 100755
--- a/gnome2-libs/evolution-exchange/DETAILS
+++ b/gnome2-libs/evolution-exchange/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-exchange
- VERSION=2.10.3
+ VERSION=2.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-exchange/HISTORY
b/gnome2-libs/evolution-exchange/HISTORY
index 37f7ab9..5f57081 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.0
+
2007-07-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.3

diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.10.3.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.10.3.tar.bz2.sig
deleted file mode 100644
index 5f9c23d..0000000
Binary files
a/gnome2-libs/evolution-exchange/evolution-exchange-2.10.3.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig
new file mode 100644
index 0000000..71fed67
Binary files /dev/null and
b/gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig differ
diff --git a/gnome2-libs/evolution-sharp/DETAILS
b/gnome2-libs/evolution-sharp/DETAILS
index 0a07676..e9656c5 100755
--- a/gnome2-libs/evolution-sharp/DETAILS
+++ b/gnome2-libs/evolution-sharp/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-sharp
- VERSION=0.12.4
+ VERSION=0.14.0.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-sharp/HISTORY
b/gnome2-libs/evolution-sharp/HISTORY
index 7e4e878..8730646 100644
--- a/gnome2-libs/evolution-sharp/HISTORY
+++ b/gnome2-libs/evolution-sharp/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.14.0.1
+
2007-05-24 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.12.4

diff --git a/gnome2-libs/evolution-sharp/evolution-sharp-0.12.4.tar.bz2.sig
b/gnome2-libs/evolution-sharp/evolution-sharp-0.12.4.tar.bz2.sig
deleted file mode 100644
index c02e867..0000000
Binary files a/gnome2-libs/evolution-sharp/evolution-sharp-0.12.4.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/evolution-sharp/evolution-sharp-0.14.0.1.tar.bz2.sig
b/gnome2-libs/evolution-sharp/evolution-sharp-0.14.0.1.tar.bz2.sig
new file mode 100644
index 0000000..76d12ef
Binary files /dev/null and
b/gnome2-libs/evolution-sharp/evolution-sharp-0.14.0.1.tar.bz2.sig differ
diff --git a/gnome2-libs/evolution-webcal/DETAILS
b/gnome2-libs/evolution-webcal/DETAILS
index 202f1f6..1821c26 100755
--- a/gnome2-libs/evolution-webcal/DETAILS
+++ b/gnome2-libs/evolution-webcal/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-webcal
- VERSION=2.10.0
+ VERSION=2.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-webcal/HISTORY
b/gnome2-libs/evolution-webcal/HISTORY
index 632a3a0..71707f0 100644
--- a/gnome2-libs/evolution-webcal/HISTORY
+++ b/gnome2-libs/evolution-webcal/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.11.91
+
2007-03-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.0

diff --git a/gnome2-libs/evolution-webcal/evolution-webcal-2.10.0.tar.bz2.sig
b/gnome2-libs/evolution-webcal/evolution-webcal-2.10.0.tar.bz2.sig
deleted file mode 100644
index de7e7ec..0000000
Binary files
a/gnome2-libs/evolution-webcal/evolution-webcal-2.10.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/evolution-webcal/evolution-webcal-2.12.0.tar.bz2.sig
b/gnome2-libs/evolution-webcal/evolution-webcal-2.12.0.tar.bz2.sig
new file mode 100644
index 0000000..e14f0c5
Binary files /dev/null and
b/gnome2-libs/evolution-webcal/evolution-webcal-2.12.0.tar.bz2.sig differ
diff --git a/gnome2-libs/fast-user-switch-applet/DEPENDS
b/gnome2-libs/fast-user-switch-applet/DEPENDS
index 331c048..a72e21b 100755
--- a/gnome2-libs/fast-user-switch-applet/DEPENDS
+++ b/gnome2-libs/fast-user-switch-applet/DEPENDS
@@ -10,7 +10,7 @@ depends libgnomeui &&
#depends libxau &&
#depends libxmu &&

-optional_depends scrollkeeper \
+optional_depends rarian \
'--enable-scrollkeeper' \
'--disable-scrollkeeper' \
'to use and update the scrollkeeper database'
diff --git a/gnome2-libs/fast-user-switch-applet/DETAILS
b/gnome2-libs/fast-user-switch-applet/DETAILS
index 663400e..b1fb20e 100755
--- a/gnome2-libs/fast-user-switch-applet/DETAILS
+++ b/gnome2-libs/fast-user-switch-applet/DETAILS
@@ -1,5 +1,5 @@
SPELL=fast-user-switch-applet
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/fast-user-switch-applet/HISTORY
b/gnome2-libs/fast-user-switch-applet/HISTORY
index d8af653..e450df0 100644
--- a/gnome2-libs/fast-user-switch-applet/HISTORY
+++ b/gnome2-libs/fast-user-switch-applet/HISTORY
@@ -1,3 +1,7 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: change scrollkeeper to rarian
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git
a/gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.18.0.tar.bz2.sig

b/gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.18.0.tar.bz2.sig
deleted file mode 100644
index 097af11..0000000
Binary files
a/gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.18.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.20.0.tar.bz2.sig

b/gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..d5028fd
Binary files /dev/null and
b/gnome2-libs/fast-user-switch-applet/fast-user-switch-applet-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gail/DEPENDS b/gnome2-libs/gail/DEPENDS
index a49d500..eba33d0 100755
--- a/gnome2-libs/gail/DEPENDS
+++ b/gnome2-libs/gail/DEPENDS
@@ -1,8 +1,7 @@
-depends atk &&
-depends gtk+2 &&
-depends libgnomecanvas &&
+depends atk &&
+depends gtk+2 &&

-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Build documentation with gtk-doc"
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "Build documentation with gtk-doc"
diff --git a/gnome2-libs/gail/DETAILS b/gnome2-libs/gail/DETAILS
index 9d7f0ce..84f17ff 100755
--- a/gnome2-libs/gail/DETAILS
+++ b/gnome2-libs/gail/DETAILS
@@ -1,5 +1,5 @@
SPELL=gail
- VERSION=1.18.0
+ VERSION=1.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gail/HISTORY b/gnome2-libs/gail/HISTORY
index 776b48c..744f9e4 100644
--- a/gnome2-libs/gail/HISTORY
+++ b/gnome2-libs/gail/HISTORY
@@ -1,3 +1,13 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.20.0
+
+2007-09-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Removed depends libgnomecanvas because it
+ depends on gail, not vice versa.
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.19.6
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.18.0

diff --git a/gnome2-libs/gail/gail-1.18.0.tar.bz2.sig
b/gnome2-libs/gail/gail-1.18.0.tar.bz2.sig
deleted file mode 100644
index bb3d46d..0000000
Binary files a/gnome2-libs/gail/gail-1.18.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gail/gail-1.20.0.tar.bz2.sig
b/gnome2-libs/gail/gail-1.20.0.tar.bz2.sig
new file mode 100644
index 0000000..2618e5c
Binary files /dev/null and b/gnome2-libs/gail/gail-1.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gconf-editor/DETAILS
b/gnome2-libs/gconf-editor/DETAILS
index 398a96b..b177f00 100755
--- a/gnome2-libs/gconf-editor/DETAILS
+++ b/gnome2-libs/gconf-editor/DETAILS
@@ -1,5 +1,5 @@
SPELL=gconf-editor
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gconf-editor/HISTORY
b/gnome2-libs/gconf-editor/HISTORY
index 92a5e4a..0fd77b3 100644
--- a/gnome2-libs/gconf-editor/HISTORY
+++ b/gnome2-libs/gconf-editor/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.18.2
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/gconf-editor/gconf-editor-2.18.0.tar.bz2.sig
b/gnome2-libs/gconf-editor/gconf-editor-2.18.0.tar.bz2.sig
deleted file mode 100644
index c0c0671..0000000
Binary files a/gnome2-libs/gconf-editor/gconf-editor-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gconf-editor/gconf-editor-2.20.0.tar.bz2.sig
b/gnome2-libs/gconf-editor/gconf-editor-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..121a05b
Binary files /dev/null and
b/gnome2-libs/gconf-editor/gconf-editor-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gconf2/DETAILS b/gnome2-libs/gconf2/DETAILS
index c22832f..03d2c3c 100755
--- a/gnome2-libs/gconf2/DETAILS
+++ b/gnome2-libs/gconf2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gconf2
- VERSION=2.18.0.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=GConf-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/GConf-$VERSION
diff --git a/gnome2-libs/gconf2/GConf-2.18.0.1.tar.bz2.sig
b/gnome2-libs/gconf2/GConf-2.18.0.1.tar.bz2.sig
deleted file mode 100644
index 118a9f3..0000000
Binary files a/gnome2-libs/gconf2/GConf-2.18.0.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig
b/gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..27095c8
Binary files /dev/null and b/gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index e010ebd..bd1d477 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.1
+
2007-03-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0.1

diff --git a/gnome2-libs/gdm2/DEPENDS b/gnome2-libs/gdm2/DEPENDS
index 8c7692d..2504e92 100755
--- a/gnome2-libs/gdm2/DEPENDS
+++ b/gnome2-libs/gdm2/DEPENDS
@@ -1,7 +1,7 @@
depends libgnomeui &&
depends libglade2 &&
depends librsvg2 &&
-depends scrollkeeper &&
+depends rarian &&
depends gnome-doc-utils &&

if [ "$(get_spell_provider gtk+2 X11-LIBS)" == "xorg-server" ]; then
diff --git a/gnome2-libs/gdm2/DETAILS b/gnome2-libs/gdm2/DETAILS
index 9c77472..bd6f1f2 100755
--- a/gnome2-libs/gdm2/DETAILS
+++ b/gnome2-libs/gdm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdm2
- VERSION=2.18.4
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gdm-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdm-$VERSION
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index 123a14e..c291aa1 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.7
+
2007-08-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.4

diff --git a/gnome2-libs/gdm2/gdm-2.18.4.tar.bz2.sig
b/gnome2-libs/gdm2/gdm-2.18.4.tar.bz2.sig
deleted file mode 100644
index f3d7b8e..0000000
Binary files a/gnome2-libs/gdm2/gdm-2.18.4.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig
b/gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..dc3202c
Binary files /dev/null and b/gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index c1766ce..bf4af80 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,5 +1,5 @@
SPELL=glib2
- VERSION=2.14.0
+ VERSION=2.14.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=glib-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/glib-$VERSION
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index ef1be01..8986d05 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.1
+
2007-08-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.0

diff --git a/gnome2-libs/glib2/glib-2.14.0.tar.bz2.sig
b/gnome2-libs/glib2/glib-2.14.0.tar.bz2.sig
deleted file mode 100644
index 7b3d098..0000000
Binary files a/gnome2-libs/glib2/glib-2.14.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig
b/gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig
new file mode 100644
index 0000000..dc3c185
Binary files /dev/null and b/gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig differ
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index 70357bb..a9aa2a7 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,5 +1,5 @@
SPELL=glibmm
- VERSION=2.12.10
+ VERSION=2.14.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index 8af767d..a249346 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.0
+
+2007-09-08 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 2.13.9 for latest gnome beta to work
+
2007-06-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.12.10

diff --git a/gnome2-libs/glibmm/glibmm-2.12.10.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.12.10.tar.bz2.sig
deleted file mode 100644
index 687925b..0000000
Binary files a/gnome2-libs/glibmm/glibmm-2.12.10.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig
new file mode 100644
index 0000000..37981d8
Binary files /dev/null and b/gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-applets2/DEPENDS
b/gnome2-libs/gnome-applets2/DEPENDS
index 19214d6..5376b22 100755
--- a/gnome2-libs/gnome-applets2/DEPENDS
+++ b/gnome2-libs/gnome-applets2/DEPENDS
@@ -1,7 +1,7 @@
depends gnome-panel &&
depends gail &&
depends libgtop2 &&
-depends scrollkeeper &&
+depends rarian &&
depends libxklavier &&
depends python &&
depends -sub python libxml2 &&
diff --git a/gnome2-libs/gnome-applets2/DETAILS
b/gnome2-libs/gnome-applets2/DETAILS
index 47c9af4..accefde 100755
--- a/gnome2-libs/gnome-applets2/DETAILS
+++ b/gnome2-libs/gnome-applets2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-applets2
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-applets-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-applets-$VERSION
diff --git a/gnome2-libs/gnome-applets2/HISTORY
b/gnome2-libs/gnome-applets2/HISTORY
index 6c6c122..127b819 100644
--- a/gnome2-libs/gnome-applets2/HISTORY
+++ b/gnome2-libs/gnome-applets2/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/gnome-applets2/gnome-applets-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-applets2/gnome-applets-2.18.0.tar.bz2.sig
deleted file mode 100644
index d016dab..0000000
Binary files a/gnome2-libs/gnome-applets2/gnome-applets-2.18.0.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/gnome-applets2/gnome-applets-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-applets2/gnome-applets-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..817bff2
Binary files /dev/null and
b/gnome2-libs/gnome-applets2/gnome-applets-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-backgrounds/DETAILS
b/gnome2-libs/gnome-backgrounds/DETAILS
index de23400..3d8f601 100755
--- a/gnome2-libs/gnome-backgrounds/DETAILS
+++ b/gnome2-libs/gnome-backgrounds/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-backgrounds
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-backgrounds/HISTORY
b/gnome2-libs/gnome-backgrounds/HISTORY
index 24fadb8..2ed5e82 100644
--- a/gnome2-libs/gnome-backgrounds/HISTORY
+++ b/gnome2-libs/gnome-backgrounds/HISTORY
@@ -1,3 +1,6 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-07-01 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git
a/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig
b/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig
deleted file mode 100644
index 74d8099..0000000
Binary files
a/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..0879ef7
Binary files /dev/null and
b/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-common2/DETAILS
b/gnome2-libs/gnome-common2/DETAILS
index 3561fc1..abadcac 100755
--- a/gnome2-libs/gnome-common2/DETAILS
+++ b/gnome2-libs/gnome-common2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-common2
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-common-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-common-$VERSION
diff --git a/gnome2-libs/gnome-common2/HISTORY
b/gnome2-libs/gnome-common2/HISTORY
index 10a7a42..a72f260 100644
--- a/gnome2-libs/gnome-common2/HISTORY
+++ b/gnome2-libs/gnome-common2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/gnome-common2/gnome-common-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-common2/gnome-common-2.18.0.tar.bz2.sig
deleted file mode 100644
index f060db9..0000000
Binary files a/gnome2-libs/gnome-common2/gnome-common-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-common2/gnome-common-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-common2/gnome-common-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..b41de1c
Binary files /dev/null and
b/gnome2-libs/gnome-common2/gnome-common-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-control-center/BUILD
b/gnome2-libs/gnome-control-center/BUILD
new file mode 100755
index 0000000..feceeab
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/gnome2-libs/gnome-control-center/CONFLICTS
b/gnome2-libs/gnome-control-center/CONFLICTS
new file mode 100755
index 0000000..4a3257c
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/CONFLICTS
@@ -0,0 +1,5 @@
+conflicts acme y
+conflicts fontilus y
+conflicts gswitchit y
+conflicts metatheme y
+conflicts control-center2 y
diff --git a/gnome2-libs/gnome-control-center/DEPENDS
b/gnome2-libs/gnome-control-center/DEPENDS
new file mode 100755
index 0000000..88fd4bc
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/DEPENDS
@@ -0,0 +1,44 @@
+depends gnome-desktop &&
+depends gnome-menus &&
+depends gconf2 &&
+depends gtk+2 &&
+depends libbonobo &&
+depends libbonoboui &&
+depends libglade2 &&
+depends libgnomeui &&
+depends esound &&
+depends metacity &&
+depends libxklavier &&
+depends libgnomekbd &&
+depends gst-plugins-base &&
+
+optional_depends nautilus2 \
+ "--enable-vfs-methods" \
+ "--disable-vfs-methods" \
+ "Enable nautilus support" &&
+
+optional_depends alsa-lib \
+ "--enable-alsa" \
+ "--disable-alsa" \
+ "Enable alsa support" &&
+
+optional_depends gstreamer \
+ "--enable-gstreamer=0.10" \
+ "--disable-gstreamer" \
+ "for gstreamer volume control support" &&
+
+optional_depends hal \
+ "--enable-hal" \
+ "--disable-hal" \
+ "for hardware detection" &&
+
+optional_depends evolution-data-server \
+ "--enable-aboutme" \
+ "--disable-aboutme" \
+ "for aboutme capplet" &&
+
+optional_depends xscreensaver \
+ '' \
+ '' \
+ 'for X-ScreenSaver daemon'
+
diff --git a/gnome2-libs/gnome-control-center/DETAILS
b/gnome2-libs/gnome-control-center/DETAILS
new file mode 100755
index 0000000..5f7db1f
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=gnome-control-center
+ VERSION=2.20.0
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.gnome.org
+ ENTERED=20020510
+ KEYWORDS="gnome2 libs"
+ SHORT="GNOME 2.0 Control Center"
+cat << EOF
+The GNOME 2.0 Control Center
+
+A collection of GNOME 2.0 preference dialogs.
+EOF
diff --git a/gnome2-libs/gnome-control-center/G_SCHEMAS
b/gnome2-libs/gnome-control-center/G_SCHEMAS
new file mode 100644
index 0000000..a482b9b
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/G_SCHEMAS
@@ -0,0 +1,8 @@
+apps_gnome_settings_daemon_default_editor.schemas
+apps_gnome_settings_daemon_keybindings.schemas
+apps_gnome_settings_daemon_screensaver.schemas
+desktop_gnome_font_rendering.schemas
+desktop_gnome_peripherals_keyboard_xkb.schemas
+fontilus.schemas
+themus.schemas
+
diff --git a/gnome2-libs/gnome-control-center/HISTORY
b/gnome2-libs/gnome-control-center/HISTORY
new file mode 100644
index 0000000..245dbce
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/HISTORY
@@ -0,0 +1,3 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
diff --git a/gnome2-libs/gnome-control-center/PRE_BUILD
b/gnome2-libs/gnome-control-center/PRE_BUILD
new file mode 100755
index 0000000..5cb3196
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# lower the xft version requirement, our xft providers are patched to work
+# correctly
+sedit 's/2.1.7/2.0/g' configure
+# Path to gzip is now harcoded, change it to fit our gzip install
+#sedit 's#/bin/gzip#/usr/bin/gzip#'
capplets/theme-switcher/gnome-theme-installer.c
diff --git
a/gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..5363f24
Binary files /dev/null and
b/gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-control-center/volatiles
b/gnome2-libs/gnome-control-center/volatiles
new file mode 100644
index 0000000..eb01de8
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/volatiles
@@ -0,0 +1 @@
+/usr/share/applications/mimeinfo.cache
diff --git a/gnome2-libs/gnome-desktop/DEPENDS
b/gnome2-libs/gnome-desktop/DEPENDS
index 573ed28..208989a 100755
--- a/gnome2-libs/gnome-desktop/DEPENDS
+++ b/gnome2-libs/gnome-desktop/DEPENDS
@@ -6,7 +6,7 @@ depends libxml2 &&

sub_depends libxml2 python &&

-optional_depends scrollkeeper \
+optional_depends rarian \
'--enable-scrollkeeper' \
'--disable-scrollkeeper' \
'to use and update the scrollkeeper database' &&
diff --git a/gnome2-libs/gnome-desktop/DETAILS
b/gnome2-libs/gnome-desktop/DETAILS
index be2c6e0..cf00d91 100755
--- a/gnome2-libs/gnome-desktop/DETAILS
+++ b/gnome2-libs/gnome-desktop/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-desktop
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-desktop/HISTORY
b/gnome2-libs/gnome-desktop/HISTORY
index 80f7990..ac592a5 100644
--- a/gnome2-libs/gnome-desktop/HISTORY
+++ b/gnome2-libs/gnome-desktop/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: change scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/gnome-desktop/gnome-desktop-2.18.3.tar.bz2.sig
b/gnome2-libs/gnome-desktop/gnome-desktop-2.18.3.tar.bz2.sig
deleted file mode 100644
index 7725284..0000000
Binary files a/gnome2-libs/gnome-desktop/gnome-desktop-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..3327d7a
Binary files /dev/null and
b/gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-devel-docs/DEPENDS
b/gnome2-libs/gnome-devel-docs/DEPENDS
new file mode 100755
index 0000000..5092354
--- /dev/null
+++ b/gnome2-libs/gnome-devel-docs/DEPENDS
@@ -0,0 +1,2 @@
+depends rarian &&
+depends gnome-doc-utils
diff --git a/gnome2-libs/gnome-devel-docs/DETAILS
b/gnome2-libs/gnome-devel-docs/DETAILS
new file mode 100755
index 0000000..b8a0086
--- /dev/null
+++ b/gnome2-libs/gnome-devel-docs/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=gnome-devel-docs
+ VERSION=2.20.0
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=FDL
+ WEB_SITE=http://www.gnome.org
+ ENTERED=2007922
+ KEYWORDS="gnome2 libs"
+ SHORT="Documents targetted for developers of GNOME 2"
+cat << EOF
+Documents targetted for developers of GNOME 2
+EOF
diff --git a/gnome2-libs/gnome-devel-docs/HISTORY
b/gnome2-libs/gnome-devel-docs/HISTORY
new file mode 100644
index 0000000..4fbbbac
--- /dev/null
+++ b/gnome2-libs/gnome-devel-docs/HISTORY
@@ -0,0 +1,5 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, HISTORY
diff --git a/gnome2-libs/gnome-devel-docs/gnome-devel-docs-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-devel-docs/gnome-devel-docs-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..8fe2e0b
Binary files /dev/null and
b/gnome2-libs/gnome-devel-docs/gnome-devel-docs-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-doc-utils/DEPENDS
b/gnome2-libs/gnome-doc-utils/DEPENDS
index d450458..5370b6d 100755
--- a/gnome2-libs/gnome-doc-utils/DEPENDS
+++ b/gnome2-libs/gnome-doc-utils/DEPENDS
@@ -1,5 +1,5 @@
depends libxml2 &&
depends libxslt &&
depends python &&
-depends scrollkeeper &&
+depends rarian &&
depends xml-parser-expat
diff --git a/gnome2-libs/gnome-doc-utils/DETAILS
b/gnome2-libs/gnome-doc-utils/DETAILS
index e6e8608..436b200 100755
--- a/gnome2-libs/gnome-doc-utils/DETAILS
+++ b/gnome2-libs/gnome-doc-utils/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-doc-utils
- VERSION=0.10.3
+ VERSION=0.12.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-doc-utils/HISTORY
b/gnome2-libs/gnome-doc-utils/HISTORY
index fa30119..02a7f14 100644
--- a/gnome2-libs/gnome-doc-utils/HISTORY
+++ b/gnome2-libs/gnome-doc-utils/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.12.0
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.11.2
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.10.3

diff --git a/gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.10.3.tar.bz2.sig
b/gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.10.3.tar.bz2.sig
deleted file mode 100644
index 4d6138c..0000000
Binary files a/gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.10.3.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.12.0.tar.bz2.sig
b/gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.12.0.tar.bz2.sig
new file mode 100644
index 0000000..74b4b51
Binary files /dev/null and
b/gnome2-libs/gnome-doc-utils/gnome-doc-utils-0.12.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-games-extra-data/DETAILS
b/gnome2-libs/gnome-games-extra-data/DETAILS
index 86b580e..6d6ff71 100755
--- a/gnome2-libs/gnome-games-extra-data/DETAILS
+++ b/gnome2-libs/gnome-games-extra-data/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-games-extra-data
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-games-extra-data/HISTORY
b/gnome2-libs/gnome-games-extra-data/HISTORY
index 9b4a6a3..0998719 100644
--- a/gnome2-libs/gnome-games-extra-data/HISTORY
+++ b/gnome2-libs/gnome-games-extra-data/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-05-01 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git
a/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.18.0.tar.bz2.sig

b/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.18.0.tar.bz2.sig
deleted file mode 100644
index bc88593..0000000
Binary files
a/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.18.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig

b/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..24ca2ac
Binary files /dev/null and
b/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-games2/DEPENDS
b/gnome2-libs/gnome-games2/DEPENDS
index 6b57188..2574265 100755
--- a/gnome2-libs/gnome-games2/DEPENDS
+++ b/gnome2-libs/gnome-games2/DEPENDS
@@ -1,6 +1,6 @@
depends librsvg2 &&
depends libgnomeui &&
-depends scrollkeeper &&
+depends rarian &&
depends gnome-python-desktop &&

optional_depends guile "" "" "to build the AisleRiot card game" &&
diff --git a/gnome2-libs/gnome-games2/DETAILS
b/gnome2-libs/gnome-games2/DETAILS
index 72fbe5e..551c1eb 100755
--- a/gnome2-libs/gnome-games2/DETAILS
+++ b/gnome2-libs/gnome-games2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-games2
- VERSION=2.18.2.1
+ VERSION=2.20.0.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-games-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-games-$VERSION
diff --git a/gnome2-libs/gnome-games2/HISTORY
b/gnome2-libs/gnome-games2/HISTORY
index 76cf6aa..259d405 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0.1
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-06-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2.1
* G_SCHEMAS: removed gataxx
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.18.2.1.tar.bz2.sig
b/gnome2-libs/gnome-games2/gnome-games-2.18.2.1.tar.bz2.sig
deleted file mode 100644
index 2bf6bba..0000000
Binary files a/gnome2-libs/gnome-games2/gnome-games-2.18.2.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig
b/gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig
new file mode 100644
index 0000000..b66d251
Binary files /dev/null and
b/gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-icon-theme/DETAILS
b/gnome2-libs/gnome-icon-theme/DETAILS
index c5dc853..b42d915 100755
--- a/gnome2-libs/gnome-icon-theme/DETAILS
+++ b/gnome2-libs/gnome-icon-theme/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-icon-theme
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-icon-theme/HISTORY
b/gnome2-libs/gnome-icon-theme/HISTORY
index 62ee030..9eb76af 100644
--- a/gnome2-libs/gnome-icon-theme/HISTORY
+++ b/gnome2-libs/gnome-icon-theme/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.18.0.tar.bz2.sig
deleted file mode 100644
index a16f237..0000000
Binary files
a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..2b49750
Binary files /dev/null and
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-keyring/DETAILS
b/gnome2-libs/gnome-keyring/DETAILS
index a450742..39854bc 100755
--- a/gnome2-libs/gnome-keyring/DETAILS
+++ b/gnome2-libs/gnome-keyring/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-keyring
- VERSION=0.8.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-keyring/HISTORY
b/gnome2-libs/gnome-keyring/HISTORY
index d15af32..bf80696 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-04-08 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.8.1

diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-0.8.1.tar.bz2.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-0.8.1.tar.bz2.sig
deleted file mode 100644
index b1bab42..0000000
Binary files a/gnome2-libs/gnome-keyring/gnome-keyring-0.8.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..75c98b1
Binary files /dev/null and
b/gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-mag/DETAILS b/gnome2-libs/gnome-mag/DETAILS
index 949d702..06ab11d 100755
--- a/gnome2-libs/gnome-mag/DETAILS
+++ b/gnome2-libs/gnome-mag/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-mag
- VERSION=0.14.6
+ VERSION=0.14.10
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-mag/HISTORY b/gnome2-libs/gnome-mag/HISTORY
index 666b574..5326713 100644
--- a/gnome2-libs/gnome-mag/HISTORY
+++ b/gnome2-libs/gnome-mag/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.14.10
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.14.8
+
2007-06-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.14.6

diff --git a/gnome2-libs/gnome-mag/gnome-mag-0.14.10.tar.bz2.sig
b/gnome2-libs/gnome-mag/gnome-mag-0.14.10.tar.bz2.sig
new file mode 100644
index 0000000..5e046e4
Binary files /dev/null and
b/gnome2-libs/gnome-mag/gnome-mag-0.14.10.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-mag/gnome-mag-0.14.6.tar.bz2.sig
b/gnome2-libs/gnome-mag/gnome-mag-0.14.6.tar.bz2.sig
deleted file mode 100644
index 444ef7b..0000000
Binary files a/gnome2-libs/gnome-mag/gnome-mag-0.14.6.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-media2/DEPENDS
b/gnome2-libs/gnome-media2/DEPENDS
index b112dd9..9cef346 100755
--- a/gnome2-libs/gnome-media2/DEPENDS
+++ b/gnome2-libs/gnome-media2/DEPENDS
@@ -1,7 +1,7 @@
depends libgnomeui &&
depends gail &&
depends sox &&
-depends scrollkeeper &&
+depends rarian &&
depends nautilus-cd-burner &&
optional_depends gstreamer "" "" "for gstreamer-properties" &&
optional_depends gst-plugins-base "" "" "for audio mixer" &&
diff --git a/gnome2-libs/gnome-media2/DETAILS
b/gnome2-libs/gnome-media2/DETAILS
index df119a9..6e3a1e0 100755
--- a/gnome2-libs/gnome-media2/DETAILS
+++ b/gnome2-libs/gnome-media2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-media2
- VERSION=2.18.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-media-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-media-$VERSION
diff --git a/gnome2-libs/gnome-media2/HISTORY
b/gnome2-libs/gnome-media2/HISTORY
index 5102fce..cd88bc8 100644
--- a/gnome2-libs/gnome-media2/HISTORY
+++ b/gnome2-libs/gnome-media2/HISTORY
@@ -1,3 +1,10 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/gnome-media2/gnome-media-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-media2/gnome-media-2.18.0.tar.bz2.sig
deleted file mode 100644
index b89408b..0000000
Binary files a/gnome2-libs/gnome-media2/gnome-media-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-media2/gnome-media-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-media2/gnome-media-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..e41199f
Binary files /dev/null and
b/gnome2-libs/gnome-media2/gnome-media-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-menus/DETAILS b/gnome2-libs/gnome-menus/DETAILS
index ee83d6e..46bf5f4 100755
--- a/gnome2-libs/gnome-menus/DETAILS
+++ b/gnome2-libs/gnome-menus/DETAILS
@@ -1,6 +1,6 @@

SPELL=gnome-menus
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-menus/HISTORY b/gnome2-libs/gnome-menus/HISTORY
index 2c6ae7f..62c7070 100644
--- a/gnome2-libs/gnome-menus/HISTORY
+++ b/gnome2-libs/gnome-menus/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/gnome-menus/gnome-menus-2.18.3.tar.bz2.sig
b/gnome2-libs/gnome-menus/gnome-menus-2.18.3.tar.bz2.sig
deleted file mode 100644
index 1c0e973..0000000
Binary files a/gnome2-libs/gnome-menus/gnome-menus-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..6a7e127
Binary files /dev/null and
b/gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-nettool/DETAILS
b/gnome2-libs/gnome-nettool/DETAILS
index ea4cb0b..c047e1a 100755
--- a/gnome2-libs/gnome-nettool/DETAILS
+++ b/gnome2-libs/gnome-nettool/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-nettool
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-nettool/HISTORY
b/gnome2-libs/gnome-nettool/HISTORY
index d5b75a2..3920274 100644
--- a/gnome2-libs/gnome-nettool/HISTORY
+++ b/gnome2-libs/gnome-nettool/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.90
+
2007-04-03 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: fuctionality -> functionality :)

diff --git a/gnome2-libs/gnome-nettool/gnome-nettool-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-nettool/gnome-nettool-2.18.0.tar.bz2.sig
deleted file mode 100644
index 6881bb0..0000000
Binary files a/gnome2-libs/gnome-nettool/gnome-nettool-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-nettool/gnome-nettool-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-nettool/gnome-nettool-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..d1a9e11
Binary files /dev/null and
b/gnome2-libs/gnome-nettool/gnome-nettool-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-panel/DEPENDS b/gnome2-libs/gnome-panel/DEPENDS
index ad309d8..6b268b9 100755
--- a/gnome2-libs/gnome-panel/DEPENDS
+++ b/gnome2-libs/gnome-panel/DEPENDS
@@ -8,7 +8,7 @@ depends libgnome &&
depends libgnomeui &&
depends orbit2 &&
depends libwnck &&
-depends scrollkeeper &&
+depends rarian &&
depends libxml2 &&

optional_depends evolution-data-server \
diff --git a/gnome2-libs/gnome-panel/DETAILS b/gnome2-libs/gnome-panel/DETAILS
index aa5c813..054e834 100755
--- a/gnome2-libs/gnome-panel/DETAILS
+++ b/gnome2-libs/gnome-panel/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-panel
- VERSION=2.18.3
+ VERSION=2.20.0.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index c6d2a0d..caa7dce 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0.1
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/gnome-panel/gnome-panel-2.18.3.tar.bz2.sig
b/gnome2-libs/gnome-panel/gnome-panel-2.18.3.tar.bz2.sig
deleted file mode 100644
index 9e67335..0000000
Binary files a/gnome2-libs/gnome-panel/gnome-panel-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig
b/gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig
new file mode 100644
index 0000000..ee4aa71
Binary files /dev/null and
b/gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-python-desktop/DETAILS
b/gnome2-libs/gnome-python-desktop/DETAILS
index 5828eab..d26c6ee 100755
--- a/gnome2-libs/gnome-python-desktop/DETAILS
+++ b/gnome2-libs/gnome-python-desktop/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-python-desktop
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY
b/gnome2-libs/gnome-python-desktop/HISTORY
index 10d36c5..81b5a63 100644
--- a/gnome2-libs/gnome-python-desktop/HISTORY
+++ b/gnome2-libs/gnome-python-desktop/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.2
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git
a/gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.18.0.tar.bz2.sig
deleted file mode 100644
index 80f344b..0000000
Binary files
a/gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.18.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..8bf48af
Binary files /dev/null and
b/gnome2-libs/gnome-python-desktop/gnome-python-desktop-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-python-extras/DETAILS
b/gnome2-libs/gnome-python-extras/DETAILS
index 8ad046f..75300c9 100755
--- a/gnome2-libs/gnome-python-extras/DETAILS
+++ b/gnome2-libs/gnome-python-extras/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-python-extras
- VERSION=2.14.3
+ VERSION=2.19.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-python-extras/HISTORY
b/gnome2-libs/gnome-python-extras/HISTORY
index fe2869a..b63c04c 100644
--- a/gnome2-libs/gnome-python-extras/HISTORY
+++ b/gnome2-libs/gnome-python-extras/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.1
+
2007-03-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.3
* PRE_BUILD: removed as eggtray patch no longer needed
diff --git
a/gnome2-libs/gnome-python-extras/gnome-python-extras-2.14.3.tar.bz2.sig
b/gnome2-libs/gnome-python-extras/gnome-python-extras-2.14.3.tar.bz2.sig
deleted file mode 100644
index 25c5832..0000000
Binary files
a/gnome2-libs/gnome-python-extras/gnome-python-extras-2.14.3.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/gnome-python-extras/gnome-python-extras-2.19.1.tar.bz2.sig
b/gnome2-libs/gnome-python-extras/gnome-python-extras-2.19.1.tar.bz2.sig
new file mode 100644
index 0000000..71aed65
Binary files /dev/null and
b/gnome2-libs/gnome-python-extras/gnome-python-extras-2.19.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-python2/DETAILS
b/gnome2-libs/gnome-python2/DETAILS
index 4ebc1da..a6df7b3 100755
--- a/gnome2-libs/gnome-python2/DETAILS
+++ b/gnome2-libs/gnome-python2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-python2
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=gnome-python-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-python-${VERSION}
diff --git a/gnome2-libs/gnome-python2/HISTORY
b/gnome2-libs/gnome-python2/HISTORY
index 55a9e50..9b18e3f 100644
--- a/gnome2-libs/gnome-python2/HISTORY
+++ b/gnome2-libs/gnome-python2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/gnome2-libs/gnome-python2/gnome-python-2.18.2.tar.bz2.sig
b/gnome2-libs/gnome-python2/gnome-python-2.18.2.tar.bz2.sig
deleted file mode 100644
index 912c41b..0000000
Binary files a/gnome2-libs/gnome-python2/gnome-python-2.18.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-python2/gnome-python-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-python2/gnome-python-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..3a37d41
Binary files /dev/null and
b/gnome2-libs/gnome-python2/gnome-python-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-screensaver/DEPENDS
b/gnome2-libs/gnome-screensaver/DEPENDS
index af15e43..8e3189a 100755
--- a/gnome2-libs/gnome-screensaver/DEPENDS
+++ b/gnome2-libs/gnome-screensaver/DEPENDS
@@ -1,8 +1,8 @@
-depends dbus-glib &&
-depends gconf2 &&
-depends libglade2 &&
-depends libgnomeui &&
-depends control-center2 &&
+depends dbus-glib &&
+depends gconf2 &&
+depends libglade2 &&
+depends libgnomeui &&
+depends gnome-control-center &&

optional_depends libexif \
"--with-libexif" \
diff --git a/gnome2-libs/gnome-screensaver/DETAILS
b/gnome2-libs/gnome-screensaver/DETAILS
index b11951a..9496faf 100755
--- a/gnome2-libs/gnome-screensaver/DETAILS
+++ b/gnome2-libs/gnome-screensaver/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-screensaver
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-screensaver/HISTORY
b/gnome2-libs/gnome-screensaver/HISTORY
index cf19a25..1101677 100644
--- a/gnome2-libs/gnome-screensaver/HISTORY
+++ b/gnome2-libs/gnome-screensaver/HISTORY
@@ -1,3 +1,10 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.7
+ * DEPENDS: change control-center2 to gnome-control-center
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git
a/gnome2-libs/gnome-screensaver/gnome-screensaver-2.18.2.tar.bz2.sig
b/gnome2-libs/gnome-screensaver/gnome-screensaver-2.18.2.tar.bz2.sig
deleted file mode 100644
index cad408c..0000000
Binary files
a/gnome2-libs/gnome-screensaver/gnome-screensaver-2.18.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/gnome-screensaver/gnome-screensaver-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-screensaver/gnome-screensaver-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..8af495a
Binary files /dev/null and
b/gnome2-libs/gnome-screensaver/gnome-screensaver-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-session/DEPENDS
b/gnome2-libs/gnome-session/DEPENDS
index ee50d1b..76d5539 100755
--- a/gnome2-libs/gnome-session/DEPENDS
+++ b/gnome2-libs/gnome-session/DEPENDS
@@ -1,5 +1,5 @@
-depends libgnomeui &&
-depends gconf2 &&
-depends esound &&
-depends libwnck &&
-depends control-center2
+depends libgnomeui &&
+depends gconf2 &&
+depends esound &&
+depends libwnck &&
+depends gnome-control-center
diff --git a/gnome2-libs/gnome-session/DETAILS
b/gnome2-libs/gnome-session/DETAILS
index 8160315..d26e528 100755
--- a/gnome2-libs/gnome-session/DETAILS
+++ b/gnome2-libs/gnome-session/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-session
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-session/HISTORY
b/gnome2-libs/gnome-session/HISTORY
index e3631b6..20e4838 100644
--- a/gnome2-libs/gnome-session/HISTORY
+++ b/gnome2-libs/gnome-session/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/gnome-session/gnome-session-2.18.3.tar.bz2.sig
b/gnome2-libs/gnome-session/gnome-session-2.18.3.tar.bz2.sig
deleted file mode 100644
index 2bddf79..0000000
Binary files a/gnome2-libs/gnome-session/gnome-session-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..055aa0f
Binary files /dev/null and
b/gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-system-monitor/DEPENDS
b/gnome2-libs/gnome-system-monitor/DEPENDS
index 20babd3..cd35322 100755
--- a/gnome2-libs/gnome-system-monitor/DEPENDS
+++ b/gnome2-libs/gnome-system-monitor/DEPENDS
@@ -1,5 +1,6 @@
depends libgnomeui &&
depends libwnck &&
depends libgtop2 &&
-depends scrollkeeper &&
-depends libgnomesu
+depends rarian &&
+depends libgnomesu &&
+depends gtkmm2
diff --git a/gnome2-libs/gnome-system-monitor/DETAILS
b/gnome2-libs/gnome-system-monitor/DETAILS
index d90a19f..8a68933 100755
--- a/gnome2-libs/gnome-system-monitor/DETAILS
+++ b/gnome2-libs/gnome-system-monitor/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-system-monitor
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-system-monitor/HISTORY
b/gnome2-libs/gnome-system-monitor/HISTORY
index a32d556..88e2b57 100644
--- a/gnome2-libs/gnome-system-monitor/HISTORY
+++ b/gnome2-libs/gnome-system-monitor/HISTORY
@@ -1,3 +1,13 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-08 David Brown <dmlb2000 AT gmail.com>
+ * DEPENDS: added gtkmm2
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91.1
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git
a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.18.2.tar.bz2.sig
b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.18.2.tar.bz2.sig
deleted file mode 100644
index 00a6aaf..0000000
Binary files
a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.18.2.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..2363141
Binary files /dev/null and
b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-terminal/DETAILS
b/gnome2-libs/gnome-terminal/DETAILS
index 13aed19..14aea67 100755
--- a/gnome2-libs/gnome-terminal/DETAILS
+++ b/gnome2-libs/gnome-terminal/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-terminal
- VERSION=2.18.1
+ VERSION=2.18.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-terminal/HISTORY
b/gnome2-libs/gnome-terminal/HISTORY
index ea867be..c79e639 100644
--- a/gnome2-libs/gnome-terminal/HISTORY
+++ b/gnome2-libs/gnome-terminal/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.18.2
+
2007-06-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/gnome-terminal/gnome-terminal-2.18.1.tar.bz2.sig
b/gnome2-libs/gnome-terminal/gnome-terminal-2.18.1.tar.bz2.sig
deleted file mode 100644
index c0968e0..0000000
Binary files a/gnome2-libs/gnome-terminal/gnome-terminal-2.18.1.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/gnome-terminal/gnome-terminal-2.18.2.tar.bz2.sig
b/gnome2-libs/gnome-terminal/gnome-terminal-2.18.2.tar.bz2.sig
new file mode 100644
index 0000000..db1cae7
Binary files /dev/null and
b/gnome2-libs/gnome-terminal/gnome-terminal-2.18.2.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-themes-extras/DETAILS
b/gnome2-libs/gnome-themes-extras/DETAILS
index edad314..d30bd9c 100755
--- a/gnome2-libs/gnome-themes-extras/DETAILS
+++ b/gnome2-libs/gnome-themes-extras/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-themes-extras
- VERSION=0.9.0
+ VERSION=2.20
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-themes-extras/HISTORY
b/gnome2-libs/gnome-themes-extras/HISTORY
index 0096f70..ee664d6 100644
--- a/gnome2-libs/gnome-themes-extras/HISTORY
+++ b/gnome2-libs/gnome-themes-extras/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20
+
2006-08-20 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 0.9.0

diff --git
a/gnome2-libs/gnome-themes-extras/gnome-themes-extras-0.9.0.tar.bz2.sig
b/gnome2-libs/gnome-themes-extras/gnome-themes-extras-0.9.0.tar.bz2.sig
deleted file mode 100644
index b8829c9..0000000
Binary files
a/gnome2-libs/gnome-themes-extras/gnome-themes-extras-0.9.0.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/gnome-themes-extras/gnome-themes-extras-2.20.tar.bz2.sig
b/gnome2-libs/gnome-themes-extras/gnome-themes-extras-2.20.tar.bz2.sig
new file mode 100644
index 0000000..b94f63c
Binary files /dev/null and
b/gnome2-libs/gnome-themes-extras/gnome-themes-extras-2.20.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-themes/DETAILS
b/gnome2-libs/gnome-themes/DETAILS
index 5f6db51..41120b3 100755
--- a/gnome2-libs/gnome-themes/DETAILS
+++ b/gnome2-libs/gnome-themes/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-themes
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-themes/HISTORY
b/gnome2-libs/gnome-themes/HISTORY
index a8060e2..40f9c1f 100644
--- a/gnome2-libs/gnome-themes/HISTORY
+++ b/gnome2-libs/gnome-themes/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/gnome-themes/gnome-themes-2.18.1.tar.bz2.sig
b/gnome2-libs/gnome-themes/gnome-themes-2.18.1.tar.bz2.sig
deleted file mode 100644
index 97fba0d..0000000
Binary files a/gnome2-libs/gnome-themes/gnome-themes-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..3728227
Binary files /dev/null and
b/gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-utils2/DEPENDS
b/gnome2-libs/gnome-utils2/DEPENDS
index 35b264b..814ed9e 100755
--- a/gnome2-libs/gnome-utils2/DEPENDS
+++ b/gnome2-libs/gnome-utils2/DEPENDS
@@ -3,7 +3,7 @@ depends gnome-desktop &&
depends libgnomeui &&
depends libgnomeprintui &&
depends e2fsprogs &&
-depends scrollkeeper &&
+depends rarian &&

optional_depends linux-pam \
"--with-pam-prefix=${INSTALL_ROOT}/etc/pam.d" \
diff --git a/gnome2-libs/gnome-utils2/DETAILS
b/gnome2-libs/gnome-utils2/DETAILS
index 060e908..63cbd6b 100755
--- a/gnome2-libs/gnome-utils2/DETAILS
+++ b/gnome2-libs/gnome-utils2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-utils2
- VERSION=2.18.1
+ VERSION=2.19.91
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-utils-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-utils-$VERSION
diff --git a/gnome2-libs/gnome-utils2/HISTORY
b/gnome2-libs/gnome-utils2/HISTORY
index 04707cc..79cc7a7 100644
--- a/gnome2-libs/gnome-utils2/HISTORY
+++ b/gnome2-libs/gnome-utils2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFLICTS: added conflict gnome-admin for deprecation

diff --git a/gnome2-libs/gnome-utils2/gnome-utils-2.18.1.tar.bz2.sig
b/gnome2-libs/gnome-utils2/gnome-utils-2.18.1.tar.bz2.sig
deleted file mode 100644
index 6070db1..0000000
Binary files a/gnome2-libs/gnome-utils2/gnome-utils-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-utils2/gnome-utils-2.19.91.tar.bz2.sig
b/gnome2-libs/gnome-utils2/gnome-utils-2.19.91.tar.bz2.sig
new file mode 100644
index 0000000..61d192e
Binary files /dev/null and
b/gnome2-libs/gnome-utils2/gnome-utils-2.19.91.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-vfs2/DETAILS b/gnome2-libs/gnome-vfs2/DETAILS
index 5f8e1b7..ceba91a 100755
--- a/gnome2-libs/gnome-vfs2/DETAILS
+++ b/gnome2-libs/gnome-vfs2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-vfs2
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-vfs-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-vfs-$VERSION
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index f76e4d1..a02d7bc 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-04-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/gnome-vfs2/gnome-vfs-2.18.1.tar.bz2.sig
b/gnome2-libs/gnome-vfs2/gnome-vfs-2.18.1.tar.bz2.sig
deleted file mode 100644
index 44175a2..0000000
Binary files a/gnome2-libs/gnome-vfs2/gnome-vfs-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-vfs2/gnome-vfs-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-vfs2/gnome-vfs-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..5f9c03c
Binary files /dev/null and
b/gnome2-libs/gnome-vfs2/gnome-vfs-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-vfsmm/DETAILS b/gnome2-libs/gnome-vfsmm/DETAILS
index cb863bc..358f4e1 100755
--- a/gnome2-libs/gnome-vfsmm/DETAILS
+++ b/gnome2-libs/gnome-vfsmm/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-vfsmm
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-vfsmm/HISTORY b/gnome2-libs/gnome-vfsmm/HISTORY
index 9e2967f..9f0670f 100644
--- a/gnome2-libs/gnome-vfsmm/HISTORY
+++ b/gnome2-libs/gnome-vfsmm/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-03-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.18.0.tar.bz2.sig
b/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.18.0.tar.bz2.sig
deleted file mode 100644
index a58a807..0000000
Binary files a/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..c566864
Binary files /dev/null and
b/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome2-user-docs/DEPENDS
b/gnome2-libs/gnome2-user-docs/DEPENDS
index 0697bac..5092354 100755
--- a/gnome2-libs/gnome2-user-docs/DEPENDS
+++ b/gnome2-libs/gnome2-user-docs/DEPENDS
@@ -1,2 +1,2 @@
-depends scrollkeeper &&
+depends rarian &&
depends gnome-doc-utils
diff --git a/gnome2-libs/gnome2-user-docs/DETAILS
b/gnome2-libs/gnome2-user-docs/DETAILS
index 4a7b9d5..2983ee5 100755
--- a/gnome2-libs/gnome2-user-docs/DETAILS
+++ b/gnome2-libs/gnome2-user-docs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome2-user-docs
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gnome-user-docs-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-user-docs-$VERSION
diff --git a/gnome2-libs/gnome2-user-docs/HISTORY
b/gnome2-libs/gnome2-user-docs/HISTORY
index f620fe9..06cf0da 100644
--- a/gnome2-libs/gnome2-user-docs/HISTORY
+++ b/gnome2-libs/gnome2-user-docs/HISTORY
@@ -1,3 +1,8 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.18.2.tar.bz2.sig
b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.18.2.tar.bz2.sig
deleted file mode 100644
index 5de8bb7..0000000
Binary files
a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.18.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..aa31a42
Binary files /dev/null and
b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/goffice-0.5/BUILD b/gnome2-libs/goffice-0.5/BUILD
new file mode 100755
index 0000000..147da82
--- /dev/null
+++ b/gnome2-libs/goffice-0.5/BUILD
@@ -0,0 +1,2 @@
+CFLAGS=${CFLAGS//-ffast-math/} &&
+default_build
diff --git a/gnome2-libs/goffice-0.5/DEPENDS b/gnome2-libs/goffice-0.5/DEPENDS
new file mode 100755
index 0000000..cc5f95f
--- /dev/null
+++ b/gnome2-libs/goffice-0.5/DEPENDS
@@ -0,0 +1,23 @@
+depends glib2 &&
+depends libgsf &&
+depends xml-parser-expat &&
+
+optional_depends cairo \
+ '--with-cairo' \
+ '--without-cairo' \
+ 'for Cairo SVG support' &&
+
+optional_depends gtk+2 \
+ "--with-gtk" \
+ "--without-gtk" \
+ "Build the UI?" &&
+
+optional_depends libgnomeui \
+ "--with-gnome" \
+ "--without-gnome" \
+ "Use GNOME extensions?" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "Build gtk-doc files?"
diff --git a/gnome2-libs/goffice-0.5/DETAILS b/gnome2-libs/goffice-0.5/DETAILS
new file mode 100755
index 0000000..f4a997c
--- /dev/null
+++ b/gnome2-libs/goffice-0.5/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=goffice-0.5
+ VERSION=0.5.0
+ BRANCH=${VERSION%\.*}
+ SOURCE=goffice-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/goffice/$BRANCH/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.gnome.org/
+ ENTERED=20070922
+ KEYWORDS="gnome2 libs"
+ SHORT='GOffice shared functionality'
+cat << EOF
+GOffice shared functionality.
+EOF
diff --git a/gnome2-libs/goffice-0.5/HISTORY b/gnome2-libs/goffice-0.5/HISTORY
new file mode 100644
index 0000000..c1ae2b1
--- /dev/null
+++ b/gnome2-libs/goffice-0.5/HISTORY
@@ -0,0 +1,2 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * New spell made from goffice-dev
diff --git a/gnome2-libs/goffice-0.5/PRE_SUB_DEPENDS
b/gnome2-libs/goffice-0.5/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..30129e7
--- /dev/null
+++ b/gnome2-libs/goffice-0.5/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ CAIRO) is_depends_enabled $SPELL cairo && return 0;;
+esac
+return 1
diff --git a/gnome2-libs/goffice-0.5/SUB_DEPENDS
b/gnome2-libs/goffice-0.5/SUB_DEPENDS
new file mode 100755
index 0000000..cc0159f
--- /dev/null
+++ b/gnome2-libs/goffice-0.5/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ CAIRO) echo "Cairo support requested: forcing cairo dependency."
+ depends cairo '--with-cairo';;
+ *) echo "Bogus sub_depends: $THIS_SUB_DEPENDS"
+ return 1;;
+esac
diff --git a/gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig
b/gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig
new file mode 100644
index 0000000..7488a46
Binary files /dev/null and
b/gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig differ
diff --git a/gnome2-libs/goffice-dev/DETAILS b/gnome2-libs/goffice-dev/DETAILS
index 1dfa398..2e5079b 100755
--- a/gnome2-libs/goffice-dev/DETAILS
+++ b/gnome2-libs/goffice-dev/DETAILS
@@ -1,5 +1,5 @@
SPELL=goffice-dev
- VERSION=0.4.2
+ VERSION=0.4.3
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 8c6fa67..49c373a 100644
--- a/gnome2-libs/goffice-dev/HISTORY
+++ b/gnome2-libs/goffice-dev/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.4.3
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.4.2

diff --git a/gnome2-libs/goffice-dev/goffice-0.4.2.tar.bz2.sig
b/gnome2-libs/goffice-dev/goffice-0.4.2.tar.bz2.sig
deleted file mode 100644
index fe86483..0000000
Binary files a/gnome2-libs/goffice-dev/goffice-0.4.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig
b/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig
new file mode 100644
index 0000000..c60efea
Binary files /dev/null and
b/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig differ
diff --git a/gnome2-libs/gtk-engines2/DETAILS
b/gnome2-libs/gtk-engines2/DETAILS
index 451b163..884d0c1 100755
--- a/gnome2-libs/gtk-engines2/DETAILS
+++ b/gnome2-libs/gtk-engines2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk-engines2
- VERSION=2.10.2
+ VERSION=2.12.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtk-engines-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk-engines-$VERSION
diff --git a/gnome2-libs/gtk-engines2/HISTORY
b/gnome2-libs/gtk-engines2/HISTORY
index 2156c34..c329115 100644
--- a/gnome2-libs/gtk-engines2/HISTORY
+++ b/gnome2-libs/gtk-engines2/HISTORY
@@ -1,3 +1,12 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.1
+
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.11.7
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.2

diff --git a/gnome2-libs/gtk-engines2/gtk-engines-2.10.2.tar.bz2.sig
b/gnome2-libs/gtk-engines2/gtk-engines-2.10.2.tar.bz2.sig
deleted file mode 100644
index dab9d65..0000000
Binary files a/gnome2-libs/gtk-engines2/gtk-engines-2.10.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig
b/gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig
new file mode 100644
index 0000000..09e952b
Binary files /dev/null and
b/gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gtkhtml2/DETAILS b/gnome2-libs/gtkhtml2/DETAILS
index d8940ee..e64e7be 100755
--- a/gnome2-libs/gtkhtml2/DETAILS
+++ b/gnome2-libs/gtkhtml2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkhtml2
- VERSION=3.14.3
+ VERSION=3.16.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtkhtml-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkhtml-$VERSION
diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index b3e4c7d..b75cd12 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.16.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.15.92
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 3.14.3

diff --git a/gnome2-libs/gtkhtml2/gtkhtml-3.14.3.tar.bz2.sig
b/gnome2-libs/gtkhtml2/gtkhtml-3.14.3.tar.bz2.sig
deleted file mode 100644
index 810682b..0000000
Binary files a/gnome2-libs/gtkhtml2/gtkhtml-3.14.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig
b/gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig
new file mode 100644
index 0000000..6587236
Binary files /dev/null and b/gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gtksourceview/DETAILS
b/gnome2-libs/gtksourceview/DETAILS
index 449e95e..896d338 100755
--- a/gnome2-libs/gtksourceview/DETAILS
+++ b/gnome2-libs/gtksourceview/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtksourceview
- VERSION=1.8.5
+ VERSION=2.0.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtksourceview/HISTORY
b/gnome2-libs/gtksourceview/HISTORY
index 9e2f0bd..e8f52ec 100644
--- a/gnome2-libs/gtksourceview/HISTORY
+++ b/gnome2-libs/gtksourceview/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.0.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.90.4
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.8.5

diff --git a/gnome2-libs/gtksourceview/gtksourceview-1.8.5.tar.bz2.sig
b/gnome2-libs/gtksourceview/gtksourceview-1.8.5.tar.bz2.sig
deleted file mode 100644
index ade46ce..0000000
Binary files a/gnome2-libs/gtksourceview/gtksourceview-1.8.5.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig
b/gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig
new file mode 100644
index 0000000..de550bf
Binary files /dev/null and
b/gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig differ
diff --git a/gnome2-libs/intltool/DETAILS b/gnome2-libs/intltool/DETAILS
index b3f5d49..86343b4 100755
--- a/gnome2-libs/intltool/DETAILS
+++ b/gnome2-libs/intltool/DETAILS
@@ -1,5 +1,5 @@
SPELL=intltool
- VERSION=0.36.0
+ VERSION=0.36.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/intltool/HISTORY b/gnome2-libs/intltool/HISTORY
index 08c097d..580f431 100644
--- a/gnome2-libs/intltool/HISTORY
+++ b/gnome2-libs/intltool/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.36.2
+
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.36.1
+
2007-08-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.36.0

diff --git a/gnome2-libs/intltool/intltool-0.36.0.tar.bz2.sig
b/gnome2-libs/intltool/intltool-0.36.0.tar.bz2.sig
deleted file mode 100644
index dd22d3f..0000000
Binary files a/gnome2-libs/intltool/intltool-0.36.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/intltool/intltool-0.36.2.tar.bz2.sig
b/gnome2-libs/intltool/intltool-0.36.2.tar.bz2.sig
new file mode 100644
index 0000000..51e183f
Binary files /dev/null and b/gnome2-libs/intltool/intltool-0.36.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/java-access-bridge/BUILD
b/gnome2-libs/java-access-bridge/BUILD
new file mode 100755
index 0000000..128af67
--- /dev/null
+++ b/gnome2-libs/java-access-bridge/BUILD
@@ -0,0 +1,2 @@
+source $INSTALL_ROOT/etc/profile.d/java.sh &&
+default_build
diff --git a/gnome2-libs/java-access-bridge/DEPENDS
b/gnome2-libs/java-access-bridge/DEPENDS
index f042c8f..b14f241 100755
--- a/gnome2-libs/java-access-bridge/DEPENDS
+++ b/gnome2-libs/java-access-bridge/DEPENDS
@@ -1,6 +1,9 @@
-depends JAVA &&
+source $GRIMOIRE/FUNCTIONS &&

-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+depends JAVA &&
+depends X11-LIBS &&
+
+if check_if_xorg_modular_libs; then
depends xprop
fi

diff --git a/gnome2-libs/java-access-bridge/HISTORY
b/gnome2-libs/java-access-bridge/HISTORY
index 240b0a7..1ea0cf5 100644
--- a/gnome2-libs/java-access-bridge/HISTORY
+++ b/gnome2-libs/java-access-bridge/HISTORY
@@ -1,3 +1,10 @@
+2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Packages that depend on JAVA need to make sure
+ /etc/profile.d/java.sh is sources before compiling.
+
+2007-08-21 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DEPENDS: fixed broken checking for Xorg
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* Initial version of spell
* DETAILS, DEPENDS
diff --git a/gnome2-libs/libbonobo/DETAILS b/gnome2-libs/libbonobo/DETAILS
index 030d944..21ea7a3 100755
--- a/gnome2-libs/libbonobo/DETAILS
+++ b/gnome2-libs/libbonobo/DETAILS
@@ -1,5 +1,5 @@
SPELL=libbonobo
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libbonobo/HISTORY b/gnome2-libs/libbonobo/HISTORY
index 3b2126d..9e98df9 100644
--- a/gnome2-libs/libbonobo/HISTORY
+++ b/gnome2-libs/libbonobo/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.6
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/libbonobo/libbonobo-2.18.0.tar.bz2.sig
b/gnome2-libs/libbonobo/libbonobo-2.18.0.tar.bz2.sig
deleted file mode 100644
index fbc795f..0000000
Binary files a/gnome2-libs/libbonobo/libbonobo-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig
b/gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..66b48e4
Binary files /dev/null and
b/gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libbonoboui/DETAILS b/gnome2-libs/libbonoboui/DETAILS
index 455f6a3..5a4bbb6 100755
--- a/gnome2-libs/libbonoboui/DETAILS
+++ b/gnome2-libs/libbonoboui/DETAILS
@@ -1,5 +1,5 @@
SPELL=libbonoboui
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libbonoboui/HISTORY b/gnome2-libs/libbonoboui/HISTORY
index 9cc1ca1..d66a57a 100644
--- a/gnome2-libs/libbonoboui/HISTORY
+++ b/gnome2-libs/libbonoboui/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.6
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/libbonoboui/libbonoboui-2.18.0.tar.bz2.sig
b/gnome2-libs/libbonoboui/libbonoboui-2.18.0.tar.bz2.sig
deleted file mode 100644
index 2b66a5f..0000000
Binary files a/gnome2-libs/libbonoboui/libbonoboui-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libbonoboui/libbonoboui-2.20.0.tar.bz2.sig
b/gnome2-libs/libbonoboui/libbonoboui-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..596a30b
Binary files /dev/null and
b/gnome2-libs/libbonoboui/libbonoboui-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgail-gnome/DETAILS
b/gnome2-libs/libgail-gnome/DETAILS
index f7bc631..59e8276 100755
--- a/gnome2-libs/libgail-gnome/DETAILS
+++ b/gnome2-libs/libgail-gnome/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgail-gnome
- VERSION=1.18.0
+ VERSION=1.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgail-gnome/HISTORY
b/gnome2-libs/libgail-gnome/HISTORY
index 6f5017d..fced018 100644
--- a/gnome2-libs/libgail-gnome/HISTORY
+++ b/gnome2-libs/libgail-gnome/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.19.5
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.18.0

diff --git a/gnome2-libs/libgail-gnome/libgail-gnome-1.18.0.tar.bz2.sig
b/gnome2-libs/libgail-gnome/libgail-gnome-1.18.0.tar.bz2.sig
deleted file mode 100644
index a270e70..0000000
Binary files a/gnome2-libs/libgail-gnome/libgail-gnome-1.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgail-gnome/libgail-gnome-1.20.0.tar.bz2.sig
b/gnome2-libs/libgail-gnome/libgail-gnome-1.20.0.tar.bz2.sig
new file mode 100644
index 0000000..6386b6f
Binary files /dev/null and
b/gnome2-libs/libgail-gnome/libgail-gnome-1.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgda3/DETAILS b/gnome2-libs/libgda3/DETAILS
index 8d58bc3..f9d4ed4 100755
--- a/gnome2-libs/libgda3/DETAILS
+++ b/gnome2-libs/libgda3/DETAILS
@@ -1,10 +1,11 @@
SPELL=libgda3
- VERSION=3.0.1
+ VERSION=3.1.1
+
SOURCE_HASH=sha512:a3efe57b86e924eb0f5b370ab3b90368611ba3351cb83cb8bb32213897e70a3ca6be36bd0983f78bfb042dbf048fca448cbe6566c0c80f9a217a4ce8c0458ed6
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libgda-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgda-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/libgda/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]="LGPL"
LICENSE[1]="GPL"
WEB_SITE=http://www.gnome-db.org
diff --git a/gnome2-libs/libgda3/HISTORY b/gnome2-libs/libgda3/HISTORY
index 73793c0..b296ad1 100644
--- a/gnome2-libs/libgda3/HISTORY
+++ b/gnome2-libs/libgda3/HISTORY
@@ -1,3 +1,6 @@
+2007-09-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.1
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added missing y needed for deprecation

diff --git a/gnome2-libs/libgda3/libgda-3.0.1.tar.bz2.sig
b/gnome2-libs/libgda3/libgda-3.0.1.tar.bz2.sig
deleted file mode 100644
index 6ed1281..0000000
Binary files a/gnome2-libs/libgda3/libgda-3.0.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgnome/DETAILS b/gnome2-libs/libgnome/DETAILS
index de3363e..c8c9d87 100755
--- a/gnome2-libs/libgnome/DETAILS
+++ b/gnome2-libs/libgnome/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnome
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnome/HISTORY b/gnome2-libs/libgnome/HISTORY
index 15ddd91..ad0ede1 100644
--- a/gnome2-libs/libgnome/HISTORY
+++ b/gnome2-libs/libgnome/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.1
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/libgnome/libgnome-2.18.0.tar.bz2.sig
b/gnome2-libs/libgnome/libgnome-2.18.0.tar.bz2.sig
deleted file mode 100644
index a53f9d3..0000000
Binary files a/gnome2-libs/libgnome/libgnome-2.18.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..146dfb8
Binary files /dev/null and b/gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgnomecanvas/DEPENDS
b/gnome2-libs/libgnomecanvas/DEPENDS
index 1133d59..e461e0c 100755
--- a/gnome2-libs/libgnomecanvas/DEPENDS
+++ b/gnome2-libs/libgnomecanvas/DEPENDS
@@ -1,9 +1,11 @@
-depends gtk+2 &&
-depends libart_lgpl &&
-depends libglade2 &&
-depends gnome-common2 &&
+depends gtk+2 &&
+depends libart_lgpl &&
+depends libglade2 &&
+depends pango &&
+depends gail &&
+depends gnome-common2 &&

-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Build documentation with gtk-doc"
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "Build documentation with gtk-doc"
diff --git a/gnome2-libs/libgnomecanvas/DETAILS
b/gnome2-libs/libgnomecanvas/DETAILS
index a8f581e..abe78e5 100755
--- a/gnome2-libs/libgnomecanvas/DETAILS
+++ b/gnome2-libs/libgnomecanvas/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomecanvas
- VERSION=2.14.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[1]=LGPL
WEB_SITE=http://www.gnome.org
ENTERED=20020509
- UPDATED=20050530
KEYWORDS="gnome2 libs"
SHORT="This is the GNOME Canvas library"
cat << EOF
diff --git a/gnome2-libs/libgnomecanvas/HISTORY
b/gnome2-libs/libgnomecanvas/HISTORY
index d6943f1..ec34689 100644
--- a/gnome2-libs/libgnomecanvas/HISTORY
+++ b/gnome2-libs/libgnomecanvas/HISTORY
@@ -1,3 +1,12 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added depends pango & gail.
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.2
+
2006-03-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.0

diff --git a/gnome2-libs/libgnomecanvas/libgnomecanvas-2.14.0.tar.bz2.sig
b/gnome2-libs/libgnomecanvas/libgnomecanvas-2.14.0.tar.bz2.sig
deleted file mode 100644
index 128e53f..0000000
Binary files a/gnome2-libs/libgnomecanvas/libgnomecanvas-2.14.0.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..b842f71
Binary files /dev/null and
b/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomecanvasmm/DETAILS
b/gnome2-libs/libgnomecanvasmm/DETAILS
index 8bdd5f1..c367df5 100755
--- a/gnome2-libs/libgnomecanvasmm/DETAILS
+++ b/gnome2-libs/libgnomecanvasmm/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomecanvasmm
- VERSION=2.16.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomecanvasmm/HISTORY
b/gnome2-libs/libgnomecanvasmm/HISTORY
index 7f44074..758fe2b 100644
--- a/gnome2-libs/libgnomecanvasmm/HISTORY
+++ b/gnome2-libs/libgnomecanvasmm/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2006-09-07 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.16.0

diff --git a/gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.16.0.tar.bz2.sig
b/gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.16.0.tar.bz2.sig
deleted file mode 100644
index 646891b..0000000
Binary files
a/gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.16.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..ff1f675
Binary files /dev/null and
b/gnome2-libs/libgnomecanvasmm/libgnomecanvasmm-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomedb3/DETAILS b/gnome2-libs/libgnomedb3/DETAILS
index a284f60..f255526 100755
--- a/gnome2-libs/libgnomedb3/DETAILS
+++ b/gnome2-libs/libgnomedb3/DETAILS
@@ -1,10 +1,11 @@
SPELL=libgnomedb3
- VERSION=3.0.0
+ VERSION=3.1.1
+
SOURCE_HASH=sha512:3839f5a8750d87df1e3e6bb980aabfceab70c81564801416c0490809e6e37c0d829d0f9627bbb95101affdbe6dae907635e537a1b9f4d7d3faf34e531a335c57
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=libgnomedb-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgnomedb-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/libgnomedb/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]="LGPL"
LICENSE[1]="GPL"
WEB_SITE=http://www.gnome-db.org
diff --git a/gnome2-libs/libgnomedb3/HISTORY b/gnome2-libs/libgnomedb3/HISTORY
index 53b1755..6ff6278 100644
--- a/gnome2-libs/libgnomedb3/HISTORY
+++ b/gnome2-libs/libgnomedb3/HISTORY
@@ -1,3 +1,6 @@
+2007-09-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.1
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* SPELL: renamed from libgnomedb-dev
* DETAILS: correct SPELL
diff --git a/gnome2-libs/libgnomedb3/libgnomedb-3.0.0.tar.bz2.sig
b/gnome2-libs/libgnomedb3/libgnomedb-3.0.0.tar.bz2.sig
deleted file mode 100644
index b476acb..0000000
Binary files a/gnome2-libs/libgnomedb3/libgnomedb-3.0.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomekbd/DETAILS b/gnome2-libs/libgnomekbd/DETAILS
index c115643..d29d143 100755
--- a/gnome2-libs/libgnomekbd/DETAILS
+++ b/gnome2-libs/libgnomekbd/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomekbd
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomekbd/HISTORY b/gnome2-libs/libgnomekbd/HISTORY
index 8263473..c8b52c8 100644
--- a/gnome2-libs/libgnomekbd/HISTORY
+++ b/gnome2-libs/libgnomekbd/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-08-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: added to remove -Werror from Makefiles

diff --git a/gnome2-libs/libgnomekbd/libgnomekbd-2.18.2.tar.bz2.sig
b/gnome2-libs/libgnomekbd/libgnomekbd-2.18.2.tar.bz2.sig
deleted file mode 100644
index a57ffb2..0000000
Binary files a/gnome2-libs/libgnomekbd/libgnomekbd-2.18.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomekbd/libgnomekbd-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomekbd/libgnomekbd-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..f65ef8b
Binary files /dev/null and
b/gnome2-libs/libgnomekbd/libgnomekbd-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomemm/DETAILS b/gnome2-libs/libgnomemm/DETAILS
index 30b548f..ba43cb9 100755
--- a/gnome2-libs/libgnomemm/DETAILS
+++ b/gnome2-libs/libgnomemm/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomemm
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomemm/HISTORY b/gnome2-libs/libgnomemm/HISTORY
index 2793885..3b1b7ca 100644
--- a/gnome2-libs/libgnomemm/HISTORY
+++ b/gnome2-libs/libgnomemm/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-03-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/libgnomemm/libgnomemm-2.18.0.tar.bz2.sig
b/gnome2-libs/libgnomemm/libgnomemm-2.18.0.tar.bz2.sig
deleted file mode 100644
index 3d613c8..0000000
Binary files a/gnome2-libs/libgnomemm/libgnomemm-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomemm/libgnomemm-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomemm/libgnomemm-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..96df1a8
Binary files /dev/null and
b/gnome2-libs/libgnomemm/libgnomemm-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeprint/DETAILS
b/gnome2-libs/libgnomeprint/DETAILS
index b1dc778..4dde7c7 100755
--- a/gnome2-libs/libgnomeprint/DETAILS
+++ b/gnome2-libs/libgnomeprint/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomeprint
- VERSION=2.18.1
+ VERSION=2.18.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomeprint/HISTORY
b/gnome2-libs/libgnomeprint/HISTORY
index 584ac5e..807c232 100644
--- a/gnome2-libs/libgnomeprint/HISTORY
+++ b/gnome2-libs/libgnomeprint/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.18.2
+
2007-08-08 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/libgnomeprint/libgnomeprint-2.18.1.tar.bz2.sig
b/gnome2-libs/libgnomeprint/libgnomeprint-2.18.1.tar.bz2.sig
deleted file mode 100644
index 4a2f179..0000000
Binary files a/gnome2-libs/libgnomeprint/libgnomeprint-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomeprint/libgnomeprint-2.18.2.tar.bz2.sig
b/gnome2-libs/libgnomeprint/libgnomeprint-2.18.2.tar.bz2.sig
new file mode 100644
index 0000000..de934d8
Binary files /dev/null and
b/gnome2-libs/libgnomeprint/libgnomeprint-2.18.2.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeprintui/DETAILS
b/gnome2-libs/libgnomeprintui/DETAILS
index 915e948..7a84e9d 100755
--- a/gnome2-libs/libgnomeprintui/DETAILS
+++ b/gnome2-libs/libgnomeprintui/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomeprintui
- VERSION=2.18.0
+ VERSION=2.18.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomeprintui/HISTORY
b/gnome2-libs/libgnomeprintui/HISTORY
index a1e5d44..5313a11 100644
--- a/gnome2-libs/libgnomeprintui/HISTORY
+++ b/gnome2-libs/libgnomeprintui/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.18.1
+
2007-03-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.0.tar.bz2.sig
b/gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.0.tar.bz2.sig
deleted file mode 100644
index 4d57856..0000000
Binary files a/gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.0.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.1.tar.bz2.sig
b/gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.1.tar.bz2.sig
new file mode 100644
index 0000000..f91cf7a
Binary files /dev/null and
b/gnome2-libs/libgnomeprintui/libgnomeprintui-2.18.1.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeui/DEPENDS b/gnome2-libs/libgnomeui/DEPENDS
index 771a67b..eb4b93f 100755
--- a/gnome2-libs/libgnomeui/DEPENDS
+++ b/gnome2-libs/libgnomeui/DEPENDS
@@ -6,6 +6,7 @@ depends gnome-keyring &&
depends gnome-vfs2 &&
depends gtk+2 &&
depends pango &&
+depends esound &&

optional_depends gtk-doc \
"--enable-gtk-doc" \
diff --git a/gnome2-libs/libgnomeui/DETAILS b/gnome2-libs/libgnomeui/DETAILS
index a9023cc..eca7414 100755
--- a/gnome2-libs/libgnomeui/DETAILS
+++ b/gnome2-libs/libgnomeui/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomeui
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomeui/HISTORY b/gnome2-libs/libgnomeui/HISTORY
index 2bb2b51..9379d13 100644
--- a/gnome2-libs/libgnomeui/HISTORY
+++ b/gnome2-libs/libgnomeui/HISTORY
@@ -1,3 +1,12 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add esound, won't build without it
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.1
+
2007-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/libgnomeui/libgnomeui-2.18.1.tar.bz2.sig
b/gnome2-libs/libgnomeui/libgnomeui-2.18.1.tar.bz2.sig
deleted file mode 100644
index 601e984..0000000
Binary files a/gnome2-libs/libgnomeui/libgnomeui-2.18.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..2502e3c
Binary files /dev/null and
b/gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeuimm/DETAILS
b/gnome2-libs/libgnomeuimm/DETAILS
index f182ae0..72c1f80 100755
--- a/gnome2-libs/libgnomeuimm/DETAILS
+++ b/gnome2-libs/libgnomeuimm/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomeuimm
- VERSION=2.18.0
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomeuimm/HISTORY
b/gnome2-libs/libgnomeuimm/HISTORY
index a551031..003e56b 100644
--- a/gnome2-libs/libgnomeuimm/HISTORY
+++ b/gnome2-libs/libgnomeuimm/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-03-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/libgnomeuimm/libgnomeuimm-2.18.0.tar.bz2.sig
b/gnome2-libs/libgnomeuimm/libgnomeuimm-2.18.0.tar.bz2.sig
deleted file mode 100644
index 8476899..0000000
Binary files a/gnome2-libs/libgnomeuimm/libgnomeuimm-2.18.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomeuimm/libgnomeuimm-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomeuimm/libgnomeuimm-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..c47699d
Binary files /dev/null and
b/gnome2-libs/libgnomeuimm/libgnomeuimm-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgsf/DETAILS b/gnome2-libs/libgsf/DETAILS
index 9cd1b08..8b3484e 100755
--- a/gnome2-libs/libgsf/DETAILS
+++ b/gnome2-libs/libgsf/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgsf
- VERSION=1.14.5
+ VERSION=1.14.7
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index bd639a8..add3393 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.14.7
+
+2007-09-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.14.6
+
2007-07-12 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.14.5

diff --git a/gnome2-libs/libgsf/libgsf-1.14.5.tar.bz2.sig
b/gnome2-libs/libgsf/libgsf-1.14.5.tar.bz2.sig
deleted file mode 100644
index d95401b..0000000
Binary files a/gnome2-libs/libgsf/libgsf-1.14.5.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgsf/libgsf-1.14.7.tar.bz2.sig
b/gnome2-libs/libgsf/libgsf-1.14.7.tar.bz2.sig
new file mode 100644
index 0000000..8a06da4
Binary files /dev/null and b/gnome2-libs/libgsf/libgsf-1.14.7.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgtop2/DETAILS b/gnome2-libs/libgtop2/DETAILS
index f37c139..6a2ce4a 100755
--- a/gnome2-libs/libgtop2/DETAILS
+++ b/gnome2-libs/libgtop2/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgtop2
- VERSION=2.14.9
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libgtop-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgtop-$VERSION
diff --git a/gnome2-libs/libgtop2/HISTORY b/gnome2-libs/libgtop2/HISTORY
index 6d247e5..e67c065 100644
--- a/gnome2-libs/libgtop2/HISTORY
+++ b/gnome2-libs/libgtop2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-05-12 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.9

diff --git a/gnome2-libs/libgtop2/libgtop-2.14.9.tar.bz2.sig
b/gnome2-libs/libgtop2/libgtop-2.14.9.tar.bz2.sig
deleted file mode 100644
index 15f74d8..0000000
Binary files a/gnome2-libs/libgtop2/libgtop-2.14.9.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgtop2/libgtop-2.20.0.tar.bz2.sig
b/gnome2-libs/libgtop2/libgtop-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..d741b5a
Binary files /dev/null and b/gnome2-libs/libgtop2/libgtop-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/libidl/DETAILS b/gnome2-libs/libidl/DETAILS
index caccfc6..c2187a5 100755
--- a/gnome2-libs/libidl/DETAILS
+++ b/gnome2-libs/libidl/DETAILS
@@ -1,5 +1,5 @@
SPELL=libidl
- VERSION=0.8.8
+ VERSION=0.8.9
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libIDL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libIDL-$VERSION
diff --git a/gnome2-libs/libidl/HISTORY b/gnome2-libs/libidl/HISTORY
index dc8bb61..0fa5d94 100644
--- a/gnome2-libs/libidl/HISTORY
+++ b/gnome2-libs/libidl/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.9
+
2007-03-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.8.8

diff --git a/gnome2-libs/libidl/libIDL-0.8.8.tar.bz2.sig
b/gnome2-libs/libidl/libIDL-0.8.8.tar.bz2.sig
deleted file mode 100644
index 0476c7d..0000000
Binary files a/gnome2-libs/libidl/libIDL-0.8.8.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libidl/libIDL-0.8.9.tar.bz2.sig
b/gnome2-libs/libidl/libIDL-0.8.9.tar.bz2.sig
new file mode 100644
index 0000000..4e712c8
Binary files /dev/null and b/gnome2-libs/libidl/libIDL-0.8.9.tar.bz2.sig
differ
diff --git a/gnome2-libs/liboobs/DETAILS b/gnome2-libs/liboobs/DETAILS
index fdc8eaf..23625c8 100755
--- a/gnome2-libs/liboobs/DETAILS
+++ b/gnome2-libs/liboobs/DETAILS
@@ -1,5 +1,5 @@
SPELL=liboobs
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/liboobs/HISTORY b/gnome2-libs/liboobs/HISTORY
index 553373c..0b7d95a 100644
--- a/gnome2-libs/liboobs/HISTORY
+++ b/gnome2-libs/liboobs/HISTORY
@@ -1,3 +1,7 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * PRE_BUILD: removed
+
2007-04-27 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/liboobs/PRE_BUILD b/gnome2-libs/liboobs/PRE_BUILD
deleted file mode 100755
index 1f00dd9..0000000
--- a/gnome2-libs/liboobs/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-sedit "s/dbus_connection_disconnect/dbus_connection_close/g"
src/oobs-session.c
diff --git a/gnome2-libs/liboobs/liboobs-2.18.1.tar.bz2.sig
b/gnome2-libs/liboobs/liboobs-2.18.1.tar.bz2.sig
deleted file mode 100644
index f0d791a..0000000
Binary files a/gnome2-libs/liboobs/liboobs-2.18.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/liboobs/liboobs-2.20.0.tar.bz2.sig
b/gnome2-libs/liboobs/liboobs-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..59ab3ba
Binary files /dev/null and b/gnome2-libs/liboobs/liboobs-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index f4a0be3..32189ca 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,5 +1,5 @@
SPELL=librsvg2
- VERSION=2.18.0
+ VERSION=2.18.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=librsvg-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/librsvg-$VERSION
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 545cc6e..3012c75 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.18.2
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.0

diff --git a/gnome2-libs/librsvg2/librsvg-2.18.0.tar.bz2.sig
b/gnome2-libs/librsvg2/librsvg-2.18.0.tar.bz2.sig
deleted file mode 100644
index 15775bd..0000000
Binary files a/gnome2-libs/librsvg2/librsvg-2.18.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/librsvg2/librsvg-2.18.2.tar.bz2.sig
b/gnome2-libs/librsvg2/librsvg-2.18.2.tar.bz2.sig
new file mode 100644
index 0000000..014fa89
Binary files /dev/null and b/gnome2-libs/librsvg2/librsvg-2.18.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/libwnck/DETAILS b/gnome2-libs/libwnck/DETAILS
index ed23835..99eb3ba 100755
--- a/gnome2-libs/libwnck/DETAILS
+++ b/gnome2-libs/libwnck/DETAILS
@@ -1,5 +1,5 @@
SPELL=libwnck
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libwnck/HISTORY b/gnome2-libs/libwnck/HISTORY
index 17861eb..6d708f5 100644
--- a/gnome2-libs/libwnck/HISTORY
+++ b/gnome2-libs/libwnck/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/libwnck/libwnck-2.18.3.tar.bz2.sig
b/gnome2-libs/libwnck/libwnck-2.18.3.tar.bz2.sig
deleted file mode 100644
index 2371d52..0000000
Binary files a/gnome2-libs/libwnck/libwnck-2.18.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig
b/gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..4b4936e
Binary files /dev/null and b/gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/libxklavier/DETAILS b/gnome2-libs/libxklavier/DETAILS
index 1edda89..353a935 100755
--- a/gnome2-libs/libxklavier/DETAILS
+++ b/gnome2-libs/libxklavier/DETAILS
@@ -1,5 +1,5 @@
SPELL=libxklavier
- VERSION=3.2
+ VERSION=3.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gswitchit/$SOURCE
diff --git a/gnome2-libs/libxklavier/HISTORY b/gnome2-libs/libxklavier/HISTORY
index 80dc033..a96a239 100644
--- a/gnome2-libs/libxklavier/HISTORY
+++ b/gnome2-libs/libxklavier/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.3
+
2007-04-10 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: remove gcc34, build fine without it using gcc-4.1.2

diff --git a/gnome2-libs/libxklavier/libxklavier-3.2.tar.gz.sig
b/gnome2-libs/libxklavier/libxklavier-3.2.tar.gz.sig
deleted file mode 100644
index afa12ec..0000000
Binary files a/gnome2-libs/libxklavier/libxklavier-3.2.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-libs/libxklavier/libxklavier-3.3.tar.gz.sig
b/gnome2-libs/libxklavier/libxklavier-3.3.tar.gz.sig
new file mode 100644
index 0000000..49a8a81
Binary files /dev/null and
b/gnome2-libs/libxklavier/libxklavier-3.3.tar.gz.sig differ
diff --git a/gnome2-libs/metacity/DETAILS b/gnome2-libs/metacity/DETAILS
index 80c619c..21470fe 100755
--- a/gnome2-libs/metacity/DETAILS
+++ b/gnome2-libs/metacity/DETAILS
@@ -1,5 +1,5 @@
SPELL=metacity
- VERSION=2.18.5
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index a1e39ef..6a79d77 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.55
+
2007-06-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.5

diff --git a/gnome2-libs/metacity/metacity-2.18.5.tar.gz.sig
b/gnome2-libs/metacity/metacity-2.18.5.tar.gz.sig
deleted file mode 100644
index 77ab792..0000000
Binary files a/gnome2-libs/metacity/metacity-2.18.5.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-libs/metacity/metacity-2.20.0.tar.gz.sig
b/gnome2-libs/metacity/metacity-2.20.0.tar.gz.sig
new file mode 100644
index 0000000..b3934de
Binary files /dev/null and b/gnome2-libs/metacity/metacity-2.20.0.tar.gz.sig
differ
diff --git a/gnome2-libs/nautilus-cd-burner/DETAILS
b/gnome2-libs/nautilus-cd-burner/DETAILS
index 00fe437..619e199 100755
--- a/gnome2-libs/nautilus-cd-burner/DETAILS
+++ b/gnome2-libs/nautilus-cd-burner/DETAILS
@@ -1,5 +1,5 @@
SPELL=nautilus-cd-burner
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/nautilus-cd-burner/HISTORY
b/gnome2-libs/nautilus-cd-burner/HISTORY
index be61a02..6be7c42 100644
--- a/gnome2-libs/nautilus-cd-burner/HISTORY
+++ b/gnome2-libs/nautilus-cd-burner/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.6
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.18.2.tar.bz2.sig
b/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.18.2.tar.bz2.sig
deleted file mode 100644
index 5841630..0000000
Binary files
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.18.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.20.0.tar.bz2.sig
b/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..a8b2dc4
Binary files /dev/null and
b/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/nautilus-sendto/DETAILS
b/gnome2-libs/nautilus-sendto/DETAILS
index 7aa1cda..5196e7c 100755
--- a/gnome2-libs/nautilus-sendto/DETAILS
+++ b/gnome2-libs/nautilus-sendto/DETAILS
@@ -1,5 +1,5 @@
SPELL=nautilus-sendto
- VERSION=0.10
+ VERSION=0.12
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/nautilus-sendto/HISTORY
b/gnome2-libs/nautilus-sendto/HISTORY
index 069f138..a4c5c0b 100644
--- a/gnome2-libs/nautilus-sendto/HISTORY
+++ b/gnome2-libs/nautilus-sendto/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.12
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: changed balsa2 to balsa

diff --git a/gnome2-libs/nautilus-sendto/nautilus-sendto-0.10.tar.bz2.sig
b/gnome2-libs/nautilus-sendto/nautilus-sendto-0.10.tar.bz2.sig
deleted file mode 100644
index d130778..0000000
Binary files a/gnome2-libs/nautilus-sendto/nautilus-sendto-0.10.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/nautilus-sendto/nautilus-sendto-0.12.tar.bz2.sig
b/gnome2-libs/nautilus-sendto/nautilus-sendto-0.12.tar.bz2.sig
new file mode 100644
index 0000000..6e8dcca
Binary files /dev/null and
b/gnome2-libs/nautilus-sendto/nautilus-sendto-0.12.tar.bz2.sig differ
diff --git a/gnome2-libs/nautilus2/DEPENDS b/gnome2-libs/nautilus2/DEPENDS
index 861cb3d..4af87e4 100755
--- a/gnome2-libs/nautilus2/DEPENDS
+++ b/gnome2-libs/nautilus2/DEPENDS
@@ -4,7 +4,7 @@ depends eel2 &&
depends librsvg2 &&
depends gnome-icon-theme &&
depends gnome-themes &&
-depends scrollkeeper &&
+depends rarian &&
depends libexif &&
depends esound &&

diff --git a/gnome2-libs/nautilus2/DETAILS b/gnome2-libs/nautilus2/DETAILS
index ebb0406..faf6232 100755
--- a/gnome2-libs/nautilus2/DETAILS
+++ b/gnome2-libs/nautilus2/DETAILS
@@ -1,5 +1,5 @@
SPELL=nautilus2
- VERSION=2.18.3
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=nautilus-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/nautilus-$VERSION
diff --git a/gnome2-libs/nautilus2/HISTORY b/gnome2-libs/nautilus2/HISTORY
index 749e50d..3569676 100644
--- a/gnome2-libs/nautilus2/HISTORY
+++ b/gnome2-libs/nautilus2/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+ * DEPENDS: changed scrollkeeper to rarian
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.91
+
2007-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.3

diff --git a/gnome2-libs/nautilus2/nautilus-2.18.3.tar.bz2.sig
b/gnome2-libs/nautilus2/nautilus-2.18.3.tar.bz2.sig
deleted file mode 100644
index 7bcc7bc..0000000
Binary files a/gnome2-libs/nautilus2/nautilus-2.18.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/nautilus2/nautilus-2.20.0.tar.bz2.sig
b/gnome2-libs/nautilus2/nautilus-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..baa51cd
Binary files /dev/null and
b/gnome2-libs/nautilus2/nautilus-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/orbit2/DETAILS b/gnome2-libs/orbit2/DETAILS
index e2fc134..6e5fc89 100755
--- a/gnome2-libs/orbit2/DETAILS
+++ b/gnome2-libs/orbit2/DETAILS
@@ -1,5 +1,5 @@
SPELL=orbit2
- VERSION=2.14.8
+ VERSION=2.14.9
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=ORBit2-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ORBit2-$VERSION
diff --git a/gnome2-libs/orbit2/HISTORY b/gnome2-libs/orbit2/HISTORY
index 79c1db4..e7d20ce 100644
--- a/gnome2-libs/orbit2/HISTORY
+++ b/gnome2-libs/orbit2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.9
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.8

diff --git a/gnome2-libs/orbit2/ORBit2-2.14.8.tar.bz2.sig
b/gnome2-libs/orbit2/ORBit2-2.14.8.tar.bz2.sig
deleted file mode 100644
index 4c98e9a..0000000
Binary files a/gnome2-libs/orbit2/ORBit2-2.14.8.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig
b/gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig
new file mode 100644
index 0000000..051595e
Binary files /dev/null and b/gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig
differ
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 5436b1f..56e763f 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,5 +1,5 @@
SPELL=pango
- VERSION=1.16.5
+ VERSION=1.18.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 8266845..2cfff31 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.18.2
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.18.1
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.16.5

diff --git a/gnome2-libs/pango/pango-1.16.5.tar.bz2.sig
b/gnome2-libs/pango/pango-1.16.5.tar.bz2.sig
deleted file mode 100644
index 1c6479b..0000000
Binary files a/gnome2-libs/pango/pango-1.16.5.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.18.2.tar.bz2.sig
b/gnome2-libs/pango/pango-1.18.2.tar.bz2.sig
new file mode 100644
index 0000000..530e2f2
Binary files /dev/null and b/gnome2-libs/pango/pango-1.18.2.tar.bz2.sig differ
diff --git a/gnome2-libs/pygobject/DETAILS b/gnome2-libs/pygobject/DETAILS
index 612fc5e..1f33718 100755
--- a/gnome2-libs/pygobject/DETAILS
+++ b/gnome2-libs/pygobject/DETAILS
@@ -1,5 +1,5 @@
SPELL=pygobject
- VERSION=2.12.3
+ VERSION=2.13.2
BRANCH=${VERSION/%.?/}
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -9,6 +9,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.daa.com.au/~james/software/pygtk/
ENTERED=20060111
KEYWORDS="gnome2 libs"
- SHORT=""
+ SHORT="Python bindings for the GObject"
cat << EOF
+Bindings for the GObject, to be used in Python. It is a fairly
+complete set of bindings, it's already rather useful, and is
+usable to write moderately complex programs. (see the examples
+directory for some examples of the simpler programs you could
+write).
EOF
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 3b17342..02c6621 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,7 @@
+2007-09-24 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 2.13.2, added short and long
+ descriptions
+
2006-11-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.12.3

diff --git a/gnome2-libs/pygobject/pygobject-2.12.3.tar.bz2.sig
b/gnome2-libs/pygobject/pygobject-2.12.3.tar.bz2.sig
deleted file mode 100644
index 581871b..0000000
Binary files a/gnome2-libs/pygobject/pygobject-2.12.3.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/pygobject/pygobject-2.13.2.tar.bz2.sig
b/gnome2-libs/pygobject/pygobject-2.13.2.tar.bz2.sig
new file mode 100644
index 0000000..c453ffc
Binary files /dev/null and
b/gnome2-libs/pygobject/pygobject-2.13.2.tar.bz2.sig differ
diff --git a/gnome2-libs/pygtksourceview/DEPENDS
b/gnome2-libs/pygtksourceview/DEPENDS
new file mode 100755
index 0000000..a8d060d
--- /dev/null
+++ b/gnome2-libs/pygtksourceview/DEPENDS
@@ -0,0 +1,4 @@
+depends pygtk2 &&
+depends pygobject &&
+depends libxslt &&
+depends gtksourceview
diff --git a/gnome2-libs/pygtksourceview/DETAILS
b/gnome2-libs/pygtksourceview/DETAILS
new file mode 100755
index 0000000..66d97d0
--- /dev/null
+++ b/gnome2-libs/pygtksourceview/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=pygtksourceview
+ VERSION=2.0.0
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=LGPL
+ ENTERED=20020505
+ KEYWORDS="gnome2 libs"
+ SHORT="Library needed by gedit2"
+cat << EOF
+Library needed by gedit2
+EOF
diff --git a/gnome2-libs/pygtksourceview/HISTORY
b/gnome2-libs/pygtksourceview/HISTORY
new file mode 100644
index 0000000..e4fcb21
--- /dev/null
+++ b/gnome2-libs/pygtksourceview/HISTORY
@@ -0,0 +1,7 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.0.0
+
+2007-09-09 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: initial spell - DETAILS, DEPENDS, HISTORY
+
+
diff --git a/gnome2-libs/pygtksourceview/pygtksourceview-2.0.0.tar.bz2.sig
b/gnome2-libs/pygtksourceview/pygtksourceview-2.0.0.tar.bz2.sig
new file mode 100644
index 0000000..7468421
Binary files /dev/null and
b/gnome2-libs/pygtksourceview/pygtksourceview-2.0.0.tar.bz2.sig differ
diff --git a/gnome2-libs/rarian/CONFLICTS b/gnome2-libs/rarian/CONFLICTS
new file mode 100755
index 0000000..48cdca2
--- /dev/null
+++ b/gnome2-libs/rarian/CONFLICTS
@@ -0,0 +1 @@
+conflicts scrollkeeper y
diff --git a/gnome2-libs/rarian/DEPENDS b/gnome2-libs/rarian/DEPENDS
new file mode 100755
index 0000000..4c9e71e
--- /dev/null
+++ b/gnome2-libs/rarian/DEPENDS
@@ -0,0 +1 @@
+depends libxslt
diff --git a/gnome2-libs/rarian/DETAILS b/gnome2-libs/rarian/DETAILS
new file mode 100755
index 0000000..43dc6f9
--- /dev/null
+++ b/gnome2-libs/rarian/DETAILS
@@ -0,0 +1,46 @@
+ SPELL=rarian
+ VERSION=0.6.0
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.gnome.org
+ ENTERED=20070907
+ KEYWORDS="gnome2 libs"
+ SHORT="Documentation metadata library"
+cat << EOF
+Rarian is designed to be a replacement for scrollkeeper. It is
+currently undergoing heavy development. As of writing, rarian can be
+installed in place of scrollkeeper and everything will work okay (as
+far as my testing indicates)
+
+The package consists of several things:
+
+* The librarian library
+ - This builds a list of available meta data files and allows access to
these.
+
+* The rarian-sk-update script
+ - This is compatible with the scrollkeeper-update script that's required to
+ be run when installing new omf files. It converts the omf files into
new-
+ style scrolls
+
+* The rarian-sk-migrate program
+ - Takes in a directory full of omf's, reads and parses them and spews out
+ an equivalent scroll file. You probably don't want to use this directly.
+ Instead, copy the omf directory to you're standard omf dir and run the
+ update script.
+
+* The rarian-example program
+ - Shows off what librarian is capable of. Prints a nice list of all
+ available documents found by the library.
+
+* Misc. rarian-sk-* scripts
+ - These emulate various functions of scrollkeeper as needed to
+ maintain backwards-compatibility.
+
+This package (the library part, at least) is based on the proposed
Freedesktop
+Help System spec. The latest version of this spec can be found in the "help"
+subdirectory of this package.
+EOF
diff --git a/gnome2-libs/rarian/HISTORY b/gnome2-libs/rarian/HISTORY
new file mode 100644
index 0000000..9be0a64
--- /dev/null
+++ b/gnome2-libs/rarian/HISTORY
@@ -0,0 +1,5 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.6.0
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * Initial Spell: DETAILS, HISTORY, CONFLICTS
diff --git a/gnome2-libs/rarian/rarian-0.6.0.tar.bz2.sig
b/gnome2-libs/rarian/rarian-0.6.0.tar.bz2.sig
new file mode 100644
index 0000000..0d50159
Binary files /dev/null and b/gnome2-libs/rarian/rarian-0.6.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/scrollkeeper/BUILD b/gnome2-libs/scrollkeeper/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/scrollkeeper/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/scrollkeeper/DEPENDS
b/gnome2-libs/scrollkeeper/DEPENDS
index d0af8f0..fc72265 100755
--- a/gnome2-libs/scrollkeeper/DEPENDS
+++ b/gnome2-libs/scrollkeeper/DEPENDS
@@ -1,16 +1 @@
-depends libxml2 &&
-depends libxslt &&
-depends intltool &&
-depends docbook-xsl &&
-depends xml-parser-expat &&
-
-optional_depends gettext \
- '--enable-nls' \
- '--disable-nls --with-included-gettext' \
- 'for Native Language Support'
-
-# the following appear to no longer be valid dependencies
-# for scrollkeeper 0.3.x
-#
-# depends sp
-# depends openjade
+depends rarian
diff --git a/gnome2-libs/scrollkeeper/DETAILS
b/gnome2-libs/scrollkeeper/DETAILS
index 8fc6cae..13554d4 100755
--- a/gnome2-libs/scrollkeeper/DETAILS
+++ b/gnome2-libs/scrollkeeper/DETAILS
@@ -1,11 +1,12 @@
SPELL=scrollkeeper
VERSION=0.3.14
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.gz
+# SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+# SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ PATCHLEVEL=1
LICENSE[0]=LGPL
LICENSE[1]=FDL
WEB_SITE=http://scrollkeeper.sourceforge.net
diff --git a/gnome2-libs/scrollkeeper/HISTORY
b/gnome2-libs/scrollkeeper/HISTORY
index 70efbb7..6e6bb99 100644
--- a/gnome2-libs/scrollkeeper/HISTORY
+++ b/gnome2-libs/scrollkeeper/HISTORY
@@ -1,3 +1,6 @@
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DEPRECATED: replaced by rarian
+
2007-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated the signature #12941

diff --git a/gnome2-libs/scrollkeeper/INSTALL
b/gnome2-libs/scrollkeeper/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/scrollkeeper/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/scrollkeeper/PRE_BUILD
b/gnome2-libs/scrollkeeper/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/scrollkeeper/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/scrollkeeper/TRIGGER
b/gnome2-libs/scrollkeeper/TRIGGER
new file mode 100755
index 0000000..b005d8e
--- /dev/null
+++ b/gnome2-libs/scrollkeeper/TRIGGER
@@ -0,0 +1 @@
+on_cast scrollkeeper dispel_self
diff --git a/gnome2-libs/startup-notification/DETAILS
b/gnome2-libs/startup-notification/DETAILS
index 0ff7293..17aac5c 100755
--- a/gnome2-libs/startup-notification/DETAILS
+++ b/gnome2-libs/startup-notification/DETAILS
@@ -1,5 +1,5 @@
SPELL=startup-notification
- VERSION=0.8
+ VERSION=0.9
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=LGPL
WEB_SITE=http://developer.gnome.org/projects/gap
ENTERED=20020314
- UPDATED=20050130
KEYWORDS="gnome2 libs"
SHORT="library that supports new startup notification spec from
freedesktop.org."
cat << EOF
diff --git a/gnome2-libs/startup-notification/HISTORY
b/gnome2-libs/startup-notification/HISTORY
index aa4226f..af66476 100644
--- a/gnome2-libs/startup-notification/HISTORY
+++ b/gnome2-libs/startup-notification/HISTORY
@@ -1,3 +1,6 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.9
+
2006-045-08 Robin Cook <rcook AT wyrms.net>
* DEPENDS: removed as no longer needed

diff --git
a/gnome2-libs/startup-notification/startup-notification-0.8.tar.bz2.sig
b/gnome2-libs/startup-notification/startup-notification-0.8.tar.bz2.sig
deleted file mode 100644
index e4b3adb..0000000
Binary files
a/gnome2-libs/startup-notification/startup-notification-0.8.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/startup-notification/startup-notification-0.9.tar.bz2.sig
b/gnome2-libs/startup-notification/startup-notification-0.9.tar.bz2.sig
new file mode 100644
index 0000000..f8cd3ac
Binary files /dev/null and
b/gnome2-libs/startup-notification/startup-notification-0.9.tar.bz2.sig differ
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index 416f0ab..76c751a 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -24,7 +24,8 @@ optional_depends poppler \
if [[ ${TRACKER_GUI} == y ]]; then
depends gtk+2 &&
depends gnome-vfs2 &&
-depends gnome-desktop
+depends gnome-desktop &&
+optional_depends xdg-utils "" "" "for automatic adaption of programs
used by tracker-search-tool to the desktop environment"
fi &&

if [[ "${TRACKER_EXTRACTOR}" == "gstreamer" ]]; then
diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS
index 3d2cc8a..6af0959 100755
--- a/gnome2-libs/tracker/DETAILS
+++ b/gnome2-libs/tracker/DETAILS
@@ -11,14 +11,14 @@ fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
FORCE_DOWNLOAD=1
else
- VERSION=0.5.4
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.6.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.gnome.org/~jamiemcc/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
LICENSE[0]=GPL
- WEB_SITE=http://freedesktop.org/wiki/Software/Tracker
+ WEB_SITE=http://www.tracker-project.org/
ENTERED=20060524
KEYWORDS="search gnome2 libs"
SHORT="Metadata database and indexer framework"
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index 21d930a..d2431f4 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,8 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.2, updated WEBSITE
+ * PRE_BUILD: removed dbus fix
+ * DEPENDS: added optional_depends on xdg-utils for xdg-open support
+
2007-06-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: added svn option
* PREPARE: created, added svn option
diff --git a/gnome2-libs/tracker/PRE_BUILD b/gnome2-libs/tracker/PRE_BUILD
index f389030..c02181a 100755
--- a/gnome2-libs/tracker/PRE_BUILD
+++ b/gnome2-libs/tracker/PRE_BUILD
@@ -3,8 +3,4 @@ cd ${SOURCE_DIRECTORY} &&
if [[ $TRACKER_SCM == y ]] ; then
NOCONFIGURE=X ./autogen.sh
fi &&
-patch -p0 < ${SCRIPT_DIRECTORY}/inotify-fix.diff &&
-
-# Fix for dbus 0.9X
-sedit "s/dbus_connection_disconnect/dbus_connection_close/" \
-src/trackerd/tracker-dbus.c
+patch -p0 < ${SCRIPT_DIRECTORY}/inotify-fix.diff
diff --git a/gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig
b/gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig
deleted file mode 100644
index b036195..0000000
Binary files a/gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-libs/tracker/tracker-0.6.2.tar.bz2.sig
b/gnome2-libs/tracker/tracker-0.6.2.tar.bz2.sig
new file mode 100644
index 0000000..bd7b6c9
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.6.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/vino/DETAILS b/gnome2-libs/vino/DETAILS
index 50e9281..5073b7c 100755
--- a/gnome2-libs/vino/DETAILS
+++ b/gnome2-libs/vino/DETAILS
@@ -1,5 +1,5 @@
SPELL=vino
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/vino/HISTORY b/gnome2-libs/vino/HISTORY
index 2c4a146..5f6eefa 100644
--- a/gnome2-libs/vino/HISTORY
+++ b/gnome2-libs/vino/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.92
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/vino/vino-2.18.1.tar.bz2.sig
b/gnome2-libs/vino/vino-2.18.1.tar.bz2.sig
deleted file mode 100644
index 8ea26fa..0000000
Binary files a/gnome2-libs/vino/vino-2.18.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/vino/vino-2.20.0.tar.bz2.sig
b/gnome2-libs/vino/vino-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..a9608b3
Binary files /dev/null and b/gnome2-libs/vino/vino-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/vte/DETAILS b/gnome2-libs/vte/DETAILS
index 00f7b8c..0f6d3be 100755
--- a/gnome2-libs/vte/DETAILS
+++ b/gnome2-libs/vte/DETAILS
@@ -1,5 +1,5 @@
SPELL=vte
- VERSION=0.16.8
+ VERSION=0.16.9
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/vte/HISTORY b/gnome2-libs/vte/HISTORY
index e6e076a..dfcf207 100644
--- a/gnome2-libs/vte/HISTORY
+++ b/gnome2-libs/vte/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.16.9
+
2007-08-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.16.8

diff --git a/gnome2-libs/vte/vte-0.16.8.tar.bz2.sig
b/gnome2-libs/vte/vte-0.16.8.tar.bz2.sig
deleted file mode 100644
index 608e6c1..0000000
Binary files a/gnome2-libs/vte/vte-0.16.8.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/vte/vte-0.16.9.tar.bz2.sig
b/gnome2-libs/vte/vte-0.16.9.tar.bz2.sig
new file mode 100644
index 0000000..dbacad2
Binary files /dev/null and b/gnome2-libs/vte/vte-0.16.9.tar.bz2.sig differ
diff --git a/gnome2-libs/xdg-user-dirs/DETAILS
b/gnome2-libs/xdg-user-dirs/DETAILS
index 0f7079b..6140ca7 100755
--- a/gnome2-libs/xdg-user-dirs/DETAILS
+++ b/gnome2-libs/xdg-user-dirs/DETAILS
@@ -1,5 +1,5 @@
SPELL=xdg-user-dirs
- VERSION=0.6
+ VERSION=0.9
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://user-dirs.freedesktop.org/releases/${SOURCE}
diff --git a/gnome2-libs/xdg-user-dirs/HISTORY
b/gnome2-libs/xdg-user-dirs/HISTORY
index b0f6572..19bc09b 100644
--- a/gnome2-libs/xdg-user-dirs/HISTORY
+++ b/gnome2-libs/xdg-user-dirs/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.9
+
2007-04-16 Robin Cook <rcook AT wyrms.net>
* Initial Spell 0.6, DETAILS, HISTORY

diff --git a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.6.tar.gz.sig
b/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.6.tar.gz.sig
deleted file mode 100644
index 265d216..0000000
Binary files a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.6.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.9.tar.gz.sig
b/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.9.tar.gz.sig
new file mode 100644
index 0000000..152cdfa
Binary files /dev/null and
b/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.9.tar.gz.sig differ
diff --git a/gnome2-libs/yelp/DEPENDS b/gnome2-libs/yelp/DEPENDS
index 5913341..d7b40fe 100755
--- a/gnome2-libs/yelp/DEPENDS
+++ b/gnome2-libs/yelp/DEPENDS
@@ -1,4 +1,14 @@
-depends libgnomeui &&
-depends gnome-doc-utils &&
-depends scrollkeeper &&
+depends gconf2 &&
+depends gnome-doc-utils &&
+depends gnome-vfs2 &&
+depends gtk+2 &&
+depends libglade2 &&
+depends libgnome &&
+depends libgnomeui &&
+depends libxml2 &&
+depends libxslt &&
+depends startup-notification &&
+depends dbus-glib &&
+depends rarian &&
depends GECKO
+
diff --git a/gnome2-libs/yelp/DETAILS b/gnome2-libs/yelp/DETAILS
index 4ce3670..8dcd307 100755
--- a/gnome2-libs/yelp/DETAILS
+++ b/gnome2-libs/yelp/DETAILS
@@ -1,5 +1,5 @@
SPELL=yelp
- VERSION=2.18.1
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/yelp/HISTORY b/gnome2-libs/yelp/HISTORY
index f77bef3..fde8e66 100644
--- a/gnome2-libs/yelp/HISTORY
+++ b/gnome2-libs/yelp/HISTORY
@@ -1,3 +1,10 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.90
+ * DEPENDS: added new depends
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/yelp/yelp-2.18.1.tar.bz2.sig
b/gnome2-libs/yelp/yelp-2.18.1.tar.bz2.sig
deleted file mode 100644
index 5b74d87..0000000
Binary files a/gnome2-libs/yelp/yelp-2.18.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/yelp/yelp-2.20.0.tar.bz2.sig
b/gnome2-libs/yelp/yelp-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..257de2b
Binary files /dev/null and b/gnome2-libs/yelp/yelp-2.20.0.tar.bz2.sig differ
diff --git a/gnome2-libs/zenity/DETAILS b/gnome2-libs/zenity/DETAILS
index cafcc7a..506914a 100755
--- a/gnome2-libs/zenity/DETAILS
+++ b/gnome2-libs/zenity/DETAILS
@@ -1,5 +1,5 @@
SPELL=zenity
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/zenity/HISTORY b/gnome2-libs/zenity/HISTORY
index caf1a1d..770fc3a 100644
--- a/gnome2-libs/zenity/HISTORY
+++ b/gnome2-libs/zenity/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-05-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/gnome2-libs/zenity/zenity-2.18.2.tar.bz2.sig
b/gnome2-libs/zenity/zenity-2.18.2.tar.bz2.sig
deleted file mode 100644
index 729f5dd..0000000
Binary files a/gnome2-libs/zenity/zenity-2.18.2.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/zenity/zenity-2.20.0.tar.bz2.sig
b/gnome2-libs/zenity/zenity-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..5d552e5
Binary files /dev/null and b/gnome2-libs/zenity/zenity-2.20.0.tar.bz2.sig
differ
diff --git a/graphics-libs/agg/DEPENDS b/graphics-libs/agg/DEPENDS
new file mode 100755
index 0000000..d7197b5
--- /dev/null
+++ b/graphics-libs/agg/DEPENDS
@@ -0,0 +1,7 @@
+depends g++ &&
+depends sdl &&
+depends X11-LIBS &&
+optional_depends freetype2 \
+ "--enable-freetype" \
+ "--disable-freetype" \
+ "freetype font support library"
diff --git a/graphics-libs/agg/DETAILS b/graphics-libs/agg/DETAILS
new file mode 100755
index 0000000..a63af60
--- /dev/null
+++ b/graphics-libs/agg/DETAILS
@@ -0,0 +1,43 @@
+ SPELL=agg
+ VERSION=2.5
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.antigrain.com/${SOURCE}
+
SOURCE_HASH=sha512:e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.antigrain.com/";
+ LICENSE[0]=GPL
+ ENTERED=20070830
+ SHORT="Anti-Grain Geometry (AGG) is an Open Source, free of
charge graphic library"
+cat << EOF
+Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library,
+written in industrially standard C++. The terms and conditions of use AGG
+are described on The License page. AGG doesn't depend on any graphic API or
+technology. Basically, you can think of AGG as of a rendering engine that
+produces pixel images in memory from some vectorial data. But of course,
+AGG can do much more than that. The ideas and the philosophy of AGG are:
+
+ * Anti-Aliasing. * Subpixel Accuracy. * The highest possible quality.
+ * High performance. * Platform independence and compatibility. *
+ Flexibility and extensibility. * Lightweight design. * Reliability
+ and stability (including numerical stability).
+
+Below there are some key features (but not all of them):
+
+ * Rendering of arbitrary polygons with Anti-Aliasing and Subpixel
+ Accuracy. * Gradients and Gouraud Shading. * Fast filtered image affine
+ transformations, including many interpolation filters (bilinear, bicubic,
+ spline16, spline36, sinc, Blackman). * Strokes with different types of
+ line joins and line caps. * Dashed line generator. * Markers, such as
+ arrowheads/arrowtails. * Fast vectorial polygon clipping to a rectangle.
+ * Low-level clipping to multiple rectangular regions. * Alpha-Masking.
+ * A new, fast Anti-Alias line algorithm. * Using arbitrary images as
+ line patterns. * Rendering in separate color channels. * Perspective
+ and bilinear transformations of vector and image data. * Boolean polygon
+ operations (and, or, xor, sub) based on Alan Murta's
+ General Polygon Clipper.
+
+Anti-Grain Geometry contains many interactive Demo exemples that are platform
+independent too, and use a simple platform_support class that currently has
+two implementations, for Win32 API and X11 (no Motiff, no other dependencies,
+just basic X11). One of the examples is an SVG Viewer.
+EOF
diff --git a/graphics-libs/agg/HISTORY b/graphics-libs/agg/HISTORY
new file mode 100644
index 0000000..6a8b377
--- /dev/null
+++ b/graphics-libs/agg/HISTORY
@@ -0,0 +1,2 @@
+2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, PRE_BUILD, HISTORY: created spell
diff --git a/graphics-libs/agg/PRE_BUILD b/graphics-libs/agg/PRE_BUILD
new file mode 100755
index 0000000..0326172
--- /dev/null
+++ b/graphics-libs/agg/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/configure/d' autogen.sh &&
+chmod +x autogen.sh &&
+./autogen.sh
diff --git a/graphics-libs/cimg/DETAILS b/graphics-libs/cimg/DETAILS
index 99b92f9..d6d6b2e 100755
--- a/graphics-libs/cimg/DETAILS
+++ b/graphics-libs/cimg/DETAILS
@@ -1,8 +1,8 @@
SPELL=cimg
- VERSION=1-19
- SOURCE=CImg-${VERSION}.zip
+ VERSION=1.2.3
+ SOURCE=CImg-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:da580e7e1022708590a7d0bad9a35db886704a8cc03b36790d030bde9fb36277152c6681f2f74a6722cd9e206dc6c14c28b0925f755d20533546517cec96b49b
+
SOURCE_HASH=sha512:dfdb037d52ca0600b832707f26b7cf50ff407e696079e646173466fb14997ce4c3f84dd1a6fe35b0f04ec2bc851c7012b7504574cd7c5975e878a63a3184689a
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/CImg-${VERSION}
WEB_SITE=http://cimg.sourceforge.net/
ENTERED=20070318
diff --git a/graphics-libs/cimg/HISTORY b/graphics-libs/cimg/HISTORY
index 092cc15..259eb94 100644
--- a/graphics-libs/cimg/HISTORY
+++ b/graphics-libs/cimg/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3
+
2007-03-18 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: install_rootifying

diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index c97d3f1..298d874 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.18
-
SOURCE_HASH=sha512:7d9df67576364681cfb8e207881429b80ae1e96ccb54c1ce315684827ae521321d2090570763c9fecb504e256abf6a5d72b3853980078ebc0ba224442e00fae0
+ VERSION=1.2.20
+
SOURCE_HASH=sha512:114a2fc6a60d4f5a4cc2f8e71bbdc52708424cdacdf3e192f5511a134af9eca1f9f702b20b86f953b0b3fa5fde52424dd10616523693ccca7a8772950974e108
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index d20d50e..f491fce 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.20
+
+2007-08-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.19
+
2007-05-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.18
* SECURITY_PATCH++
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 1c1a6f9..f5d58c3 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,12 +1,12 @@
depends libdrm &&
depends X11-UTILS &&
-depends X11-LIBS &&
-
-source $GRIMOIRE/FUNCTIONS &&
-if check_if_xorg_modular_libs ; then
- depends libxdamage &&
- depends libxfixes
-fi &&
+depends expat &&
+depends libxdamage &&
+depends libx11 &&
+depends libxext &&
+depends libxxf86vm &&
+depends libxau &&
+depends libxfixes
if [[ "$MESALIB_GIT" == "y" ]]; then
depends git
fi
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 10010b3..732a6c3 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2007-09-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: missing various dependencies droping X11-LIBS
+ it's useless as it conflicts with all other providers but
+ the xorg-modular ones
+
2007-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.0.1

diff --git a/graphics-libs/ogre/BUILD b/graphics-libs/ogre/BUILD
index 6bfd4ff..9910fc4 100755
--- a/graphics-libs/ogre/BUILD
+++ b/graphics-libs/ogre/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OGRE_DOUBLE OPTS" &&
+OPTS="$OGRE_DOUBLE $OPTS" &&
default_build
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 96b2e2e..5cb1ec9 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,6 @@
+2007-08-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: added a missing $ which made BUILD fail
+
2007-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1-4-3
* DEPENDS: add optional boost (for threading)
diff --git a/graphics-libs/poppler-data/BUILD
b/graphics-libs/poppler-data/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/graphics-libs/poppler-data/BUILD
@@ -0,0 +1 @@
+true
diff --git a/graphics-libs/poppler-data/DETAILS
b/graphics-libs/poppler-data/DETAILS
new file mode 100755
index 0000000..6cd371d
--- /dev/null
+++ b/graphics-libs/poppler-data/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=poppler-data
+ VERSION=0.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=LICENSE
+ WEB_SITE=http://poppler.freedesktop.org/
+ ENTERED=20070911
+ SHORT="poppler encoding data"
+cat << EOF
+poppler encoding data
+EOF
diff --git a/graphics-libs/poppler-data/HISTORY
b/graphics-libs/poppler-data/HISTORY
new file mode 100644
index 0000000..7457460
--- /dev/null
+++ b/graphics-libs/poppler-data/HISTORY
@@ -0,0 +1,2 @@
+2007-09-12 Robin Cook <rcook AT wyrms.net>
+ * Initial Spell: DETAILS, PRE_BUILD, BUILD, HISTORY
diff --git a/graphics-libs/poppler-data/LICENSE
b/graphics-libs/poppler-data/LICENSE
new file mode 100644
index 0000000..70acb91
--- /dev/null
+++ b/graphics-libs/poppler-data/LICENSE
@@ -0,0 +1,41 @@
+The various data files installed by the poppler-data package carries
+this license:
+
+ Copyright 1990-1998 Adobe Systems Incorporated.
+ All Rights Reserved.
+
+ Patents Pending
+
+ NOTICE: All information contained herein is the property of Adobe
+ Systems Incorporated.
+
+ Permission is granted for redistribution of this file provided
+ this copyright notice is maintained intact and that the contents
+ of this file are not altered in any way from its original form.
+
+ PostScript and Display PostScript are trademarks of Adobe Systems
+ Incorporated which may be registered in certain jurisdictions.
+
+The Makefile is licensed under the MIT license:
+
+ Copyright © 2006 Red Hat, Inc
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Red Hat, Inc not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission. Red Hat, Inc makes no representations about the
+ suitability of this software for any purpose. It is provided "as
+ is" without express or implied warranty.
+
+ RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL,
+ INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/graphics-libs/poppler-data/Makefile.diff
b/graphics-libs/poppler-data/Makefile.diff
new file mode 100644
index 0000000..09d7055
--- /dev/null
+++ b/graphics-libs/poppler-data/Makefile.diff
@@ -0,0 +1,11 @@
+--- Makefile.orig 2007-09-11 22:25:18.000000000 -0500
++++ Makefile 2007-09-11 22:25:30.000000000 -0500
+@@ -1,7 +1,7 @@
+ PACKAGE = poppler-data
+ VERSION = 0.1
+ distdir = $(PACKAGE)-$(VERSION)
+-prefix = /usr/local
++prefix = /usr
+ datadir = $(prefix)/share
+ pkgdatadir = $(datadir)/poppler
+
diff --git a/graphics-libs/poppler-data/PRE_BUILD
b/graphics-libs/poppler-data/PRE_BUILD
new file mode 100755
index 0000000..a1dcf21
--- /dev/null
+++ b/graphics-libs/poppler-data/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/Makefile.diff
diff --git a/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig
b/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig
new file mode 100644
index 0000000..c36d1c3
Binary files /dev/null and
b/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig differ
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 2725d7c..d091739 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -2,30 +2,39 @@ if [ "$POPPLER_CVS" == "y" ]; then
depends CVS
fi &&

-depends g++ &&
-depends fontconfig &&
+depends g++ &&
+depends fontconfig &&
+depends poppler-data &&

-optional_depends zlib \
- "--enable-zlib" \
- "--disable-zlib" \
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
"for compressed file support" &&
-optional_depends jpeg \
- "--enable-libjpeg" \
- "--disable-libjpeg" \
- "for jpeg support" &&
-optional_depends gtk+2 \
- "--enable-poppler-glib" \
- "--disable-poppler-glib" \
- "for glib wrapper" &&
-optional_depends qt4 \
- "--enable-poppler-qt4" \
- "--disable-poppler-qt4" \
- "for QT wrapper" &&
-optional_depends qt-x11 \
- "--enable-poppler-qt" \
- "--disable-poppler-qt" \
- "for QT wrapper" &&
-optional_depends cairo \
- "--enable-cairo-output" \
- "--disable-cairo-output" \
- "for cairo output"
+optional_depends jpeg \
+ "--enable-libjpeg" \
+ "--disable-libjpeg" \
+ "for jpeg support" &&
+optional_depends gtk+2 \
+ "--enable-poppler-glib" \
+ "--disable-poppler-glib" \
+ "for glib wrapper" &&
+optional_depends qt4 \
+ "--enable-poppler-qt4" \
+ "--disable-poppler-qt4" \
+ "for QT wrapper" &&
+optional_depends qt-x11 \
+ "--enable-poppler-qt" \
+ "--disable-poppler-qt" \
+ "for QT wrapper" &&
+optional_depends cairo \
+ "--enable-cairo-output" \
+ "--disable-cairo-output" \
+ "for cairo output" &&
+optional_depends abiword \
+ "--enable-abiword-output" \
+ "--disable-abiword-output" \
+ "generate gtk-docs" &&
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "generate gtk-docs"
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 7b0e543..00e3a54 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -1,9 +1,9 @@
SPELL=poppler
if [ "$POPPLER_CVS" == "y" ]; then
if [ "$POPPLER_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=0.5.9
+ VERSION=$(date +%Y%m%d)
else
- VERSION=0.5.9
+ VERSION=cvs
fi
SOURCE=$SPELL-cvs.tar.bz2
FORCE_DOWNLOAD=on
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anoncvs AT cvs.freedesktop.org:/cvs/poppler:poppler
SOURCE_IGNORE=volatile
else
- VERSION=0.5.9
+ VERSION=0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index cda03cc..03168ca 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,17 @@
+2007-09-15 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: fixed annoying typo
+
+2007-09-11 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.6
+ * DEPENDS: added poppler-data
+ added optionals on abiword and gtk-doc
+
+2007-09-12 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: fixed VERSION fields for CVS branch
+
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.91
+
2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: change glib2 to gtk+2

diff --git a/graphics-libs/poppler/configure.ac.diff
b/graphics-libs/poppler/configure.ac.diff
deleted file mode 100644
index b64fd3d..0000000
--- a/graphics-libs/poppler/configure.ac.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2006-10-12 19:44:43.000000000 -0500
-+++ configure.ac 2006-10-12 19:45:40.000000000 -0500
-@@ -183,7 +183,7 @@
- enable_poppler_glib=$enableval,
- enable_poppler_glib="try")
- if test x$enable_poppler_glib = xyes; then
-- PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6)
-+ PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6)
- elif test x$enable_poppler_glib = xtry; then
- PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0,
- [enable_poppler_glib="yes"],
diff --git a/graphics-libs/poppler/poppler-0.5.9.tar.gz.sig
b/graphics-libs/poppler/poppler-0.5.9.tar.gz.sig
deleted file mode 100644
index 54045d3..0000000
Binary files a/graphics-libs/poppler/poppler-0.5.9.tar.gz.sig and /dev/null
differ
diff --git a/graphics-libs/poppler/poppler-0.6.tar.gz.sig
b/graphics-libs/poppler/poppler-0.6.tar.gz.sig
new file mode 100644
index 0000000..dcd56ea
Binary files /dev/null and b/graphics-libs/poppler/poppler-0.6.tar.gz.sig
differ
diff --git a/graphics-libs/rmagick/DETAILS b/graphics-libs/rmagick/DETAILS
index f305290..0846574 100755
--- a/graphics-libs/rmagick/DETAILS
+++ b/graphics-libs/rmagick/DETAILS
@@ -1,8 +1,8 @@
SPELL=rmagick
- VERSION=2.0.0-beta2
+ VERSION=2.0.0-beta3
SOURCE=RMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/RMagick-${VERSION:0:5}
- SOURCE_URL[0]=http://rubyforge.org/frs/download.php/24002/$SOURCE
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/25311/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://rmagick.rubyforge.org/
ENTERED=20051105
diff --git a/graphics-libs/rmagick/HISTORY b/graphics-libs/rmagick/HISTORY
index a6877a7..e61393f 100644
--- a/graphics-libs/rmagick/HISTORY
+++ b/graphics-libs/rmagick/HISTORY
@@ -1,3 +1,6 @@
+2007-09-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 2.0.0-beta3
+
2007-08-13 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 2.0.0-beta2, changed SOURCE_DIRECTORY, updated
short and long description
diff --git a/graphics-libs/rmagick/RMagick-2.0.0-beta2.tar.bz2.sig
b/graphics-libs/rmagick/RMagick-2.0.0-beta2.tar.bz2.sig
deleted file mode 100644
index 27b813d..0000000
Binary files a/graphics-libs/rmagick/RMagick-2.0.0-beta2.tar.bz2.sig and
/dev/null differ
diff --git a/graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig
b/graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig
new file mode 100644
index 0000000..c75f2cd
Binary files /dev/null and
b/graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig differ
diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index 545506f..474ae2c 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -9,13 +9,25 @@ if [ $OPENEXR == y ]; then
else
USE_OPENEXR="WITH_BF_OPENEXR=0"
fi &&
+if [ $FFMPEG == y ]; then
+ USE_FFMPEG="WITH_BF_FFMPEG=1"
+else
+ USE_FFMPEG="WITH_BF_FFMPEG=0"
+fi &&

scons \
$USE_OPENAL \
$USE_OPENEXR \
+ $USE_FFMPEG \
WITH_BF_INTERNATIONAL=1 \
WITH_BF_PLAYER=1 \
WITH_BF_GAMEENGINE=1 \
- BF_INSTALLDIR=$SOURCE_DIRECTORY/install
+ BF_INSTALLDIR=$SOURCE_DIRECTORY/install &&
# Do not build outside the default tree because of a bug in makesdna
compiling
# BF_BUILDDIR=$SOURCE_DIRECTORY/build
+
+install -d ${SOURCE_DIRECTORY}/install/linux2/plugins/include &&
+install -m 644 ${SOURCE_DIRECTORY}/source/blender/blenpluginapi/*.h \
+ ${SOURCE_DIRECTORY}/install/linux2/plugins/include &&
+cp -a ${SOURCE_DIRECTORY}/release/plugins/*
${SOURCE_DIRECTORY}/install/linux2/plugins &&
+make -C ${SOURCE_DIRECTORY}/install/linux2/plugins
diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
index 6ac1f01..b8a3c6c 100755
--- a/graphics/blender/CONFIGURE
+++ b/graphics/blender/CONFIGURE
@@ -1,2 +1,3 @@
-config_query OPENAL "Use blender audio ability (openal) ?" y &&
-config_query OPENEXR "Enable High Dynamic Range graphics (openexr)" y
+config_query OPENAL "Use blender audio ability (openal) ?" y &&
+config_query OPENEXR "Enable High Dynamic Range graphics (openexr)" y &&
+config_query FFMPEG "Use ffmpeg as a dependency?" y
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index dacd4aa..762088d 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -13,6 +13,10 @@ if [ "$OPENEXR" == "y" ]; then
depends openexr
fi &&

+if [ "$FFMPEG" == "y" ]; then
+ depends LIBAVCODEC
+fi &&
+
optional_depends libpng \
"" \
"" \
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index 4b77580..5a42a60 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,11 @@
+2007-09-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, INSTALL: build and install libraries necessary to
+ execute scripts
+ * INSTALL: cleaned up the installation process
+ * PRE_BUILD, blender-2.44-scriptsdir.patch: added patch from
+ gentoo to correctly set the scriptsdir
+ * BUILD, DEPENDS, CONFIGURE: added optional support for ffmpeg
+
2007-07-29 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* PRE_BUILD: fixed permissions and include files for the sample
plugins
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
index d208b17..a6da702 100755
--- a/graphics/blender/INSTALL
+++ b/graphics/blender/INSTALL
@@ -4,5 +4,20 @@ install -m 644 ${SCRIPT_DIRECTORY}/blender48x48.png
\
${INSTALL_ROOT}/usr/share/pixmaps &&

install -m 755 -d ${INSTALL_ROOT}/usr/share/blender &&
-cp -R install/plugins ${INSTALL_ROOT}/usr/share/blender &&
-cp -R install/.blender ${INSTALL_ROOT}/usr/share/blender
+install -m 755 -d ${INSTALL_ROOT}/usr/lib/blender/plugins/sequence &&
+install -m 755 -d ${INSTALL_ROOT}/usr/lib/blender/plugins/texture &&
+
+install -m 644 ${SOURCE_DIRECTORY}/install/linux2/plugins/sequence/*.so \
+ ${INSTALL_ROOT}/usr/lib/blender/plugins/sequence &&
+install -m 644 ${SOURCE_DIRECTORY}/install/linux2/plugins/texture/*.so \
+ ${INSTALL_ROOT}/usr/lib/blender/plugins/texture &&
+cp -R ${SOURCE_DIRECTORY}/install/.blender \
+ ${INSTALL_ROOT}/usr/share/blender &&
+cp -a ${SOURCE_DIRECTORY}/release/scripts/bpydata \
+ ${INSTALL_ROOT}/usr/share/blender &&
+cp -a ${SOURCE_DIRECTORY}/release/scripts \
+ ${INSTALL_ROOT}/usr/share/blender &&
+install -m 644 ${SOURCE_DIRECTORY}/release/VERSION \
+ ${INSTALL_ROOT}/usr/share/blender &&
+
+find ${INSTALL_ROOT}/usr/share/blender/scripts/ -name "*.py" -exec chmod -R
644 '{}' \;
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
index 1c45575..d0431e1 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -6,4 +6,5 @@ sedit "s:2.4:$(installed_version python):" \

cd $SOURCE_DIRECTORY &&
chmod 755 release/plugins/bmake &&
-cp -r source/blender/blenpluginapi release/plugins/include
+cp -r source/blender/blenpluginapi release/plugins/include &&
+patch -p1 < ${SCRIPT_DIRECTORY}/blender-2.44-scriptsdir.patch
diff --git a/graphics/blender/blender-2.44-scriptsdir.patch
b/graphics/blender/blender-2.44-scriptsdir.patch
new file mode 100644
index 0000000..398ccc5
--- /dev/null
+++ b/graphics/blender/blender-2.44-scriptsdir.patch
@@ -0,0 +1,91 @@
+--- blender-2.44/source/blender/python/api2_2x/EXPP_interface.c.orig
2006-05-01 14:24:56.000000000 +0200
++++ blender-2.44/source/blender/python/api2_2x/EXPP_interface.c
2007-06-21 22:25:39.000000000 +0200
+@@ -52,85 +52,13 @@
+ */
+ char *bpy_gethome(int append_scriptsdir)
+ {
+- static char homedir[FILE_MAXDIR];
+- static char scriptsdir[FILE_MAXDIR];
+- char tmpdir[FILE_MAXDIR];
+- char bprogdir[FILE_MAXDIR];
+- char *s;
+- int i;
++ static char homedir[FILE_MAXDIR]="/usr/share/blender";
++ static char scriptsdir[FILE_MAXDIR]="/usr/share/blender/scripts";
+
+ if (append_scriptsdir) {
+- if (scriptsdir[0] != '\0')
+ return scriptsdir;
+ }
+- else if (homedir[0] != '\0')
+- return homedir;
+-
+- /* BLI_gethome() can return NULL if env vars are not set */
+- s = BLI_gethome();
+-
+- if( !s ) /* bail if no $HOME */
+- {
+- printf("$HOME is NOT set\n");
+- return NULL;
+- }
+-
+- if( strstr( s, ".blender" ) )
+- PyOS_snprintf( homedir, FILE_MAXDIR, s );
+- else
+- BLI_make_file_string( "/", homedir, s, ".blender" );
+-
+- /* if userhome/.blender/ exists, return it */
+- if( BLI_exists( homedir ) ) {
+- if (append_scriptsdir) {
+- BLI_make_file_string("/", scriptsdir, homedir,
"scripts");
+- if (BLI_exists (scriptsdir)) return scriptsdir;
+- }
+- else return homedir;
+- }
+- else homedir[0] = '\0';
+-
+- /* if either:
+- * no homedir was found or
+- * append_scriptsdir = 1 but there's no scripts/ inside homedir,
+- * use argv[0] (bprogname) to get .blender/ in
+- * Blender's installation dir */
+- s = BLI_last_slash( bprogname );
+-
+- i = s - bprogname + 1;
+-
+- PyOS_snprintf( bprogdir, i, "%s", bprogname );
+-
+- /* using tmpdir to preserve homedir (if) found above:
+- * the ideal is to have a home dir with scripts dir inside
+- * it, but if that isn't available, it's possible to
+- * have a 'broken' home dir somewhere and a scripts dir in the
+- * cvs sources */
+- BLI_make_file_string( "/", tmpdir, bprogdir, ".blender" );
+-
+- if (BLI_exists(tmpdir)) {
+- if (append_scriptsdir) {
+- BLI_make_file_string("/", scriptsdir, tmpdir,
"scripts");
+- if (BLI_exists(scriptsdir)) {
+- PyOS_snprintf(homedir, FILE_MAXDIR, "%s",
tmpdir);
+- return scriptsdir;
+- }
+- else {
+- homedir[0] = '\0';
+- scriptsdir[0] = '\0';
+- }
+- }
+- else return homedir;
+- }
+-
+- /* last try for scripts dir: blender in cvs dir, scripts/ inside
release/: */
+- if (append_scriptsdir) {
+- BLI_make_file_string("/", scriptsdir, bprogdir,
"release/scripts");
+- if (BLI_exists(scriptsdir)) return scriptsdir;
+- else scriptsdir[0] = '\0';
+- }
+-
+- return NULL;
++ return homedir;
+ }
+
+ /* PyDrivers */
diff --git a/graphics/fontforge/DETAILS b/graphics/fontforge/DETAILS
index 70c242c..ee7de66 100755
--- a/graphics/fontforge/DETAILS
+++ b/graphics/fontforge/DETAILS
@@ -1,6 +1,6 @@
SPELL=fontforge
- VERSION=20070723
-
SOURCE_HASH=sha512:9ecb2729f9762b53c2669dd4007936b7c8784457ffc934a96c3f0f24d38bf8cb9ac15dcc7cc808f79242d9fe1b9eb0fe206b15d98b0ff5cfbfa792c75001ab32
+ VERSION=20070808
+
SOURCE_HASH=sha512:af539afd17f8365d625042d1c617f06ab9567a8a6adcd7a6406785866b6aa251e8c14c49416bb8b5677ba65e75fcb7e2b723b5779458967fab746dc3414f3de9
SOURCE=${SPELL}_full-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics/fontforge/HISTORY b/graphics/fontforge/HISTORY
index af4380d..076f460 100644
--- a/graphics/fontforge/HISTORY
+++ b/graphics/fontforge/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20070808
+
2007-07-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20070723

diff --git a/graphics/gimp-lqr-plugin/DEPENDS
b/graphics/gimp-lqr-plugin/DEPENDS
new file mode 100755
index 0000000..7b40790
--- /dev/null
+++ b/graphics/gimp-lqr-plugin/DEPENDS
@@ -0,0 +1,4 @@
+depends autoconf &&
+depends automake &&
+depends gimp &&
+depends intltool
diff --git a/graphics/gimp-lqr-plugin/DETAILS
b/graphics/gimp-lqr-plugin/DETAILS
new file mode 100755
index 0000000..c77dada
--- /dev/null
+++ b/graphics/gimp-lqr-plugin/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=gimp-lqr-plugin
+ VERSION=0.2.0
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://web.tiscali.it/carlobaldassi/GimpLqrPlugin/${SOURCE}
+
SOURCE_HASH=sha512:ed1ffa9208141aba771efe2bfe785487ea5607a9112e7e1bc627cf6ab332115f0c5aec61059463d2df34986462d297c4d9f96a413c5f4f67f60b4998b6a9a271
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ WEB_SITE=http://mydebianblog.blogspot.com/2007/09/blog-post.html
+ LICENSE[0]=GPL
+ KEYWORDS="graphics"
+ ENTERED=20070908
+ SHORT="GIMP Liquid rescale plugin"
+cat << EOF
+GIMP Liquid rescale plugin. It implements the algorithm
+described in the paper "Seam Carving for Content-Aware
+Image Resizing" by Shai Avidan and Ariel Shamir, which
+can be found at http://www.faculty.idc.ac.il/arik/imret.pdf
+EOF
diff --git a/graphics/gimp-lqr-plugin/HISTORY
b/graphics/gimp-lqr-plugin/HISTORY
new file mode 100644
index 0000000..d2de9d3
--- /dev/null
+++ b/graphics/gimp-lqr-plugin/HISTORY
@@ -0,0 +1,5 @@
+2007-09-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.0
+
+2007-09-08 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS, DETAILS, PRE_BUILD: spell created
diff --git a/graphics/gimp-lqr-plugin/PRE_BUILD
b/graphics/gimp-lqr-plugin/PRE_BUILD
new file mode 100755
index 0000000..a7c2dd8
--- /dev/null
+++ b/graphics/gimp-lqr-plugin/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+rm -f COPYING config.{guess,sub} &&
+intltoolize --force --copy &&
+libtoolize --copy --force &&
+aclocal &&
+autoheader &&
+automake --add-missing --copy &&
+autoconf &&
+automake
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 81d1b97..9aa7888 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -1,5 +1,9 @@
if [ "$GIMP_DEVEL" == "y" ];then
- depends pygtk2
+ depends pygtk2 &&
+ optional_depends dbus-glib \
+ "--with-dbus" \
+ "--without-dbus" \
+ "for D-Bus support"
else
optional_depends pygtk2 "--enable-python" "--disable-python" \
"for python scripting support"
@@ -14,7 +18,7 @@ optional_depends lcms \
"" \
"for color proof module" &&

-optional_depends gutenprint \
+optional_depends gimp-print \
"" \
"--disable-print" \
"to support printing from gimp" &&
@@ -48,4 +52,4 @@ optional_depends libwmf \
optional_depends aalib \
"" \
"--without-aa" \
- "for Ascii Art Plugin"
+ "for ASCII Art Plugin"
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 0a19a63..24a60db 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,10 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Ascii -> ASCII :)
+ Depends on gimp-print for printing support, not gutenprint
+
+2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added dbus-glib as optional for devel branch
+
2007-08-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.0-rc1 (devel)
* INSTALL: removed, links are created by make install now
diff --git a/graphics/graphicsmagick/DETAILS b/graphics/graphicsmagick/DETAILS
index 603bd03..074d475 100755
--- a/graphics/graphicsmagick/DETAILS
+++ b/graphics/graphicsmagick/DETAILS
@@ -1,16 +1,16 @@
SPELL=graphicsmagick
if [[ $GM_SNAP == y ]]
then
- VERSION=1.2.020061102
+ VERSION=1.2.020070918
+
SOURCE_HASH=sha512:949003c5d9d6e1d9bdaa2dc31922934babef3c8a9794ef1cdf12f376efaa7f4f52c6a3e290729a516c212b4adf8d13821808f7d8d482ddfff6bb771dad1006a8
SOURCE=GraphicsMagick-${VERSION}.tar.bz2

SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
-
SOURCE_HASH=sha512:ee6cb4760f766174088275eafaf44506158bfa1665bf36ecdd0a840aa4b0b9688e032088a2a06bd7ae5abc6239b538f504c52bc1a5030ae1c905afff6568a747
else
- VERSION=1.1.7
+ VERSION=1.1.10
+
SOURCE_HASH=sha512:22ea04134a6e3cc84749f7a114670586ff25515129addb4f27854b8353d70a00a476407a4e47799d62f52c2656dc850b8789b4af3358703ebe0a85e6521b1910
SOURCE=GraphicsMagick-${VERSION}.tar.bz2
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/${SOURCE}
SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:ec32ed20c27233998c118b9ff9578711df12b9973621673593e38177be70015cd11b3ff7e5f19139777210e4582d4200737b76fdf0ade162f42591c9449dc3e7
fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/GraphicsMagick-${VERSION}
WEB_SITE=http://www.${SPELL}.org
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 5458a6c..0de49ba 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,10 @@
+2007-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.10
+ update snapshot to 20070918
+
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.8
+
2007-03-02 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: enabled perl optional dependency with explicitly pointed
binary location
diff --git a/graphics/gscan2pdf/BUILD b/graphics/gscan2pdf/BUILD
new file mode 100755
index 0000000..f0ec840
--- /dev/null
+++ b/graphics/gscan2pdf/BUILD
@@ -0,0 +1,2 @@
+perl Makefile.PL
+make
diff --git a/graphics/gscan2pdf/DEPENDS b/graphics/gscan2pdf/DEPENDS
new file mode 100755
index 0000000..ef20ac5
--- /dev/null
+++ b/graphics/gscan2pdf/DEPENDS
@@ -0,0 +1,12 @@
+depends gtk+2 &&
+depends perl-glib &&
+depends perl-gtk2 &&
+depends sane-backends &&
+depends pdf-api2 &&
+depends perl-gtk2-simple-list &&
+depends locale-gettext &&
+depends tiff &&
+optional_depends gocr "" "" "for Optical Character Recognition" &&
+optional_depends unpaper "" "" "to clean up scanned pages" &&
+optional_depends djvulibre "" "" "to save files as DjVu" &&
+optional_depends xdg-utils "" "" "to email as PDF"
diff --git a/graphics/gscan2pdf/DETAILS b/graphics/gscan2pdf/DETAILS
new file mode 100755
index 0000000..8967c1a
--- /dev/null
+++ b/graphics/gscan2pdf/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=gscan2pdf
+ VERSION=0.9.16
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:acce4717473e6533d3bb7b08357f59a77be4597974af416956496bb9fa445f2de6c44fa77f26a24f0c3ddf3b39ec723467ab03d8e2b617afbd2000ec23eca2f2
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://gscan2pdf.sourceforge.net/";
+ LICENSE[0]=GPL
+ ENTERED=20070825
+ SHORT="UI to produce a multipage PDF from a scan"
+cat << EOF
+gscan2pdf - A GUI to produce a multipage PDF from a scan. gscan2pdf should
+work on almost any Linux/BSD machine.
+
+Scanning is handled with SANE via scanimage. PDF conversion is done by
+PDF::API2. TIFF export is handled by libtiff (faster and smaller memory
+footprint for multipage files).
+EOF
diff --git a/graphics/gscan2pdf/HISTORY b/graphics/gscan2pdf/HISTORY
new file mode 100644
index 0000000..662e9a8
--- /dev/null
+++ b/graphics/gscan2pdf/HISTORY
@@ -0,0 +1,2 @@
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index de267ad..bc1a57c 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -1,6 +1,11 @@
depends libtool "--disable-ltdl-install" &&
depends freetype2 &&

+optional_depends perl \
+ "--with-perl" \
+ "--without-perl" \
+ "for PerlMagick" &&
+
optional_depends graphviz \
"--with-gvc" \
"--without-gvc" \
@@ -20,8 +25,6 @@ if [ "$(get_spell_provider $SPELL X11-LIBS)" ==
"xorg-server" ]; then
depends libxrender
fi &&

-message "If you are going to install cups, choose espgs instead of
ghostscript." &&
-
optional_depends POSTSCRIPT-INTERPRETER \
"" \
"" \
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index d439def..c49a8e4 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,9 +1,9 @@
SPELL=imagemagick
- VERSION=6.3.5-6
+ VERSION=6.3.5-10
+ SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION/-*/}
SOURCE_URL[0]=ftp://ftp.imagemagick.org/pub/ImageMagick/$SOURCE
- SOURCE_URL[1]=${SOURCEFORGE_URL}/$SPELL/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 8ae011b..71a7152 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,22 @@
+2007-09-22 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.5-10
+
+2007-09-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated spell to 6.3.5-9. SECURITY_PATCH++
+
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove obsolete message about espgs
+
+2007-09-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated to version 6.3.5-8
+
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.5-7
+ Removed non-working SOURCE_URL[1]
+
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Added optional_depends perl
+
2007-08-15 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 6.3.5-6

diff --git a/graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig
new file mode 100644
index 0000000..3dc62fb
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig differ
diff --git a/graphics/imagemagick/ImageMagick-6.3.5-6.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.3.5-6.tar.bz2.sig
deleted file mode 100644
index aa3d523..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.3.5-6.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/inkscape/DEPENDS b/graphics/inkscape/DEPENDS
index f392a32..b6c5e79 100755
--- a/graphics/inkscape/DEPENDS
+++ b/graphics/inkscape/DEPENDS
@@ -8,6 +8,16 @@ depends libgc &&
depends xml-parser-expat &&
depends popt &&

+optional_depends pyxml \
+ "" \
+ "" \
+ "to enable several effects" &&
+
+optional_depends numpy \
+ "" \
+ "" \
+ "to enable several effects" &&
+
optional_depends libgnomeprintui \
"--with-gnome-print" \
"--without-gnome-print" \
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 192feb8..5bd524c 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,6 @@
+2007-08-19 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DEPENDS: added dependency on PyXML (Bug #13291) and numPy
+
2007-03-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 0.45.1. SECURITY_PATCH++

diff --git a/graphics/libgphoto2/CONFIGURE b/graphics/libgphoto2/CONFIGURE
index c6bff00..b4300b4 100755
--- a/graphics/libgphoto2/CONFIGURE
+++ b/graphics/libgphoto2/CONFIGURE
@@ -1,3 +1,4 @@
+message "if configure fails, unknown camera driver, please reconfigure" &&
if query "Do you want to (re)configure drivers?" n
then
local drivers=$( sed 's/$/\0 driver off/' $SCRIPT_DIRECTORY/drivers )
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 13d6b71..b56fe7a 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,11 @@
+2007-08-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * drivers: update camera list.
+ * CONFIGURE: warn about driver changes
+ * upddrv: added, for future use
+ if you encounter problems with an unknown camera driver,
+ please reconfigure the spell
+ fixes bug #13966
+
2007-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* INSTALL: fix install of hal-fdi data, breaks hal-0.5.9.1
diff --git a/graphics/libgphoto2/drivers b/graphics/libgphoto2/drivers
index 7dc8df6..b64d33a 100644
--- a/graphics/libgphoto2/drivers
+++ b/graphics/libgphoto2/drivers
@@ -1,12 +1,13 @@
-adcs65
-agfa-cl20
+adc65
+agfa_cl20
aox
barbie
canon
-casio
+casio_qv
+clicksmart310
digigr8
digita
-dimera
+dimera3500
directory
enigma13
fuji
@@ -15,30 +16,42 @@ hp215
iclick
jamcam
jd11
-kodak
+kodak_dc120
+kodak_dc210
+kodak_dc240
+kodak_dc3200
+kodak_ez200
konica
+konica_qm150
largan
lg_gsm
mars
-minolta
+dimagev
mustek
-panasonic
+panasonic_coolshot
+panasonic_l859
+panasonic_dc1000
+panasonic_dc1580
pccam300
pccam600
-polaroid
+polaroid_pdc320
+polaroid_pdc640
+polaroid_pdc700
ptp2
ricoh
+ricoh_g3
samsung
sierra
-sipix
+sipix_blink2
+sipix_web2
smal
-sonydscf1
-sonydscf55
+sonix
+sony_dscf1
+sony_dscf55
soundvision
spca50x
sq905
stv0674
stv0680
sx330z
-template
-toshiba
+toshiba_pdrm11
diff --git a/graphics/libgphoto2/upddrv b/graphics/libgphoto2/upddrv
new file mode 100755
index 0000000..e2d75a8
--- /dev/null
+++ b/graphics/libgphoto2/upddrv
@@ -0,0 +1,4 @@
+grep GP_CAMLIB /usr/src/libgphoto2-2.4.0/configure.ac |sed \
+"/obsolete/D;/DEFINE/D;s/^.*\[//;s/\].*$//">drv
+diff -uN drivers drv|less
+
diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index 46b6f0f..fc29aa3 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -1,6 +1,7 @@
SPELL=tesseract
- VERSION=2.00
-
SOURCE_HASH=sha512:95862bba97d696fc277dc5b19bb7d1ec3716d8db9675696fc9233e6080b76ca83c1deb8a26ecb00bc5e23de5850c0a4eb007dc608df0e1f44fe30a1cac377878
+ VERSION=2.01
+ LANGVER=2.00
+
SOURCE_HASH=sha512:12ffa36a6e0006ad3a657fa5653d0d6c8fcdf557a8893ef509a7cd0aa0334e939be3f3cff172408946dc1702b83c032f53db2642bbe4f5aaec0e33091eecc831
URI=http://tesseract-ocr.googlecode.com/files
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$URI/$SOURCE
@@ -8,32 +9,32 @@
for LL in $TESS_LANG; do
case $LL in
eng)
- SOURCE2=$SPELL-$VERSION.eng.tar.gz
+ SOURCE2=$SPELL-$LANGVER.eng.tar.gz
SOURCE2_URL[0]=$URI/$SOURCE2

SOURCE2_HASH=sha512:f2aa2e1aa8f20c59faa664675f85ca8c1dcc922803f17cc00519f84a01c0c98ba431915ba5765d5de75200d828687507846af7e9e0096f3a4fdf1163e54cb83d
;;
fra)
- SOURCE3=$SPELL-$VERSION.fra.tar.gz
+ SOURCE3=$SPELL-$LANGVER.fra.tar.gz
SOURCE3_URL[0]=$URI/$SOURCE3

SOURCE3_HASH=sha512:46686d6296446c59d020731e2d36e015717a750f6a41401c38794e7e8067dbd0299b838260a9ea9d5da3ddc289e0320ed71437f67ea99f93e79895e4aaf9cdc8
;;
ita)
- SOURCE4=$SPELL-$VERSION.ita.tar.gz
+ SOURCE4=$SPELL-$LANGVER.ita.tar.gz
SOURCE4_URL[0]=$URI/$SOURCE4

SOURCE4_HASH=sha512:75cb670c1fe202878c220029d113e0795844f94901a6a0e31201c43d5694e1995c11760229ef6dc5222ff1fe49ee87ee1cdf073e80347e2862e71f045ce4a2db
;;
nld)
- SOURCE5=$SPELL-$VERSION.nld.tar.gz
+ SOURCE5=$SPELL-$LANGVER.nld.tar.gz
SOURCE5_URL[0]=$URI/$SOURCE5

SOURCE5_HASH=sha512:0a2b7f13d784d210f5284de1a02c9b3849c4b36a27cf6276b5d9d444607bf52b909f8edfa07b5b1e0ee6bf59504bb9c92a47297ce31efa351aaa6b81c038b0ef
;;
spa)
- SOURCE6=$SPELL-$VERSION.spa.tar.gz
+ SOURCE6=$SPELL-$LANGVER.spa.tar.gz
SOURCE6_URL[0]=$URI/$SOURCE6

SOURCE6_HASH=sha512:a7efb46c5cc3812789f3dacf151e547007c3de1eed3d4a6a5c55cc18d4e1794377f34b55fd9e6a416f91a0ff62a66c0825a1993029ce4656ea64fcc18b9fa3fe
;;
deu)
- SOURCE7=$SPELL-$VERSION.deu.tar.gz
+ SOURCE7=$SPELL-$LANGVER.deu.tar.gz
SOURCE7_URL[0]=$URI/$SOURCE6

SOURCE7_HASH=sha512:e1792055d666c6090c4094b032d0143fd6bd5545c2d2e926f71bb360c6628ae5550f158df8efe47b69c987ac9cef8bd914fedcad2bd5b79901a41506ad8a60f2
;;
@@ -46,6 +47,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/tesseract-ocr/
LICENSE[0]=APACHE
ENTERED=20060509
+ PATCHLEVEL=1
KEYWORDS="ocr"
SHORT="ocr engine"
cat << EOF
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index 93dac6f..41af2e1 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,12 @@
+2007-09-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * train.diff: add
+ * PRE_BUILD: apply upstream patch
+
+2007-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.01
+ language packs are still 2.00
+
2007-07-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.00
* PREPARE: add support for language pack
diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
index 80f882f..c5fbc72 100755
--- a/graphics/tesseract/PRE_BUILD
+++ b/graphics/tesseract/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# apply upstream patch
+patch -p0 <$SPELL_DIRECTORY/train.diff &&
for LL in $TESS_LANG; do
case $LL in
eng) unpack_file 2 ;;
diff --git a/graphics/tesseract/train.diff b/graphics/tesseract/train.diff
new file mode 100644
index 0000000..07d199c
--- /dev/null
+++ b/graphics/tesseract/train.diff
@@ -0,0 +1,11 @@
+--- training/unicharset_extractor.cpp 2007-08-28 03:59:07.000000000 +0200
++++ training/unicharset_extractor.cpp 2007-08-31 00:11:09.000000000 +0200
+@@ -72,7 +72,7 @@
+ unicharset->set_isalpha(id, 1);
+ if (iswlower(wc))
+ unicharset->set_islower(id, 1);
+- if (iswlower(wc))
++ if (iswupper(wc))
+ unicharset->set_isupper(id, 1);
+ }
+ if (iswdigit(wc))
diff --git a/graphics/unpaper/BUILD b/graphics/unpaper/BUILD
new file mode 100755
index 0000000..6c8cae5
--- /dev/null
+++ b/graphics/unpaper/BUILD
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY/src &&
+gcc $CFLAGS -lm -o unpaper unpaper.c
diff --git a/graphics/unpaper/DETAILS b/graphics/unpaper/DETAILS
new file mode 100755
index 0000000..af2e1dd
--- /dev/null
+++ b/graphics/unpaper/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=unpaper
+ VERSION=0_2
+ SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:9955db91a486f0c5a6178a17ce03619c1428f64d755056ee57c5842fc800b04dcc5085a858933fcee65b0222b74a5f5e67b080926a2594429cf746dceec25219
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://unpaper.berlios.de/";
+ LICENSE[0]=GPL
+ ENTERED=20070825
+ SHORT="post-processing scanned and photocopied book pages"
+cat << EOF
+npaper is a post-processing tool for scanned sheets of paper, especially for
+book pages that have been scanned from previously created photocopies. The
+main purpose is to make scanned book pages better readable on screen after
+conversion to PDF. Additionally, unpaper might be useful to enhance the
+quality of scanned pages before performing optical character recognition
+(OCR). unpaper tries to clean scanned images by removing dark edges that
+appeared through scanning or copying on areas outside the actual page content
+(e.g. dark areas between the left-hand-side and the right-hand-side of a
+double- sided book-page scan). The program also tries to detect disaligned
+centering and rotation of pages and will automatically straighten each page
+by rotating it to the correct angle.
+EOF
diff --git a/graphics/unpaper/HISTORY b/graphics/unpaper/HISTORY
new file mode 100644
index 0000000..4bf9723
--- /dev/null
+++ b/graphics/unpaper/HISTORY
@@ -0,0 +1,2 @@
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS, HISTORY, BUILD, INSTALL, PRE_BUILD: created spell
diff --git a/graphics/unpaper/INSTALL b/graphics/unpaper/INSTALL
new file mode 100755
index 0000000..47cdd59
--- /dev/null
+++ b/graphics/unpaper/INSTALL
@@ -0,0 +1 @@
+cp -v $SOURCE_DIRECTORY/src/unpaper $INSTALL_ROOT/usr/bin
diff --git a/graphics/unpaper/PRE_BUILD b/graphics/unpaper/PRE_BUILD
new file mode 100755
index 0000000..9eb27d1
--- /dev/null
+++ b/graphics/unpaper/PRE_BUILD
@@ -0,0 +1,3 @@
+mkdir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file
\ No newline at end of file
diff --git a/graphics/xaralx/DETAILS b/graphics/xaralx/DETAILS
index 48357cc..41aff93 100755
--- a/graphics/xaralx/DETAILS
+++ b/graphics/xaralx/DETAILS
@@ -1,7 +1,7 @@
SPELL=xaralx
SPELLX=XaraLX
- VERSION=0.7r1777
-
SOURCE_HASH=sha512:705e86a15506f9f7e753134c3946dd60c754836c6390c8fc77a84686cfff99e1a8b0641853183de656a2f03a975d3dd81d9eed15ea8f9fdc1f2464007499a54e
+ VERSION=0.7r1780
+
SOURCE_HASH=sha512:8d5f24bfd6757a8f33837c9d1b5df8b7fb0e322bac970c7ca064e72813f0447a4f9c088f236bc6abd24d0afec7e69a185559cfcf0ee12813c862a196e3f2cc11
SOURCE=${SPELLX}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
SOURCE_URL[0]=http://downloads2.xara.com/opensource/$SOURCE
diff --git a/graphics/xaralx/HISTORY b/graphics/xaralx/HISTORY
index 5b1b0da..d7f13fc 100644
--- a/graphics/xaralx/HISTORY
+++ b/graphics/xaralx/HISTORY
@@ -1,3 +1,6 @@
+2007-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7r1780
+
2007-07-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7r1777

diff --git a/groups b/groups
index 64e4fa4..e41730c 100755
--- a/groups
+++ b/groups
@@ -78,5 +78,6 @@ powerdev:155:
iplog:156:
stb-admin:157:
davfs2:158:
+dovecot:159:
users:1000:
nogroup:65534:
diff --git a/gurus.gpg b/gurus.gpg
index 5f76161..d639f58 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/haskell/FUNCTIONS b/haskell/FUNCTIONS
index c53bce9..fdc837f 100755
--- a/haskell/FUNCTIONS
+++ b/haskell/FUNCTIONS
@@ -28,7 +28,13 @@ function default_build() {
#-------------------------------------------------------------------------
function default_install() {
local setup_file
+ local cabal_file
+ local share_dir

setup_file=$(detect_setup_file)
runhaskell $setup_file install
+ cabal_file=$(ls *.cabal)
+ share_dir=${INSTALL_ROOT}/usr/share/${SPELL}
+ mkdir -vp $share_dir
+ cp -v $cabal_file $share_dir
}
diff --git a/haskell/HASKELL_POST_REMOVE b/haskell/HASKELL_POST_REMOVE
new file mode 100755
index 0000000..d66a1c7
--- /dev/null
+++ b/haskell/HASKELL_POST_REMOVE
@@ -0,0 +1,5 @@
+if [ -z "$PACKAGE" ] ; then
+ PACKAGE=${SPELL#haskell-}
+fi
+message "${MESSAGE_COLOR}Unregistering package with
ghc-pkg...${DEFAULT_COLOR}"
+ghc-pkg unregister $PACKAGE
diff --git a/haskell/HASKELL_POST_RESURRECT b/haskell/HASKELL_POST_RESURRECT
new file mode 100755
index 0000000..7e7173f
--- /dev/null
+++ b/haskell/HASKELL_POST_RESURRECT
@@ -0,0 +1,16 @@
+# We need to restore package.conf and package.conf.old after resurrection.
+# Also we need to register package with ghc-pkg.
+
+message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
+GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
+GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
+mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
+mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
+
+message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
+SHARE_DIR=${INSTALL_ROOT}/usr/share/${SPELL}
+CABAL_FILE=$(ls ${SHARE_DIR}/*.cabal)
+ghc-pkg register --force-files $CABAL_FILE
+PACKAGE=$(grep 'name:' $CABAL_FILE | tr '\t' ' ' | tr -s ' ' | cut -d ' ' -f
2)
+message "${MESSAGE_COLOR}Exposing package with ghc-pkg...${DEFAULT_COLOR}"
+ghc-pkg expose $PACKAGE
diff --git a/haskell/HASKELL_PRE_RESURRECT b/haskell/HASKELL_PRE_RESURRECT
new file mode 100755
index 0000000..96595c8
--- /dev/null
+++ b/haskell/HASKELL_PRE_RESURRECT
@@ -0,0 +1,7 @@
+# We need to backup package.conf and package.conf.old before resurrection
+
+message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
+GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
+GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
+cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
+cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
diff --git a/haskell/haskell-html/DEPENDS b/haskell/haskell-html/DEPENDS
new file mode 100755
index 0000000..8eace53
--- /dev/null
+++ b/haskell/haskell-html/DEPENDS
@@ -0,0 +1 @@
+depends ghc
diff --git a/haskell/haskell-html/DETAILS b/haskell/haskell-html/DETAILS
new file mode 100755
index 0000000..22cb011
--- /dev/null
+++ b/haskell/haskell-html/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=haskell-html
+ VERSION=1.0
+ SOURCE="html-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/html/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:81de6cbb4f8686f77f25878dba3ff19ed6fe92821151767f2f03cc2d46868a7e19f04c585ddf8ee5427d8402bed50d9e030b17168405dbacff50a539428f44f7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/html-${VERSION}"
+
WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/html";
+ LICENSE[0]=BSD3
+ ENTERED=20070821
+ SHORT="Haskell HTML combinator library"
+cat << EOF
+A Haskell combinator library for constructing HTML documents.
+EOF
diff --git a/haskell/haskell-html/HISTORY b/haskell/haskell-html/HISTORY
new file mode 100644
index 0000000..e86e813
--- /dev/null
+++ b/haskell/haskell-html/HISTORY
@@ -0,0 +1,3 @@
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS, DEPENDS, HISTORY, POST_REMOVE, {PRE,POST}_RESSURECT:
+ created spell
diff --git a/haskell/haskell-html/POST_REMOVE
b/haskell/haskell-html/POST_REMOVE
new file mode 100755
index 0000000..cebb9b7
--- /dev/null
+++ b/haskell/haskell-html/POST_REMOVE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_REMOVE
diff --git a/haskell/haskell-html/POST_RESURRECT
b/haskell/haskell-html/POST_RESURRECT
new file mode 100755
index 0000000..18c6ef5
--- /dev/null
+++ b/haskell/haskell-html/POST_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_RESURRECT
diff --git a/haskell/haskell-html/PRE_RESURRECT
b/haskell/haskell-html/PRE_RESURRECT
new file mode 100755
index 0000000..a88ddcb
--- /dev/null
+++ b/haskell/haskell-html/PRE_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_PRE_RESURRECT
diff --git a/haskell/haskell-mtl/HISTORY b/haskell/haskell-mtl/HISTORY
index 0aa49fe..1e4f3a0 100644
--- a/haskell/haskell-mtl/HISTORY
+++ b/haskell/haskell-mtl/HISTORY
@@ -1,2 +1,7 @@
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * POST_REMOVE: Added to unregister package with ghc-pkg
+ * PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
+ also register package with ghc-pkg
+
2007-08-12 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/haskell/haskell-mtl/POST_REMOVE b/haskell/haskell-mtl/POST_REMOVE
new file mode 100755
index 0000000..cebb9b7
--- /dev/null
+++ b/haskell/haskell-mtl/POST_REMOVE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_REMOVE
diff --git a/haskell/haskell-mtl/POST_RESURRECT
b/haskell/haskell-mtl/POST_RESURRECT
new file mode 100755
index 0000000..18c6ef5
--- /dev/null
+++ b/haskell/haskell-mtl/POST_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_RESURRECT
diff --git a/haskell/haskell-mtl/PRE_RESURRECT
b/haskell/haskell-mtl/PRE_RESURRECT
new file mode 100755
index 0000000..a88ddcb
--- /dev/null
+++ b/haskell/haskell-mtl/PRE_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_PRE_RESURRECT
diff --git a/haskell/haskell-quickcheck/DEPENDS
b/haskell/haskell-quickcheck/DEPENDS
new file mode 100755
index 0000000..8eace53
--- /dev/null
+++ b/haskell/haskell-quickcheck/DEPENDS
@@ -0,0 +1 @@
+depends ghc
diff --git a/haskell/haskell-quickcheck/DETAILS
b/haskell/haskell-quickcheck/DETAILS
new file mode 100755
index 0000000..ca32afb
--- /dev/null
+++ b/haskell/haskell-quickcheck/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=haskell-quickcheck
+ VERSION=1.0
+ SOURCE="QuickCheck-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/QuickCheck/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:0f9ec6e9a111500c86dba1316c07eb6abb5ddd8312f119be1c374d6fa68fdb94ca539601891d0a8eb586c04b8e6cbdd9b0941ae734622d150f2502eb31be9324
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QuickCheck-${VERSION}"
+ WEB_SITE="http://www.math.chalmers.se/~rjmh/QuickCheck/";
+ LICENSE[0]=BSD3
+ ENTERED=20070821
+ SHORT="a library for automatic testing of Haskell programs"
+cat << EOF
+A library for testing Haskell programs automatically. The programmer
provides
+a specification of the program, in the form of properties which functions
+should satisfy, and QuickCheck then tests that the properties hold in a large
+number of randomly generated cases. Specifications are expressed in Haskell,
+using combinators defined in the QuickCheck library. QuickCheck provides
+combinators to define properties, observe the distribution of test data,
+and define test data generators.
+EOF
diff --git a/haskell/haskell-quickcheck/HISTORY
b/haskell/haskell-quickcheck/HISTORY
new file mode 100644
index 0000000..986eb88
--- /dev/null
+++ b/haskell/haskell-quickcheck/HISTORY
@@ -0,0 +1,3 @@
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS, DEPENDS, HISTORY, POST_REMOVE, {PRE,POST}_RESSURECT:
+ created spell
diff --git a/haskell/haskell-quickcheck/POST_REMOVE
b/haskell/haskell-quickcheck/POST_REMOVE
new file mode 100755
index 0000000..b1cd7d1
--- /dev/null
+++ b/haskell/haskell-quickcheck/POST_REMOVE
@@ -0,0 +1,2 @@
+PACKAGE=QuickCheck
+source $SECTION_DIRECTORY/HASKELL_POST_REMOVE
diff --git a/haskell/haskell-quickcheck/POST_RESURRECT
b/haskell/haskell-quickcheck/POST_RESURRECT
new file mode 100755
index 0000000..18c6ef5
--- /dev/null
+++ b/haskell/haskell-quickcheck/POST_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_RESURRECT
diff --git a/haskell/haskell-quickcheck/PRE_RESURRECT
b/haskell/haskell-quickcheck/PRE_RESURRECT
new file mode 100755
index 0000000..a88ddcb
--- /dev/null
+++ b/haskell/haskell-quickcheck/PRE_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_PRE_RESURRECT
diff --git a/haskell/haskell-x11-extras/DETAILS
b/haskell/haskell-x11-extras/DETAILS
index e4381fa..60297c1 100755
--- a/haskell/haskell-x11-extras/DETAILS
+++ b/haskell/haskell-x11-extras/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11-extras
- VERSION=0.2
+ VERSION=0.3
SOURCE="X11-extras-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11-extras/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:51aa73b9821687e57c2ed03abbc5b4c6760e765af54aa95ae79f63529405300a5653451dc2dc125040db603abed44967cd1764114b011475bf788450d69e11ea
+
SOURCE_HASH=sha512:07192db7bc245489e20bc90a49b9d0428ddf22757c4584073cdbc89832f8c912807584c73ffd0968014de933c8c6779b4fbccb779689010ec6137f33bb694581
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-extras-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-extras";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11-extras/HISTORY
b/haskell/haskell-x11-extras/HISTORY
index 0aa49fe..9cfdf36 100644
--- a/haskell/haskell-x11-extras/HISTORY
+++ b/haskell/haskell-x11-extras/HISTORY
@@ -1,2 +1,10 @@
+2007-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.3
+
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * POST_REMOVE: Added to unregister package with ghc-pkg
+ * PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
+ also register package with ghc-pkg
+
2007-08-12 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/haskell/haskell-x11-extras/POST_REMOVE
b/haskell/haskell-x11-extras/POST_REMOVE
new file mode 100755
index 0000000..b038d0c
--- /dev/null
+++ b/haskell/haskell-x11-extras/POST_REMOVE
@@ -0,0 +1,2 @@
+PACKAGE=X11-extras
+source $SECTION_DIRECTORY/HASKELL_POST_REMOVE
diff --git a/haskell/haskell-x11-extras/POST_RESURRECT
b/haskell/haskell-x11-extras/POST_RESURRECT
new file mode 100755
index 0000000..18c6ef5
--- /dev/null
+++ b/haskell/haskell-x11-extras/POST_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_RESURRECT
diff --git a/haskell/haskell-x11-extras/PRE_RESURRECT
b/haskell/haskell-x11-extras/PRE_RESURRECT
new file mode 100755
index 0000000..a88ddcb
--- /dev/null
+++ b/haskell/haskell-x11-extras/PRE_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_PRE_RESURRECT
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index 0aa49fe..1e4f3a0 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,2 +1,7 @@
+2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
+ * POST_REMOVE: Added to unregister package with ghc-pkg
+ * PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
+ also register package with ghc-pkg
+
2007-08-12 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/haskell/haskell-x11/POST_REMOVE b/haskell/haskell-x11/POST_REMOVE
new file mode 100755
index 0000000..5262bb6
--- /dev/null
+++ b/haskell/haskell-x11/POST_REMOVE
@@ -0,0 +1,2 @@
+PACKAGE=X11
+source $SECTION_DIRECTORY/HASKELL_POST_REMOVE
diff --git a/haskell/haskell-x11/POST_RESURRECT
b/haskell/haskell-x11/POST_RESURRECT
new file mode 100755
index 0000000..18c6ef5
--- /dev/null
+++ b/haskell/haskell-x11/POST_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_RESURRECT
diff --git a/haskell/haskell-x11/PRE_RESURRECT
b/haskell/haskell-x11/PRE_RESURRECT
new file mode 100755
index 0000000..a88ddcb
--- /dev/null
+++ b/haskell/haskell-x11/PRE_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_PRE_RESURRECT
diff --git a/http/apache-mod_ssl/DETAILS b/http/apache-mod_ssl/DETAILS
index 82ab85a..e736a9a 100755
--- a/http/apache-mod_ssl/DETAILS
+++ b/http/apache-mod_ssl/DETAILS
@@ -1,13 +1,14 @@
SPELL=apache-mod_ssl
- VERSION=2.8.28-1.3.37
+ VERSION=2.8.30-1.3.39
+ SECURITY_PATCH=1
SOURCE=mod_ssl-$VERSION.tar.gz
SOURCE2_BASE=apache_${VERSION##*-}
SOURCE2=$SOURCE2_BASE.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL=http://www.modssl.org/source/$SOURCE
SOURCE2_URL=http://www.apache.org/dist/httpd/$SOURCE2
-
SOURCE_HASH=sha512:17347e190b24a447ac295e0ec7ee737bfc953df58e6aa441017046db4f250b9b0ffe5bcbebd11e2c141b89296295b78fc21a6fea500017e45c6580e927072d8e
-
SOURCE2_HASH=sha512:471b83d7701c42bf21dff0b7dac242ed519c8517dddebc78b148ee2dbfdb6e9ad244c00a290294427c4ebdfbce19b01f30c0fdc32a4ac6f5b8cf473d69e377a8
+
SOURCE_HASH=sha512:9c5bc72ce5c44626d265410c21c1cb82ba77d76615d887b6c8f6e09d26aa5cb1a2bb3ee575977c32c734b60cb133bd6cb5d3289e4256460803a1623380d6453c
+
SOURCE2_HASH=sha512:fdffb3ed167d7beae0162f341c36cbb5f0a9be63c898442534b217e0ce7c5f87dffe6a9223873fc336848261ea3424a7e692c3de1b4a4cf9ae43e9f75d8827d9
WEB_SITE=http://www.modssl.org/
ENTERED=20011219
LICENSE[0]=BSD
diff --git a/http/apache-mod_ssl/HISTORY b/http/apache-mod_ssl/HISTORY
index ca42de0..aed0ec8 100644
--- a/http/apache-mod_ssl/HISTORY
+++ b/http/apache-mod_ssl/HISTORY
@@ -1,3 +1,10 @@
+2007-09-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.8.30-1.3.39
+
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.8.29-1.3.39, SECURITY_PATCH=1
+ CVE-2006-5752, CVE-2007-3304
+
2006-12-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.8.28-1.3.37 & Removed UPDATED

diff --git a/http/apache/BUILD b/http/apache/BUILD
index 7f212ab..210aa41 100755
--- a/http/apache/BUILD
+++ b/http/apache/BUILD
@@ -1,6 +1,3 @@
-# Berkeley DB 4.1 requires an extra parameter in `open'
-#patch -p1 < $SCRIPT_DIRECTORY/db-4.1.diff &&
-
./configure --prefix=/usr \
--sysconfdir=/etc/httpd \
--localstatedir=/var \
diff --git a/http/apache/DETAILS b/http/apache/DETAILS
index a35d340..3db6e7f 100755
--- a/http/apache/DETAILS
+++ b/http/apache/DETAILS
@@ -1,13 +1,13 @@
SPELL=apache
- VERSION=1.3.37
-
SOURCE_HASH=sha512:471b83d7701c42bf21dff0b7dac242ed519c8517dddebc78b148ee2dbfdb6e9ad244c00a290294427c4ebdfbce19b01f30c0fdc32a4ac6f5b8cf473d69e377a8
- SECURITY_PATCH=1
+ VERSION=1.3.39
+
SOURCE_HASH=sha512:fdffb3ed167d7beae0162f341c36cbb5f0a9be63c898442534b217e0ce7c5f87dffe6a9223873fc336848261ea3424a7e692c3de1b4a4cf9ae43e9f75d8827d9
+ SECURITY_PATCH=2
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
- SOURCE_URL[0]=http://www.wmwweb.com/apache/httpd/$SOURCE
+ SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
+ SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
WEB_SITE=http://httpd.apache.org/
ENTERED=20010922
- UPDATED=20040515
LICENSE[0]=APACHE
KEYWORDS="http"
SHORT="Apache HTTP Server"
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
index b8ee298..0415b58 100644
--- a/http/apache/HISTORY
+++ b/http/apache/HISTORY
@@ -1,3 +1,7 @@
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs
+ CVE-2006-5752, CVE-2007-3304
+
2006-09-29 Arjan Bouter <abouter AT sourcemage.org>
* CONFLICTS: added apache22

diff --git a/http/apache/db-4.1.diff b/http/apache/db-4.1.diff
deleted file mode 100644
index 1c25fde..0000000
--- a/http/apache/db-4.1.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN apache_1.3.27/src/modules/standard/mod_auth_db.c
apache/src/modules/standard/mod_auth_db.c
---- apache_1.3.27/src/modules/standard/mod_auth_db.c 2002-09-04
10:29:13.000000000 -0400
-+++ apache/src/modules/standard/mod_auth_db.c 2003-06-29 12:35:28.000000000
-0400
-@@ -172,7 +172,11 @@ static char *get_db_pw(request_rec *r, c
-
- #if defined(DB3) || defined(DB4)
- if ( db_create(&f, NULL, 0) != 0
-- || f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
-+ || f->open(f,
-+#if defined(DB4)
-+ NULL,
-+#endif
-+ auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
- #elif defined(DB2)
- if (db_open(auth_dbpwfile, DB_HASH, DB_RDONLY, 0664, NULL, NULL, &f) !=
0) {
- #else
diff --git a/http/apache2/01_all_gentoo_ipv6.patch
b/http/apache2/01_all_gentoo_ipv6.patch
deleted file mode 100644
index 6812c12..0000000
--- a/http/apache2/01_all_gentoo_ipv6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur httpd-2.0.53.orig/server/listen.c httpd-2.0.53/server/listen.c
---- httpd-2.0.53.orig/server/listen.c 2005-02-07 13:07:46.808512368 -0800
-+++ httpd-2.0.53/server/listen.c 2005-02-07 14:55:45.926536712 -0800
-@@ -75,19 +75,6 @@
- return stat;
- }
-
--#if APR_HAVE_IPV6
-- if (server->bind_addr->family == APR_INET6) {
-- stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
-- if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
-- ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
-- "make_sock: for address %pI, apr_socket_opt_set: "
-- "(IPV6_V6ONLY)",
-- server->bind_addr);
-- apr_socket_close(s);
-- return stat;
-- }
-- }
--#endif
-
- /*
- * To send data over high bandwidth-delay connections at full
diff --git a/http/apache2/03_all_redhat_xfsz.patch
b/http/apache2/03_all_redhat_xfsz.patch
deleted file mode 100644
index d6afc6a..0000000
--- a/http/apache2/03_all_redhat_xfsz.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur httpd-2.0.53.orig/server/mpm/prefork/prefork.c
httpd-2.0.53/server/mpm/prefork/prefork.c
---- httpd-2.0.53.orig/server/mpm/prefork/prefork.c 2005-02-18
12:58:45.347325288 -0800
-+++ httpd-2.0.53/server/mpm/prefork/prefork.c 2005-02-18 12:59:16.689560544
-0800
-@@ -382,7 +382,7 @@
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
"sigaction(SIGXCPU)");
- #endif
- #ifdef SIGXFSZ
-- sa.sa_handler = SIG_DFL;
-+ sa.sa_handler = SIG_IGN;
- if (sigaction(SIGXFSZ, &sa, NULL) < 0)
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
"sigaction(SIGXFSZ)");
- #endif
diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS
index f8145a7..f658e6a 100755
--- a/http/apache2/DETAILS
+++ b/http/apache2/DETAILS
@@ -1,12 +1,12 @@
SPELL=apache2
- VERSION=2.0.59
+ VERSION=2.0.61
SOURCE=httpd-$VERSION.tar.gz
SOURCE_GPG="httpd.gpg:${SOURCE}.asc:UPSTREAM_KEY"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- SECURITY_PATCH=1
- PATCHLEVEL=4
+ SECURITY_PATCH=2
+ PATCHLEVEL=0
LICENSE[0]=APACHE
KEYWORDS="http"
WEB_SITE=http://www.apache.org/
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 915cb9a..6abdb03 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,8 @@
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.61, SECURITY_PATCH=2
+ CVE-2007-3847, CVE-2007-1863, CVE-2006-5752, CVE-2007-3304
+ * PRE_BUILD, *.patch: removed
+
2007-02-17 Jeremy Blosser <jblosser-smgl AT firinn.org>
* config.layout: Use literal paths everywhere because otherwise
autoconf 2.60 gets lost when apxs is invoked. Bug 13510. Remove
diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD
deleted file mode 100755
index 917f8ff..0000000
--- a/http/apache2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/buildconf.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/03_all_redhat_xfsz.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/01_all_gentoo_ipv6.patch
diff --git a/http/apache2/buildconf.patch b/http/apache2/buildconf.patch
deleted file mode 100644
index 427a438..0000000
--- a/http/apache2/buildconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN httpd-2.0.58/buildconf httpd/buildconf
---- httpd-2.0.58/buildconf 2006-04-24 13:12:21.000000000 -0400
-+++ httpd/buildconf 2006-05-15 22:28:32.000000000 -0400
-@@ -67,7 +67,7 @@
- should_exit=1
- fi
-
--if [ ! -f "$apu_src_dir/Makefile.in" ]; then
-+if [ ! -f "$apu_src_dir/build/apu-conf.m4" ]; then
- echo ""
- echo "You don't have a copy of the apr-util source in $apu_src_dir. "
- echo "Please get one the source using the following instructions, "
diff --git a/http/apache2/httpd-2.0.59.tar.gz.asc
b/http/apache2/httpd-2.0.59.tar.gz.asc
deleted file mode 100644
index 331a646..0000000
--- a/http/apache2/httpd-2.0.59.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iQEVAwUARMj7lvcTqHkQ/eB1AQKApAgAjnO4vMS0hmJc7FI/X/qT5L9ZmwZpZFLW
-uFFlLCOlRNluQ4e+Y+a9lIlbvkhGATWC4ukDSa4EEuVa/Bs6rgDFm0jJW8c+pjG7
-NybvXIfVl2bmUI2LJPAJsAYm3vhThvPROVLuTg6FawCTAdjGrMli2gJQmNdw++Lk
-CzntFbrQajaZCV2Tc1wMOOzKFM7jPvgxAla9vd0tfRVAdMZQfz2BXGF0Nis7cd7i
-QmgdeExfKlQehJ3kf09z8td07IuXmxxg5Z3ktB3SNnKo8MclNcbUlDwiAM8ePieG
-pfGV1TQqHd+CvfRn/MoS5Sl74GtpXw0vgr4/A1ZjoTw3OM9x+cYHSQ==
-=JQal
------END PGP SIGNATURE-----
diff --git a/http/apache2/httpd-2.0.61.tar.gz.asc
b/http/apache2/httpd-2.0.61.tar.gz.asc
new file mode 100644
index 0000000..b51c800
--- /dev/null
+++ b/http/apache2/httpd-2.0.61.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (Darwin)
+
+iD8DBQBG3bjkizpgHwjJdeURAnqeAJ0dZrvd6Iu2q1kNoZ7B+mRdF6izYQCeM1Li
+Yqkmoz1yEtTEdzst6S+Zf0s=
+=sysN
+-----END PGP SIGNATURE-----
diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index 46ebae1..41591a4 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,8 +1,8 @@
SPELL=apache22
- VERSION=2.2.4
- SECURITY_PATCH=1
+ VERSION=2.2.6
+ SECURITY_PATCH=2
SOURCE=httpd-$VERSION.tar.gz
-
SOURCE_HASH=sha512:1652830821d86721f34553f89ffc4f1ee4c2306719ce062822d2f324186636d6faaf09b409558ca58e49a981e469c1704baa656e035a4a99d39ef090a6cafc46
+
SOURCE_HASH=sha512:5d7d54785c2c25649a55c61f9fccd52f7607f15fce595c48d0dd13110df4e91ad6c3cdce111bb40a1770b39fbccae98521f3ac647ea1d35d5fa0f8064b8d5293
SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 1f84639..44f2c65 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,8 @@
+2007-09-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.6, SECURITY_PATCH=2
+ CVE-2007-3847, CVE-2007-1863, CVE-2007-3304, CVE-2006-5752,
+ CVE-2007-1862
+
2007-07-10 Robin Cook <rcook AT wyrms.net>
* PREPARE: ask to build as shared modules
* CONFIGURE: add =shared if y to shared modules
diff --git a/http/cherokee/DETAILS b/http/cherokee/DETAILS
index 5fc0060..c3fe59b 100755
--- a/http/cherokee/DETAILS
+++ b/http/cherokee/DETAILS
@@ -1,7 +1,7 @@
SPELL=cherokee
if [[ $CHER_DEV == y ]];then
- VERSION=0.6.0b700
-
SOURCE_HASH=sha512:02d5a11e97343c45bc7fd7dab05a69341fa376a628c39e828c666d7bc5b5311e8e090a328c0d02c46949e685d093a326f78e1e4ce1e7ea2db4f1254c0d7adfdb
+ VERSION=0.6.0b863
+
SOURCE_HASH=sha512:9a24c0f722510847f09cb34757f60a7daa0b9c887ddf630b6b833af7ee0c720a84375afda057bcdc4db3151ed281606ef2e74b6a104c7e1cea13d3f44ad3eda8
else
VERSION=0.5.6

SOURCE_HASH=sha512:a4e3a2a7fc5be5e35147196e750e9d9782b6d48b084da1351d3104f709e8751ddb39f5552a4af3cc52797d9e60e56b8cf23c1332f86b82c30bd4f5cf896d4a39
diff --git a/http/cherokee/HISTORY b/http/cherokee/HISTORY
index c511d26..a156c0e 100644
--- a/http/cherokee/HISTORY
+++ b/http/cherokee/HISTORY
@@ -1,3 +1,6 @@
+2007-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.0b873 (devel)
+
2007-04-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.0b700 (devel)
* PREPARE: added, allow deve and stable versions
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index a6aeb0a..e41176a 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,17 +5,18 @@ if [ "$FIREFOX_CVS" == "y" ]; then

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=2.0.0.6
+ VERSION=2.0.0.7
SOURCE=$SPELL-$VERSION-source.tar.bz2
- SOURCE2=${SOURCE}.asc
- SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
- SOURCE2_IGNORE=signature
+# SOURCE2=${SOURCE}.asc
+# SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
+# SOURCE2_IGNORE=signature
+
SOURCE_HASH=sha512:012f40b916556edab115b28ec50b5be9b4af1196bdd1449e4da2f1de5be9fb44aaa55e848e3ec326478af67bea6671f3385501591ba484375e3af2c88af1f9ba


SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[1]=ftp://ftp.access.ch/mirror/mozilla/$SPELL/releases/$VERSION/source/$SOURCE

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=10
+# SOURCE2_URL[0]=${SOURCE_URL}.asc
+ SECURITY_PATCH=11
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f39d2ae..0497834 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,17 @@
+2007-09-22 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
+ * firefox: removed obsolete xfeDoCommand code.
+
+2007-09-19 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 2.0.0.7, SECURITY_PATCH=11
+
http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.7
+ New sig not part of firefox.gpg
+ * PRE_BUILD: Added && after default_pre_build
+ * firefox-config.patch: updated to 2.0.0.7
+
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added patch for newer cairo's
+ * cairo-fixes.patch: added for missing cairo_font_type_t
+
2007-07-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.6, SECURITY_PATCH=10

http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.6
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 042d15f..d523658 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -25,9 +25,10 @@ FIREFOX_TARBALL=firefox-1.0+.tar.bz2 &&
message "Moving $FIREFOX_TARBALL to/var/spool/sorcery${DEFAULT_COLOR}"
&&
mv -v $FIREFOX_TARBALL $SOURCE_CACHE/
else
- default_pre_build
+ default_pre_build &&
cd $SOURCE_DIRECTORY &&
- patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
+ patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch &&
+ patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
fi &&

cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
diff --git a/http/firefox/cairo-fixes.patch b/http/firefox/cairo-fixes.patch
new file mode 100644
index 0000000..f11250e
--- /dev/null
+++ b/http/firefox/cairo-fixes.patch
@@ -0,0 +1,15 @@
+--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:55.602763128 +0000
++++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:27.527046255 +0000
+@@ -98,6 +98,12 @@
+ #include "nsTArray.h"
+
+ #include "cairo.h"
++typedef enum _cairo_font_type {
++ CAIRO_FONT_TYPE_TOY,
++ CAIRO_FONT_TYPE_FT,
++ CAIRO_FONT_TYPE_WIN32,
++ CAIRO_FONT_TYPE_ATSUI
++} cairo_font_type_t;
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
diff --git a/http/firefox/firefox b/http/firefox/firefox
index ec8066c..dd837b9 100644
--- a/http/firefox/firefox
+++ b/http/firefox/firefox
@@ -7,16 +7,10 @@
# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
#
export LD_LIBRARY_PATH=/usr/lib/firefox
-remote=""
-if /usr/lib/firefox/firefox-bin -remote "ping()" > /dev/null 2>&1 ; then
- if [ -z "$@" ] ; then
- remote='-remote xfeDoCommand(openBrowser)'
- fi
-fi

if [ $USE_AOSS_WRAPPER ] &&
[ -x /usr/bin/aoss ]; then
- /usr/bin/aoss /usr/lib/firefox/firefox-bin $remote "$@"
+ /usr/bin/aoss /usr/lib/firefox/firefox-bin "$@"
else
- /usr/lib/firefox/firefox-bin $remote "$@"
+ /usr/lib/firefox/firefox-bin "$@"
fi
diff --git a/http/firefox/firefox-config.patch
b/http/firefox/firefox-config.patch
index 179fc5f..6a3f0dd 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
exit 0
;;
--cflags)
-- if test "/usr/local/include/firefox-2.0.0.6" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.6"
+- if test "/usr/local/include/firefox-2.0.0.7" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.7"
+ if test "/usr/include/firefox" != /usr/include ; then
+ includes="-I/usr/include/firefox"
fi
@@ -25,14 +25,14 @@
if test "$echo_cflags" = "yes"; then
nspr_cflags="-I/usr/include/nspr"
for n in $echo_components; do
-- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.6/$n"
+- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.7/$n"
+ component_includes="$component_includes -I/usr/include/firefox/$n"
done
echo $component_includes $includes $nspr_cflags
fi

if test "$echo_idlflags" = "yes"; then
-- echo "-I/usr/local/share/idl/firefox-2.0.0.6"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.7"
+ echo "-I/usr/share/idl/firefox"
fi

@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.6 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.7 $libs
+ echo -L/usr/lib $libs
fi
diff --git a/http/galeon/DEPENDS b/http/galeon/DEPENDS
index 6198229..c8f03cf 100755
--- a/http/galeon/DEPENDS
+++ b/http/galeon/DEPENDS
@@ -4,7 +4,7 @@ depends gnome-vfs2 &&
depends gconf2 &&
depends libxml2 &&
depends intltool &&
-depends scrollkeeper &&
+depends rarian &&
depends GECKO &&

if [ "$GALEON_CVS" == "y" ]; then
diff --git a/http/galeon/HISTORY b/http/galeon/HISTORY
index 80eaa84..fbc5158 100644
--- a/http/galeon/HISTORY
+++ b/http/galeon/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: renamed from galeon2 to galeon
* CONFLICTS: conflict to galeon2, removed conflict galeon
diff --git a/http/gnash/BUILD b/http/gnash/BUILD
index 96d6f2e..dd214c4 100755
--- a/http/gnash/BUILD
+++ b/http/gnash/BUILD
@@ -1,9 +1,4 @@
-if [[ "$(get_spell_provider $SPELL NS-PLUGIN-COMPATIBLE)" == "firefox" ]];
then
- 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
-elif [[ "$(get_spell_provider $SPELL NS-PLUGIN-COMPATIBLE)" == "mozilla" ]];
then
- 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
-fi &&
-
+CXXFLAGS=${CXXFLAGS/-Os/-O2}
+CFLAGS=${CFLAGS/-Os/-O2}
+OPTS="$GNASH_OPTS $OPTS" &&
default_build
diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
index 1fb40da..5d61e1e 100755
--- a/http/gnash/CONFIGURE
+++ b/http/gnash/CONFIGURE
@@ -1,12 +1,28 @@
-config_query_list GNASH_GUI "Which GUI do you want to use?" \
- SDL GTK FB &&
-# fix old stored values to match configure options
-if [[ "$GNASH_SOUND" == sdl ]]; then
- GNASH_SOUND=SDL
-fi &&
-if [[ "$GNASH_SOUND" == gstreamer ]]; then
- GNASH_SOUND=GST
-fi &&
-config_query_list GNASH_SOUND \
- "Which soundsystem do you want to use (GST=gstreamer)?" \
- NO SDL GST
+config_query_option GNASH_OPTS \
+ "Build a netscape-api compatible plugin?" \
+ y \
+ "--enable-nsapi" \
+ "--disable-nsapi" &&
+config_query_option GNASH_OPTS \
+ "Enable support for the MIT-SHM X extension" \
+ n \
+ "--enable-mit-shm" \
+ "--disable-mit-shm" &&
+config_query_option GNASH_OPTS \
+ "Makes the plugin write the currently playing SWF to
/tmp." \
+ n \
+ "--enable-write" \
+ "--disable-write" &&
+config_query_list GNASH_GUI \
+ "Which GUI do you want to use?" \
+ GTK KDE &&
+config_query_list GNASH_MEDIA \
+ "Which media backend do you want to use?" \
+ ffmpeg gstreamer libmad &&
+GNASH_SOUND=${GNASH_SOUND/SDL/sdl} &&
+GNASH_SOUND=${GNASH_SOUND/GST/gstreamer} &&
+GNASH_SOUND=${GNASH_SOUND/gst/gstreamer} &&
+# doesn't have much sense to keep this here but anyway...
+config_query_list GNASH_SOUND \
+ "Which sound system do you want to use?" \
+ sdl gstreamer
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index cc78fe8..7b8ec40 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -1,39 +1,37 @@
-depends -sub THREAD boost &&
-depends libpng &&
-
-optional_depends jpeg \
- '--enable-jpeg' \
- '--disable-jpeg' \
- 'for JPEG image support' &&
-
-optional_depends libxml2 \
- '--enable-xml' \
- '--disable-xml' \
- 'Enable XML support?' &&
-
-optional_depends kdebase \
- '--enable-klash' \
- '--disable-klash' \
- 'Build konqueror plugin?' &&
-
-optional_depends NS-PLUGIN-COMPATIBLE \
- '--enable-plugin' \
- '--disable-plugin' \
- 'for Netscape/Mozilla plugin' &&
-
+depends boost &&
+sub_depends boost THREAD &&
+sub_depends boost DATE_TIME &&
+depends g++ &&
+depends libpng &&
+depends jpeg &&
+depends libxml2 &&
+depends curl &&
+# only recommnedde renderer is ogl... the other
+# one is agg which we don't have a spell yet for and doesn't
+# have the same performance under certain conditions
+depends OPENGL '--enable-renderer=ogl' &&
+if [[ $GNASH_MEDIA == "gstreamer" ]]; then
+ depends $GNASH_MEDIA '--enable-media=GST'
+elif [[ $GNASH_MEDIA == "libmad" ]]; then
+ depends $GNASH_MEDIA '--enable-media=mad}'
+elif [[ $GNASH_MEDIA == "ffmpeg" ]]; then
+ depends LIBAVCODEC '--enable-media=ffmpeg'
+fi &&
+# There's no --enable/--disable sound option
+depends $GNASH_SOUND &&
+# no longer needed to build
+suggest_depends NS-PLUGIN-COMPATIBLE \
+ '' \
+ '' \
+ 'Suggested to run the plugin from a browser' &&
if [[ "${GNASH_GUI}" == "GTK" ]]; then
depends atk &&
depends cairo &&
- depends GTK2 '--enable-gui=GTK --enable-renderer=opengl' &&
+ depends GTK2 '--enable-gui=gtk' &&
depends gtkglext '--enable-glext' &&
depends pango
-elif [[ "${GNASH_GUI}" == "SDL" ]]; then
- depends OPENGL &&
- depends sdl '--enable-gui=SDL --enable-renderer=opengl --disable-glext'
-fi &&
-
-if [[ "${GNASH_SOUND}" == "GST" ]]; then
- depends gstreamer '--enable-sound=gst'
-elif [[ "${GNASH_SOUND}" == "SDL" ]]; then
- depends sdl '--enable-sound=SDL'
+elif [[ "${GNASH_GUI}" == "KDE" ]]; then
+ depends kdebase '--enable-gui=kde' &&
+ depends kdelibs '--enable-kparts'
fi
+
diff --git a/http/gnash/DETAILS b/http/gnash/DETAILS
index 168b96e..420c681 100755
--- a/http/gnash/DETAILS
+++ b/http/gnash/DETAILS
@@ -1,9 +1,12 @@
SPELL=gnash
- VERSION=0.7.2
+ VERSION=0.8.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:6039876cc29259dfcaad4c41839216cc830bb070d1861dedfa141f1bc4012b360b08dd72281596381f4c0f9bb8099f66ad517d4d47ee2997cb513d4b49bd75d0
+ SOURCE2_URL[0]=$GNU_URL/$SPELL/$VERSION/$SOURCE2
+ SOURCE_GPG=gnash.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/gnash/
ENTERED=20070308
LICENSE[0]=GPL
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 4e1a2b3..ab1ca6a 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,13 @@
+2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * gnash.gpg: added gpg keyring
+ * DETAILS: updated spell to 0.8.1
+ converted to upstream signature checking
+ * PRE_BUILD: add the sedits
+ * BUILD: drop the sedits
+ * CONFIGURE: added some options and some revamping
+ * DEPENDS: revamp of depends
+ * INSTALL: reduce all the code duplication with two for loops
+
2007-06-01 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Don't bother with --plugin-dir, as we'll install the plugin
ourselves
diff --git a/http/gnash/INSTALL b/http/gnash/INSTALL
index edeca3f..25fe1ef 100755
--- a/http/gnash/INSTALL
+++ b/http/gnash/INSTALL
@@ -1,46 +1,28 @@
default_install &&
+local ns_compat
+for ns_compat in mozilla firefox seamonkey xulrunner opera netscape4; do
+if spell_installed $ns_compat; then
+ message "${MESSAGE_COLOR}Installing for $ns_compat${DEFAULT_COLOR}\n" &&

-if spell_installed mozilla; then
- message "${MESSAGE_COLOR}Installing for Mozilla${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/mozilla/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/mozilla/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/mozilla/plugins/
-fi &&
-
-if spell_installed firefox; then
- FIREFOX_DIR="/usr/lib/firefox" &&
-
- message "${MESSAGE_COLOR}Installing for firefox${DEFAULT_COLOR}\n" &&
-
- if [ -e $FIREFOX_DIR/plugins/libgnashplugin.so ]; then
- rm -f $FIREFOX_DIR/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $FIREFOX_DIR/plugins/
-fi &&
-
-if spell_installed seamonkey; then
- message "${MESSAGE_COLOR}Installing for Seamonkey${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/seamonkey/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/seamonkey/plugins/libgnashplugin.so
+ if [[ -e $INSTALL_ROOT/usr/lib/$ns_compat/plugins/libgnashplugin.so ]];
then
+ rm -f $INSTALL_ROOT/usr/lib/$ns_compat/plugins/libgnashplugin.so
fi &&

- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/seamonkey/plugins/
-fi &&
-
-if spell_installed firefox-bin; then
- message "${MESSAGE_COLOR}Installing for Firefox-bin${DEFAULT_COLOR}\n" &&
-
- if [ -e /opt/firefox/plugins/libgnashplugin.so ]; then
- rm -f /opt/firefox/plugins/libgnashplugin.so
+ cp -v plugin/.libs/libgnashplugin.so \
+ $INSTALL_ROOT/usr/lib/$ns_compat/plugins/
+fi
+done &&
+for ns_compat in mozilla firefox seamonkey xulrunner opera netscape4; do
+if spell_installed firefox-bin seamonkey-bin; then
+ message "${MESSAGE_COLOR}Installing for $ns_compat${DEFAULT_COLOR}\n" &&
+ if [[ -e $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so ]];
then
+ rm -f $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so
fi &&

- cp plugin/.libs/libgnashplugin.so /opt/firefox/plugins/
-fi &&
+ cp plugin/.libs/libgnashplugin.so \
+ $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/
+fi
+done &&

if spell_installed kdebase; then
message "${MESSAGE_COLOR}Installing for Konqueror${DEFAULT_COLOR}\n"
&&
@@ -48,7 +30,7 @@ if spell_installed kdebase; then
"After install, add /usr/lib/konqueror to the Plugins folders\n"
\
"list and click on the \"Scan for New Plugins\" button${DEFAULT_COLOR}\n"
&&

- if [ -e $INSTALL_ROOT/usr/lib/konqueror/libgnashplugin.so ]; then
+ if [[ -e $INSTALL_ROOT/usr/lib/konqueror/libgnashplugin.so ]]; then
rm -f $INSTALL_ROOT/usr/lib/konqueror/libgnashplugin.so
fi &&

@@ -56,35 +38,6 @@ if spell_installed kdebase; then
mkdir --mode=755 $INSTALL_ROOT/usr/lib/konqueror
fi &&

- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/konqueror/
-fi &&
-
-if spell_installed opera; then
- message "${MESSAGE_COLOR}Installing for Opera${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/opera/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/opera/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/opera/plugins/
-fi
-
-if spell_installed netscape4; then
- message "${MESSAGE_COLOR}Installing for Netscape${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/netscape4/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/netscape4/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/netscape4/plugins/
-fi &&
-
-if spell_installed xulrunner; then
- message "${MESSAGE_COLOR}Installing for XULRunner${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/xulrunner/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/xulrunner/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/xulrunner/plugins/
+ cp plugin/.libs/libgnashplugin.so \
+ $INSTALL_ROOT/usr/lib/konqueror/
fi
diff --git a/http/gnash/PRE_BUILD b/http/gnash/PRE_BUILD
new file mode 100755
index 0000000..282756e
--- /dev/null
+++ b/http/gnash/PRE_BUILD
@@ -0,0 +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
+
diff --git a/http/gnash/gnash.gpg b/http/gnash/gnash.gpg
new file mode 100644
index 0000000..f073bd0
Binary files /dev/null and b/http/gnash/gnash.gpg differ
diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 993675a..5d6f1cc 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,6 +1,6 @@
SPELL=lighttpd
- VERSION=1.4.16
-
SOURCE_HASH=sha512:9c60ee964c6c794031b28e916ec548bf5484e7bb0d44c60d78e4bc6cf6523619566810e8b097a1a9ec9bb01f09c157034bf005eb7cc46581d8daf3e18675b580
+ VERSION=1.4.18
+
SOURCE_HASH=sha512:7cdb72a66909646c2b98b701bf17fadcf2eed0369bf8a28a6073cbccaa52d4a1141bcc5a5a6f07e6e03ac87ee21b3367cdc0a21a0328dd7b755c9a923ec94697
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="http://www.lighttpd.net/download/$SOURCE";
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%%-*}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%%-*}
FRESHMEAT_URL="http://freshmeat.net/projects/$SPELL/";
LICENSE[0]='BSD'
ENTERED=20050722
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
KEYWORDS="http"
SHORT='A light httpd'
cat << EOF
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 7590237..b291895 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,9 @@
+2007-09-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated Version to 1.4.18. SECURITY_PATCH++
+
+2007-08-29 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 1.4.17
+
2007-07-25 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.4.16
SECURITY_PATCH++
diff --git a/http/links-twibright/DETAILS b/http/links-twibright/DETAILS
index 3ed6f66..2ad31da 100755
--- a/http/links-twibright/DETAILS
+++ b/http/links-twibright/DETAILS
@@ -1,13 +1,14 @@
SPELL=links-twibright
- VERSION=2.1pre29
+ VERSION=2.1pre30
SOURCE_NAME=links
SOURCE=$SOURCE_NAME-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_NAME-$VERSION
SOURCE_URL[0]=http://links.twibright.com/download/$SOURCE
-
SOURCE_HASH=sha512:8a2f7c19ab12892737ab6d45c819800cefa5386cb40133bf5f6e369a1a3efadce3ae253242c6f478f8e3e9c75f79c448da7cc3f6ca84043df18073b727bb8616
+
SOURCE_HASH=sha512:9d909cace759c04ef7b812316946c78a6a9ccc9b5198b4179ec35466d4825579f6716673043cbf430eb54dfc769ba159ae4cc16e0d39e1e8e95992defde76dc5
LICENSE[0]=GPL
WEB_SITE=http://links.twibright.com/
ENTERED=20011027
+ SECURITY_PATCH=1
PATCHLEVEL=0
KEYWORDS="http"
SHORT='Advanced text browser with an optional GUI'
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 6c69a70..fe04d2a 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2007-08-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1pre30, SECURITY_PATCH=1
+
2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1pre29

diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index de26e51..26f276c 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,3 +1,5 @@
+source $GRIMOIRE/FUNCTIONS &&
+
depends gtk+2 '--enable-default-toolkit=gtk2 --enable-xft
--disable-freetype2' &&
depends jpeg '--with-system-jpeg' &&
depends libpng '--with-system-png' &&
@@ -9,7 +11,7 @@ depends X11-LIBS '--with-x'
&&
depends zip &&
depends zlib '--with-system-zlib' &&

-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+if check_if_xorg_modular_libs; then
depends libxft
fi &&

diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 0ebc732..7b48806 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -23,7 +23,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
KEYWORDS="web http"
- SHORT="Web browser and a rich cient application platform"
+ PATCHLEVEL=1
+ SHORT="Web browser and a rich cient application platform"
cat << EOF
The SeaMonkey project is a community effort to deliver production-quality
releases of code derived from the application formerly known as "Mozilla
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 7a4d6c5..74741aa 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,12 @@
+2007-09-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, cairo-fixes.patch: added patch from firefox spell
+ as seamonkey needs it too
+
+2007-09-04 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Changed to check_if_xorg_modular_libs to cover all cases
+ Bug #13976
+
2007-08-16 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.1.4. SECURITY_PATCH++
http://www.mozilla.org/projects/security/
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index ec0245e..adc6b49 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -6,4 +6,7 @@ if [ -f /root/.mozconfig ]; then
fi &&

# remove broken .mozconfig shipped with 1.0b
-rm -f $SOURCE_DIRECTORY/.mozconfig
+rm -f $SOURCE_DIRECTORY/.mozconfig &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
diff --git a/http/seamonkey/cairo-fixes.patch
b/http/seamonkey/cairo-fixes.patch
new file mode 100644
index 0000000..f11250e
--- /dev/null
+++ b/http/seamonkey/cairo-fixes.patch
@@ -0,0 +1,15 @@
+--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:55.602763128 +0000
++++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:27.527046255 +0000
+@@ -98,6 +98,12 @@
+ #include "nsTArray.h"
+
+ #include "cairo.h"
++typedef enum _cairo_font_type {
++ CAIRO_FONT_TYPE_TOY,
++ CAIRO_FONT_TYPE_FT,
++ CAIRO_FONT_TYPE_WIN32,
++ CAIRO_FONT_TYPE_ATSUI
++} cairo_font_type_t;
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 3603212..4342f93 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
SPELL=squid
- VERSION=2.6.STABLE14
+ VERSION=2.6.STABLE16
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
#
SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
# SOURCE_GPG=squid.gpg:$SOURCE2
-
SOURCE_HASH=sha512:3894a2d2c4fc87744d19933d0bec3a2a30f2bd5a4373e8f60773e4f8ca2e0c2ec52a70b9c2a29138ae3bc85aad6b082560539430eaec81a81c3c3afcbcc488c7
+
SOURCE_HASH=sha512:ba20d5f421ade72e49cded54cc868331c8c9d492fb27d649db6e008ea0340a2f9ae853cf6c46cdebcbcfe34b81a1e3623b3c98a456114ca156dfc7074ac52724
WEB_SITE=http://www.squid-cache.org/
ENTERED=20011214
SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index dce252b..29d5a92 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,9 @@
+2007-09-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.6.STABLE16
+
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.6.STABLE15
+
2007-07-17 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.6.STABLE14

diff --git a/http/w3m/CONFIGURE b/http/w3m/CONFIGURE
index b98c39b..546d82a 100755
--- a/http/w3m/CONFIGURE
+++ b/http/w3m/CONFIGURE
@@ -23,7 +23,7 @@ config_query_list W3M_KEYMAP \
w3m \
lynx &&
config_query_option W3M_OPTS \
- "Enable m17n?" \
+ "Enable multilingualisation (m17n)?" \
y \
"--enable-m17n" \
"--disable-m17n" &&
diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index 5894402..b4e0e48 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,7 @@
+2007-09-22 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
+ * CONFIGURE: Changed "Enable m17n?" to
+ "Enable multilingualisation (m17n)?" for clarity.
+
2007-07-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: revamped
* PRE_BUILD: added
diff --git a/i18n/im-ja/CONFIGURE b/i18n/im-ja/CONFIGURE
index 55fe40a..e48c596 100755
--- a/i18n/im-ja/CONFIGURE
+++ b/i18n/im-ja/CONFIGURE
@@ -1,5 +1,5 @@
config_query_option IMJA_OPTS \
"Enable XIM server (for IM support in non-gtk applications)?" \
y \
- "--enable-xim" \
+ "" \
"--disable-xim"
diff --git a/i18n/im-ja/HISTORY b/i18n/im-ja/HISTORY
index 7b5417e..0593904 100644
--- a/i18n/im-ja/HISTORY
+++ b/i18n/im-ja/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * CONFIGURE: Fixed XIM option
+
2007-06-27 Remko van der Vossen <wich AT stack.nl>
* CONFIGURE: Allow caster to disable XIM server
* DETAILS: Added long description
diff --git a/i18n/scim/DETAILS b/i18n/scim/DETAILS
index f910640..ae29167 100755
--- a/i18n/scim/DETAILS
+++ b/i18n/scim/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.scim-im.org/
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:023289554a1f17e7dd74fdf589a5fab975899758f284483f0d1515f3663f31c6a31daecad976611218f09793b38dacea3ae74eec02ec832fc64d97333fc532c8
+
SOURCE_HASH=sha512:69ca549afb1049747bb769bfa2d0d0bbad438fa73f4ba353d549efc9486fe82b6ae3d90ded7ac115543e02aba4b3ba9225ac72f9d36fbd6836ccada69a0f95c1
LICENSE[0]=GPL
ENTERED=20030912
KEYWORDS="i18n"
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index 555bd6c..0a9b110 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,6 @@
+2007-09-09 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: fixed SOURCE_HASh
+
2007-06-27 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.4.7
fixed long description wrap
diff --git a/java/jakarta-log4j/DEPENDS b/java/jakarta-log4j/DEPENDS
index aecf344..3ecf827 100755
--- a/java/jakarta-log4j/DEPENDS
+++ b/java/jakarta-log4j/DEPENDS
@@ -1,7 +1,7 @@
-depends JAXP z-rejected &&
-depends JAVAMAIL z-rejected &&
-depends JMS z-rejected &&
-depends JMX z-rejected &&
-depends JDMK z-rejected &&
-depends crimson-apache &&
+depends JAXP '' '' 'z-rejected' &&
+depends JAVAMAIL '' '' 'z-rejected' &&
+depends JMS '' '' 'z-rejected' &&
+depends JMX '' '' 'z-rejected' &&
+depends JDMK '' '' 'z-rejected' &&
+depends crimson-apache &&
depends ant
diff --git a/java/jakarta-log4j/HISTORY b/java/jakarta-log4j/HISTORY
index d5f1577..ff37f40 100644
--- a/java/jakarta-log4j/HISTORY
+++ b/java/jakarta-log4j/HISTORY
@@ -1,3 +1,6 @@
+2007-08-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Fixed missing parameters for depending on z-rejected
+
2006-10-11 David Kowis <dkowis AT shlrm.org>
* DEPENDS: Pointed z-rejected dependencies at the right spot
QuickFix 11062
diff --git a/java/jakarta-regexp/DEPENDS b/java/jakarta-regexp/DEPENDS
index 94c49df..c605f54 100755
--- a/java/jakarta-regexp/DEPENDS
+++ b/java/jakarta-regexp/DEPENDS
@@ -1,2 +1,2 @@
-depends JDMK z-rejected &&
+depends JDMK '' '' 'z-rejected' &&
depends ant
diff --git a/java/jakarta-regexp/HISTORY b/java/jakarta-regexp/HISTORY
index fed25bf..a292312 100644
--- a/java/jakarta-regexp/HISTORY
+++ b/java/jakarta-regexp/HISTORY
@@ -1,3 +1,6 @@
+2007-08-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Fix missing parameters for depending on z-rejected
+
2006-10-11 David Kowis <dkowis AT shlrm.org>
* DEPENDS: "quick" fixed bug 11125

diff --git a/java/tomcat/DEPENDS b/java/tomcat/DEPENDS
index 31fd8d5..6007ee1 100755
--- a/java/tomcat/DEPENDS
+++ b/java/tomcat/DEPENDS
@@ -1,22 +1,22 @@
-depends JAF &&
-depends JMX &&
-depends JAVAMAIL &&
-depends JSTRUCTS &&
-depends ant &&
-depends jakarta-commons-beanutils &&
-depends jakarta-commons-collections &&
-depends jakarta-commons-digester &&
-depends jakarta-commons-fileupload &&
-depends jakarta-commons-logging &&
-depends jakarta-commons-daemon &&
-depends jakarta-commons-dbcp &&
-depends jakarta-commons-modeler &&
-depends jakarta-commons-pool &&
-depends jakarta-commons-logging &&
-depends jakarta-regexp &&
-depends jakarta-servletapi-4 &&
-depends xerces-j &&
-depends jndi &&
-depends jta &&
-depends jdbc-optional &&
+depends JAF '' '' 'z-rejected' &&
+depends JMX '' '' 'z-rejected' &&
+depends JAVAMAIL '' '' 'z-rejected' &&
+depends JSTRUCTS &&
+depends ant &&
+depends jakarta-commons-beanutils &&
+depends jakarta-commons-collections &&
+depends jakarta-commons-digester &&
+depends jakarta-commons-fileupload &&
+depends jakarta-commons-logging &&
+depends jakarta-commons-daemon &&
+depends jakarta-commons-dbcp &&
+depends jakarta-commons-modeler &&
+depends jakarta-commons-pool &&
+depends jakarta-commons-logging &&
+depends jakarta-regexp &&
+depends jakarta-servletapi-4 &&
+depends xerces-j &&
+depends jndi '' '' 'z-rejected' &&
+depends jta '' '' 'z-rejected' &&
+depends jdbc-optional '' '' 'z-rejected' &&
depends junit
diff --git a/java/tomcat/HISTORY b/java/tomcat/HISTORY
index 49d073a..475cfb9 100644
--- a/java/tomcat/HISTORY
+++ b/java/tomcat/HISTORY
@@ -1,3 +1,8 @@
+2007-08-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Added missing grimoire dependency on z-rejected for JAF,
JMX,
+ JAVAMAIL, jndi, jta, and jdbc-optional
+ Removed a TAB before xerces-j
+
2007-01-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: use $SOURCEFORGE_URL instead of hardcoded broken value

diff --git a/kde-apps/digikam/HISTORY b/kde-apps/digikam/HISTORY
index 143b8b8..f098a5e 100644
--- a/kde-apps/digikam/HISTORY
+++ b/kde-apps/digikam/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 Treeve Jelbert <treevesourcemage.org>
+ * lcmsprf.h, PRE_BUILD: added, fix compiel with lcms-1.17
+
2007-07-24 Treeve Jelbert <treevesourcemage.org>
* CONFLICTS: removed, digikamplugins is gone

diff --git a/kde-apps/digikam/PRE_BUILD b/kde-apps/digikam/PRE_BUILD
new file mode 100755
index 0000000..bf1fca7
--- /dev/null
+++ b/kde-apps/digikam/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p3 < $SPELL_DIRECTORY/lcmsprf.h
diff --git a/kde-apps/digikam/lcmsprf.h b/kde-apps/digikam/lcmsprf.h
new file mode 100644
index 0000000..c71b599
--- /dev/null
+++ b/kde-apps/digikam/lcmsprf.h
@@ -0,0 +1,13 @@
+--- trunk/extragear/graphics/digikam/libs/lprof/lcmsprf.h 2007/06/14
07:54:58 675400
++++ trunk/extragear/graphics/digikam/libs/lprof/lcmsprf.h 2007/08/22
06:12:41 703177
+@@ -68,6 +68,10 @@
+
+ } MATN,FAR* LPMATN;
+
++// See B.K.O #148930: compile with lcms v.1.17
++#if (LCMS_VERSION > 116)
++typedef LCMSBOOL BOOL;
++#endif
+
+ LPMATN cdecl MATNalloc(int Rows, int Cols);
+ void cdecl MATNfree (LPMATN mat);
diff --git a/kde-apps/gwenview/DETAILS b/kde-apps/gwenview/DETAILS
index 81e957b..ef6a085 100755
--- a/kde-apps/gwenview/DETAILS
+++ b/kde-apps/gwenview/DETAILS
@@ -1,6 +1,6 @@
SPELL=gwenview
- VERSION=1.4.1
-
SOURCE_HASH=sha512:d7efe5d17dc1423c376f1a400861bc8f8f35eeb84bc5f316d7c754e307e11277a231efd989e0fcff8abcc60c8a4f020464bd9ab658044b77ef2b361a2c953998
+ VERSION=1.4.2
+
SOURCE_HASH=sha512:4dc7415c12bb0b1cadbc1cbafb6c55c9e5a213de18b1cc9dc6b658bdd23e1a77c395e5a730f0cb62c80cd676e1be851343521f76e820e589e85fa630151044b5
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kde-apps/gwenview/HISTORY b/kde-apps/gwenview/HISTORY
index 4a461dd..71245be 100644
--- a/kde-apps/gwenview/HISTORY
+++ b/kde-apps/gwenview/HISTORY
@@ -1,3 +1,6 @@
+2007-09-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.2
+
2006-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add exiv2
remove libkexif
diff --git a/kde-apps/k9copy/DETAILS b/kde-apps/k9copy/DETAILS
index b8a0d5a..c0810a4 100755
--- a/kde-apps/k9copy/DETAILS
+++ b/kde-apps/k9copy/DETAILS
@@ -1,14 +1,14 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=k9copy
- VERSION=1.0.2
+ VERSION=1.1.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://k9copy.free.fr/${SOURCE}
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- WEB_SITE=http://k9copy.free.fr/
+ WEB_SITE=http://k9copy.sourceforge.net/
ENTERED=20060102
LICENSE[0]=GPL
- KEYWORDS="dvd kde"
+ KEYWORDS="dvd kde"
SHORT="A small utility which allows the copying of a DVD."
cat << EOF
K9Copy is a small utility which allows the copy of DVD on Linux. The DVD
diff --git a/kde-apps/k9copy/HISTORY b/kde-apps/k9copy/HISTORY
index e9a3c40..e1ad7c8 100644
--- a/kde-apps/k9copy/HISTORY
+++ b/kde-apps/k9copy/HISTORY
@@ -1,3 +1,6 @@
+2007-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.3, patch from Julien "KaZe" ROZO
#13971
+
2006-12-14 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Removed depends kdelibs (now in KDE_DEPENDS).

diff --git a/kde-apps/k9copy/k9copy-1.0.2.tar.gz.sig
b/kde-apps/k9copy/k9copy-1.0.2.tar.gz.sig
deleted file mode 100644
index 9fbf8c2..0000000
Binary files a/kde-apps/k9copy/k9copy-1.0.2.tar.gz.sig and /dev/null differ
diff --git a/kde-apps/k9copy/k9copy-1.1.3.tar.gz.sig
b/kde-apps/k9copy/k9copy-1.1.3.tar.gz.sig
new file mode 100644
index 0000000..57feb97
Binary files /dev/null and b/kde-apps/k9copy/k9copy-1.1.3.tar.gz.sig differ
diff --git a/kde-apps/kcpufreq/BUILD b/kde-apps/kcpufreq/BUILD
new file mode 100755
index 0000000..3e061f5
--- /dev/null
+++ b/kde-apps/kcpufreq/BUILD
@@ -0,0 +1,9 @@
+OPTS="$KDE_FINAL_OPTION \
+ --disable-dependency-tracking \
+ $OPTS" &&
+
+if [[ -f /etc/profile.d/qt.sh ]]; then
+ . /etc/profile.d/qt.sh
+fi &&
+
+default_build
diff --git a/kde-apps/kcpufreq/CONFIGURE b/kde-apps/kcpufreq/CONFIGURE
new file mode 100755
index 0000000..604c7a9
--- /dev/null
+++ b/kde-apps/kcpufreq/CONFIGURE
@@ -0,0 +1,4 @@
+# Final code makes objects up to 250Mb
+#
+config_query_option KDE_FINAL_OPTION 'Enable final code?' n \
+ '--enable-final' '--disable-final'
diff --git a/kde-apps/kcpufreq/DEPENDS b/kde-apps/kcpufreq/DEPENDS
new file mode 100755
index 0000000..7daf4b6
--- /dev/null
+++ b/kde-apps/kcpufreq/DEPENDS
@@ -0,0 +1,6 @@
+source "$SECTION_DIRECTORY/KDE_DEPENDS" &&
+
+optional_depends cpufrequtils \
+ '' \
+ '' \
+ 'for more generic CPUFreq interface support'
diff --git a/kde-apps/kcpufreq/DETAILS b/kde-apps/kcpufreq/DETAILS
new file mode 100755
index 0000000..b599343
--- /dev/null
+++ b/kde-apps/kcpufreq/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=kcpufreq
+ VERSION=0.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=http://www.wastl.net/download/kcpufreq/kcpufreq-0.3.tar.gz
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.wastl.net/projects_html
+ KEYWORDS="kde cpufreq"
+ ENTERED=20070823
+ SHORT='KDE CPUFreq applet'
+cat << EOF
+KDE cpufreq applet is a small KDE 3.x panel applet that displays the current
+CPU frequency on processors with variable speed CPUs (like Pentium M or
Athlon
+64) on Linux 2.6 kernels. It is similar in look and functionality to the
GNOME
+cpufreq applet.
+EOF
diff --git a/kde-apps/kcpufreq/HISTORY b/kde-apps/kcpufreq/HISTORY
new file mode 100644
index 0000000..df0188c
--- /dev/null
+++ b/kde-apps/kcpufreq/HISTORY
@@ -0,0 +1,3 @@
+2007-08-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, CONFIGURE, DEPENDS, BUILD: Created
+
diff --git a/kde-apps/kcpufreq/kcpufreq-0.3.tar.gz.sig
b/kde-apps/kcpufreq/kcpufreq-0.3.tar.gz.sig
new file mode 100644
index 0000000..c2db586
Binary files /dev/null and b/kde-apps/kcpufreq/kcpufreq-0.3.tar.gz.sig differ
diff --git a/kde-apps/kid3/BUILD b/kde-apps/kid3/BUILD
index f842eb9..83e3561 100755
--- a/kde-apps/kid3/BUILD
+++ b/kde-apps/kid3/BUILD
@@ -4,6 +4,7 @@ if [[ $KID3_KDE == "--with-kde" ]]
then
default_build
else
+ cd $SOURCE_DIRECTORY/kid3-qt &&
OPTS="$OPTS --build=${BUILD}"
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
./configure --prefix=${INSTALL_ROOT}/usr \
@@ -11,6 +12,7 @@ else
--localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS &&
- ./make_qtonly.sh
+ $OPTS &&
+ sed -i -e 's/-lFLAC/-lFLAC++ -lFLAC/' kid3/Makefile &&
+ make
fi
diff --git a/kde-apps/kid3/DETAILS b/kde-apps/kid3/DETAILS
index 244029a..8dc8b24 100755
--- a/kde-apps/kid3/DETAILS
+++ b/kde-apps/kid3/DETAILS
@@ -1,11 +1,11 @@
SPELL=kid3
- VERSION=0.8.1
+ VERSION=0.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://kid3.sourceforge.net/
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:f19ac1bdd7f8e60f28665e117f27d71bf11111a732d72220f257ae3320a7e1c948708affb4a3d2432a10628e992af830b2b5f797cbe3f5743e982abe48745f36
+
SOURCE_HASH=sha512:9a17587a892273402f9b401a90217c7f3c59d2c0b14107c03241b35f36a032910d41fb70de273dc16d227a8c5498e2f9bcf5d7514bb9049132f574ef9a70e175
ENTERED=20040514
KEYWORDS="kde editors"
SHORT="A Qt/KDE-based ID3 tag editor."
diff --git a/kde-apps/kid3/HISTORY b/kde-apps/kid3/HISTORY
index a2e11d8..b399b5e 100644
--- a/kde-apps/kid3/HISTORY
+++ b/kde-apps/kid3/HISTORY
@@ -1,3 +1,8 @@
+2007-09-08 Remko van der Vossen <wich AT stack.nl>
+ * PRE_BUILD, BUILD, INSTALL: kid3 uses a new way to support a qt-only
+ build
+ * DETAILS: version 0.9
+
2006-12-23 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Made taglib dependency non-optional and id3lib
optional (program author's recommendation), did some
diff --git a/kde-apps/kid3/INSTALL b/kde-apps/kid3/INSTALL
new file mode 100755
index 0000000..b70f268
--- /dev/null
+++ b/kde-apps/kid3/INSTALL
@@ -0,0 +1,7 @@
+if [[ $KID3_KDE == "--with-kde" ]]
+then
+ default_install
+else
+ cd $SOURCE_DIRECTORY/kid3-qt &&
+ make install
+fi
diff --git a/kde-apps/kid3/PRE_BUILD b/kde-apps/kid3/PRE_BUILD
new file mode 100755
index 0000000..b5881fe
--- /dev/null
+++ b/kde-apps/kid3/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11
+then
+ . "$INSTALL_ROOT/etc/profile.d/qt.sh"
+fi
diff --git a/kde-apps/kipi-plugins/HISTORY b/kde-apps/kipi-plugins/HISTORY
index 641d3be..f915346 100644
--- a/kde-apps/kipi-plugins/HISTORY
+++ b/kde-apps/kipi-plugins/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * TRIGGERS: added, to check libkexiv2 chamges
+
2007-07-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.4

diff --git a/kde-apps/kipi-plugins/TRIGGERS b/kde-apps/kipi-plugins/TRIGGERS
new file mode 100755
index 0000000..92c0a87
--- /dev/null
+++ b/kde-apps/kipi-plugins/TRIGGERS
@@ -0,0 +1 @@
+on_cast libkexiv2 check_self
diff --git a/kde-apps/ksquirrel-libs/DEPENDS b/kde-apps/ksquirrel-libs/DEPENDS
index da0b4ce..ef11357 100755
--- a/kde-apps/ksquirrel-libs/DEPENDS
+++ b/kde-apps/ksquirrel-libs/DEPENDS
@@ -2,9 +2,11 @@ source $SECTION_DIRECTORY/KDE_DEPENDS
optional_depends libpng "" "" "to view PNG images" &&
optional_depends libmng "" "" "to view MNG/JNG images" &&
optional_depends jpeg "" "" "to view JPEG images" &&
-optional_depends libungif "" "" "to view GIF images" &&
+optional_depends LIBGIF "" "" "to view GIF images" &&
+#optional_depends libungif "" "" "to view GIF images" &&
optional_depends tiff "" "" "to view TIFF images" &&
optional_depends freetype2 "" "" "to view TTF images" &&
optional_depends libsvg "" "" "to view SVG images" &&
optional_depends cairo "" "" "to view SVG images" &&
-optional_depends openexr "" "" "to view EXR images"
+optional_depends openexr "" "" "to view EXR images" &&
+optional_depends transfig "" "" "XFIG support"
diff --git a/kde-apps/ksquirrel-libs/DETAILS b/kde-apps/ksquirrel-libs/DETAILS
index 6189232..416c27a 100755
--- a/kde-apps/ksquirrel-libs/DETAILS
+++ b/kde-apps/ksquirrel-libs/DETAILS
@@ -1,9 +1,9 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=ksquirrel-libs
- VERSION=0.7.0
-
SOURCE_HASH=sha512:c12829e849018f6c9839879dbb544cca4daea75ad2dca252a93d17c6ee579b321fb8a1655e6ebc8e3e850c879aa02735f5edb8487098db75c32ebd20e4873cd0
+ VERSION=0.7.1try2
+
SOURCE_HASH=sha512:bdb42b01e0b0efc40d22af317237016adde1a311f11b09848cd5d91d28495b5bfe7da9927ee63ce2855b7d64a8cd4ee90352d002fbf7cf326d063d5f6d2408a0
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//try?}
SOURCE_URL[0]=$SOURCEFORGE_URL/ksquirrel/$SOURCE
WEB_SITE=http://$SPELL.sourceforge.net
LICENSE[0]=GPL
diff --git a/kde-apps/ksquirrel-libs/HISTORY b/kde-apps/ksquirrel-libs/HISTORY
index b3b198d..d03ab8c 100644
--- a/kde-apps/ksquirrel-libs/HISTORY
+++ b/kde-apps/ksquirrel-libs/HISTORY
@@ -1,3 +1,11 @@
+2007-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1try2
+
+2007-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1
+ * DEPENDS: add optional transfig
+ libungif -> LIBGIF
+
2007-05-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.0

diff --git a/kde-apps/ksquirrel/DETAILS b/kde-apps/ksquirrel/DETAILS
index 6acefbd..0adfa5a 100755
--- a/kde-apps/ksquirrel/DETAILS
+++ b/kde-apps/ksquirrel/DETAILS
@@ -1,7 +1,7 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=ksquirrel
- VERSION=0.7.0try5
-
SOURCE_HASH=sha512:d7f6f20c5e73c979c8acdc997130e5804f3819a09c7a103dfa3b06124373871e4c1d062899ce65115747c78e49ba3aa4c98935e38b59a2b044acf273335bbfd7
+ VERSION=0.7.1try4
+
SOURCE_HASH=sha512:10b250af009241d0c6264b792d08e68664971158fbc94cea3604c99f5207309c8d5927658778310892c4a631d373fba7c65f3cebe5b3919ed5b031a1d250926d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//try?}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kde-apps/ksquirrel/HISTORY b/kde-apps/ksquirrel/HISTORY
index fd98be0..82dfced 100644
--- a/kde-apps/ksquirrel/HISTORY
+++ b/kde-apps/ksquirrel/HISTORY
@@ -1,3 +1,15 @@
+2007-09-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1try4
+
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1try3
+
+2007-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1try2
+
+2007-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1
+
2007-06-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.0try5

diff --git a/kde-apps/ktorrent/DETAILS b/kde-apps/ktorrent/DETAILS
index becc9d4..a0e978f 100755
--- a/kde-apps/ktorrent/DETAILS
+++ b/kde-apps/ktorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=ktorrent
- VERSION=2.2.1
+ VERSION=2.2.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=http://ktorrent.org/downloads/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:26ae2755945d0ff518d08e53201e71b7fc9f283e0cf0f4346a9508623476d0f194ae8121b260694915c66e3fe86c91eb58b09f932742f97ad346f3019c7710a3
+
SOURCE_HASH=sha512:30eab423d66f1252c3d9eeb35de5112bcdd8b681726f70f6664c1aa2cd7d3ce625d068a596780fb7c65d2036373b6e21d63a2895d30a5d5aa46ac92d2f92d692
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ktorrent.org
ENTERED=20060128
diff --git a/kde-apps/ktorrent/HISTORY b/kde-apps/ktorrent/HISTORY
index dec408d..0598987 100644
--- a/kde-apps/ktorrent/HISTORY
+++ b/kde-apps/ktorrent/HISTORY
@@ -1,3 +1,6 @@
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.2.2
+
2007-07-26 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.2.1

diff --git a/kde-apps/libkexiv2/DETAILS b/kde-apps/libkexiv2/DETAILS
index 78e08c5..c603460 100755
--- a/kde-apps/libkexiv2/DETAILS
+++ b/kde-apps/libkexiv2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libkexiv2
- VERSION=0.1.5
-
SOURCE_HASH=sha512:d3aaf606d28059b77f64e1d368eb3a7f473b83763a43b6779a1c1ecf9434fa4cd365dc7dcf8849a370d1c31b903d370b2d6fcc8226c42c14bc011fd174132abf
+ VERSION=0.1.6
+
SOURCE_HASH=sha512:198d68dd9c3a62ea4b0ff0f8d4b39b961110101b943435c08518b88f81b83e2efc6198de9d002dbaa847c25a57782edbd21cffb0523c4fb599add0fba635dfa8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
diff --git a/kde-apps/libkexiv2/HISTORY b/kde-apps/libkexiv2/HISTORY
index 0cc3125..06414d1 100644
--- a/kde-apps/libkexiv2/HISTORY
+++ b/kde-apps/libkexiv2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.6
+
2007-05-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.5

diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index 0620370..dc439fc 100755
--- a/kde-core/kdebase/DETAILS
+++ b/kde-core/kdebase/DETAILS
@@ -13,7 +13,7 @@ if [[ $SMGL_THEME == "y" ]]; then
fi
WEB_SITE=http://www.kde.org
ENTERED=20010912
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
LICENSE[0]=GPL
KEYWORDS="kde"
SHORT="Base applications that form the core of KDE."
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index c91ef4c..4c4e521 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,8 @@
+2007-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURTIY_PATCH++
+ * post-3.5.7-kdebase-konqueror.diff: added
+ * PRE_BUILD: apply security patch
+
2007-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 07fb1e0..10c9438 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# dbus patch
-#patch -p0 < $SPELL_DIRECTORY/dbus.patch &&
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-konqueror.diff &&
# splashscreen patch
if [[ $SMGL_THEME == "y" ]]; then
unpack_file 2
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
b/kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
new file mode 100644
index 0000000..0d6e44e
--- /dev/null
+++ b/kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
@@ -0,0 +1,49 @@
+--- konqueror/konq_combo.cc
++++ konqueror/konq_combo.cc
+@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
+ kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+ "addToCombo(QString,QCString)", data);
+ }
++ // important security consideration: always display the beginning
++ // of the url rather than its end to prevent spoofing attempts.
++ lineEdit()->setCursorPosition( 0 );
+ }
+
+ void KonqCombo::setTemporary( const QString& text )
+--- konqueror/konq_mainwindow.cc
++++ konqueror/konq_mainwindow.cc
+@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
+ }
+ else // no known serviceType, use KonqRun
+ {
+- if ( ( view && view == m_currentView ) ||
+- ( !view && !req.newTab ) ) // startup with argument
++ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup
with argument
+ {
+ // Show it for now in the location bar, but we'll need to store
it in the view
+ // later on (can't do it yet since either view == 0 or
updateHistoryEntry will be called).
+- kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
++ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url <<
endl;
+ setLocationBarURL( url );
+ }
+
+@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
+ if ( childView )
+ {
+ enableAllActions( true );
+-
+- m_pViewManager->setActivePart( childView->part() );
+ m_currentView = childView;
+ }
+ }
+--- konqueror/konq_viewmgr.cc
++++ konqueror/konq_viewmgr.cc
+@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
+
+ void KonqViewManager::emitActivePartChanged()
+ {
++ // prevent unnecessary multiple calls to slotPartActivated:
++ m_activePartChangedTimer->stop();
+ m_pMainWindow->slotPartActivated( activePart() );
+ }
+
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index 0cd5a79..c067ee7 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20020912
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=GPL
KEYWORDS="kde"
SHORT="Base applications that form the core of KDE."
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 1ba99a6..8d37f74 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,13 @@
+2007-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * post-3.5.7-kdelibs-kdecore.diff: added
+ cups.diff: added
+ fix compilation with cups-1.3 (upstream patch) kde bug #148121
+ * PRE_BUILD: apply patches
+ security fix CVE-2007-4224, CVE-2007-4225, CVE-2007-3820
+ URL: http://www.kde.org/info/security/advisory-20070816-1.txt
+ fixes bug #13950
+
2007-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
index 539ca82..0c1ab77 100755
--- a/kde-core/kdelibs/PRE_BUILD
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-true
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore.diff &&
+patch -p1 < $SPELL_DIRECTORY/cups.diff
diff --git a/kde-core/kdelibs/cups.diff b/kde-core/kdelibs/cups.diff
new file mode 100644
index 0000000..124d799
--- /dev/null
+++ b/kde-core/kdelibs/cups.diff
@@ -0,0 +1,82 @@
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13 2006-10-01
12:33:43.000000000 -0500
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-07-19
15:12:48.000000000 -0500
+@@ -108,7 +108,8 @@ cupsGetConf(void)
+ * See if we should retry the current digest password...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0 ||
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0 ||
+ digest_tries > 1 || !pwdstring[0])
+ {
+ /*
+@@ -116,7 +117,7 @@ cupsGetConf(void)
+ */
+
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ",
cupsUser(),
+- cups_server->hostname);
++ cupsServer());
+
+ if ((password = cupsGetPassword(prompt)) == NULL)
+ break;
+@@ -135,7 +136,8 @@ cupsGetConf(void)
+ * Got a password; encode it for the server...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0)
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0)
+ {
+ /*
+ * Basic authentication...
+@@ -334,7 +336,8 @@ cupsPutConf(const char *name) /* I - Na
+ * See if we should retry the current digest password...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0 ||
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0 ||
+ digest_tries > 1 || !pwdstring[0])
+ {
+ /*
+@@ -342,7 +345,7 @@ cupsPutConf(const char *name) /* I - Na
+ */
+
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ",
cupsUser(),
+- cups_server->hostname);
++ cupsServer());
+
+ if ((password = cupsGetPassword(prompt)) == NULL)
+ break;
+@@ -361,7 +364,8 @@ cupsPutConf(const char *name) /* I - Na
+ * Got a password; encode it for the server...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0)
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0)
+ {
+ /*
+ * Basic authentication...
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13 2007-01-15
05:34:19.000000000 -0600
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-07-19 15:15:09.000000000
-0500
+@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
+ return false;
+ }
+
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
+ #endif
+
+@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
+ }
+
+ request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" :
res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ cups_authstring = HTTP->authstring;
+ #endif
+ httpClose(HTTP);
diff --git a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
new file mode 100644
index 0000000..eb7e89e
--- /dev/null
+++ b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
@@ -0,0 +1,61 @@
+------------------------------------------------------------------------
+r700053 | mueller | 2007-08-14 18:37:30 +0200 (Tue, 14 Aug 2007) | 2 lines
+
+be more robust against addressbar spoofing (CVE-2007-4225)
+
+------------------------------------------------------------------------
+--- kdecore/tests/kurltest.cpp
++++ kdecore/tests/kurltest.cpp
+@@ -288,6 +288,16 @@ int main(int argc, char *argv[])
+ check("KURL::prettyURL()", url15582.prettyURL(),
"http://alain.knaff.linux.lu/bug-reports/kde/percentage%in%url.html";);
+ check("KURL::url()", url15582.url(),
"http://alain.knaff.linux.lu/bug-reports/kde/percentage%25in%25url.html";);
+
++ KURL whitespaceInUser("http://www.google.com%20%20%20%20%20 AT foobar.com/";);
++ check("KURL::prettyURL()", whitespaceInUser.prettyURL(),
"http://www.google.com%20%20%20%20%20 AT foobar.com/";);
++
++ KURL whitespaceInPath("http://www.google.com/foo%20bar/";);
++ check("KURL::prettyURL()", whitespaceInPath.prettyURL(),
"http://www.google.com/foo bar/");
++
++ KURL
whitespaceInPath2("http://www.google.com/foo%20%20%20%20%20%20%20bar/";);
++ check("KURL::prettyURL()", whitespaceInPath2.prettyURL(),
++ "http://www.google.com/foo%20%20%20%20%20%20 bar/");
++
+ KURL carsten;
+
carsten.setPath("/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
+ check("KURL::path()", carsten.path(),
"/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
+@@ -594,6 +604,15 @@ int main(int argc, char *argv[])
+ check("http: URL with empty path string path", waba1.path(),
+ "");
+
++ waba1 = "http://www.meinestadt.de&url_plain=http";;
++ check("http: URL with empty path string", waba1.host(),
++ "www.meinestadt.de&url_plain=http");
++ check("http: URL with empty path string", waba1.htmlURL(),
++ "http://www.meinestadt.de&amp;url_plain=http";);
++
++ check("http: URL with empty path string", waba1.path(),
++ "");
++
+ waba1 = "http://a:389#b=c";;
+ check( "http: URL with port, ref, and empty path; url", waba1.url(),
"http://a:389#b=c"; );
+ check( "http: URL with port, ref, and empty path; host", waba1.host(),
"a" );
+--- kdecore/kurl.cpp
++++ kdecore/kurl.cpp
+@@ -183,7 +183,7 @@ static QString lazy_encode( const QStrin
+ (character == '?') || // Start of query delimiter
+ ((character == '@') && encodeAt) || // Username delimiter
+ (character == '#') || // Start of reference delimiter
+- ((character == 32) && (i+1 == old_length))) // A trailing space
++ ((character == 32) && (i+1 == old_length || segment[i+1] == ' ')))
// A trailing space
+ {
+ new_segment[ new_length++ ] = '%';
+
+@@ -1540,7 +1540,7 @@ QString KURL::prettyURL( int _trailing )
+ u += "//";
+ if ( hasUser() )
+ {
+- u += lazy_encode(m_strUser);
++ u += encode(m_strUser, 0, 0);
+ // Don't show password!
+ u += "@";
+ }
diff --git a/kde-look/polyester/DETAILS b/kde-look/polyester/DETAILS
index b017138..e476095 100755
--- a/kde-look/polyester/DETAILS
+++ b/kde-look/polyester/DETAILS
@@ -1,12 +1,13 @@
SPELL=polyester
- VERSION=1.0_beta2
+ VERSION=1.0.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.notmart.org/files/$SOURCE
-
SOURCE_HASH=sha512:de36fa1758d6dbb67c17db777a1707cd01f6661dd1c0587be0ca4479ba75f099d1850ef4b99d86a84f18ca18ecde227a0afd892ac0b4152e0636ea0166e93e26
+#
SOURCE_HASH=sha512:de36fa1758d6dbb67c17db777a1707cd01f6661dd1c0587be0ca4479ba75f099d1850ef4b99d86a84f18ca18ecde227a0afd892ac0b4152e0636ea0166e93e26
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ LICENSE[0]=LGPL
WEB_SITE=http://www.kde-look.org/content/show.php?content=27968
ENTERED=20060606
- LICENSE[0]=LGPL
SHORT="Widget style + kwin decoration for KDE."
cat << EOF
Polyester is a kde widget style and a kwin decoration both aimed to be a
diff --git a/kde-look/polyester/HISTORY b/kde-look/polyester/HISTORY
index cd06720..7574a37 100644
--- a/kde-look/polyester/HISTORY
+++ b/kde-look/polyester/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.0.2
+
2006-10-26 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.0_beta2.
* DEPENDS: Source KDE_DEPENDS.
@@ -10,3 +13,4 @@

2006-06-06 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, DEPENDS, HISTORY: created spell
+
diff --git a/kde-look/polyester/polyester-1.0.2.tar.bz2.sig
b/kde-look/polyester/polyester-1.0.2.tar.bz2.sig
new file mode 100644
index 0000000..db511ad
Binary files /dev/null and b/kde-look/polyester/polyester-1.0.2.tar.bz2.sig
differ
diff --git a/kde-look/qtcurve-kde3/DEPENDS b/kde-look/qtcurve-kde3/DEPENDS
new file mode 100755
index 0000000..8764ff5
--- /dev/null
+++ b/kde-look/qtcurve-kde3/DEPENDS
@@ -0,0 +1,3 @@
+depends kdebase &&
+
+. "$SECTION_DIRECTORY/KDE_DEPENDS"
diff --git a/kde-look/qtcurve-kde3/DETAILS b/kde-look/qtcurve-kde3/DETAILS
new file mode 100755
index 0000000..2a368ae
--- /dev/null
+++ b/kde-look/qtcurve-kde3/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=qtcurve-kde3
+ VERSION=0.52.3
+ SOURCE=QtCurve-KDE3-$VERSION.tar.gz
+ SOURCE_URL[0]=http://home.freeuk.com/cpdrummond/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/QtCurve-KDE3-$VERSION"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.kde-look.org/content/show.php?content=40492
+ ENTERED=20060606
+ SHORT='Widget styles for QT/KDE3'
+cat << EOF
+Widget styles for KDE3.
+EOF
diff --git a/kde-look/qtcurve-kde3/HISTORY b/kde-look/qtcurve-kde3/HISTORY
new file mode 100644
index 0000000..abdecc4
--- /dev/null
+++ b/kde-look/qtcurve-kde3/HISTORY
@@ -0,0 +1,3 @@
+2007-08-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS: Created
+
diff --git a/kde-look/qtcurve-kde3/QtCurve-KDE3-0.52.3.tar.gz.sig
b/kde-look/qtcurve-kde3/QtCurve-KDE3-0.52.3.tar.gz.sig
new file mode 100644
index 0000000..214fc27
Binary files /dev/null and
b/kde-look/qtcurve-kde3/QtCurve-KDE3-0.52.3.tar.gz.sig differ
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 63fbb53..ae7faf4 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,15 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE_DEPENDS: adjust more dependencies
+
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE_DEPENDS: adjust dependencies
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE_DEPENDS: add kdebase-workspace4, qimageblitz
+
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE_DEPENDS: add hal
+
2007-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* KDE_DEPENDS: add gpgme and libgpg-error for kdepimlibs
add xorg_modular related stuff
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 049469b..5c31e5d 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -10,6 +10,7 @@ case $SPELL in
depends libxext
fi &&
depends dbus &&
+ depends hal &&
depends pkgconfig &&
depends openssl &&
sub_depends qt4 DBUS &&
@@ -34,5 +35,12 @@ case $SPELL in
depends libgpg-error &&
depends boost
;;
- *) depends kdepimlibs4;;
+
+ kdebase-workspace4)
+ depends kdelibs4 &&
+ depends X11-SERVER
+ ;;
+
+ *) depends kdebase-workspace4
+ ;;
esac
diff --git a/kde4/NOTES b/kde4/NOTES
index a9d40e2..606a3e8 100644
--- a/kde4/NOTES
+++ b/kde4/NOTES
@@ -28,3 +28,10 @@
#11. use the logic from kdebase/{BUILD,INSTALL} to preserve
#/opt/share/config/kdm/
# ok
+
+
+12. need to set XDG_DATA_DIRS in a profile or bashrc
+
+In the standard KDE4 environment you can add
+ export XDG_DATA_DIRS=$KDEDIR/share
+ to your .bashrc file.
diff --git a/kde4/kde4-l10n/BUILD b/kde4/kde4-l10n/BUILD
new file mode 100755
index 0000000..e4e4f52
--- /dev/null
+++ b/kde4/kde4-l10n/BUILD
@@ -0,0 +1,32 @@
+QTDIR=$INSTALL_ROOT/usr &&
+PATH=$QTDIR/bin/qt4:$PATH &&
+
+persistent_add KDE4DIR &&
+KDE4DIR=$INSTALL_ROOT/opt &&
+
+PATH=$KDE4DIR/bin:$PATH &&
+LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
+QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins &&
+
+XDG_DATA_DIRS=$KDE4DIR/share &&
+
+cd $SOURCE_DIRECTORY &&
+
+
+local BUILD_SUBDIRECTORY &&
+
+for BUILD_SUBDIRECTORY in $SPELLX*
+do
+ if [ -d $BUILD_SUBDIRECTORY ]
+ then
+ message "${MESSAGE_COLOR}Building $BUILD_SUBDIRECTORY${DEFAULT_COLOR}"
&&
+ cd $BUILD_SUBDIRECTORY
&&
+ mkdir -p build &&
+ cd build &&
+ cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
+ -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ ../ &&
+ make &&
+ cd $SOURCE_DIRECTORY
+ fi
+done
diff --git a/kde4/kde4-l10n/CONFIGURE b/kde4/kde4-l10n/CONFIGURE
new file mode 100755
index 0000000..6ea5dd7
--- /dev/null
+++ b/kde4/kde4-l10n/CONFIGURE
@@ -0,0 +1,40 @@
+source $GRIMOIRE/FUNCTIONS &&
+source $SECTION_DIRECTORY/KDE_CONFIGURE &&
+
+local CFG=$SPELL_CONFIG
+
+get_kdelanguages() {
+ local i LANGUAGE LANGUAGES &&
+ rm -f $CFG &&
+ touch $CFG &&
+
+config_query_multi KDE_LANG "please specify the required languages" \
+ ar bg cs csb da de en_GB es et eu fa fi fr ga hu it ja km \
+ nb ne nl pa pl pt ru sl sv th tr uk zh_CN zh_TW &&
+
+# should perhaps use SOURCE_IGNORE=unversioned instead of MD5[0]="IGNORE"
+ echo MD5[0]="IGNORE" >> $CFG &&
+ local i=1 &&
+ for LANGUAGE in $KDE_LANG
+ do
+ if [[ $i == 1 ]]
+ then
+ echo SOURCE=$SPELLX-$LANGUAGE-\$VERSION.tar.bz2 >> $CFG &&
+ echo SOURCE_URL[0]=\$SITE/\$SOURCE >> $CFG
+ else
+ echo SOURCE$i=$SPELLX-$LANGUAGE-\$VERSION.tar.bz2 >> $CFG &&
+ echo SOURCE${i}_URL[0]=\$SITE/\$SOURCE$i >> $CFG
+ fi &&
+ echo MD5[$i]="IGNORE" >> $CFG &&
+ i=$[$i+1]
+ done
+}
+
+if [[ -z $KDE_LANG ]] || query "Reconfigure?" n
+then
+ get_kdelanguages
+else
+ message "${MESSAGE_COLOR}Using existing config${DEFAULT_COLOR}"
+fi &&
+
+. $CFG
diff --git a/kde4/kde4-l10n/DEPENDS b/kde4/kde4-l10n/DEPENDS
new file mode 100755
index 0000000..b4b4f02
--- /dev/null
+++ b/kde4/kde4-l10n/DEPENDS
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS
new file mode 100755
index 0000000..200c131
--- /dev/null
+++ b/kde4/kde4-l10n/DETAILS
@@ -0,0 +1,16 @@
+# the remaining details of this spell are provided by CONFIGURE
+ SPELL=kde4-l10n
+ SPELLX=kde-l10n
+ VERSION=3.93.0
+ SITE=$KDE_URL/unstable/${VERSION//.0/}/src/$SPELLX
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
+source $SPELL_CONFIG
+ WEB_SITE=http://www.kde.org
+ ENTERED=20070909
+ LICENSE[0]=GPL
+ ARCHIVE=off
+ KEYWORDS="kde"
+ SHORT="Translated KDE messages."
+cat << EOF
+kde4-l10n contains translated KDE messages.
+EOF
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
new file mode 100644
index 0000000..b6190f8
--- /dev/null
+++ b/kde4/kde4-l10n/HISTORY
@@ -0,0 +1,8 @@
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ spell created, cloned from kde3 spell
+ * CONFIGURE: adjustments for kde4
+ use config_query_multi
+ i10n -> l10n
+ * PRE_BUILD: patch Cmake files,
+ as koffice dir does not exist for some languages
diff --git a/kde4/kde4-l10n/INSTALL b/kde4/kde4-l10n/INSTALL
new file mode 100755
index 0000000..51c0b3b
--- /dev/null
+++ b/kde4/kde4-l10n/INSTALL
@@ -0,0 +1,13 @@
+local BUILD_SUBDIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+
+for BUILD_SUBDIRECTORY in $SPELLX*
+do
+ if [ -d $BUILD_SUBDIRECTORY/build ]
+ then
+ message "${MESSAGE_COLOR}Installing
$BUILD_SUBDIRECTORY...${DEFAULT_COLOR}" &&
+ cd $BUILD_SUBDIRECTORY/build &&
+ make install &&
+ cd $SOURCE_DIRECTORY
+ fi
+done
diff --git a/kde4/kde4-l10n/PRE_BUILD b/kde4/kde4-l10n/PRE_BUILD
new file mode 100755
index 0000000..ecddcff
--- /dev/null
+++ b/kde4/kde4-l10n/PRE_BUILD
@@ -0,0 +1,18 @@
+. $SPELL_CONFIG &&
+
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+
+# unpack all files
+local i SS &&
+i=1 &&
+for SS in $KDE_LANG; do
+ if [[ $i == 1 ]];then
+ unpack_file
+ else
+ unpack_file $i
+ fi &&
+ i=$[$i+1] &&
+# patch CMake files; remove invalid ref to koffice
+ sed -i "/koffice/D" $SPELLX-$SS-$VERSION/data/CMakeLists.txt
+done
diff --git a/kde4/kde4-profile/DEPENDS b/kde4/kde4-profile/DEPENDS
index c64f7e6..0b96471 100755
--- a/kde4/kde4-profile/DEPENDS
+++ b/kde4/kde4-profile/DEPENDS
@@ -1,5 +1,3 @@
-depends kdebase4 &&
-
optional_depends kdeadmin4 \
"" \
"" \
diff --git a/kde4/kde4-profile/DETAILS b/kde4/kde4-profile/DETAILS
index 481cc61..1b039ff 100755
--- a/kde4/kde4-profile/DETAILS
+++ b/kde4/kde4-profile/DETAILS
@@ -1,5 +1,5 @@
SPELL=kde4-profile
- VERSION=3.92.0
+ VERSION=3.93.0
WEB_SITE=http://www.kde.org/
ENTERED=20070307
KEYWORDS="kde"
diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY
index 77ac5a7..774a7b8 100644
--- a/kde4/kde4-profile/HISTORY
+++ b/kde4/kde4-profile/HISTORY
@@ -1,3 +1,7 @@
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: remove explicit kdebase4
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdeaccessibility4/CONFIGURE
b/kde4/kdeaccessibility4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdeaccessibility4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdeaccessibility4/DEPENDS b/kde4/kdeaccessibility4/DEPENDS
new file mode 100755
index 0000000..7fdde86
--- /dev/null
+++ b/kde4/kdeaccessibility4/DEPENDS
@@ -0,0 +1,8 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+
+optional_depends flite '' '' 'text-to-speech support' &&
+#optional_depends gstreamer '' '' 'Streamer audio plugin' &&
+optional_depends alsa-lib '' '' 'ALSA sound system support'
+#optional_depends akode '' '' 'aKode decoder support'
+
+
diff --git a/kde4/kdeaccessibility4/DETAILS b/kde4/kdeaccessibility4/DETAILS
new file mode 100755
index 0000000..adf4b98
--- /dev/null
+++ b/kde4/kdeaccessibility4/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=kdeaccessibility4
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:c8a82a4aca4ac3e47492afae407e462c8f3ca7e4b3a4fb5cb7454842df6d465b18af5404661996cceeede3cb11d1f621c5f7691bb9d00832a7891261c01456e9
+ SOURCE=${SPELL//4}-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE
+ LICENSE[0]=GPL
+ WEB_SITE=http://accessibility.kde.org/aids/
+ ENTERED=20040113
+ KEYWORDS="kde"
+ SHORT="KDE Accessibility Aids"
+cat << EOF
+The kdeaccessibility package contains three KDE Accessibility Aids:
+KMouseTool, KMag and KMouth.
+
+KMouseTool is a Linux-based KDE program. It clicks the mouse for you, so
+you don't have to. KMouseTool works with any mouse or pointing device.
+
+KMagnifier (or kmag, its unix name) is a small utility for Linux to magnify
+a part of the screen. It magnifies the area of the screen around the mouse
+pointer or optionally a user defined area. Additionally it offers to save a
+magnified screenshot to disk.
+
+KMouth is a KDE program which enables persons that cannot speak to let
+their computer speak, e.g. mutal people or people who have lost their
+voice. It has a text input field and speaks the sentences that you enter.
+It also has support for user defined phrasebooks.
+EOF
diff --git a/kde4/kdeaccessibility4/HISTORY b/kde4/kdeaccessibility4/HISTORY
new file mode 100644
index 0000000..ab45e6b
--- /dev/null
+++ b/kde4/kdeaccessibility4/HISTORY
@@ -0,0 +1,3 @@
+2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ spell created
diff --git a/kde4/kdeaddons4/CONFIGURE b/kde4/kdeaddons4/CONFIGURE
new file mode 100755
index 0000000..7794ee1
--- /dev/null
+++ b/kde4/kdeaddons4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdeaddons4/DEPENDS b/kde4/kdeaddons4/DEPENDS
new file mode 100755
index 0000000..88b9ef9
--- /dev/null
+++ b/kde4/kdeaddons4/DEPENDS
@@ -0,0 +1,8 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+
+optional_depends kdegames4 '' '' 'Atlantik plugins' &&
+optional_depends kdemultimedia4 '' '' 'noatun plugins'
+
+
+#optional_depends xmms '' '' 'for xmms control applet support'
+
diff --git a/kde4/kdeaddons4/DETAILS b/kde4/kdeaddons4/DETAILS
new file mode 100755
index 0000000..e42961b
--- /dev/null
+++ b/kde4/kdeaddons4/DETAILS
@@ -0,0 +1,21 @@
+source $SECTION_DIRECTORY/KDE_DETAILS
+
+ SPELL=kdeaddons4
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:cfc34de276ade1a0a0711cf437fada9309a3f2996abb0811e896d74c3ec6d455bc6ed6f835420d1f92c3eee3abbea0fab25f25c2ffe14d8ea2a37cacfaa4d4f6
+ SOURCE=${SPELL//4}-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.kde.org
+ ENTERED=20070909
+ KEYWORDS="kde"
+ SHORT="Plugins for kate, kicker, konqueror, noatun, knewsticker."
+cat << EOF
+kdeaddons contains
+* Plugins for Kate
+* Plugins for Kicker
+* Plugins for Konqueror
+* Plugins for Noatun
+* Scripts for KNewsTicker
+EOF
diff --git a/kde4/kdeaddons4/HISTORY b/kde4/kdeaddons4/HISTORY
new file mode 100644
index 0000000..6aa35ee
--- /dev/null
+++ b/kde4/kdeaddons4/HISTORY
@@ -0,0 +1,3 @@
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ spell created
diff --git a/kde4/kdeadmin4/DEPENDS b/kde4/kdeadmin4/DEPENDS
index d15ea45..523d74f 100755
--- a/kde4/kdeadmin4/DEPENDS
+++ b/kde4/kdeadmin4/DEPENDS
@@ -1,9 +1,3 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&

optional_depends shadow '' '' 'for shadow password support'
-#optional_depends linux-pam '' '' 'for Linux PAM support' &&
-#optional_depends fontconfig '' '' 'to configure font access' &&
-#optional_depends libxml2 '' '' 'for a C++ XML interface' &&
-#optional_depends libxslt '' '' 'for XSLT support' &&
-#optional_depends lm_sensors '' '' 'for hardware monitoring' &&
-#optional_depends freetype2 '' '' 'for freetype support'
diff --git a/kde4/kdeadmin4/DETAILS b/kde4/kdeadmin4/DETAILS
index c26c6fe..1b1fde3 100755
--- a/kde4/kdeadmin4/DETAILS
+++ b/kde4/kdeadmin4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdeadmin4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:65ea53ba2f7fd80b842d12a884d524d4bdd840532a9c36e9bc532ce7b3f2d6a6419e72965c2b9d5a4452c564c3888285bdf6c5219375d2be607aae2e2ba1fd8d
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:d9abc5d023e8877e2c7411c6cee299ae186a8c4da58317c07eb5d90faab3d83ba68860cdca358764bbe7ac9f834705005b8880949b908efb12659a2022eb92fe
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeadmin4/HISTORY b/kde4/kdeadmin4/HISTORY
index d31abab..4bcd00a 100644
--- a/kde4/kdeadmin4/HISTORY
+++ b/kde4/kdeadmin4/HISTORY
@@ -1,3 +1,7 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: remove old code
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdebase-workspace4/CONFIGURE
b/kde4/kdebase-workspace4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdebase-workspace4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
new file mode 100755
index 0000000..cfd7dc5
--- /dev/null
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -0,0 +1,20 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs qt4 ; then
+ depends libxdmcp &&
+ depends libxrandr &&
+ depends libxxf86misc
+fi &&
+
+optional_depends freetype2 '' '' 'anti-aliasing of fonts' &&
+optional_depends lm_sensors '' '' 'harware monitoring' &&
+optional_depends glib2 '' '' 'gnome support' &&
+optional_depends libraw1394 '' '' 'Firewire support' &&
+optional_depends libxklavier '' '' 'keyboard configuration' &&
+optional_depends libusb '' '' 'usb support' &&
+optional_depends bluez-libs '' '' 'Bluetooth support ' &&
+optional_depends openldap '' '' 'LDAP authentication' &&
+optional_depends cyrus-sasl '' '' 'Cyrus SASL authentication' &&
+optional_depends OPENGL '' '' 'OpenGL support in plasma'
+#optional_depends networkmanager '' '' '' &&
diff --git a/kde4/kdebase-workspace4/DETAILS b/kde4/kdebase-workspace4/DETAILS
new file mode 100755
index 0000000..1609c3b
--- /dev/null
+++ b/kde4/kdebase-workspace4/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=kdebase-workspace4
+ SPELLX=${SPELL//4}
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:950147a0d4e7b2de6b2b6477cf2c37165d69f91ca3fa310e1c8d166abb0af1a3b420b4c3a62ad9fca186cd212f0a3f42243146165785d8eb344f10e134d7e7d7
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+ WEB_SITE=http://www.kde.org
+ ENTERED=20070803
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde"
+ SHORT="workspace for all KDE desktop applications"
+cat << EOF
+workspace for all KDE desktop applications
+EOF
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
new file mode 100644
index 0000000..3249ad7
--- /dev/null
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -0,0 +1,25 @@
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Dependency on X11-SERVER is already covered in KDE_DEPENDS
+ * INSTALL: /usr/share/xsessions is a directory, create it before
copying
+
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: update description
+ * INSTALL: fix typo
+
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS, PROVIDES: deleted
+ * INSTALL: added, for kde4.desktop
+ * init.d/kdm4, kde4.desktop: added, moved from kdebase4
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS, PROVIDES: added
+ * DEPENDS: add OPENGL
+ remove dead code, tidy up
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+
+2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.92.0
+ spell created
+
diff --git a/kde4/kdebase-workspace4/INSTALL b/kde4/kdebase-workspace4/INSTALL
new file mode 100755
index 0000000..92b4dbb
--- /dev/null
+++ b/kde4/kdebase-workspace4/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+mkdir -p $INSTALL_ROOT/usr/share/xsessions &&
+install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde4.desktop \
+ $INSTALL_ROOT/usr/share/xsessions
diff --git a/kde4/kdebase-workspace4/TRIGGERS
b/kde4/kdebase-workspace4/TRIGGERS
new file mode 100755
index 0000000..8508632
--- /dev/null
+++ b/kde4/kdebase-workspace4/TRIGGERS
@@ -0,0 +1 @@
+on_cast qt4 check_self
diff --git a/kde4/kdebase-workspace4/init.d/kdm4
b/kde4/kdebase-workspace4/init.d/kdm4
new file mode 100755
index 0000000..815445a
--- /dev/null
+++ b/kde4/kdebase-workspace4/init.d/kdm4
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+PROGRAM=/opt/bin/kdm
+RUNLEVEL=5
+PROVIDES=display_manager
+NEEDS="smgl-messagebus"
+
+. /etc/init.d/smgl_init
diff --git a/kde4/kdebase-workspace4/kde4.desktop
b/kde4/kdebase-workspace4/kde4.desktop
new file mode 100644
index 0000000..31b20b3
--- /dev/null
+++ b/kde4/kdebase-workspace4/kde4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=KDE4
+Comment=This session logs you into KDE4
+Exec=/opt/bin/kstart
+TryExec=/opt/bin/kstart
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/kde4/kdebase4/BUILD b/kde4/kdebase4/BUILD
deleted file mode 100755
index ecee162..0000000
--- a/kde4/kdebase4/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-default_build &&
-# Backup existing kdm dir
-if spell_ok $SPELL; then
- OLD_VERSION=$(installed_version $SPELL) &&
- if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]] &&
- [[ -d "$KDE4DIR/share/config/kdm" ]]; then
- mkdir -p kdm-3.141594 &&
- echo "Backing up configuration files..." &&
- mv $KDE4DIR/share/config/kdm/{background,kdm}rc \
- kdm-3.141594 &&
- rm -rf $KDE4DIR/share/config/kdm
- fi
-fi
-
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 344d262..506a913 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -1,6 +1,7 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
source $GRIMOIRE/FUNCTIONS &&
-depends X11-SERVER &&
+depends qimageblitz &&
+depends kdepimlibs4 &&
if check_if_xorg_modular_libs qt4 ; then
depends imake &&
depends libxau &&
@@ -14,21 +15,21 @@ if check_if_xorg_modular_libs qt4 ; then
depends libxxf86misc &&
depends xsetroot &&
depends xset &&
- optional_depends libxdamage '' '' 'Compositing support'
+ optional_depends libxcb '' '' 'VideoWidget' &&
+ optional_depends libxdamage '' '' 'Compositing support'
fi &&

-optional_depends freetype2 '' '' '' &&
-optional_depends samba '' '' 'for the smb-ioslave' &&
-optional_depends linux-pam '' '' '' &&
-optional_depends lm_sensors '' '' 'harware monitoring' &&
-optional_depends glib2 '' '' '' &&
-optional_depends libraw1394 '' '' 'Firewire support' &&
+optional_depends freetype2 '' '' 'font anti-aliasing' &&
+optional_depends samba '' '' 'for the smb-ioslave' &&
+optional_depends linux-pam '' '' 'PAM authorisation' &&
+optional_depends lm_sensors '' '' 'harware monitoring' &&
+optional_depends glib2 '' '' 'Gnome support' &&
+optional_depends libraw1394 '' '' 'Firewire support' &&
#optional_depends networkmanager '' '' '' &&
-optional_depends fontconfig '' '' '' &&
-optional_depends libxklavier '' '' 'keyboard configuration' &&
-optional_depends libusb '' '' 'usb support' &&
-optional_depends bluez-libs '' '' 'Bluetooth support ' &&
-optional_depends openldap '' '' 'for LDAP authentication' &&
-optional_depends cyrus-sasl '' '' 'for Cyrus SASL authentication'
-
-
+optional_depends fontconfig '' '' 'font management' &&
+optional_depends libxklavier '' '' 'keyboard configuration' &&
+optional_depends libusb '' '' 'usb support' &&
+optional_depends bluez-libs '' '' 'Bluetooth support ' &&
+optional_depends openldap '' '' 'LDAP authentication' &&
+optional_depends cyrus-sasl '' '' 'Cyrus SASL authentication' &&
+optional_depends xine-lib '' '' 'video player'
diff --git a/kde4/kdebase4/DETAILS b/kde4/kdebase4/DETAILS
index 90c6107..a734fa7 100755
--- a/kde4/kdebase4/DETAILS
+++ b/kde4/kdebase4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdebase4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:8c1eec86817374c000029e4ddda1e8d10a57ad3d47da21b2d6e4780e273e7a3f402357cc5199eba6489da638b530253fab6bc47f6490961c48ff21474501e844
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:8643a6ec5c9d6f2e109924bf265ce088db8ad2ce4d04ff9c33b08e65812e628100a5014d6b20eb021902727cddc22ee443308e99b8b46b608c779bab2b8b014c
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
@@ -10,9 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
# SECURITY_PATCH=1
LICENSE[0]=GPL
KEYWORDS="kde"
- SHORT="Base applications that form the core of KDE."
+ SHORT="basic KDE applications such as Konqueror and Dolphin"
cat << EOF
-This package contains the base applications that form the core of
-the K Desktop Environment like the window manager, the terminal
-emulator, the control center, the file manager, and the panel.
+basic KDE applications such as Konqueror and Dolphin
EOF
diff --git a/kde4/kdebase4/FINAL b/kde4/kdebase4/FINAL
deleted file mode 100755
index 144d0c0..0000000
--- a/kde4/kdebase4/FINAL
+++ /dev/null
@@ -1,24 +0,0 @@
-if check_if_xorg_modular_libs qt4; then
- message "$PROBLEM_COLOR"
- message "kdm does not work out-of-the-box with xorg-modular since the "
- message "paths changed. Edit /opt/share/config/kdm/kdmrc and modify "
- message "ServerCmd to point to /usr/bin/X . If needed, set Xrdb, "
- message "FailsafeClient and Session to point to correct paths (no X11R6/)."
- message "$DEFAULT_COLOR"
-fi &&
-
-message '
-To get pmount working with hal on kde >= 3.5.4 a policy for the plugdev group
-has to be created in /etc/dbus-1/system.d/hal.conf:
-
-<policy group="plugdev">
- <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
- <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-</policy>
-'
-
-message '
-ensure that your ~/.xsession file contains the following line
- eval $(dbus-launch --sh-syntax --exit-with-session)
-this is needed to handle interprocess communication in kde4
-'
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index d9f291d..623a74f 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,24 @@
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: update description
+ * DEPENDS: add qimageblitz, kdepimlibs
+
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS, PROVIDES: deleted
+
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUIILD, INSTALL, FINAL: deleted
+ there has been a major reorganisation of the config files,
+ so this logic is no longer valid
+
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix typo (extra quote)
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * CONFLICTS, PROVIDES: added
+ * DEPENDS: add xine-lib, libxcb
+ tidy up
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdebase4/INSTALL b/kde4/kdebase4/INSTALL
deleted file mode 100755
index 32cef05..0000000
--- a/kde4/kdebase4/INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-default_install &&
-if [[ -d kdm-3.141594 ]]; then
- # Restore backuped kdm dir
- echo "Restoring configuration files..."
&&
- mv $KDE4DIR/share/config/kdm/backgroundrc kdm-3.141594/backgroundrc.new &&
- mv $KDE4DIR/share/config/kdm/kdmrc kdm-3.141594/kdmrc.new &&
- mv kdm-3.141594/{background,kdm}rc $KDE4DIR/share/config/kdm/ &&
- install_config_file kdm-3.141594/backgroundrc.new
$KDE4DIR/share/config/kdm/backgroundrc &&
- install_config_file kdm-3.141594/kdmrc.new $KDE4DIR/share/config/kdm/kdmrc
&&
- rm -r kdm-3.141594
-fi &&
-#if [[ $SMGL_THEME == "y" ]]; then
-# if [[ ! -e $KDE4DIR/share/apps/ksplash/Themes/SourceMage ]]; then
-# mkdir $KDE4DIR/share/apps/ksplash/Themes/SourceMage
-# fi &&
-# for file in SourceMage*; do
-# mv $file $KDE4DIR/share/apps/ksplash/Themes/SourceMage/${file#*\\}
-# done
-#fi &&
-
-install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde4.desktop \
- $KDE4DIR/share/xsessions
diff --git a/kde4/kdebase4/init.d/kdm4 b/kde4/kdebase4/init.d/kdm4
deleted file mode 100755
index 815445a..0000000
--- a/kde4/kdebase4/init.d/kdm4
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PROGRAM=/opt/bin/kdm
-RUNLEVEL=5
-PROVIDES=display_manager
-NEEDS="smgl-messagebus"
-
-. /etc/init.d/smgl_init
diff --git a/kde4/kdebase4/kde4.desktop b/kde4/kdebase4/kde4.desktop
deleted file mode 100644
index 31b20b3..0000000
--- a/kde4/kdebase4/kde4.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=KDE4
-Comment=This session logs you into KDE4
-Exec=/opt/bin/kstart
-TryExec=/opt/bin/kstart
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/kde4/kdeedu4/CONFIGURE b/kde4/kdeedu4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdeedu4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdeedu4/DEPENDS b/kde4/kdeedu4/DEPENDS
new file mode 100755
index 0000000..fc6742d
--- /dev/null
+++ b/kde4/kdeedu4/DEPENDS
@@ -0,0 +1,15 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+optional_depends boost "" "" "scripting support in Kig" &&
+if is_depends_enabled $SPELL boost ; then
+ sub_depends boost PYTHON
+fi &&
+optional_depends facile "" "" "for Kalzium (linear algebra)" &&
+if is_depends_enabled $SPELL facile ; then
+ depends eigen &&
+ depends ocaml
+fi &&
+optional_depends openbabel "" "" "chemistry support"
+# libsbigudrv for KStars
+#
+# libcfitsio for KStars
+# http://heasarc.gsfc.nasa.gov/docs/software/fitsio
diff --git a/kde4/kdeedu4/DETAILS b/kde4/kdeedu4/DETAILS
new file mode 100755
index 0000000..9dfce9e
--- /dev/null
+++ b/kde4/kdeedu4/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=kdeedu4
+ SPELLX=${SPELL//4}
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:b7d17deb0d69bce0477d327f0e3112933671964232e1d96200e658cf1a86456f6e1ef2739835dcd00c83db09ab985d18154d4a0918a1d9c0370e2a9909510337
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+ WEB_SITE=http://www.kde.org
+ ENTERED=20020912
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde"
+ SHORT="educational apps for KDE"
+cat << EOF
+educational apps for KDE
+EOF
diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
new file mode 100644
index 0000000..c4f7983
--- /dev/null
+++ b/kde4/kdeedu4/HISTORY
@@ -0,0 +1,9 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: add facile, for Kalzium (linear algebra support)
+ add openbabel (chemistry support)
+ add sub_depends boost PYTHON (scripting support)
+
+2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.92.0
+ spell created
diff --git a/kde4/kdegames4/DEPENDS b/kde4/kdegames4/DEPENDS
index a76a6e4..c38156b 100755
--- a/kde4/kdegames4/DEPENDS
+++ b/kde4/kdegames4/DEPENDS
@@ -1 +1,2 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+optional_depends ggz-client-libs '' '' 'register KDE games with GGZ games'
games
diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS
index 87852ba..9eae062 100755
--- a/kde4/kdegames4/DETAILS
+++ b/kde4/kdegames4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdegames4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:372b300bf8e6c75085745350291f9adb0f3fcd22ad4abf040404c5f03506c525f4b21dda6e8afa35d6e1b95d5fd222334874dd17d05a1601c6adb850a271de0d
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:f6754c2ff74a7bd738fe3fdb39afeee79c7d043ac7ca033a23ebbdf217642788296b4ca93a212ad456cc83c20c5124c3daf7bdfcbc5e77971d179584120bab12
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index d4e7b67..6cfc3e7 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,9 @@
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional ggz-client-libs (games grimoire)
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdegraphics4/DEPENDS b/kde4/kdegraphics4/DEPENDS
index bf9bb09..65d37f0 100755
--- a/kde4/kdegraphics4/DEPENDS
+++ b/kde4/kdegraphics4/DEPENDS
@@ -10,4 +10,5 @@ optional_depends jpeg '' '' 'Ligature djvu-plugin'
&&
optional_depends poppler '' '' 'Ligature PDF-plugin' &&
optional_depends imlib '' '' 'build kuickshow ' &&
optional_depends chmlib '' '' 'read Windows help files'&&
-optional_depends djvulibre '' '' 'read DejaVu files'
+optional_depends djvulibre '' '' 'read DejaVu files' &&
+optional_depends qimageblitz '' '' 'image manipulation'
diff --git a/kde4/kdegraphics4/DETAILS b/kde4/kdegraphics4/DETAILS
index 23f6814..cea471b 100755
--- a/kde4/kdegraphics4/DETAILS
+++ b/kde4/kdegraphics4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdegraphics4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:f0261b18dcc63ecef6e8527c7ea3d4c64bcf55ba468691ae0c03c2a327b2daa6fc8e96debdbdac4bf45c197014764f35a72b1f19751eb75afe362e7ee61852e9
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:fd0c6c4e72e47e744b5b2d32ab60d2fcc6528be4f6d51fe2c1724d64624c3ff8d7637661a2eeb935c0278e0ee51ae3ef17f9735eec8769a4f96851d4445ae26a
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index 459d827..40fc774 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,7 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: add qimageblitz
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 87de971..8e68089 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -2,9 +2,11 @@ source $SECTION_DIRECTORY/KDE_DEPENDS
&&
optional_depends tiff '' '' 'to view tiff graphics' &&
optional_depends alsa-lib '' '' 'for libKMid alsa support' &&
optional_depends CUPS '' '' 'to use cups printing' &&
-optional_depends aspell '' '' 'forspell checking support' &&
+optional_depends aspell '' '' 'for spell checking support'&&
+optional_depends enchant '' '' 'generic spelling library' &&
optional_depends avahi '' '' 'for domain browsing' &&
optional_depends python '' '' 'kross scripting support' &&
optional_depends jpeg '' '' 'for JPEG image support' &&
optional_depends libmng '' '' 'for animated PNG' &&
-optional_depends jasper '' '' 'jpeg support'
+optional_depends jasper '' '' 'jpeg 2000 support' &&
+optional_depends openexr '' '' 'high dynamic-range images'
diff --git a/kde4/kdelibs4/DETAILS b/kde4/kdelibs4/DETAILS
index 13d1ada..b68a36e 100755
--- a/kde4/kdelibs4/DETAILS
+++ b/kde4/kdelibs4/DETAILS
@@ -1,12 +1,13 @@
SPELL=kdelibs4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:b9d3ba347294fc2dcb93c202b95925b5ed33b4b33aa5496ef34169b167f67133afccdac084bed5f8627d1123728882959442de39a91d1a6a2d7aba93589ad261
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:4f16765cd1b493468aca9c9963fb17b4d57b6f6564526613b567349579810d5595569960da1c7f2bc497f6ff6af3590b5d504fa6ea78b537a3fdc5d0d03d8b58
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20020912
+ PATCHLEVEL=1
# SECURITY_PATCH=1
LICENSE[0]=GPL
KEYWORDS="kde"
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 75cf697..85ec4fd 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,11 @@
+2007-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: fix creation of symlink for dbus
+ * DETAILS: PATCHLEVEL++
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: add optional enchant, openexr
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0
fix the description
diff --git a/kde4/kdelibs4/INSTALL b/kde4/kdelibs4/INSTALL
index d40bea2..458cfe9 100755
--- a/kde4/kdelibs4/INSTALL
+++ b/kde4/kdelibs4/INSTALL
@@ -5,9 +5,9 @@
DBUSDIR=`pkg-config --variable=session_bus_services_dir dbus-1 \
| cut -d/ -f-4` &&

-if [[ $KDE4DIR != /usr ]] ;then
+if [[ $KDE4DIR != $INSTALL_ROOT/usr ]] ;then
if [[ ! -s $KDE4DIR/$DBUSDIR ]];then
- mkdir -p $KDE4DIR/$DBUSDIR
+ mkdir -p $KDE4DIR/share &&
ln -s $INSTALL_ROOT/$DBUSDIR $KDE4DIR/share
fi
fi &&
diff --git a/kde4/kdemultimedia4/DEPENDS b/kde4/kdemultimedia4/DEPENDS
index b97da4f..7c3e7a3 100755
--- a/kde4/kdemultimedia4/DEPENDS
+++ b/kde4/kdemultimedia4/DEPENDS
@@ -1,5 +1,4 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
-optional_depends kdebase4 '' '' 'for Plasma support' &&
optional_depends alsa-lib '' '' 'sound support' &&
optional_depends libogg '' '' 'play Ogg files' &&
optional_depends libvorbis '' '' 'play Vorbis files' &&
@@ -11,5 +10,7 @@ optional_depends flac '' '' 'lossless audio
codec' &&
optional_depends libtunepimp '' '' 'MusicBrainz tagging' &&
optional_depends taglib '' '' 'process audio meta data' &&
#optional_depends nmm '' '' 'Phonon-NMM backend' &&
-optional_depends cdparanoia '' '' 'cd ripper' &&
+# http://www.networkmultimedia.org
+
+optional_depends cdparanoia '' '' 'cd ripper'
optional_depends libmusicbrainz '' '' 'download music metadata'
diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index 0d9174e..adc64e6 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdemultimedia4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:85419a12989d276bd736c54caf1495610efd7f89e723069bf965189fafec4fb8810b9961f49dab4ca49224cf371d9bd338d94eefe98e3a29372c23f3a50970d3
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:c9ffe775f97ce3eb5b7a5348409ffec6f9d752735591d9a406801c3be058c2ef92b9fbf094b2a325255e3188597fef049ec74c7f69ac0dde8c731b9d94de2384
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index 7206299..fafead7 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,7 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: remove explicit kdebase4
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS
index 8416384..b5e85ca 100755
--- a/kde4/kdenetwork4/DETAILS
+++ b/kde4/kdenetwork4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdenetwork4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:4f5abdf216c9a935092b06d7d7c4f58be5c284b79657afc2f29ad4aa54a39e89859936f62a1db6393e15d7c7bc02054a66c7e8d2c079f58316f0e7750beb71d7
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:9f2a0e6486e5f85ffc1435ecc29bcbeefb6ac6bbd31052de165ed32a7e7bc55c5bff0ecdd9fbb90bdd3ab4eb50ec6593decbf43b0783258529fb9755e4b969f3
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 9547756..ba17ebf 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,7 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: remove explicit kdebase4, tidy up
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdepim4/DEPENDS b/kde4/kdepim4/DEPENDS
index 261e431..89a8346 100755
--- a/kde4/kdepim4/DEPENDS
+++ b/kde4/kdepim4/DEPENDS
@@ -1,4 +1,5 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends kdepimlibs4 &&
depends boost &&
# whichever db is built into qt4 ??
optional_depends mysql '' '' 'MySQL/Embedded Akonadi backend' &&
@@ -8,9 +9,3 @@ optional_depends libopensync '' '' 'sync with mobile
devices' &&
optional_depends pilot-link '' '' 'Palm Pilot support' &&
optional_depends libmal '' '' 'Avantgo support' &&
optional_depends gnokii '' '' 'Nokia support'
-#optional_depends libmapi '' '' 'OpenChange / Exchane support'
-#optional_depends shadow '' '' 'for shadow password support'
-#optional_depends linux-pam '' '' 'for Linux PAM support' &&
-#optional_depends fontconfig '' '' 'to configure font access' &&
-#optional_depends lm_sensors '' '' 'for hardware monitoring' &&
-#optional_depends freetype2 '' '' 'for freetype support'
diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index 541af3b..2f09074 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdepim4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:a904b3f4995a1c9fb9f281396ed0854f746bada3ef3c6491b301b694692017ec2c317837676c3304ae65b9e53442621212cde120a4665a81552d1fa6ee6044bc
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:02bbb5f4460d896f7889b824a967435689e40636b9417f612afdaa0c42908ee40badce838a1804df4f7988d1be2da4e49adca1bf5d56265f855974f66efa404b
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 4ab65d4..bd9dbb4 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,10 @@
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add kdepimlibs4
+ tidy up
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdepimlibs4/DETAILS b/kde4/kdepimlibs4/DETAILS
index bc3cd0a..49f4f34 100755
--- a/kde4/kdepimlibs4/DETAILS
+++ b/kde4/kdepimlibs4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdepimlibs4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:282559a8d209949d9fafc414530c13b8ae7c51040f3fd587a6710033dab129eacb63e73c579c3003d41bc7a1b9347164048700d77a5fd880f414a7d363626cd9
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:0d147831f2b7e9fa78489b3fe82f99ae477f42741c8b4f5a73b5aa39a907fb0fdca5e459bdac533e939b0c6318f21c696ddba109282ec1d63b794fe9ed105622
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 1e19005..c5a12c1 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
index 38ac5c0..5f977e5 100755
--- a/kde4/kdesdk4/DETAILS
+++ b/kde4/kdesdk4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdesdk4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:55f1e475fe22ab16d64a10f95d76263f61c9abb6b0e6db391dc0d77dea1eac28f349534ef7ce806d47ace370e29021956e5b931536d7b060bbdaaf9b7514706b
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:6676f2ebfb151defeab33c6f758d1656d686ca4452c3109f47e03b2fef51213c8502c630ed784b4e820aeab2aea4816ff1624f3204c5e9aa6f708350c929ef7e
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index 322f728..ac75181 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/kdetoys4/CONFIGURE b/kde4/kdetoys4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdetoys4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdetoys4/DEPENDS b/kde4/kdetoys4/DEPENDS
new file mode 100755
index 0000000..b4b4f02
--- /dev/null
+++ b/kde4/kdetoys4/DEPENDS
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4/kdetoys4/DETAILS b/kde4/kdetoys4/DETAILS
new file mode 100755
index 0000000..0e52439
--- /dev/null
+++ b/kde4/kdetoys4/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=kdetoys4
+ SPELLX=${SPELL//4}
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:aa903b7d79f3f7da317267bdfb54eede8aece85d87a65abcb179d700f2aba75e0b5ee05bb5b763ea0974714dfca0a25992d2553fb740fa14c87db8a738a8dbe1
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+ WEB_SITE=http://www.kde.org
+ ENTERED=20020912
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde"
+ SHORT="toys for KDE"
+cat << EOF
+toys for KDE
+EOF
diff --git a/kde4/kdetoys4/HISTORY b/kde4/kdetoys4/HISTORY
new file mode 100644
index 0000000..64d1030
--- /dev/null
+++ b/kde4/kdetoys4/HISTORY
@@ -0,0 +1,7 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+ * DEPENDS: remove explict kdebase4
+
+2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.92.0
+ spell created
diff --git a/kde4/kdeutils4/DETAILS b/kde4/kdeutils4/DETAILS
index 332f2e6..c7cf277 100755
--- a/kde4/kdeutils4/DETAILS
+++ b/kde4/kdeutils4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdeutils4
SPELLX=${SPELL//4}
- VERSION=3.92.0
-
SOURCE_HASH=sha512:f46f009e22e38e494ce40b800629636f69dfc2435d4704a4dd1fec85b15fa08e484f3cc1d2dbaebd8a364b419ce6bcee710fb90640c45f7f5bc65899b84bd244
+ VERSION=3.93.0
+
SOURCE_HASH=sha512:eea1cb95042be8adcef5db354965a37f6d4e8c63a2f3b0f4f83ba43e88ddc9313afeb41c5550dd9a1339b7f03c2d43d6a954d2ace9b998dd5d1051c4317cb23d
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index d31abab..1ca6aeb 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.93.0
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.92.0

diff --git a/kde4/koffice2/DEPENDS b/kde4/koffice2/DEPENDS
index 8ae770b..e5045a7 100755
--- a/kde4/koffice2/DEPENDS
+++ b/kde4/koffice2/DEPENDS
@@ -11,8 +11,13 @@ optional_depends sqlite '' '' 'kexi database'
&&
optional_depends glew '' '' 'OpenGL shader support' &&
optional_depends exiv2 '' '' 'decode photo tags' &&
optional_depends poppler '' '' 'PDF support' &&
-optional_depends wv2 '' '' 'for MS word importing' &&
+optional_depends wv2 '' '' 'MS Word import' &&
optional_depends tiff '' '' 'graphics support' &&
optional_depends graphicsmagick '' '' 'various Krita filters' &&
optional_depends openexr '' '' 'Krita EXR filter' &&
-optional_depends qca2 '' '' 'crypto support'
+optional_depends qca2 '' '' 'crypto support' &&
+optional_depends qimageblitz '' '' 'graphics manipulation' &&
+optional_depends glpk '' '' 'painterly mixer plugin'&&
+optional_depends libart_lgpl '' '' '2D graphics support' &&
+optional_depends kdepimlibs4 '' '' 'PIM support'
+#libwpd '' '' 'WordPerfect import'
diff --git a/kde4/koffice2/DETAILS b/kde4/koffice2/DETAILS
index 2fa738c..27f54b1 100755
--- a/kde4/koffice2/DETAILS
+++ b/kde4/koffice2/DETAILS
@@ -1,8 +1,7 @@
#source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=koffice2
- VERSION=1.9.92
-# KDEVER=3.91.0
-
SOURCE_HASH=sha512:827a4f84912ee84ebbbeff8a7319909c6dfc82ba0f948beecd7d4ff5ab7b95156ee32dc1f85f0516b23249ad2aaef23d19551c50e68ad0996de4ec03161609a8
+ VERSION=1.9.93
+
SOURCE_HASH=sha512:4e36124bcbf0cfc963ffa5b8ae267f6518747b995b32903c23524487048a459db07173e2207a5a322ace551a52b034c9c106c8226632734cbd042e82194ddef5
SOURCE=${SPELL//2}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-${VERSION}
SOURCE_URL[0]=$KDE_URL/unstable/${SPELL//2}-${VERSION}/src/$SOURCE
diff --git a/kde4/koffice2/HISTORY b/kde4/koffice2/HISTORY
index 5c11c22..490100e 100644
--- a/kde4/koffice2/HISTORY
+++ b/kde4/koffice2/HISTORY
@@ -1,3 +1,7 @@
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.93
+ * DEPENDS: add libart_lgpl, qimageblitz, kdepimlibs4, glpk
+
2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.92

diff --git a/kde4/qimageblitz/DEPENDS b/kde4/qimageblitz/DEPENDS
new file mode 100755
index 0000000..cbfe3d0
--- /dev/null
+++ b/kde4/qimageblitz/DEPENDS
@@ -0,0 +1,3 @@
+depends qt4 &&
+depends kdelibs4 &&
+depends cmake
diff --git a/kde4/qimageblitz/DETAILS b/kde4/qimageblitz/DETAILS
new file mode 100755
index 0000000..8ed5fea
--- /dev/null
+++ b/kde4/qimageblitz/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=qimageblitz
+ VERSION=0.0.706674
+
SOURCE_HASH=sha512:b0e7e35610ac8c53b270d0dc2315d845987c7f5e8d5b3580e578371b6ea1b9e862f0bf3e555f0150e5d50d5b9cd8ef697fc29371c4f98d7dfc8a0e987d6eb51d
+ SOURCE=$SPELL\_$VERSION.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/q/$SPELL/$SOURCE
+ WEB_SITE=
+ LICENSE[0]=BSD
+ ENTERED=20070906
+ KEYWORDS="graphics"
+ SHORT="graphical effect and filter library"
+cat << EOF
+Blitz is a graphical effect and filter library for KDE4.0 that contains many
+improvements over KDE 3.x's kdefx library including bugfixes, memory and
speed
+improvements, and MMX/SSE support.
+EOF
diff --git a/kde4/qimageblitz/HISTORY b/kde4/qimageblitz/HISTORY
new file mode 100644
index 0000000..1722536
--- /dev/null
+++ b/kde4/qimageblitz/HISTORY
@@ -0,0 +1,7 @@
+2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix typo, should be kdelibs4
+
+2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.0.706674
+ spell created
+
diff --git a/kde4/tagua/DEPENDS b/kde4/tagua/DEPENDS
new file mode 100755
index 0000000..a482f45
--- /dev/null
+++ b/kde4/tagua/DEPENDS
@@ -0,0 +1,2 @@
+source $SECTION/KDE_DEPENDS
+
diff --git a/kde4/tagua/DETAILS b/kde4/tagua/DETAILS
new file mode 100755
index 0000000..d73b924
--- /dev/null
+++ b/kde4/tagua/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=tagua
+ VERSION=1.0-alpha
+
SOURCE_HASH=sha512:3b4ac2af16c93c075131f55bfee5c24beb8d7b7952367ad686a177646e92f5a16972a361f1604527ebf08177413c4860684cecd6fa769849d11b1044bfb9addf
+ SOURCE=$SPELL-$VERSION.tar.gz
+# SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+# SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
+ WEB_SITE=http://www.tagua-project.org/
+ SOURCE_URL[0]=http://tarballs.tagua-project.org/releases/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20070906
+ KEYWORDS="gasmes"
+ SHORT="generic board game application for KDE"
+cat << EOF
+Tagua (previously known as KBoard) is a generic board game application for
+KDE, including games like Chess, Shogi, Xiangqi and variants. Tagua is based
on
+a powerful plugin system that allows many games to share the same graphical
+framework, game history handling, interoperability with AI engines and
+connectivity to network servers
+ EOF
diff --git a/kde4/tagua/HISTORY b/kde4/tagua/HISTORY
new file mode 100644
index 0000000..5a101ca
--- /dev/null
+++ b/kde4/tagua/HISTORY
@@ -0,0 +1,4 @@
+2007-09-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0-alpha
+ spell created
+
diff --git a/kernels/dazuko/DETAILS b/kernels/dazuko/DETAILS
index b419cf6..bb92ca4 100755
--- a/kernels/dazuko/DETAILS
+++ b/kernels/dazuko/DETAILS
@@ -1,5 +1,5 @@
SPELL=dazuko
- VERSION=2.3.3
+ VERSION=2.3.4-pre2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.dazuko.org/files/$SOURCE
diff --git a/kernels/dazuko/HISTORY b/kernels/dazuko/HISTORY
index 1309395..b14977d 100644
--- a/kernels/dazuko/HISTORY
+++ b/kernels/dazuko/HISTORY
@@ -1,3 +1,9 @@
+2007-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.4-pre2
+
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.4-pre1
+
2007-03-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.3

diff --git a/kernels/deskopt/BUILD b/kernels/deskopt/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kernels/deskopt/BUILD
@@ -0,0 +1 @@
+true
diff --git a/kernels/deskopt/DEPENDS b/kernels/deskopt/DEPENDS
new file mode 100755
index 0000000..5128a1f
--- /dev/null
+++ b/kernels/deskopt/DEPENDS
@@ -0,0 +1,3 @@
+depends elementtree &&
+depends python
+
diff --git a/kernels/deskopt/DETAILS b/kernels/deskopt/DETAILS
new file mode 100755
index 0000000..23c22b2
--- /dev/null
+++ b/kernels/deskopt/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=deskopt
+ VERSION=005
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+
SOURCE_URL[0]=http://www.stardust.webpages.pl/files/tools/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:4c4792f08e61d53b8cf12e6d111eeb63f0d7da2ab1a7c3e1921157a5d794916ac03c8a640bb14374ab0c0eff347e2df51a0d4e83c5ab666bdc3a04eed7f82465
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ WEB_SITE=http://kernel.org/
+ LICENSE[0]=GPL
+ KEYWORDS="kernel utils"
+ ENTERED=20070906
+ DOCS="doc.txt ${DOCS}"
+ SHORT="DeskOpt is an utility to tune kernel schedulers"
+cat << EOF
+DeskOpt is an utility to tune kernel schedulers. It supports Anticipatory,
+Deadline, CFQ and CFS schedulers.
+EOF
diff --git a/kernels/deskopt/HISTORY b/kernels/deskopt/HISTORY
new file mode 100644
index 0000000..af3e14f
--- /dev/null
+++ b/kernels/deskopt/HISTORY
@@ -0,0 +1,6 @@
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added elementtree
+
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, DEPENDS, DETAILS, INSTALL, HISTORY, init.d/deskopt:
+ spell created
diff --git a/kernels/deskopt/INSTALL b/kernels/deskopt/INSTALL
new file mode 100755
index 0000000..26e5441
--- /dev/null
+++ b/kernels/deskopt/INSTALL
@@ -0,0 +1,3 @@
+cp deskopt ${INSTALL_ROOT}/usr/bin &&
+mkdir -p ${INSTALL_ROOT}/etc/deskopt &&
+cp deskopt.conf ${INSTALL_ROOT}/etc/deskopt
diff --git a/kernels/deskopt/init.d/deskopt b/kernels/deskopt/init.d/deskopt
new file mode 100644
index 0000000..53d9a35
--- /dev/null
+++ b/kernels/deskopt/init.d/deskopt
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/deskopt
+ARGS="-c /etc/deskopt/deskopt.conf"
+RUNLEVEL=1
+
+. /etc/init.d/smgl_init
+
+stop() {
+ echo "Stopping $NAME..."
+ $PROGRAM -q
+}
diff --git a/kernels/device-mapper/DETAILS b/kernels/device-mapper/DETAILS
index 2fb0583..81941d5 100755
--- a/kernels/device-mapper/DETAILS
+++ b/kernels/device-mapper/DETAILS
@@ -24,8 +24,8 @@ case $DEVICE_MAPPER_BRANCH in
PATCHLEVEL=1
;;
1.02)
- VERSION=1.02.20
-
SOURCE_HASH=sha512:2edbd6a4635a2f822f6ef014c562aa5b052ac21514739cc65f8112f6c6237f6cb766ed6818f90eba408b12a8eb35c8eca6179d9e65777fc78be417852faef091
+ VERSION=1.02.22
+
SOURCE_HASH=sha512:36e02b5102fea9c921f6fde5598d2e73f7899df09f6c9a2862d1eeab4f312e3073aafa2b567f2e15ffa3b8e637a5e00eb65e96d883d35b26b9317e9c381435be
;;
esac

diff --git a/kernels/device-mapper/HISTORY b/kernels/device-mapper/HISTORY
index db05abb..8c56120 100644
--- a/kernels/device-mapper/HISTORY
+++ b/kernels/device-mapper/HISTORY
@@ -1,3 +1,6 @@
+2007-08-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.02.22
+
2007-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.02.20

diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index 014cec2..3aeaacb 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,7 @@
+2007-08-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, kqemu-1.3.0pre11_linux-2.6.22.patch: make it work with
+ newer kernels; patch from Debian package
+
2007-06-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* INSTALL: ifed the udev rule echo... not everyone uses udev

diff --git a/kernels/kqemu/PRE_BUILD b/kernels/kqemu/PRE_BUILD
index f751273..98f551b 100755
--- a/kernels/kqemu/PRE_BUILD
+++ b/kernels/kqemu/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build
&&
+cd "$SOURCE_DIRECTORY"
&&
+patch -Np1 < "$SCRIPT_DIRECTORY/kqemu-1.3.0pre11_linux-2.6.22.patch"
&&
sedit "s:\`uname -r\`:$(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
&&
sedit "s:depmod -a:& $(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
diff --git a/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
b/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
new file mode 100644
index 0000000..9735d2c
--- /dev/null
+++ b/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
@@ -0,0 +1,16 @@
+## From Debian's kqemu-source package:
+## 03-2.5.22.dpatch by Samuel Tardieu <sam AT rfc1149.net>
+##
+## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031).
+
+diff -Naur kqemu-1.3.0pre11.orig/kqemu-linux.c kqemu-1.3.0pre11/kqemu-linux.c
+--- kqemu-1.3.0pre11.orig/kqemu-linux.c 2007-02-06 21:02:00.000000000
+0000
++++ kqemu-1.3.0pre11/kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/smp_lock.h>
+ #include <linux/miscdevice.h>
++#include <linux/sched.h>
+ #include <asm/atomic.h>
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index 193f38a..253b399 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,6 +1,6 @@
SPELL=kvm
- VERSION=35
-
SOURCE_HASH=sha512:fcb4d100a87409d52952fda27482e2d49fdf616e9beb850361567b32ba74162855aaf25a6d15fa43e4ed07ec98bf15dc1f8668f4f624d0d60bb1d2c5e0e0b0b3
+ VERSION=44
+
SOURCE_HASH=sha512:392a5043bef245263959068cfc5bc5c42a002bb2c0e5b392adfc4d1ca3743a76de9b4a1c305659f5fe7671fb867a0b48806665061dc9e9a22a1b771b0fc2a909
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index c1d9cd9..e486b3d 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,21 @@
+2007-09-23 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 44
+
+2007-09-20 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 42
+
+2007-09-19 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 41
+
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 40
+
+2007-09-13 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 38
+
+2007-09-08 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 37
+
2007-08-14 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated to 35

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index edeb59a..34b678c 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,47 @@
+2007-09-21 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.22.7
+ * info/patches/maintenance_patches/patch-2.6.22.7: added
+
+2007-09-19 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23-rc7
+ * info/patches/PRE_2_6/patch-2.6.23-rc7: added
+
+2007-09-19 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to 2.6.23-rc6-mm1
+ * info/patches/mm_patches/2.6.23-rc6-mm1: added
+
+2007-09-10 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23-rc6
+ * info/patches/PRE_2_6/patch-2.6.23-rc6: added
+
+2007-09-03 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23-rc5
+ * info/patches/PRE_2_6/patch-2.6.23-rc5: added
+
+2007-09-03 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to 2.6.23-rc4-mm1
+ * info/patches/mm_patches/2.6.23-rc4-mm1: added
+
+2007-08-31 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: updated latest to patch-2.6.22.6
+ * info/patches/maintenance_patches/patch-2.6.22.6: added
+
+2007-08-27 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23-rc4
+ * info/patches/PRE_2_6/patch-2.6.23-rc4: added
+
+2007-08-26 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to 2.6.23-rc3-mm1
+ * info/patches/mm_patches/2.6.23-rc3-mm1: added
+
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: updated latest to patch-2.6.22.5
+ * info/patches/maintenance_patches/patch-2.6.22.5: added
+
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: updated latest to patch-2.6.22.4
+ * info/patches/maintenance_patches/patch-2.6.22.4: added
+
2007-08-15 David Brown <dmlb2000 AT gmail.com>
* latest.defaults: updated latest to patch-2.6.22.3
* info/patches/maintenance_patches/patch-2.6.22.3: added
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc4
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc4
new file mode 100755
index 0000000..d488621
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc4
@@ -0,0 +1,7 @@
+patchversion="2.6.23-rc4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.22"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc5
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc5
new file mode 100755
index 0000000..111991e
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc5
@@ -0,0 +1,7 @@
+patchversion="2.6.23-rc5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.22"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc6
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc6
new file mode 100755
index 0000000..2ab2d32
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc6
@@ -0,0 +1,7 @@
+patchversion="2.6.23-rc6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.22"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc7
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc7
new file mode 100755
index 0000000..3347de8
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc7
@@ -0,0 +1,7 @@
+patchversion="2.6.23-rc7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.22"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.4
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.4
new file mode 100755
index 0000000..a6837e2
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.5
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.5
new file mode 100755
index 0000000..ebf039f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.5
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.6
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.6
new file mode 100755
index 0000000..bb42c56
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.6
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.7
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.7
new file mode 100755
index 0000000..fae8a02
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.7
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.23-rc3-mm1
b/kernels/linux/info/patches/mm_patches/2.6.23-rc3-mm1
new file mode 100755
index 0000000..0f2745a
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.23-rc3-mm1
@@ -0,0 +1,7 @@
+appliedkernels="2.6.22"
+depends="patch-2.6.23-rc3"
+patchversion="${depends/patch-/}-mm1"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${depends/patch-/}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.23-rc4-mm1
b/kernels/linux/info/patches/mm_patches/2.6.23-rc4-mm1
new file mode 100755
index 0000000..665c363
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.23-rc4-mm1
@@ -0,0 +1,7 @@
+appliedkernels="2.6.22"
+depends="patch-2.6.23-rc4"
+patchversion="${depends/patch-/}-mm1"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${depends/patch-/}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.23-rc6-mm1
b/kernels/linux/info/patches/mm_patches/2.6.23-rc6-mm1
new file mode 100755
index 0000000..816d29e
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.23-rc6-mm1
@@ -0,0 +1,7 @@
+appliedkernels="2.6.22"
+depends="patch-2.6.23-rc6"
+patchversion="${depends/patch-/}-mm1"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${depends/patch-/}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 93459f2..dfcdb4f 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,10 +1,10 @@
LATEST_2_6=2.6.22
-LATEST_PRE_2_6=patch-2.6.23-rc3
-LATEST_maintenance_patches=patch-2.6.22.3
+LATEST_PRE_2_6=patch-2.6.23-rc7
+LATEST_maintenance_patches=patch-2.6.22.7
LATEST_git_patches=patch-2.6.12-rc5-git8
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
-LATEST_mm_patches=2.6.23-rc2-mm2
+LATEST_mm_patches=2.6.23-rc6-mm1
LATEST_ac_patches=patch-2.6.11-ac7
LATEST_grsecurity_2_4=grsecurity-2.1.8-2.4.32-200601211647.patch
LATEST_grsec_secfix_2_4=linux-2.4.28-secfix-200501071141.patch
diff --git a/kernels/lirc/DETAILS b/kernels/lirc/DETAILS
index 2e3910e..5fcf19a 100755
--- a/kernels/lirc/DETAILS
+++ b/kernels/lirc/DETAILS
@@ -1,6 +1,6 @@
SPELL=lirc
- VERSION=0.8.1
-
SOURCE_HASH=sha512:838fab7cbcf5f1bb054d7c8538395ec0d2c0f9288ea055cb8e55137f731bb4856752ff75c099d3cb0858159387b1c648a9d11dd00822fdf3e459669541501bde
+ VERSION=0.8.2
+
SOURCE_HASH=sha512:0259ad48882277773744c7ffa4f9d4189095b9da28c5f59310e623c5be6ca66b46de8f80dbec56f83d468c8be0650c2e44c9b66103e7ea92a4b26461a888b790
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=${SOURCEFORGE_URL}/$SPELL/$SOURCE
diff --git a/kernels/lirc/HISTORY b/kernels/lirc/HISTORY
index 9f46c7d..446f0bf 100644
--- a/kernels/lirc/HISTORY
+++ b/kernels/lirc/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.2
+
2007-03-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 0.8.1

diff --git a/kernels/madwifi/DETAILS b/kernels/madwifi/DETAILS
index 3e78544..ba8e9e4 100755
--- a/kernels/madwifi/DETAILS
+++ b/kernels/madwifi/DETAILS
@@ -6,14 +6,15 @@ if [[ "$MADWIFI_SVN" == "y" ]]; then
VERSION=svn
fi
SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_HINTS=old_svn_compat
SOURCE_URL[0]=svn://svn.madwifi.org/trunk:madwifi
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD="on"
else
- VERSION=0.9.3.1
+ VERSION=0.9.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_HASH=sha1:ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SECURITY_PATCH=2
diff --git a/kernels/madwifi/HISTORY b/kernels/madwifi/HISTORY
index fe58ed2..aa2ec5b 100644
--- a/kernels/madwifi/HISTORY
+++ b/kernels/madwifi/HISTORY
@@ -1,3 +1,10 @@
+2007-09-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version bumped to 0.9.3.2, compiles with linux-2.6.22
+ * *.sig: Removed, using sha1 hash for now ...
+
+2007-09-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Added SOURCE_HINTS=old_svn_compat
+
2007-06-12 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version bumped to 0.9.3.1
secpatch++
diff --git a/kernels/madwifi/madwifi-0.9.3.1.tar.bz2.sig
b/kernels/madwifi/madwifi-0.9.3.1.tar.bz2.sig
deleted file mode 100644
index 536daba..0000000
Binary files a/kernels/madwifi/madwifi-0.9.3.1.tar.bz2.sig and /dev/null
differ
diff --git a/latex/pgf/DETAILS b/latex/pgf/DETAILS
index e31b68c..cc75d71 100755
--- a/latex/pgf/DETAILS
+++ b/latex/pgf/DETAILS
@@ -1,10 +1,10 @@
SPELL=pgf
- VERSION=1.01
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://dfn.dl.sourceforge.net/sourceforge/latex-beamer/${SOURCE}
-
SOURCE_HASH=sha512:9bdc414e0a54bf4cc9a882adc7f19e63286ba13c4caba5ba6f1cec1a9a137b3484c9e867de1251b0148e9725808f98f95f034199d4d26a30bd91b3b5b6a32747
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://latex-beamer.sourceforge.net";
+ VERSION=1.18
+ SOURCE="${SPELL}.zip"
+ SOURCE_URL[0]=$CTAN_URL/graphics/pgf.zip
+
SOURCE_HASH=sha512:aea841e7f8d2652ad9438d9f1105e9a2441ec7fc49227aa285f4c2a681b32582377544913153f2946b1946241180cf03e103a7394624e01d45e58d2f09993fb4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+
WEB_SITE=http://www.ctan.org/tex-archive/help/Catalogue/entries/pgf.html
LICENSE[0]=GPL
GATHER_DOCS="off"
ENTERED=20070427
diff --git a/latex/pgf/HISTORY b/latex/pgf/HISTORY
index 5bbc5bc..ed21d84 100644
--- a/latex/pgf/HISTORY
+++ b/latex/pgf/HISTORY
@@ -1,3 +1,6 @@
+2007-08-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 1.18
+
2007-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: GATHER_DOCS=off

diff --git a/libaccount b/libaccount
index 1c3261b..73f3547 100755
--- a/libaccount
+++ b/libaccount
@@ -73,10 +73,18 @@ function create_account() {

debug "libgrimoire" "create_account() - $1, UID=$ACCOUNT_UID,
GID=$PRIMARY_GID:$PRIMARY_GNAME, HOME=$HOME_DIR, SHELL=$USER_SHELL,
SECONDARY_GIDS=$4"

+ # selinux/pam doesn't like it when LD_PRELOAD is set during group/user
+ # manipulations. These files aren't tracked anyway so this won't matter.
+
+ LD_PRELOAD_BAK="$LD_PRELOAD"
+ unset LD_PRELOAD
groupadd -g $PRIMARY_GID -f $PRIMARY_GNAME

# check for adding user problems and try to notify user.
useradd -u $ACCOUNT_UID -g $PRIMARY_GNAME $SECONDARY_GIDS -d "$HOME_DIR"
-s "$USER_SHELL" $1
+ export LD_PRELOAD="$LD_PRELOAD_BAK"
+ unset LD_PRELOAD_BAK
+
local USERADD_RETURN=$?
debug "libgrimoire.create_account()" "useradd return code was:
$USERADD_RETURN"

@@ -117,7 +125,15 @@ function create_group() {

debug "libgrimoire" "create_group() - $1, GID=$GROUP_UID "

+ # selinux/pam doesn't like it when you are doing user/group manipulations
+ # with LD_PRELOAD set. the files changed aren't tracked anyway so this
+ # shouldn't matter
+
+ LD_PRELOAD_BAK="$LD_PRELOAD"
+ unset LD_PRELOAD
groupadd -g $GROUP_GID $1 > /dev/null 2>&1
+ export LD_PRELOAD="$LD_PRELOAD_BAK"
+ unset LD_PRELOAD_BAK

local GROUPADD_RETURN=$?
debug "libgrimoire.create_group()" "groupadd return code was:
$GROUPADD_RETURN"
diff --git a/libs/ace/BUILD b/libs/ace/BUILD
index 48edaf9..acb35b8 100755
--- a/libs/ace/BUILD
+++ b/libs/ace/BUILD
@@ -1,3 +1,4 @@
+./bin/bootstrap &&
mkdir build &&
cd build &&
ln -s ../configure &&
diff --git a/libs/ace/DETAILS b/libs/ace/DETAILS
index 871018e..daeeef7 100755
--- a/libs/ace/DETAILS
+++ b/libs/ace/DETAILS
@@ -1,13 +1,13 @@
SPELL=ace
- VERSION=5.5.9
- SOURCE=ACE.tar.gz
-
SOURCE_HASH=sha512:d94372b1fe8d8469283c3beb2fd53284f29bfddbff0489f5db8a7fb7289aee1ecd8b4ec65e6cf9ca4716d318de769e23c2994a2eda2313a55e5b83653aa7aa27
+ VERSION=5.6.1
+ SOURCE=ACE-src-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:15b9946120048cce150ff60c2ef53ccd06e1d6cb92df79f884514ac9518e470b7a8ed381ea332fd4a7bf2da534fa53b764d4273c53aca9a9452362aa53e9b0ab
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ACE_wrappers
- SOURCE_URL[0]=http://deuce.doc.wustl.edu/$SOURCE
+
+SOURCE_URL[0]=ftp://download.dre.vanderbilt.edu/previous_versions/$SOURCE
WEB_SITE=http://www.cs.wustl.edu/~schmidt/ACE.html
ENTERED=20031012
LICENSE[0]=http://www.cs.wustl.edu/~schmidt/ACE-copying.html
- FORCE_DOWNLOAD=on
KEYWORDS="libs"
SHORT="ACE/TAO is a framework for concerent communication
software"
cat << EOF
diff --git a/libs/ace/HISTORY b/libs/ace/HISTORY
index 50db6d9..0eb7b1b 100644
--- a/libs/ace/HISTORY
+++ b/libs/ace/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.6.1
+ used versioned tarball
+ new url
+ * BUILD: add ./bin/bootstrap
+
2007-06-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.5.9

diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index 76973d0..485d770 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,10 +1,10 @@
SPELL=clucene
if [[ $CLUC_VER = devel ]];then
- VERSION=0.9.19
-
SOURCE_HASH=sha512:7fc6eb69dde9d52a60b2dc0814f2ddf1834b56be437fef6c89ee49e75287e96f80d57ff537c94a18eba6edeae806c34a77803be8e0d7ada8d809aa7f1814a52e
+ VERSION=0.9.20
+
SOURCE_HASH=sha512:f06eba582da4f776c9a893fd1467f07d10a912f4f9a887740b40dfd39487d4e363e31366673c5d1b9799abd80d51bdd29acc4666e228fbdb0082971271e8a79a
else
- VERSION=0.9.19
-
SOURCE_HASH=sha512:7fc6eb69dde9d52a60b2dc0814f2ddf1834b56be437fef6c89ee49e75287e96f80d57ff537c94a18eba6edeae806c34a77803be8e0d7ada8d809aa7f1814a52e
+ VERSION=0.9.20
+
SOURCE_HASH=sha512:f06eba582da4f776c9a893fd1467f07d10a912f4f9a887740b40dfd39487d4e363e31366673c5d1b9799abd80d51bdd29acc4666e228fbdb0082971271e8a79a
fi
SOURCE=$SPELL-core-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-core-$VERSION
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 5a9f59f..b67fc9c 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.20
+
2007-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.19
devel and stable are the same at present
diff --git a/libs/confuse/BUILD b/libs/confuse/BUILD
new file mode 100755
index 0000000..37517ed
--- /dev/null
+++ b/libs/confuse/BUILD
@@ -0,0 +1,2 @@
+OPTS="--enable-shared $OPTS" &&
+default_build
diff --git a/libs/confuse/HISTORY b/libs/confuse/HISTORY
index 0342003..9c328ea 100644
--- a/libs/confuse/HISTORY
+++ b/libs/confuse/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: added to pass --enable-shared #13956
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/elfutils/DETAILS b/libs/elfutils/DETAILS
index 5c3a4f0..590bdff 100755
--- a/libs/elfutils/DETAILS
+++ b/libs/elfutils/DETAILS
@@ -1,15 +1,10 @@
SPELL=elfutils
- VERSION=0.128
+ VERSION=0.129
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SPELL-portability.patch
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://sources.redhat.com/pub/systemtap/elfutils/$SOURCE

SOURCE_URL[1]=http://mirrors.kernel.org/sources.redhat.com/systemtap/elfutils/$SOURCE
- SOURCE2_URL[0]=ftp://sources.redhat.com/pub/systemtap/elfutils/$SOURCE2
-
SOURCE2_URL[1]=http://mirrors.kernel.org/sources.redhat.com/systemtap/elfutils/$SOURCE2
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
-FORCE_DOWNLOAD[2]="ON"
LICENSE[0]=OpenSoftware
KEYWORDS="libs"
WEB_SITE=http://www.redhat.com/
diff --git a/libs/elfutils/HISTORY b/libs/elfutils/HISTORY
index e37fbc0..15bbfb5 100644
--- a/libs/elfutils/HISTORY
+++ b/libs/elfutils/HISTORY
@@ -1,3 +1,11 @@
+2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.129
+ Don't bother making the portability patch a SOURCE
+ * PRE_BUILD: Apply portability patch from SCRIPT_DIRECTORY now
+ * elfutils-0.129-portability.patch: Downloaded from
+
ftp://sources.redhat.com/pub/systemtap/elfutils/elfutils-portability.patch
+ Tired of this 'breaking' every time elfutils updates
+
2007-08-02 Elisamuel Resto <ryuji AT mages.ath.cx>
* DETAILS: fixed a typo in SOURCE2_URL[1]

diff --git a/libs/elfutils/PRE_BUILD b/libs/elfutils/PRE_BUILD
index 17e0c35..4cc69fd 100755
--- a/libs/elfutils/PRE_BUILD
+++ b/libs/elfutils/PRE_BUILD
@@ -1,10 +1,9 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-unpack_file '2' &&
-patch -p1 < $SOURCE_CACHE/$SOURCE2 &&
-sed -i "s/-Werror//" */Makefile.in &&
-sedit "/^addr/s/)/) \$(libelf)/" src/Makefile.am &&
-sedit "/^line2addr_LDADD/s/)/) \$(libelf)/" tests/Makefile.am &&
-sedit "/^addrscopes/s/)/) \$(libelf)/" tests/Makefile.am &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SCRIPT_DIRECTORY/$SPELL-$VERSION-portability.patch &&
+sed -i "s/-Werror//" */Makefile.in &&
+sedit "/^addr/s/)/) \$(libelf)/" src/Makefile.am &&
+sedit "/^line2addr_LDADD/s/)/) \$(libelf)/" tests/Makefile.am &&
+sedit "/^addrscopes/s/)/) \$(libelf)/" tests/Makefile.am &&
sedit "/ifndef/s/PACKAGE/PACKAGE_NAME/" libdwfl/libdwflP.h

diff --git a/libs/elfutils/elfutils-0.127.tar.gz.sig
b/libs/elfutils/elfutils-0.127.tar.gz.sig
deleted file mode 100644
index 48a41ac..0000000
Binary files a/libs/elfutils/elfutils-0.127.tar.gz.sig and /dev/null differ
diff --git a/libs/elfutils/elfutils-0.128.tar.gz.sig
b/libs/elfutils/elfutils-0.128.tar.gz.sig
deleted file mode 100644
index 02b139f..0000000
Binary files a/libs/elfutils/elfutils-0.128.tar.gz.sig and /dev/null differ
diff --git a/libs/elfutils/elfutils-0.129-portability.patch
b/libs/elfutils/elfutils-0.129-portability.patch
new file mode 100644
index 0000000..d8cdd9a
--- /dev/null
+++ b/libs/elfutils/elfutils-0.129-portability.patch
@@ -0,0 +1,1043 @@
+--- elfutils/backends/ChangeLog
++++ elfutils/backends/ChangeLog
+@@ -157,6 +157,11 @@
+ * sparc_init.c: Likewise.
+ * x86_64_init.c: Likewise.
+
++2005-11-22 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
++ (libebl_%.so rule): Use it in place of -Wl,--as-needed.
++
+ 2005-11-19 Roland McGrath <roland AT redhat.com>
+
+ * ppc64_reloc.def: REL30 -> ADDR30.
+@@ -179,6 +184,9 @@
+ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
+ (CLEANFILES): Add libebl_$(m).so.
+
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ * ppc_reloc.def: Update bits per Alan Modra <amodra AT bigpond.net.au>.
+ * ppc64_reloc.def: Likewise.
+
+--- elfutils/backends/Makefile.am
++++ elfutils/backends/Makefile.am
+@@ -25,12 +25,14 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
++WEXTRA = @WEXTRA@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
++AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
+ -std=gnu99
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
+ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+@@ -62,7 +64,7 @@ textrel_check = if readelf -d $@ | fgrep
+ libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
+ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ -Wl,--version-script,$(word 2,$^) \
+- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ $(textrel_check)
+
+ libebl_%.map: Makefile
+--- elfutils/backends/Makefile.in
++++ elfutils/backends/Makefile.in
+@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -176,6 +177,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -231,9 +233,9 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
+-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
++@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
+-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99
++@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
+ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+ -I$(top_srcdir)/lib -I..
+@@ -605,7 +607,7 @@ uninstall-am:
+ libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
+ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ -Wl,--version-script,$(word 2,$^) \
+- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ $(textrel_check)
+
+ libebl_%.map: Makefile
+--- elfutils/ChangeLog
++++ elfutils/ChangeLog
+@@ -25,6 +25,10 @@
+ * configure.ac: Add dummy automake conditional to get dependencies
+ for non-generic linker right. See src/Makefile.am.
+
++2005-11-22 Roland McGrath <roland AT redhat.com>
++
++ * configure.ac: Check for --as-needed linker option.
++
+ 2005-11-18 Roland McGrath <roland AT redhat.com>
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
+@@ -72,6 +76,17 @@
+ * Makefile.am (all_SUBDIRS): Add libdwfl.
+ * configure.ac: Write libdwfl/Makefile.
+
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
++ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.
++
++ * configure.ac: Check for struct stat st_?tim members.
++ * src/strip.c (process_file): Use st_?time if st_?tim are not there.
++
++ * configure.ac: Check for futimes function.
++ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
++ (handle_ar) [! HAVE_FUTIMES]: Likewise.
++
+ 2005-05-19 Roland McGrath <roland AT redhat.com>
+
+ * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
+--- elfutils/config/Makefile.in
++++ elfutils/config/Makefile.in
+@@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -100,6 +101,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+--- elfutils/configure
++++ elfutils/configure
+@@ -674,6 +674,8 @@ YFLAGS
+ LEX
+ LEX_OUTPUT_ROOT
+ LEXLIB
++WEXTRA
++LD_AS_NEEDED
+ LOCALEDIR
+ DATADIRNAME
+ NATIVE_LD_TRUE
+@@ -3874,6 +3876,88 @@ echo "$as_me: error: gcc with C99 suppor
+ fi
+
+
++{ echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
++echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6; }
++if test "${ac_cv_cc_wextra+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -Wextra"
++cat >conftest.$ac_ext <<_ACEOF
++void foo (void) { }
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_cc_wextra=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_cc_wextra=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$old_CFLAGS"
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5
++echo "${ECHO_T}$ac_cv_cc_wextra" >&6; }
++
++if test "x$ac_cv_cc_wextra" = xyes; then
++ WEXTRA=-Wextra
++else
++ WEXTRA=-W
++fi
++
++
++{ echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
++echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6; }
++if test "${ac_cv_as_needed+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat > conftest.c <<EOF
++int main (void) { return 0; }
++EOF
++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
++ -fPIC -shared -o conftest.so conftest.c
++ -Wl,--as-needed 1>&5'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }
++then
++ ac_cv_as_needed=yes
++else
++ ac_cv_as_needed=no
++fi
++rm -f conftest*
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
++echo "${ECHO_T}$ac_cv_as_needed" >&6; }
++if test "x$ac_cv_as_needed" = xyes; then
++ LD_AS_NEEDED=-Wl,--as-needed
++else
++ LD_AS_NEEDED=
++fi
++
++
++
++
+ LOCALEDIR=$datadir
+
+ cat >>confdefs.h <<_ACEOF
+@@ -5608,10 +5692,10 @@ YFLAGS!$YFLAGS$ac_delim
+ LEX!$LEX$ac_delim
+ LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
+ LEXLIB!$LEXLIB$ac_delim
++WEXTRA!$WEXTRA$ac_delim
++LD_AS_NEEDED!$LD_AS_NEEDED$ac_delim
+ LOCALEDIR!$LOCALEDIR$ac_delim
+ DATADIRNAME!$DATADIRNAME$ac_delim
+-NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim
+-NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97;
then
+@@ -5653,6 +5737,8 @@ _ACEOF
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim
++NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim
+ base_cpu!$base_cpu$ac_delim
+ NEVER_TRUE!$NEVER_TRUE$ac_delim
+ NEVER_FALSE!$NEVER_FALSE$ac_delim
+@@ -5683,7 +5769,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28;
then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30;
then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+--- elfutils/configure.ac
++++ elfutils/configure.ac
+@@ -71,6 +71,34 @@ CFLAGS="$old_CFLAGS"])
+ AS_IF([test "x$ac_cv_c99" != xyes],
+ AC_MSG_ERROR([gcc with C99 support required]))
+
++AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
++old_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -Wextra"
++AC_COMPILE_IFELSE([void foo (void) { }],
++ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
++CFLAGS="$old_CFLAGS"])
++AC_SUBST(WEXTRA)
++AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
++
++AC_CACHE_CHECK([for --as-needed linker option],
++ ac_cv_as_needed, [dnl
++cat > conftest.c <<EOF
++int main (void) { return 0; }
++EOF
++if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
++ -fPIC -shared -o conftest.so conftest.c
++ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
++then
++ ac_cv_as_needed=yes
++else
++ ac_cv_as_needed=no
++fi
++rm -f conftest*])
++AS_IF([test "x$ac_cv_as_needed" = xyes],
++ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
++AC_SUBST(LD_AS_NEEDED)
++
++
+ LOCALEDIR=$datadir
+ AC_SUBST(LOCALEDIR)
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+--- elfutils/lib/ChangeLog
++++ elfutils/lib/ChangeLog
+@@ -16,6 +16,11 @@
+ * Makefile.am (libeu_a_SOURCES): Add it.
+ * system.h: Declare crc32_file.
+
++2005-02-07 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ 2005-04-30 Ulrich Drepper <drepper AT redhat.com>
+
+ * Makefile.am: Use -ffunction-sections for xmalloc.c.
+--- elfutils/lib/Makefile.am
++++ elfutils/lib/Makefile.am
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)
++AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS)
+ INCLUDES = -I$(srcdir)/../libelf -I..
+
+ noinst_LIBRARIES = libeu.a
+--- elfutils/lib/Makefile.in
++++ elfutils/lib/Makefile.in
+@@ -91,6 +91,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -120,6 +121,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -175,9 +177,9 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
+-@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS)
++@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS)
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
+-@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS)
++@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS)
+ INCLUDES = -I$(srcdir)/../libelf -I..
+ noinst_LIBRARIES = libeu.a
+ libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
+--- elfutils/libasm/ChangeLog
++++ elfutils/libasm/ChangeLog
+@@ -32,6 +32,11 @@
+ * asm_error.c: Add new error ASM_E_IOERROR.
+ * libasmP.h: Add ASM_E_IOERROR definition.
+
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ 2005-02-15 Ulrich Drepper <drepper AT redhat.com>
+
+ * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
+--- elfutils/libasm/Makefile.am
++++ elfutils/libasm/Makefile.am
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
++AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
+ INCLUDES = -I. -I$(srcdir) -I.. \
+ -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl
-I$(top_srcdir)/libdw\
+ -I$(top_srcdir)/lib
+--- elfutils/libasm/Makefile.in
++++ elfutils/libasm/Makefile.in
+@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -153,6 +154,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = 1
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -208,9 +210,9 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
+-@MUDFLAP_FALSE@ -Wextra -Wformat=2
++@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \
+-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2
++@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2
+ INCLUDES = -I. -I$(srcdir) -I.. \
+ -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl
-I$(top_srcdir)/libdw\
+ -I$(top_srcdir)/lib
+--- elfutils/libcpu/ChangeLog
++++ elfutils/libcpu/ChangeLog
+@@ -1,3 +1,8 @@
++2005-04-04 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it instead of -Wextra.
++
+ 2005-02-15 Ulrich Drepper <drepper AT redhat.com>
+
+ * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
+--- elfutils/libcpu/Makefile.am
++++ elfutils/libcpu/Makefile.am
+@@ -25,7 +25,8 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
+-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
++WEXTRA = @WEXTRA@
++AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
+ INCLUDES = -I$(srcdir)
+
+ noinst_LIBRARIES = libcpu_i386.a
+--- elfutils/libcpu/Makefile.in
++++ elfutils/libcpu/Makefile.in
+@@ -87,6 +87,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -116,6 +117,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -170,7 +172,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
++AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
+ INCLUDES = -I$(srcdir)
+ noinst_LIBRARIES = libcpu_i386.a
+ libcpu_i386_a_SOURCES = i386_dis.c
+--- elfutils/libdw/ChangeLog
++++ elfutils/libdw/ChangeLog
+@@ -386,6 +386,11 @@
+
+ 2005-05-31 Roland McGrath <roland AT redhat.com>
+
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
+ * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
+ formref offset.
+
+--- elfutils/libdw/Makefile.am
++++ elfutils/libdw/Makefile.am
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+@@ -33,7 +34,7 @@ endif
+ if BUILD_STATIC
+ AM_CFLAGS += -fpic
+ endif
+-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
++AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
+ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
+ VERSION = 1
+
+--- elfutils/libdw/Makefile.in
++++ elfutils/libdw/Makefile.in
+@@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -192,6 +193,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = 1
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -247,9 +249,10 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
+-@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99
++@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \
+-@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
++@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 $(WEXTRA) \
++@MUDFLAP_TRUE@ -std=gnu99
+ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
+ COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
+ $(COMPILE)))
+--- elfutils/libdwfl/ChangeLog
++++ elfutils/libdwfl/ChangeLog
+@@ -531,6 +531,11 @@
+
+ 2005-07-21 Roland McGrath <roland AT redhat.com>
+
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
++2005-07-21 Roland McGrath <roland AT redhat.com>
++
+ * Makefile.am (noinst_HEADERS): Add loc2c.c.
+
+ * test2.c (main): Check sscanf result to quiet warning.
+--- elfutils/libdwfl/Makefile.am
++++ elfutils/libdwfl/Makefile.am
+@@ -27,12 +27,13 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
++AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
+ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
+ -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
+ VERSION = 1
+--- elfutils/libdwfl/Makefile.in
++++ elfutils/libdwfl/Makefile.in
+@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -153,6 +154,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = 1
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -208,9 +210,9 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
+-@MUDFLAP_FALSE@ -Wextra -std=gnu99
++@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
+-@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99
++@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99
+ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
+ -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
+
+--- elfutils/libebl/ChangeLog
++++ elfutils/libebl/ChangeLog
+@@ -476,6 +476,11 @@
+ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
+ tracking works right.
+
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ 2005-05-21 Ulrich Drepper <drepper AT redhat.com>
+
+ * libebl_x86_64.map: Add x86_64_core_note.
+--- elfutils/libebl/Makefile.am
++++ elfutils/libebl/Makefile.am
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
++AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
+ -std=gnu99
+
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+--- elfutils/libebl/Makefile.in
++++ elfutils/libebl/Makefile.in
+@@ -120,6 +120,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -149,6 +150,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = 1
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -204,9 +206,9 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
+-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
++@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
+-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99
++@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+ -I$(top_srcdir)/lib -I..
+
+--- elfutils/libelf/ChangeLog
++++ elfutils/libelf/ChangeLog
+@@ -234,6 +234,11 @@
+ If section content hasn't been read yet, do it before looking for the
+ block size. If no section data present, infer size of section header.
+
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ 2005-05-11 Ulrich Drepper <drepper AT redhat.com>
+
+ * elf.h: Update again.
+--- elfutils/libelf/common.h
++++ elfutils/libelf/common.h
+@@ -155,7 +155,7 @@ libelf_release_all (Elf *elf)
+ (Var) = (sizeof (Var) == 1
\
+ ? (unsigned char) (Var)
\
+ : (sizeof (Var) == 2
\
+- ? bswap_16 (Var)
\
++ ? (unsigned short int) bswap_16 (Var)
\
+ : (sizeof (Var) == 4
\
+ ? bswap_32 (Var)
\
+ : bswap_64 (Var))))
+@@ -164,7 +164,7 @@ libelf_release_all (Elf *elf)
+ (Dst) = (sizeof (Var) == 1
\
+ ? (unsigned char) (Var)
\
+ : (sizeof (Var) == 2
\
+- ? bswap_16 (Var)
\
++ ? (unsigned short int) bswap_16 (Var)
\
+ : (sizeof (Var) == 4
\
+ ? bswap_32 (Var)
\
+ : bswap_64 (Var))))
+--- elfutils/libelf/Makefile.am
++++ elfutils/libelf/Makefile.am
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+@@ -33,7 +34,10 @@ endif
+ if BUILD_STATIC
+ AM_CFLAGS += -fpic
+ endif
+-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
++if BUILD_STATIC
++AM_CFLAGS += -fpic
++endif
++AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
-std=gnu99 \
+ $($(*F)_CFLAGS)
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
+ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
+--- elfutils/libelf/Makefile.in
++++ elfutils/libelf/Makefile.in
+@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@BUILD_STATIC_TRUE@am__append_1 = -fpic
++@BUILD_STATIC_TRUE@am__append_1 = -fpic -fpic
+ @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
+ @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
+ subdir = libelf
+@@ -167,6 +167,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -196,6 +197,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = 1
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -251,10 +253,10 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
+-@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \
++@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
+ @MUDFLAP_FALSE@ $($(*F)_CFLAGS)
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \
+-@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
++@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
+ @MUDFLAP_TRUE@ $($(*F)_CFLAGS)
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
+ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
+--- elfutils/m4/Makefile.in
++++ elfutils/m4/Makefile.in
+@@ -70,6 +70,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -99,6 +100,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+--- elfutils/Makefile.in
++++ elfutils/Makefile.in
+@@ -97,6 +97,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -126,6 +127,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+--- elfutils/src/ChangeLog
++++ elfutils/src/ChangeLog
+@@ -220,6 +220,10 @@
+ * elflint.c (valid_e_machine): Add EM_ALPHA.
+ Reported by Christian Aichinger <Greek0 AT gmx.net>.
+
++ * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
++ MADV_SEQUENTIAL if undefined. Don't call posix_madvise
++ if neither is defined.
++
+ 2006-08-08 Ulrich Drepper <drepper AT redhat.com>
+
+ * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
+@@ -296,6 +300,10 @@
+ * Makefile.am: Add hacks to create dependency files for non-generic
+ linker.
+
++2006-04-05 Roland McGrath <roland AT redhat.com>
++
++ * strings.c (MAP_POPULATE): Define to 0 if undefined.
++
+ 2006-06-12 Ulrich Drepper <drepper AT redhat.com>
+
+ * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
+@@ -644,6 +652,11 @@
+ * readelf.c (print_debug_loc_section): Fix indentation for larger
+ address size.
+
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ 2005-05-30 Roland McGrath <roland AT redhat.com>
+
+ * readelf.c (print_debug_line_section): Print section offset of each
+--- elfutils/src/findtextrel.c
++++ elfutils/src/findtextrel.c
+@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
+
+
+ static void
+-check_rel (size_t nsegments, struct segments segments[nsegments],
++check_rel (size_t nsegments, struct segments segments[
++#if __GNUC__ >= 4
++ nsegments
++#endif
++ ],
+ GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
+ const char *fname, bool more_than_one, void **knownsrcs)
+ {
+--- elfutils/src/Makefile.am
++++ elfutils/src/Makefile.am
+@@ -26,6 +26,7 @@
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
+ -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+@@ -33,7 +34,7 @@ AM_CFLAGS =
+ endif
+ AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
+ $(if $($(*F)_no_Werror),,-Werror) \
+- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
++ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
+ $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+
+ INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
+--- elfutils/src/Makefile.in
++++ elfutils/src/Makefile.in
+@@ -197,6 +197,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -226,6 +227,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@ -d
+@@ -283,13 +285,13 @@ top_srcdir = @top_srcdir@
+ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
+ @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \
+ @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \
+-@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
++@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
+ @MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2) \
+ @MUDFLAP_FALSE@ $(CFLAGS_$(*F))
+ @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
+ @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \
+ @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \
+-@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
++@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
+ @MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
+ -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
+--- elfutils/src/strings.c
++++ elfutils/src/strings.c
+@@ -51,6 +51,10 @@
+
+ #include <system.h>
+
++#ifndef MAP_POPULATE
++# define MAP_POPULATE 0
++#endif
++
+
+ /* Prototypes of local functions. */
+ static int read_fd (int fd, const char *fname, off64_t fdlen);
+@@ -491,8 +495,13 @@ map_file (int fd, off64_t start_off, off
+ fd, start_off);
+ if (mem != MAP_FAILED)
+ {
++#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
++# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
++#endif
++#ifdef POSIX_MADV_SEQUENTIAL
+ /* We will go through the mapping sequentially. */
+ (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
++#endif
+ break;
+ }
+ if (errno != EINVAL && errno != ENOMEM)
+--- elfutils/src/strip.c
++++ elfutils/src/strip.c
+@@ -52,6 +52,12 @@
+ #include <libebl.h>
+ #include <system.h>
+
++#ifdef HAVE_FUTIMES
++# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
++#else
++# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
++#endif
++
+
+ /* Name and version of program. */
+ static void print_version (FILE *stream, struct argp_state *state);
+@@ -300,8 +306,18 @@ process_file (const char *fname)
+
+ /* If we have to preserve the timestamp, we need it in the
+ format utimes() understands. */
++#ifdef HAVE_STRUCT_STAT_ST_ATIM
+ TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
++#else
++ tv[0].tv_sec = pre_st.st_atime;
++ tv[0].tv_usec = 0;
++#endif
++#ifdef HAVE_STRUCT_STAT_ST_MTIM
+ TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
++#else
++ tv[1].tv_sec = pre_st.st_atime;
++ tv[1].tv_usec = 0;
++#endif
+ }
+
+ /* Open the file. */
+@@ -1702,7 +1718,7 @@ handle_elf (int fd, Elf *elf, const char
+ /* If requested, preserve the timestamp. */
+ if (tvp != NULL)
+ {
+- if (futimes (fd, tvp) != 0)
++ if (FUTIMES (fd, output_fname, tvp) != 0)
+ {
+ error (0, errno, gettext ("\
+ cannot set access and modification date of '%s'"),
+@@ -1759,7 +1775,7 @@ handle_ar (int fd, Elf *elf, const char
+
+ if (tvp != NULL)
+ {
+- if (unlikely (futimes (fd, tvp) != 0))
++ if (unlikely (FUTIMES (fd, fname, tvp) != 0))
+ {
+ error (0, errno, gettext ("\
+ cannot set access and modification date of '%s'"), fname);
+--- elfutils/tests/ChangeLog
++++ elfutils/tests/ChangeLog
+@@ -549,6 +549,11 @@
+ * Makefile.am (TESTS): Add run-elflint-test.sh.
+ (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
+
++2005-05-31 Roland McGrath <roland AT redhat.com>
++
++ * Makefile.am (WEXTRA): New variable, substituted by configure.
++ (AM_CFLAGS): Use it in place of -Wextra.
++
+ 2005-05-24 Ulrich Drepper <drepper AT redhat.com>
+
+ * get-files.c (main): Use correct format specifier.
+--- elfutils/tests/Makefile.am
++++ elfutils/tests/Makefile.am
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
+ ##
+ DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
++WEXTRA = @WEXTRA@
+ if MUDFLAP
+-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
++AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
+ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+ BUILD_RPATH = \$$ORIGIN/../backends
+ else
+-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
++AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
+ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+ BUILT_RPATH =
\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
+ endif
+--- elfutils/tests/Makefile.in
++++ elfutils/tests/Makefile.in
+@@ -322,6 +322,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -351,6 +352,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ XGETTEXT_015 = @XGETTEXT_015@
+ YACC = @YACC@
+@@ -405,10 +407,10 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
++@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
+ @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+
+-@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
++@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
+ @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+
+ @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends
diff --git a/libs/elfutils/elfutils-0.129.tar.gz.sig
b/libs/elfutils/elfutils-0.129.tar.gz.sig
new file mode 100644
index 0000000..9a67e65
Binary files /dev/null and b/libs/elfutils/elfutils-0.129.tar.gz.sig differ
diff --git a/libs/elfutils/elfutils-portability.patch.sig
b/libs/elfutils/elfutils-portability.patch.sig
deleted file mode 100644
index f85e2f2..0000000
Binary files a/libs/elfutils/elfutils-portability.patch.sig and /dev/null
differ
diff --git a/libs/galago-sharp/DEPENDS b/libs/galago-sharp/DEPENDS
index cd65b98..d94a612 100755
--- a/libs/galago-sharp/DEPENDS
+++ b/libs/galago-sharp/DEPENDS
@@ -1,3 +1,5 @@
-depends mono &&
+depends dbus-mono &&
depends gtk-sharp-2 &&
-depends libgalago
+depends libgalago &&
+depends mono &&
+depends xml-libxml
diff --git a/libs/galago-sharp/HISTORY b/libs/galago-sharp/HISTORY
index 685012b..21f8008 100644
--- a/libs/galago-sharp/HISTORY
+++ b/libs/galago-sharp/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on xml-libxml and dbus-mono
+
2006-09-30 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.5.0
changed SOURCE to bz2
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 2480ef0..905b619 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,9 @@
+2007-09-20 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply as-test-x.patch: Fixes Bug #14004
+ * as-test-x.patch: Added from David Brown's devel update of glibc to
2.6.1
+ in commit 199874422bbb17772cb0257187151007ab398463
+ Fixes Bug #14004
+
2007-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: fix typo (bug #13925)

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 7528daa..6a435a2 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -58,6 +58,7 @@ fi &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SCRIPT_DIRECTORY/glibcshared.patch &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/as-test-x.patch b/libs/glibc/as-test-x.patch
new file mode 100644
index 0000000..b0f299c
--- /dev/null
+++ b/libs/glibc/as-test-x.patch
@@ -0,0 +1,10 @@
+--- a/sysdeps/unix/sysv/linux/configure.in 2007-09-13 17:56:51.519950207
-0700
++++ b/sysdeps/unix/sysv/linux/configure.in 2007-09-13 17:40:35.186895935
-0700
+@@ -24,6 +24,7 @@
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
+ fi
+ define([libc_cv_linuxVER],
[libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl
++as_test_x="test -x"
+ AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl
+ AC_EGREP_CPP([eat flaming death], [#include <linux/version.h>
+ #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < ]dnl
diff --git a/libs/guilib/BUILD b/libs/guilib/BUILD
deleted file mode 100755
index 2ffc938..0000000
--- a/libs/guilib/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-export LDFLAGS="$LDFLAGS -lstdc++"
-patch -p0 <$SCRIPT_DIRECTORY/config.sub.patch &&
-patch -p1 <$SCRIPT_DIRECTORY/guilib-1.1.0-gcc-4.1.x-fix.diff &&
-default_build
diff --git a/libs/guilib/HISTORY b/libs/guilib/HISTORY
index b492421..9c39c1d 100644
--- a/libs/guilib/HISTORY
+++ b/libs/guilib/HISTORY
@@ -1,3 +1,7 @@
+2007-08-16 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, config.sub.patch, guilib-1.1.0-gcc-4.1.x-fix.diff: really
+ removed BUILD and patches now; needed changes are upstream
+
2007-07-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.2.1
* BUILD: removed as patches no longer needed
diff --git a/libs/guilib/config.sub.patch b/libs/guilib/config.sub.patch
deleted file mode 100644
index fed546f..0000000
--- a/libs/guilib/config.sub.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- config.sub.old 2006-07-18 02:11:00.145083145 +0200
-+++ config.sub 2006-07-18 02:15:42.020515400 +0200
-@@ -153,7 +153,8 @@
- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
- | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
- | hppa2.0w \
-- | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-+ | alpha | alphaev5 | alphaev56 | alphaev6 | alphaev67 |
alphaev7 \
-+ | we32k | ns16k | clipper \
- | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
- | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
- | mipstx39 | mipstx39el | armv[34][lb] \
-@@ -178,7 +179,8 @@
- | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
- | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
- | hppa2.0w-* \
-- | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-+ | alpha-* | alphaev5-* | alphaev56-* | alphaev6-* | alphaev67-*
| alphaev7-* \
-+ | we32k-* | cydra-* \
- | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
-@@ -501,6 +503,9 @@
- pentiumii-* | pentium2-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ x86_64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pn)
- basic_machine=pn-gould
- ;;
diff --git a/libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff
b/libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff
deleted file mode 100644
index 450a440..0000000
--- a/libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-will fix some compile Problems on gcc-4.1
-
-Joerg Bornkessel <hd_brummy AT gentoo.org> 29 Sep 2006
-
-diff -Naur GUIlib-1.1.0.orig/GUI_menu.h GUIlib-1.1.0/GUI_menu.h
---- GUIlib-1.1.0.orig/GUI_menu.h 2006-09-29 19:38:54.767324511 +0200
-+++ GUIlib-1.1.0/GUI_menu.h 2006-09-29 19:40:13.464242760 +0200
-@@ -39,9 +39,9 @@
- virtual void AddSubitem(GUI_Menuitem *newitem);
- virtual GUI_Menuitem* GetSubItem(int Aid);
-
-- GUI_status GUI_Submenu:: MouseDown(int x, int y, int button);
-- GUI_status GUI_Submenu::MouseUp(int x,int y,int button);
-- GUI_status GUI_Submenu::MouseMotion(int x,int y,Uint8 state);
-+ GUI_status MouseDown(int x, int y, int button);
-+ GUI_status MouseUp(int x,int y,int button);
-+ GUI_status MouseMotion(int x,int y,Uint8 state);
-
- inline virtual int GetSubmenuId()
- {return submenuid;}
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index 5a3fae0..a2a8595 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,14 +1,15 @@
SPELL=icu
- VERSION=3.6
-
SOURCE_HASH=sha512:bd4517dc7494630b180ce08824929ed142f76d82864652b92e62df3853cec491d366ccfc59867676455c3beaed867356a6da5e8d1f01903ad6d85f8039a6bf2b
-
SOURCE2_HASH=sha512:a47265929cb74e558aed5a5eac6594d3d89d75277486ae4b46688ea567b3a0f9d3db99a1b578aac07658cc9e727a4d98627d3b416fae3faa27497da511664f40
+ VERSION=3.8
+
SOURCE_HASH=sha512:2a314f93744edf59cb65af1482318bd89f3c6c6d20349f681c0af76e196360667118e834c644111c5a9a7aff0cce8251651cf2b6fe64db5380c700436d02777c
+
SOURCE2_HASH=sha512:a396d2ba9d151de73b4852a2cd65e83ed0a6f0c53cc5fcbb992a99951e2e074579631699834e44aefc6228322e3a22726bd1fccf28d864b92064ef36be24e375
SPELLX=icu4c
VERSIONX=${VERSION//./_}
SOURCE=$SPELLX-$VERSIONX-src.tgz
SOURCE2=$SPELLX-$VERSIONX-docs.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=ftp://ftp.software.ibm.com/software/globalization/$SPELL/$VERSION/$SOURCE
-
SOURCE2_URL[0]=ftp://ftp.software.ibm.com/software/globalization/$SPELL/$VERSION/$SOURCE2
+ SITE=http://download.icu-project.org/files
+ SOURCE_URL[0]=$SITE/$SPELLX/$VERSION/$SOURCE
+ SOURCE2_URL[0]=$SITE/$SPELLX/$VERSION/$SOURCE2
WEB_SITE=http://www.ibm.com/software/globalization/icu/
LICENSE[0]=$WEB_SITE/license.jsp
ENTERED=20030320
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 9609d41..3c7e0f3 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,4 +1,8 @@
-2006-09-02Treeve Jelbert <treeve AT sourcemage.org>
+2007-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.8
+ new url
+
+2006-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.6
LICENSE=X
* UP_TRIGGERS: add
diff --git a/libs/libcap/DETAILS b/libs/libcap/DETAILS
index 931a07f..656ec54 100755
--- a/libs/libcap/DETAILS
+++ b/libs/libcap/DETAILS
@@ -1,5 +1,6 @@
SPELL=libcap
-KVER=$(installed_version linux | cut -c-3)
+source $GRIMOIRE/FUNCTIONS
+KVER=$(get_kernel_version | cut -c-3)
if [[ $KVER == 2.4 ]];then
VERSION=1.10
else
diff --git a/libs/libcap/HISTORY b/libs/libcap/HISTORY
index 1ae94b9..ef1f272 100644
--- a/libs/libcap/HISTORY
+++ b/libs/libcap/HISTORY
@@ -1,3 +1,7 @@
+2007-08-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: use get_kernel_version
+ works even if linux spell is not installed
+
2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.97 / 1.10
support 2.4 kernes as well
diff --git a/libs/libedit/DETAILS b/libs/libedit/DETAILS
index 70e7629..5b52d35 100755
--- a/libs/libedit/DETAILS
+++ b/libs/libedit/DETAILS
@@ -1,6 +1,6 @@
SPELL=libedit
- VERSION=20070813-2.10
-
SOURCE_HASH=sha512:0c30381dea6b69b533ca22b9afda257383774cec22222ab660cd0f1bdcdff957739b118f90a56402e43b65ce60e4b192318472a993ea20217d73d199d998d393
+ VERSION=20070831-2.10
+
SOURCE_HASH=sha512:f1ffdd1285243f361afc57fd9fdb4b9a82033f59974864625b9a2caa6820f749fc563a35171c0d7cc950fc49f7ad5ab7d68c1d1726283af127bc4e3e42695056
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.thrysoee.dk/editline/
diff --git a/libs/libedit/HISTORY b/libs/libedit/HISTORY
index bbe77b5..4df2b21 100644
--- a/libs/libedit/HISTORY
+++ b/libs/libedit/HISTORY
@@ -1,3 +1,6 @@
+2007-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20070831-2.10
+
2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20070813-2.10

diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index 5979280..25e62ec 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,11 +1,12 @@
SPELL=libidn
- VERSION=1.0
-
SOURCE_HASH='sha512:2bca85f937429d7a8baf77ea031ebfc26d43924b9db0ca2fa5d3cf8578cc8e0244a76d0386b7a66bd02f45f8b88248b60e35988e27f695df256e960fff38c7bb'
+ VERSION=1.1
+
SOURCE_HASH=sha512:3dbb8644e6710a62e2fd2bc643bb8e79101a557dafc50d46d1571da82d91cd39b9c17e1c2bebd2e9c45d212a7a2f7b3d71e44ce32e887a0742cca517f71b4158
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://josefsson.org/libidn/releases/$SOURCE
WEB_SITE=http://www.gnu.org/software/libidn/
ENTERED=20040824
+ PATCHLEVEL=1
LICENSE[0]=LGPL
KEYWORDS="libs"
SHORT="Internationalized Domain Names (IDN) implementation."
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index 92fee59..efaf8a9 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,17 @@
+2007-09-10 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: 1.1
+ * BUILD: Removed. idn-int.h issue was fixed upstream
+
+2007-08-28 George Sherwood <george AT beernabeer.com>
+ * BUILD: Changed to an sedit. It is possible for idn-int.h
+ to be created correctly. Possibly due to glibc version.
+ * idn-int.h.patch: Removed. Using sedit
+
+2007-08-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * BUILD: Added to patch idn-int.h. Bug #13857
+ * idn-int.h.patch: Added as a fix until fixed upstream.
+
2007-07-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0

diff --git a/libs/liboil/DETAILS b/libs/liboil/DETAILS
index 03ff2fb..e42dce2 100755
--- a/libs/liboil/DETAILS
+++ b/libs/liboil/DETAILS
@@ -1,6 +1,6 @@
SPELL=liboil
- VERSION=0.3.11
-
SOURCE_HASH=sha512:7d3ce69c7d5332bdcbc86a1c1b6110e8c81d0e83d8c09111f36e9c946066ccc3637826d215947cca2907f7a97fc088a60412aca203f676471d2b6028a6441d18
+ VERSION=0.3.12
+
SOURCE_HASH=sha512:038abaf26e622b0662bd9362db5589074a28fd4fd48ecf618d90217f9e8d07a1eb8cd3317c4122b1f3eccdae268eff367cccf20e1ef46bdb23d97ce5fd3a5109
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://liboil.freedesktop.org/download/$SOURCE
diff --git a/libs/liboil/HISTORY b/libs/liboil/HISTORY
index 0efbfb3..b56aa46 100644
--- a/libs/liboil/HISTORY
+++ b/libs/liboil/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.12
+
2007-04-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.11
* BUILD: deleted, works without this
diff --git a/libs/libsigc++3/DETAILS b/libs/libsigc++3/DETAILS
index ac42025..2b932a6 100755
--- a/libs/libsigc++3/DETAILS
+++ b/libs/libsigc++3/DETAILS
@@ -1,5 +1,5 @@
SPELL=libsigc++3
- VERSION=2.0.17
+ VERSION=2.1.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libsigc++-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libsigc++-$VERSION
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/libsigc++-$VERSION
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://libsigc.sourceforge.net/
ENTERED=20020523
- UPDATED=20050708
LICENSE[0]=LGPL
KEYWORDS="libs"
SHORT="Callback system for use in widget libraries"
diff --git a/libs/libsigc++3/HISTORY b/libs/libsigc++3/HISTORY
index 2827d99..42697fb 100644
--- a/libs/libsigc++3/HISTORY
+++ b/libs/libsigc++3/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.1.1
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/libs/libsigc++3/libsigc++-2.0.17.tar.gz.sig
b/libs/libsigc++3/libsigc++-2.0.17.tar.gz.sig
deleted file mode 100644
index c850d70..0000000
Binary files a/libs/libsigc++3/libsigc++-2.0.17.tar.gz.sig and /dev/null
differ
diff --git a/libs/libsigc++3/libsigc++-2.1.1.tar.gz.sig
b/libs/libsigc++3/libsigc++-2.1.1.tar.gz.sig
new file mode 100644
index 0000000..b3ff90b
Binary files /dev/null and b/libs/libsigc++3/libsigc++-2.1.1.tar.gz.sig differ
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index cf93ef2..b5555c3 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,6 +1,6 @@
SPELL=libtasn1
- VERSION=0.3.9
-
SOURCE_HASH=sha512:d61096ac1b90102900b777581d0f936bc6d4891e2eabc1ed539a5d7a1a78763deee9746bb1749f8671cb2468b5556ca1f2ddd3702968bc428f764d8b2c68c25d
+ VERSION=1.1
+
SOURCE_HASH=sha512:31536142218ccc39e1ecfd11c7bc466dfbd0d4e4f2cc55fb5698f0c9e7278d2407f3ded58ca80cdbab786cbc502f894b69c3af191e749d8f4251d65cfd3af6f3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnutls.org/pub/gnutls/$SPELL/$SOURCE
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index da948d9..b9f2574 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,10 @@
+2007-09-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1
+ * UP_TRIGGERS: removed
+
+2007-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.3.10
+
2007-03-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.3.9

diff --git a/libs/libtasn1/UP_TRIGGERS b/libs/libtasn1/UP_TRIGGERS
deleted file mode 100755
index 749d414..0000000
--- a/libs/libtasn1/UP_TRIGGERS
+++ /dev/null
@@ -1,9 +0,0 @@
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
-if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
- message "This is a possibly incompatible update of libtasn1..."
- message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(show_up_depends $SPELL); do
- up_trigger $each cast_self
- done
-fi
diff --git a/libs/libxml++/DETAILS b/libs/libxml++/DETAILS
index 222638b..ea7fbe3 100755
--- a/libs/libxml++/DETAILS
+++ b/libs/libxml++/DETAILS
@@ -1,5 +1,5 @@
SPELL=libxml++
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libxml++/HISTORY b/libs/libxml++/HISTORY
index 47c1769..69b7e13 100644
--- a/libs/libxml++/HISTORY
+++ b/libs/libxml++/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
2007-08-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/libs/libxml++/libxml++-2.18.2.tar.bz2.sig
b/libs/libxml++/libxml++-2.18.2.tar.bz2.sig
deleted file mode 100644
index 887a036..0000000
Binary files a/libs/libxml++/libxml++-2.18.2.tar.bz2.sig and /dev/null differ
diff --git a/libs/libxml++/libxml++-2.20.0.tar.bz2.sig
b/libs/libxml++/libxml++-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..f35e9f8
Binary files /dev/null and b/libs/libxml++/libxml++-2.20.0.tar.bz2.sig differ
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index aa70b94..f8c7748 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libxml2
- VERSION=2.6.29
-
SOURCE_HASH=sha512:3e9a2ae04fd05c8991f5f77401006cadb6acac1d56d6f1ed716f08eca4f164c35c933040f7a16b41328978ce66dc83fd82a49160a548c9ace87413c016053b85
+ VERSION=2.6.30
+
SOURCE_HASH=sha512:5192d5aa4573a607a56cdf8fe7214b26319917861dc50fa596e27a4f6a6e20153f5e6188f51d95f355f2aff2f2160bba08d6899194c37a4b67c4dbba2027ad37
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 e79a9e0..f6bf745 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6.30
+
2007-06-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: Upgrade to 2.6.29

diff --git a/libs/libxslt/DETAILS b/libs/libxslt/DETAILS
index 4575a43..da366d7 100755
--- a/libs/libxslt/DETAILS
+++ b/libs/libxslt/DETAILS
@@ -1,9 +1,9 @@
SPELL=libxslt
- VERSION=1.1.21
-
SOURCE_HASH=sha512:7b326c6aba767c82ee2838882f2f168af102db72d0badbbbec685926aecc30b50ac0413505ed1e9ee1345b56ce9de8a4efa8dc8e847b75ac9d7dbbef13a470ae
+ VERSION=1.1.22
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=BSD
WEB_SITE=http://xmlsoft.org
ENTERED=20011010
diff --git a/libs/libxslt/HISTORY b/libs/libxslt/HISTORY
index 6f610b3..e596fc5 100644
--- a/libs/libxslt/HISTORY
+++ b/libs/libxslt/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.1.22
+
2007-06-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.21
* BUILD: deleted, not needed
diff --git a/libs/libxslt/libxslt-1.1.22.tar.gz.sig
b/libs/libxslt/libxslt-1.1.22.tar.gz.sig
new file mode 100644
index 0000000..1ab224b
Binary files /dev/null and b/libs/libxslt/libxslt-1.1.22.tar.gz.sig differ
diff --git a/libs/lrmi/HISTORY b/libs/lrmi/HISTORY
index 4be8b95..be27edf 100644
--- a/libs/lrmi/HISTORY
+++ b/libs/lrmi/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * INSTALL: Created, install vbetest utility that comes with lrmi
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/lrmi/INSTALL b/libs/lrmi/INSTALL
new file mode 100755
index 0000000..259c5fe
--- /dev/null
+++ b/libs/lrmi/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install -m 755 -p vbetest $INSTALL_ROOT/usr/bin/vbetest
diff --git a/libs/newt/DETAILS b/libs/newt/DETAILS
index e7c1c03..6bd4449 100755
--- a/libs/newt/DETAILS
+++ b/libs/newt/DETAILS
@@ -1,6 +1,6 @@
SPELL=newt
- VERSION=0.52.7-2.fc8
-
SOURCE_HASH=sha512:e3a5572c805d49561301891edea67e81b0affb5101378eb3090763467f02906528fc03d881b1a4c26abc8b9cd18677687ce376858a1f6d7e74f0938206a0e73a
+ VERSION=0.52.7-3.fc8
+
SOURCE_HASH=sha512:b516838c1400715af377fda565ceee886a1cdf40c5146fb18465e2787a6ab55aad6afde1f2b07f31a8409cd2b7e842b40651547007e449d65e6f7f5c3c43b212
SOURCE=$SPELL-$VERSION.src.rpm
local RHL_DIR
RHL_DIR=pub/fedora/linux/development/source/SRPMS
diff --git a/libs/newt/HISTORY b/libs/newt/HISTORY
index 76cd62a..3ecb4f4 100644
--- a/libs/newt/HISTORY
+++ b/libs/newt/HISTORY
@@ -1,3 +1,6 @@
+2007-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.52.7-3.fc8
+
2007-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.52.7-2.fc8

diff --git a/libs/ode/DETAILS b/libs/ode/DETAILS
index 36eebde..54e45b6 100755
--- a/libs/ode/DETAILS
+++ b/libs/ode/DETAILS
@@ -5,10 +5,10 @@ if [ "${ODE_SNAP}" == "y" ]; then
SOURCE_URL[0]=http://opende.sourceforge.net/snapshots/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
else
- VERSION=0.8
+ VERSION=0.8.1-rc1
SOURCE=${SPELL}-src-${VERSION}.zip
SOURCE_URL[0]=${SOURCEFORGE_URL}/opende/${SOURCE}
-
SOURCE_HASH=sha512:46c78c0408293c37b53fd3a9a14898de5a3a9693bff19ebf99c73f9bc5bf8e9dd3711742198d714e259da1e76c0600b20cc9d682839a2ecc0fb612455395eaf0
+
SOURCE_HASH=sha512:502b4d66a731940ddbd3acace7b93aa6f528844ac86518afa169eee7826a74ba3f8c0878f55ec98f1275de547d7cbb4bff1bfc0eaaff964a78c07c7ec1e7e049
fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://ode.org/
diff --git a/libs/ode/HISTORY b/libs/ode/HISTORY
index fbaf1a0..5024153 100644
--- a/libs/ode/HISTORY
+++ b/libs/ode/HISTORY
@@ -1,3 +1,6 @@
+2008-09-10 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.8.1-rc1
+
2007-02-13 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.8

diff --git a/libs/openbabel/DETAILS b/libs/openbabel/DETAILS
index b1bc07d..41e7e8a 100755
--- a/libs/openbabel/DETAILS
+++ b/libs/openbabel/DETAILS
@@ -1,9 +1,10 @@
SPELL=openbabel
- VERSION=2.0.1
+ VERSION=2.1.1
+
SOURCE_HASH=sha512:634cf43cfaa544d32d27bc43dd9f36945285b61f6925cd774d1064439adc251ccaf5e36de3f500d1ed57cf6c991cd42c77584ad2e047bd631f40fe729f8ff462
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://openbabel.sourceforge.net/wiki/Main_Page
ENTERED=20031114
LICENSE[0]=GPL
diff --git a/libs/openbabel/HISTORY b/libs/openbabel/HISTORY
index 881b33e..f25ba82 100644
--- a/libs/openbabel/HISTORY
+++ b/libs/openbabel/HISTORY
@@ -1,3 +1,6 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.1
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/libs/openbabel/openbabel-2.0.1.tar.gz.sig
b/libs/openbabel/openbabel-2.0.1.tar.gz.sig
deleted file mode 100644
index 12169cb..0000000
Binary files a/libs/openbabel/openbabel-2.0.1.tar.gz.sig and /dev/null differ
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 70188d5..8bda460 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=7.2
+ VERSION=7.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 5ed8a14..07f9121 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.4
+
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.3
+
2007-08-15 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* added SUB_DEPENDS and PRE_SUB_DEPENDS with g++ for mkvtoolnix

diff --git a/libs/popt/DETAILS b/libs/popt/DETAILS
index 1b8606b..d1f5a45 100755
--- a/libs/popt/DETAILS
+++ b/libs/popt/DETAILS
@@ -1,5 +1,5 @@
SPELL=popt
- VERSION=1.11
+ VERSION=1.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/popt/HISTORY b/libs/popt/HISTORY
index b9b1ed4..81c5ef7 100644
--- a/libs/popt/HISTORY
+++ b/libs/popt/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12
+
2007-06-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.11
new website & url
diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index c159ac7..c02c048 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
ENTERED=20010922
- PATCHLEVEL=3
+ PATCHLEVEL=4
KEYWORDS="libs"
SHORT="readline lets users edit command lines as they are typed
in."
cat << EOF
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 784a4d5..148b326 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,8 @@
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added patches readline52-005/006/007
+ * readline52-005/006/007: Added upstream patches
+
2007-06-23 George Sherwood <george AT beernabeer.com>
* DETAILS: converted to upstream signature checking.

diff --git a/libs/readline/PRE_BUILD b/libs/readline/PRE_BUILD
index fcdc774..1ad32d3 100755
--- a/libs/readline/PRE_BUILD
+++ b/libs/readline/PRE_BUILD
@@ -4,7 +4,11 @@ cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/readline52-001 &&
patch -p0 < $SCRIPT_DIRECTORY/readline52-002 &&
patch -p0 < $SCRIPT_DIRECTORY/readline52-003 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-004
+patch -p0 < $SCRIPT_DIRECTORY/readline52-004 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-005 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-006 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-007
+


# Dynamically link against termcap or ncurses
diff --git a/libs/readline/readline52-005 b/libs/readline/readline52-005
new file mode 100644
index 0000000..d192ac1
--- /dev/null
+++ b/libs/readline/readline52-005
@@ -0,0 +1,328 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-005
+
+Bug-Reported-by: Thomas Loeber <ifp AT loeber1.de>
+Bug-Reference-ID: <200703082223.08919.ifp AT loeber1.de>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html
+
+Bug-Description:
+
+When rl_read_key returns -1, indicating that readline's controlling terminal
+has been invalidated for some reason (e.g., receiving a SIGHUP), the error
+status was not reported correctly to the caller. This could cause input
+loops.
+
+Patch:
+
+*** ../readline-5.2/complete.c Fri Jul 28 11:35:49 2006
+--- complete.c Tue Mar 13 08:50:16 2007
+***************
+*** 429,433 ****
+ if (c == 'n' || c == 'N' || c == RUBOUT)
+ return (0);
+! if (c == ABORT_CHAR)
+ _rl_abort_internal ();
+ if (for_pager && (c == NEWLINE || c == RETURN))
+--- 440,444 ----
+ if (c == 'n' || c == 'N' || c == RUBOUT)
+ return (0);
+! if (c == ABORT_CHAR || c < 0)
+ _rl_abort_internal ();
+ if (for_pager && (c == NEWLINE || c == RETURN))
+*** ../readline-5.2/input.c Wed Aug 16 15:15:16 2006
+--- input.c Wed May 2 16:07:59 2007
+***************
+*** 514,518 ****
+ int size;
+ {
+! int mb_len = 0;
+ size_t mbchar_bytes_length;
+ wchar_t wc;
+--- 522,526 ----
+ int size;
+ {
+! int mb_len, c;
+ size_t mbchar_bytes_length;
+ wchar_t wc;
+***************
+*** 521,531 ****
+ memset(&ps, 0, sizeof (mbstate_t));
+ memset(&ps_back, 0, sizeof (mbstate_t));
+!
+ while (mb_len < size)
+ {
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! mbchar[mb_len++] = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+ mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+ if (mbchar_bytes_length == (size_t)(-1))
+--- 529,545 ----
+ memset(&ps, 0, sizeof (mbstate_t));
+ memset(&ps_back, 0, sizeof (mbstate_t));
+!
+! mb_len = 0;
+ while (mb_len < size)
+ {
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ break;
++
++ mbchar[mb_len++] = c;
++
+ mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+ if (mbchar_bytes_length == (size_t)(-1))
+***************
+*** 565,569 ****
+ c = first;
+ memset (mb, 0, mlen);
+! for (i = 0; i < mlen; i++)
+ {
+ mb[i] = (char)c;
+--- 579,583 ----
+ c = first;
+ memset (mb, 0, mlen);
+! for (i = 0; c >= 0 && i < mlen; i++)
+ {
+ mb[i] = (char)c;
+*** ../readline-5.2/isearch.c Mon Dec 26 17:18:53 2005
+--- isearch.c Fri Mar 9 14:30:59 2007
+***************
+*** 328,333 ****
+
+ f = (rl_command_func_t *)NULL;
+!
+! /* Translate the keys we do something with to opcodes. */
+ if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+ {
+--- 328,340 ----
+
+ f = (rl_command_func_t *)NULL;
+!
+! if (c < 0)
+! {
+! cxt->sflags |= SF_FAILED;
+! cxt->history_pos = cxt->last_found_line;
+! return -1;
+! }
+!
+! /* Translate the keys we do something with to opcodes. */
+ if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+ {
+*** ../readline-5.2/misc.c Mon Dec 26 17:20:46 2005
+--- misc.c Fri Mar 9 14:44:11 2007
+***************
+*** 147,150 ****
+--- 147,152 ----
+ rl_clear_message ();
+ RL_UNSETSTATE(RL_STATE_NUMERICARG);
++ if (key < 0)
++ return -1;
+ return (_rl_dispatch (key, _rl_keymap));
+ }
+*** ../readline-5.2/readline.c Wed Aug 16 15:00:36 2006
+--- readline.c Fri Mar 9 14:47:24 2007
+***************
+*** 646,649 ****
+--- 669,677 ----
+ {
+ nkey = _rl_subseq_getchar (cxt->okey);
++ if (nkey < 0)
++ {
++ _rl_abort_internal ();
++ return -1;
++ }
+ r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
+ cxt->flags |= KSEQ_DISPATCHED;
+*** ../readline-5.2/text.c Fri Jul 28 11:55:27 2006
+--- text.c Sun Mar 25 13:41:38 2007
+***************
+*** 858,861 ****
+--- 864,870 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ return -1;
++
+ #if defined (HANDLE_SIGNALS)
+ if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
+***************
+*** 1521,1524 ****
+--- 1530,1536 ----
+ mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
+
++ if (mb_len <= 0)
++ return -1;
++
+ if (count < 0)
+ return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
+***************
+*** 1537,1540 ****
+--- 1549,1555 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ return -1;
++
+ if (count < 0)
+ return (_rl_char_search_internal (-count, bdir, c));
+*** ../readline-5.2/vi_mode.c Sat Jul 29 16:42:28 2006
+--- vi_mode.c Fri Mar 9 15:02:11 2007
+***************
+*** 887,890 ****
+--- 887,897 ----
+ c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
++
++ if (c < 0)
++ {
++ *nextkey = 0;
++ return -1;
++ }
++
+ *nextkey = c;
+
+***************
+*** 903,906 ****
+--- 910,918 ----
+ c = rl_read_key (); /* real command */
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ if (c < 0)
++ {
++ *nextkey = 0;
++ return -1;
++ }
+ *nextkey = c;
+ }
+***************
+*** 1225,1236 ****
+ _rl_callback_generic_arg *data;
+ {
+ #if defined (HANDLE_MULTIBYTE)
+! _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar,
MB_LEN_MAX);
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! _rl_vi_last_search_char = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+
+ _rl_callback_func = 0;
+ _rl_want_redisplay = 1;
+--- 1243,1262 ----
+ _rl_callback_generic_arg *data;
+ {
++ int c;
+ #if defined (HANDLE_MULTIBYTE)
+! c = _rl_vi_last_search_mblen = _rl_read_mbchar
(_rl_vi_last_search_mbchar, MB_LEN_MAX);
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+
++ if (c <= 0)
++ return -1;
++
++ #if !defined (HANDLE_MULTIBYTE)
++ _rl_vi_last_search_char = c;
++ #endif
++
+ _rl_callback_func = 0;
+ _rl_want_redisplay = 1;
+***************
+*** 1248,1251 ****
+--- 1274,1278 ----
+ int count, key;
+ {
++ int c;
+ #if defined (HANDLE_MULTIBYTE)
+ static char *target;
+***************
+*** 1294,1302 ****
+ {
+ #if defined (HANDLE_MULTIBYTE)
+! _rl_vi_last_search_mblen = _rl_read_mbchar
(_rl_vi_last_search_mbchar, MB_LEN_MAX);
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! _rl_vi_last_search_char = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+ }
+--- 1321,1335 ----
+ {
+ #if defined (HANDLE_MULTIBYTE)
+! c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+! if (c <= 0)
+! return -1;
+! _rl_vi_last_search_mblen = c;
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ if (c < 0)
++ return -1;
++ _rl_vi_last_search_char = c;
+ #endif
+ }
+***************
+*** 1468,1471 ****
+--- 1501,1507 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ return -1;
++
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+***************
+*** 1486,1489 ****
+--- 1522,1528 ----
+ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+
++ if (c < 0)
++ return -1;
++
+ _rl_callback_func = 0;
+ _rl_want_redisplay = 1;
+***************
+*** 1517,1520 ****
+--- 1556,1562 ----
+ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+
++ if (c < 0)
++ return -1;
++
+ return (_rl_vi_change_char (count, c, mb));
+ }
+***************
+*** 1651,1655 ****
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+! if (ch < 'a' || ch > 'z')
+ {
+ rl_ding ();
+--- 1693,1697 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+! if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0
explicit */
+ {
+ rl_ding ();
+***************
+*** 1703,1707 ****
+ return 0;
+ }
+! else if (ch < 'a' || ch > 'z')
+ {
+ rl_ding ();
+--- 1745,1749 ----
+ return 0;
+ }
+! else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0
explicit */
+ {
+ rl_ding ();
diff --git a/libs/readline/readline52-006 b/libs/readline/readline52-006
new file mode 100644
index 0000000..d739143
--- /dev/null
+++ b/libs/readline/readline52-006
@@ -0,0 +1,62 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-006
+
+Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
+Bug-Reference-ID: <1178376645.9063.25.camel@localhost>
+Bug-Reference-URL: http://bugs.gentoo.org/177095
+
+Bug-Description:
+
+The readline display code miscalculated the screen position when performing
+a redisplay in which the new text occupies more screen space that the old,
+but takes fewer bytes to do so (e.g., when replacing a shorter string
+containing multibyte characters with a longer one containing only ASCII).
+
+Patch:
+
+*** ../readline-5.2/display.c Thu Apr 26 11:38:22 2007
+--- display.c Thu Jul 12 23:10:10 2007
+***************
+*** 1519,1527 ****
+ /* Non-zero if we're increasing the number of lines. */
+ int gl = current_line >= _rl_vis_botlin && inv_botlin >
_rl_vis_botlin;
+ /* Sometimes it is cheaper to print the characters rather than
+ use the terminal's capabilities. If we're growing the number
+ of lines, make sure we actually cause the new line to wrap
+ around on auto-wrapping terminals. */
+! if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff ||
_rl_term_IC) && (!_rl_term_autowrap || !gl))
+ {
+ /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
+--- 1568,1596 ----
+ /* Non-zero if we're increasing the number of lines. */
+ int gl = current_line >= _rl_vis_botlin && inv_botlin >
_rl_vis_botlin;
++ /* If col_lendiff is > 0, implying that the new string takes up more
++ screen real estate than the old, but lendiff is < 0, meaning that it
++ takes fewer bytes, we need to just output the characters starting
++ from the first difference. These will overwrite what is on the
++ display, so there's no reason to do a smart update. This can really
++ only happen in a multibyte environment. */
++ if (lendiff < 0)
++ {
++ _rl_output_some_chars (nfd, temp);
++ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
++ /* If nfd begins before any invisible characters in the prompt,
++ adjust _rl_last_c_pos to account for wrap_offset and set
++ cpos_adjusted to let the caller know. */
++ if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
++ {
++ _rl_last_c_pos -= wrap_offset;
++ cpos_adjusted = 1;
++ }
++ return;
++ }
+ /* Sometimes it is cheaper to print the characters rather than
+ use the terminal's capabilities. If we're growing the number
+ of lines, make sure we actually cause the new line to wrap
+ around on auto-wrapping terminals. */
+! else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff
|| _rl_term_IC) && (!_rl_term_autowrap || !gl))
+ {
+ /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
diff --git a/libs/readline/readline52-007 b/libs/readline/readline52-007
new file mode 100644
index 0000000..f75f53f
--- /dev/null
+++ b/libs/readline/readline52-007
@@ -0,0 +1,65 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-007
+
+Bug-Reported-by: Tom Bjorkholm <tom.bjorkholm AT ericsson.com>
+Bug-Reference-ID:
<AEA1A32F001C6B4F98614B5B80D7647D01C075E9 AT esealmw115.eemea.ericsson.se>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html
+
+
+Bug-Description:
+
+An off-by-one error in readline's input buffering caused readline to drop
+each 511th character of buffered input (e.g., when pasting a large amount
+of data into a terminal window).
+
+Patch:
+
+*** ../readline-5.2/input.c Wed Aug 16 15:15:16 2006
+--- input.c Tue Jul 17 09:24:21 2007
+***************
+*** 134,139 ****
+
+ *key = ibuffer[pop_index++];
+!
+ if (pop_index >= ibuffer_len)
+ pop_index = 0;
+
+--- 134,142 ----
+
+ *key = ibuffer[pop_index++];
+! #if 0
+ if (pop_index >= ibuffer_len)
++ #else
++ if (pop_index > ibuffer_len)
++ #endif
+ pop_index = 0;
+
+***************
+*** 251,255 ****
+ {
+ k = (*rl_getc_function) (rl_instream);
+! rl_stuff_char (k);
+ if (k == NEWLINE || k == RETURN)
+ break;
+--- 254,259 ----
+ {
+ k = (*rl_getc_function) (rl_instream);
+! if (rl_stuff_char (k) == 0)
+! break; /* some problem; no more room */
+ if (k == NEWLINE || k == RETURN)
+ break;
+***************
+*** 374,378 ****
+--- 378,386 ----
+ }
+ ibuffer[push_index++] = key;
++ #if 0
+ if (push_index >= ibuffer_len)
++ #else
++ if (push_index > ibuffer_len)
++ #endif
+ push_index = 0;
+
diff --git a/libs/sdl_net/DETAILS b/libs/sdl_net/DETAILS
index ba64cbb..54718ee 100755
--- a/libs/sdl_net/DETAILS
+++ b/libs/sdl_net/DETAILS
@@ -1,12 +1,11 @@
SPELL=sdl_net
- VERSION=1.2.6
+ VERSION=1.2.7
+
SOURCE_HASH=sha512:d255297df97bda4ab27710120404254aba83418a62899210df36d228d0dc61324cda5910e61520c6fda8c4d6104966da7f6af9311564a2180dbcd0a007cbe069
SOURCE=SDL_net-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_net-$VERSION
SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_net/release/$SOURCE
-
SOURCE_HASH=sha512:cb3e420eeab65a29b6b49160ae1afefbf4d72ac705ec6c3edef1cab79c38e601fb1b8cf05cf332723f0e845de40610a3d7c83482f005375562c199535595c170
WEB_SITE=http://www.libsdl.org/projects/SDL_net/
ENTERED=20011124
- UPDATED=20020424
LICENSE[0]=LGPL
KEYWORDS="sdl libs"
SHORT="SDL cross-platform networking library"
diff --git a/libs/sdl_net/HISTORY b/libs/sdl_net/HISTORY
index 4ef6c68..2b3f265 100644
--- a/libs/sdl_net/HISTORY
+++ b/libs/sdl_net/HISTORY
@@ -1,3 +1,6 @@
+2007-09-06 Treeve Jelbert <treeve AT souremage.org>
+ * DETAILS: version 1.2.7
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/uds/DEPENDS b/libs/uds/DEPENDS
new file mode 100755
index 0000000..22f91f7
--- /dev/null
+++ b/libs/uds/DEPENDS
@@ -0,0 +1 @@
+depends gcc33
diff --git a/libs/uds/DETAILS b/libs/uds/DETAILS
index df4b659..7f02021 100755
--- a/libs/uds/DETAILS
+++ b/libs/uds/DETAILS
@@ -2,10 +2,11 @@
VERSION=1.0.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://frost.flewid.de/dist/$SOURCE
+ SOURCE_URL[0]=http://src.wongr.net/dist/$SOURCE

SOURCE_HASH=sha512:9fe5db8905775e758ad85cf00ef7a707b0841d7eb5bc6465b6e9f0b3c23157f1b66535735aabe401489f72de685b6c405653ddc92b74fe61395110967d41bf75
LICENSE[0]=GPL
WEB_SITE=http://src.wongr.net/uds/
+ GCC_VERSION=3.3
KEYWORDS="debugger libs"
SHORT="C++ development and debugging support library"
ENTERED=20021107
diff --git a/libs/uds/HISTORY b/libs/uds/HISTORY
index 199a114..998e77a 100644
--- a/libs/uds/HISTORY
+++ b/libs/uds/HISTORY
@@ -1,3 +1,8 @@
+2007-08-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: requires gcc 3.3 #11737
+ fixed source url
+ * DEPENDS: added for gcc33
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/libs/xapian-core/CONFLICTS b/libs/xapian-core/CONFLICTS
new file mode 100755
index 0000000..f376318
--- /dev/null
+++ b/libs/xapian-core/CONFLICTS
@@ -0,0 +1 @@
+conflicts xapian-core y
diff --git a/libs/xapian-core/DETAILS b/libs/xapian-core/DETAILS
index 7bc6365..2d6cc8b 100755
--- a/libs/xapian-core/DETAILS
+++ b/libs/xapian-core/DETAILS
@@ -1,8 +1,8 @@
SPELL=xapian-core
- VERSION=1.0.1
+ VERSION=1.0.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.oligarchy.co.uk/xapian/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:4754a140e95a8545e4c36952fac3fc6f86c975c5bfe5c28768c9131d51091f668ea271fb17f4aecfc1cbd819e7b91c7f50166c1a465651d852f56c43d5c9b6ce
+
SOURCE_HASH=sha512:892329ef5fbd8566c5bdee6f3cf67a925e0e9b5f944ef4d8f8613046139878c65cc5f475371c7f425ba45846ddfa530aec9dab4ecd6bdbd5c6cdbfe1611d6d07
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.xapian.org/ "
LICENSE[0]=GPL
diff --git a/libs/xapian-core/HISTORY b/libs/xapian-core/HISTORY
index 4a52bbe..581e438 100644
--- a/libs/xapian-core/HISTORY
+++ b/libs/xapian-core/HISTORY
@@ -1,3 +1,7 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+ * CONFLICTS: added, otherwise install fails
+
2007-06-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update 1.0.1

diff --git a/mail/claws-mail-extra-plugins/CONFIGURE
b/mail/claws-mail-extra-plugins/CONFIGURE
index b9972c0..4062647 100755
--- a/mail/claws-mail-extra-plugins/CONFIGURE
+++ b/mail/claws-mail-extra-plugins/CONFIGURE
@@ -12,5 +12,6 @@ SYLPHEED_CLAWS_EXTRA_PLUGINS="acpi_notifier \
perl_plugin \
rssyl \
smime \
+ spam_report \
synce_plugin \
vcalendar"
diff --git a/mail/claws-mail-extra-plugins/DETAILS
b/mail/claws-mail-extra-plugins/DETAILS
index 677f7fd..aaa25c6 100755
--- a/mail/claws-mail-extra-plugins/DETAILS
+++ b/mail/claws-mail-extra-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail-extra-plugins
- VERSION=2.10.0
+ VERSION=3.0.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
SOURCE2=${SOURCE}.asc
diff --git a/mail/claws-mail-extra-plugins/HISTORY
b/mail/claws-mail-extra-plugins/HISTORY
index d244c93..1406a9d 100644
--- a/mail/claws-mail-extra-plugins/HISTORY
+++ b/mail/claws-mail-extra-plugins/HISTORY
@@ -1,3 +1,10 @@
+2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.1
+
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.0
+ * CONFIGURE: added spam_report
+
2007-07-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10.0

diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index e52a6fb..7f882ca 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail
- VERSION=2.10.0
+ VERSION=3.0.1
SECURITY_PATCH=1
SOURCE=$SPELL-${VERSION}.tar.bz2
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 83a3bb0..8cf6a07 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,9 @@
+2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.1
+
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.0
+
2007-07-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10.0

diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index 966460d..6220938 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -5,7 +5,10 @@ OPTS="--with-deliver $OPTS"
else
OPTS="--without-deliver $OPTS"
fi &&
+# desired to have dev headers installed else it's hard
+# to have external plugins built
OPTS="--without-vpopmail \
+ --enable-header-install \
--without-sia \
--without-bsdauth \
--with-ioloop=$DOVECOT_IOLOOP \
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index fc039cb..a18bec4 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -12,9 +12,9 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
SOURCE3=$SPELL-sieve-$VERSION2.tar.gz
SOURCE3_URL[0]=http://dovecot.org/nightly/sieve/$SOURCE3
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
- VERSION3=1.0.2
- VERSION4=v5
-
SOURCE4_HASH=sha512:9d136a570c6920176f1f05bebc72397a91475afa49df8549e39ca97cd5462b1224090dab9107d7f54bf5dd7d099e4467aeafa821d634dccaf88c25a123f78860
+ VERSION3=1.0.3
+ VERSION4=v6
+
SOURCE4_HASH=sha512:0fb4fd6385c57f59dbf9b9e49b20e57585b86b984af2473c11358e0f3a09dd76999797d48c2417a17107e4509b6a213deaaa5b162ab6c170999648bd67b9e666
SOURCE4=$SPELL-$VERSION3-MANAGESIEVE-$VERSION4.diff.gz
SOURCE4_URL[0]=http://sinas.rename-it.nl/~sirius/$SOURCE4
fi
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index a9414b0..36c1e60 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,12 @@
+2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: always install dev headers
+
+2007-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: create dovecot account
+
+2007-08-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated MANAGESIEVE patch
+
2007-08-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 1.0.3, MANAGESIEVE patch update
SECURITY_PATCH++
diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index d2599df..e8e0531 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,4 +1,5 @@
default_install &&
+create_account dovecot &&
if [[ $DOVECOT_EXT_LDA == y ]]; then
pushd dovecot-sieve-1.0.1 &&
default_install &&
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index a26cb3a..b23104e 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,8 @@
+2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * INSTALL: install src/pref.h else nothing else can use
+ the headers to build, minor cleanup of the rest of the
+ file
+
2007-05-31 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: removed db question. its no longer supported.
DETAILS: version bumped to 3.8.0
diff --git a/mail/dspam/INSTALL b/mail/dspam/INSTALL
index e4e2746..be17051 100755
--- a/mail/dspam/INSTALL
+++ b/mail/dspam/INSTALL
@@ -1,18 +1,23 @@
-default_install &&
-pushd webui &&
-rm Makefile* &&
-rm cgi-bin/Makefile* &&
-rm cgi-bin/templates/Makefile* &&
-rm htdocs/Makefile* &&
-install_www_files &&
-popd &&
-if [[ "$DSPAM_PGSQL" == y ]]; then
- [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql ] &&
+default_install &&
+# needed if one wants to build anything with it afterwards
+cp src/pref.h \
+ ${INSTALL_ROOT}/usr/include/dspam/ &&
+pushd webui &&
+rm Makefile* &&
+rm cgi-bin/Makefile* &&
+rm cgi-bin/templates/Makefile* &&
+rm htdocs/Makefile* &&
+install_www_files &&
+popd &&
+if [[ "$DSPAM_PGSQL" == y ]]; then
+ [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql ] &&
mkdir -p ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql
- install -D src/tools.pgsql_drv/*.sql
${INSTALL_ROOT}/usr/share/doc/dspam/postgresql/
-fi &&
-if [[ "$DSPAM_MYSQL" == y ]]; then
- [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/mysql ] &&
+ install -D src/tools.pgsql_drv/*.sql \
+ ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql/
+fi &&
+if [[ "$DSPAM_MYSQL" == y ]]; then
+ [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/mysql ] &&
mkdir -p ${INSTALL_ROOT}/usr/share/doc/dspam/mysql
- install -D src/tools.mysql_drv/*.sql
${INSTALL_ROOT}/usr/share/doc/dspam/mysql/
+ install -D src/tools.mysql_drv/*.sql \
+ ${INSTALL_ROOT}/usr/share/doc/dspam/mysql/
fi
diff --git a/mail/spamassassin/DETAILS b/mail/spamassassin/DETAILS
index 0e69b69..93cf0f8 100755
--- a/mail/spamassassin/DETAILS
+++ b/mail/spamassassin/DETAILS
@@ -1,5 +1,5 @@
SPELL=spamassassin
- VERSION=3.2.2
+ VERSION=3.2.3
SOURCE=Mail-SpamAssassin-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mail-SpamAssassin-$VERSION
SOURCE_URL[0]=http://www.apache.org/dist/$SPELL/$SOURCE
diff --git a/mail/spamassassin/HISTORY b/mail/spamassassin/HISTORY
index 4a362c3..a98025f 100644
--- a/mail/spamassassin/HISTORY
+++ b/mail/spamassassin/HISTORY
@@ -1,3 +1,6 @@
+2007-08-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.2.2
+
2007-07-26 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 3.2.2

diff --git a/mail/spamassassin/Mail-SpamAssassin-3.2.2.tar.bz2.sig
b/mail/spamassassin/Mail-SpamAssassin-3.2.2.tar.bz2.sig
deleted file mode 100644
index a671af1..0000000
Binary files a/mail/spamassassin/Mail-SpamAssassin-3.2.2.tar.bz2.sig and
/dev/null differ
diff --git a/mail/spamassassin/Mail-SpamAssassin-3.2.3.tar.bz2.sig
b/mail/spamassassin/Mail-SpamAssassin-3.2.3.tar.bz2.sig
new file mode 100644
index 0000000..6df0439
Binary files /dev/null and
b/mail/spamassassin/Mail-SpamAssassin-3.2.3.tar.bz2.sig differ
diff --git a/mail/squirrelmail-gpg/DETAILS b/mail/squirrelmail-gpg/DETAILS
index 3fe6b44..a17e046 100755
--- a/mail/squirrelmail-gpg/DETAILS
+++ b/mail/squirrelmail-gpg/DETAILS
@@ -1,9 +1,9 @@
SPELL=squirrelmail-gpg
- VERSION=2.1devbuild06Jul07
- SOURCE=gpg.$VERSION.tar.gz
+ VERSION=2.1
+ SOURCE=gpg-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gpg
- SOURCE_URL[0]=http://www.braverock.com/gpg/dailybuild/gpg.$VERSION.tar.gz
-
SOURCE_HASH=sha512:35c6e4e7625430e13c052ce2be6a25d7f04dcafadbafc25b1b6d4c280c354f609572969d59f98bdd463b723495abdb64fabefd899c71dc16aa694bdbfaf4cae4
+ SOURCE_URL[0]=http://www.braverock.com/gpg/$SOURCE
+
SOURCE_HASH=sha512:47ffeff8e1ff7403413b37dc8f8c200ffe10bb5d5c1e5e3311a0edc112a0dd491e247a830a4ba076414d67b961a34ac542fe2e7e4a975d314b81c7a0e08b256d
WEB_SITE=http://www.squirrelmail.org/plugin_view.php?id=153
ENTERED=20070707
LICENSE[0]=GPL
diff --git a/mail/squirrelmail-gpg/HISTORY b/mail/squirrelmail-gpg/HISTORY
index 8973141..d93a6f7 100644
--- a/mail/squirrelmail-gpg/HISTORY
+++ b/mail/squirrelmail-gpg/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1
+
2007-07-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, BUILD, FINAL, INSTALL: created this spell

diff --git a/mail/squirrelmail-notes/DETAILS b/mail/squirrelmail-notes/DETAILS
index 844a663..703465f 100755
--- a/mail/squirrelmail-notes/DETAILS
+++ b/mail/squirrelmail-notes/DETAILS
@@ -1,7 +1,7 @@
SPELL=squirrelmail-notes
VERSION=1.0-1.2.11
SOURCE=notes.$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/notes-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/notes
SOURCE_URL[0]=http://www.squirrelmail.org/plugins/$SOURCE

SOURCE_HASH=sha512:f516e745e8704d3555e4da2010f2ca913cde3a5eed027c32ba041c4611bc46c9ff19e6d74b7f72578aaadddc9c679a3fc85f84b546ea6bfe3468469e7bacedd6
WEB_SITE=http://www.squirrelmail.org/plugin_view.php?id=79
diff --git a/mail/squirrelmail-notes/HISTORY b/mail/squirrelmail-notes/HISTORY
index 7d98c6c..ff1573e 100644
--- a/mail/squirrelmail-notes/HISTORY
+++ b/mail/squirrelmail-notes/HISTORY
@@ -1,3 +1,6 @@
+2007-08-25 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: fixed install location
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/mail/squirrelmail-notes/INSTALL b/mail/squirrelmail-notes/INSTALL
index f9853c8..ba6907b 100755
--- a/mail/squirrelmail-notes/INSTALL
+++ b/mail/squirrelmail-notes/INSTALL
@@ -1,17 +1,3 @@
-if spell_ok apache; then
- LOC="/usr/share/httpd/htdocs/squirrelmail/plugins/"
-elif spell_ok apache-mod_ssl; then
- LOC="/usr/share/httpsd/htdocs/squirrelmail/plugins/"
-elif spell_ok apache2; then
- LOC="/usr/share/apache2/htdocs/squirrelmail/plugins/"
-fi &&
-
-if [ "$LOC" == "" ]; then
- message "${MESSAGE_COLOR}Unable to find apache or apache2 installed" \
- "version...$SPELL cast aborded.${DEFAULT_COLOR}" &&
- return 1
-fi &&
-
cd .. &&
chown -R nobody.nogroup notes &&
-mv notes $LOC
+mv notes /usr/share/www/squirrelmail/plugins/notes
diff --git a/mail/ssmtp/DEPENDS b/mail/ssmtp/DEPENDS
new file mode 100755
index 0000000..65e81a1
--- /dev/null
+++ b/mail/ssmtp/DEPENDS
@@ -0,0 +1,2 @@
+optional_depends openssl "--enable-ssl" "--disable-ssl" \
+ "Enable SSL/TLS support?"
diff --git a/mail/ssmtp/HISTORY b/mail/ssmtp/HISTORY
index 4f1ce79..729d7f5 100644
--- a/mail/ssmtp/HISTORY
+++ b/mail/ssmtp/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DEPENDS: created, added openssl as a optional dep for SSL/TLS
support
+
2006-11-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFLICTS, DETAILS, HISTORY, INSTALL, PROVIDES:
created spell
diff --git a/mail/sylpheed/DETAILS b/mail/sylpheed/DETAILS
index e582e47..9ddc364 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -3,8 +3,9 @@ if [ "$SYLPHEED_GTK2" == "n" ]; then
VERSION=1.0.5

SOURCE_HASH=sha512:060b9ad6f829edaef8dd67c05237fd73bb24216daedc668e5e442b280730b205b64d8efe56e0f215bd7716a30734cfc6e8fd53252de1220b74c3f3d0d8eb5622
else
- VERSION=2.4.4
-
SOURCE_HASH=sha512:532a8aca3bdd8c812dab6bb9769039d1d67a0b48ce731ca19a97f3e9c795da34f583856a8574026ff655035540011c2fc2503837efc88810288c5d19d67e48ae
+ VERSION=2.4.6
+
SOURCE_HASH=sha512:0d6703fa1f81d0f18f9dbf8f9b5ccd55e8fcb6379754558e242055bdc42ecb0b5fcc3dd8a3608b29611ecb4900337edd246209ba733810fd21c902a022e33140
+ SECURITY_PATCH=1
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index d0c4cfb..7dd64aa 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.6
+
+2007-08-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.5, SECURITY_PATCH=1, SA26550
+
2007-07-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.4

diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index e9559ec..edb300e 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -10,6 +10,7 @@ depends perl
&&
depends zip
&&
depends gtk+2
\
'--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2'
&&
+depends gnome-panel
&&
#
# LDAP support doesn't work (fails to build)
#
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 5ee928e..6224983 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -19,6 +19,7 @@ ENIGMAIL_VERSION=0.95.3
LICENSE[2]=MPL
fi
SECURITY_PATCH=9
+ PATCHLEVEL=1
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 3bbff6c..39a9209 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2007-08-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: patchlevel++
+ * DEPENDS: added gnome-panel
+
2007-08-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: ENIGMAIL_VERSION=0.95.3, signature sig -> gpg

diff --git a/mobile/gnokii/BUILD b/mobile/gnokii/BUILD
new file mode 100755
index 0000000..d22e99f
--- /dev/null
+++ b/mobile/gnokii/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/mobile/gnokii/DETAILS b/mobile/gnokii/DETAILS
index 960ab2b..9f8ca48 100755
--- a/mobile/gnokii/DETAILS
+++ b/mobile/gnokii/DETAILS
@@ -11,10 +11,10 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
- VERSION=0.6.16
+ VERSION=0.6.18
SOURCE="$SPELL-$VERSION.tar.bz2"
SOURCE_URL[0]=http://www.$SPELL.org/download/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:b85dbafba14ae9f3be2a8edeb4ab624ade95e37f93fbfcc534307e173f40edf0e9c44c12fa3bdcbe20a2101c63f59a868043169628cb194096c1fdac961e8dc5
+
SOURCE_HASH=sha512:665cebd2e2169352232d2e88197ce1c8c49c62ce7a0d6cf50567a5347640aff397d8ba36a3953dba07c36cd90f319ae4620f534a0911b3d31f52812b8865d536
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
fi
WEB_SITE=http://www.gnokii.org/
diff --git a/mobile/gnokii/HISTORY b/mobile/gnokii/HISTORY
index 9bb9f21..181b651 100644
--- a/mobile/gnokii/HISTORY
+++ b/mobile/gnokii/HISTORY
@@ -1,3 +1,7 @@
+2007-09-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: added for make_single
+ * DETAILS: updated spell to 0.6.18
+
2007-06-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version updat to 0.6.16, added cvs option
* PREPARE: added for cvs option
diff --git a/mobile/pilot-link/7075AE4A.gpg b/mobile/pilot-link/7075AE4A.gpg
new file mode 100644
index 0000000..14759e0
Binary files /dev/null and b/mobile/pilot-link/7075AE4A.gpg differ
diff --git a/mobile/pilot-link/BUILD b/mobile/pilot-link/BUILD
index eae054e..154153e 100755
--- a/mobile/pilot-link/BUILD
+++ b/mobile/pilot-link/BUILD
@@ -1,9 +1,4 @@
-if [[ "${PILOTLINK_THREAD}" == "y" ]]; then
- OPTS="--enable-threads ${OPTS}"
-fi &&
-
-OPTS="--disable-debug --enable-conduits ${OPTS}" &&
-
+OPTS="$PL_OPTS $OPTS"
make_single &&
default_build &&
make_normal
diff --git a/mobile/pilot-link/CONFIGURE b/mobile/pilot-link/CONFIGURE
new file mode 100755
index 0000000..5c0f46f
--- /dev/null
+++ b/mobile/pilot-link/CONFIGURE
@@ -0,0 +1,15 @@
+config_query_option PL_OPTS \
+ "Enable threads?" \
+ n \
+ "--enable-threads" \
+ "--disable-threads" &&
+config_query_option PL_OPTS \
+ "Enable debug support?" \
+ n \
+ "--enable-debug" \
+ "--disable-debug" &&
+config_query_option PL_OPTS \
+ "Enable userland conduits?" \
+ n \
+ "--enable-conduits" \
+ "--disable-conduits"
diff --git a/mobile/pilot-link/DEPENDS b/mobile/pilot-link/DEPENDS
index 1b19078..9b05b6a 100755
--- a/mobile/pilot-link/DEPENDS
+++ b/mobile/pilot-link/DEPENDS
@@ -1,35 +1,48 @@
-optional_depends g++ \
- "" \
- "" \
- "for a c++ library" &&
+depends popt &&
+depends bison &&
+depends pkgconfig &&
+optional_depends g++ \
+ "" \
+ "" \
+ "for a c++ library" &&

-optional_depends libusb \
- "--enable-libusb" \
- "--disable-libusb" \
- "Enable use of libusb" &&
+optional_depends readline \
+ "--with-readline" \
+ "--without-readline" \
+ "Enable readline" &&

-optional_depends libpng \
- "--with-png=/usr/lib" \
- "--without-png" \
- "Enable PNG Support" &&
+optional_depends libusb \
+ "--enable-libusb" \
+ "--disable-libusb" \
+ "Enable use of libusb" &&

-optional_depends perl \
- "--with-perl" \
- "--without-perl" \
- "Enable Perl Support" &&
+optional_depends bluez-libs \
+ "--with-bluez" \
+ "--without-bluez" \
+ "Enable bluetooth support" &&

-optional_depends JDK \
- '--with-java' \
- '--without-java' \
- 'Enable Java Support' \
- 'z-rejected' &&
+optional_depends libpng \
+ "--with-libpng" \
+ "--without-libpng" \
+ "Enable PNG Support" &&

-optional_depends python \
- "--with-python" \
- "--without-python" \
- "Enable Python Support" &&
+optional_depends perl \
+ "--with-perl" \
+ "--without-perl" \
+ "Enable Perl Support" &&

-optional_depends tk \
- "--with-tcl=/usr/lib --with-tclinclude=/usr/include" \
- "--without-tcl" \
- "Enable TCL Support"
+optional_depends JDK \
+ '--with-java' \
+ '--without-java' \
+ 'Enable Java Support' \
+ 'z-rejected' &&
+
+optional_depends python \
+ "--with-python" \
+ "--without-python" \
+ "Enable Python Support"
+# this seems broken for now
+#optional_depends tcl \
+# "--with-tcl=/usr/lib" \
+# "--without-tcl" \
+# "Enable TCL Support"
diff --git a/mobile/pilot-link/DETAILS b/mobile/pilot-link/DETAILS
index 0cf6751..c7cdcd2 100755
--- a/mobile/pilot-link/DETAILS
+++ b/mobile/pilot-link/DETAILS
@@ -1,10 +1,12 @@
SPELL=pilot-link
VERSION=0.12.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.pilot-link.org/$SOURCE
+ SOURCE2_URL[0]=http://downloads.pilot-link.org/$SOURCE2
WEB_SITE=http://www.pilot-link.org/
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG="7075AE4A.gpg:${SOURCE2}:UPSTREAM_KEY"
ENTERED=20020214
LICENSE[0]=GPL
KEYWORDS="palm mobile"
diff --git a/mobile/pilot-link/HISTORY b/mobile/pilot-link/HISTORY
index 6d8b1f6..8657cf8 100644
--- a/mobile/pilot-link/HISTORY
+++ b/mobile/pilot-link/HISTORY
@@ -1,3 +1,11 @@
+2007-08-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: converted to upstream signature checking
+ * 7075AE4A.gpg: added gpg keyring
+ * PREPARE: removed it
+ * BUILD: cleanup
+ * CONFIGURE: added
+ * DEPENDS: missing some, cleanup others
+
2007-06-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.12.2
* PREPARE: added threads query
diff --git a/mobile/pilot-link/PREPARE b/mobile/pilot-link/PREPARE
deleted file mode 100755
index 925b566..0000000
--- a/mobile/pilot-link/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query PILOTLINK_THREAD "Enable built-in thread safety?" n
diff --git a/mobile/pilot-link/pilot-link-0.12.2.tar.bz2.sig
b/mobile/pilot-link/pilot-link-0.12.2.tar.bz2.sig
deleted file mode 100644
index 9d7ce14..0000000
Binary files a/mobile/pilot-link/pilot-link-0.12.2.tar.bz2.sig and /dev/null
differ
diff --git a/net/ipsec-tools/DETAILS b/net/ipsec-tools/DETAILS
index 7c23b03..d1c45b4 100755
--- a/net/ipsec-tools/DETAILS
+++ b/net/ipsec-tools/DETAILS
@@ -1,10 +1,10 @@
SPELL=ipsec-tools
- VERSION=0.6.7
+ VERSION=0.7
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:75ab71c60c7873144fdd6664141a9329a0286435f2cc914a9d534ebd6e74d1733f24ad788c183d9582e96baafa13538b2d216ed685c8452dfb1fc4450b765c5b
+
SOURCE_HASH=sha512:36cbf72c4ef72723ecdaa3e53aeab3fa8eea44ed5ba13477d0d433e1b18a8e3f0445a41c21c6d11373c69fc0b1a22470b2406c19e68c058814f05441de7eeff1
WEB_SITE=http://ipsec-tools.sourceforge.net/
ENTERED=20031120
LICENSE[0]=BSD
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index 8ef798c..f83c5b4 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7
+
2007-04-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.7, SECURITY_PATCH=1, CVE-2007-1841

diff --git a/net/iptables/CONFIGURE b/net/iptables/CONFIGURE
new file mode 100755
index 0000000..cc8b9d7
--- /dev/null
+++ b/net/iptables/CONFIGURE
@@ -0,0 +1 @@
+config_query GRSECPATCH "Apply grsecurity patch (adds stealth target)?" n
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index 93dd4a3..deaaa50 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,17 +1,5 @@
SPELL=iptables
-if [ "${GRSEC_PATCH}" == "y" ]
-then
- VERSION=1.2.11
-
- SOURCE3=grsecurity-$VERSION-$SPELL.patch
- SOURCE4=$SOURCE3.sign
- SOURCE3_URL=http://www.grsecurity.org/${SOURCE3}
- SOURCE4_URL=http://www.grsecurity.org/${SOURCE4}
- SOURCE3_GPG=grsecurity.gpg:$SOURCE4
- SOURCE4_IGNORE=signature
-else
VERSION=1.3.8
-fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=http://www.iptables.org/projects/$SPELL/files/$SOURCE
@@ -19,6 +7,14 @@ fi
SOURCE_GPG=iptables.gpg:$SOURCE2
SOURCE2_IGNORE=signature

+ GRSECVERSION=1.3.5
+ SOURCE3=grsecurity-$SPELL-$GRSECVERSION.patch
+ SOURCE4=$SOURCE3.sign
+ SOURCE3_URL=http://www.grsecurity.org/${SOURCE3}
+ SOURCE4_URL=http://www.grsecurity.org/${SOURCE4}
+ SOURCE3_GPG=grsecurity.gpg:$SOURCE4
+ SOURCE4_IGNORE=signature
+
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.iptables.org/projects/iptables/index.html
ENTERED=20010922
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index dc82c62..25ce579 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,9 @@
+2007-09-13 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: grsec patch to 1.3.5
+ * PREPARE: removed
+ * CONFIGURE: added question for grsec patch
+ * PRE_BUILD: applies grsec patch, and fix the makefile fuzz
+
2007-06-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.8
* iptables.gpg: updated from 0xCA9A8D5B to 0x2D0987E6
diff --git a/net/iptables/PREPARE b/net/iptables/PREPARE
deleted file mode 100755
index dcd8d8d..0000000
--- a/net/iptables/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GRSEC_PATCH "Would you like to add the grsecurity patch
(iptables version 1.2.x instead of 1.3.x will be used)?" n
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
index 73ebfed..b852c2e 100755
--- a/net/iptables/PRE_BUILD
+++ b/net/iptables/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
-if [ "$GRSEC_PATCH" == "y" ]
+if [ "$GRSECPATCH" == "y" ]
then
unpack_file 3 &&
- patch -p0 <${SOURCE_CACHE}/$SOURCE3
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 <${SOURCE_CACHE}/$SOURCE3
+ message "Ignore the patch failure, it's just a Makefile issue, fixed
it with sed" &&
+ sed -i -e "s/PF_EXT_SLIB:=ah/PF_EXT_SLIB:=stealth ah/"
extensions/Makefile
fi
diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE
index 08da957..5ef105b 100755
--- a/net/net-tools/CONFIGURE
+++ b/net/net-tools/CONFIGURE
@@ -1,7 +1,7 @@
# Setting all options default to 'y' so the default can be used
# on any system.
config_query UNIX "UNIX protocol family?" y &&
-config_query INET "INET (TCP/IP) protocol familiy?" y &&
+config_query INET "INET (TCP/IP) protocol family?" y &&
config_query INET6 "INET6 (IPv6) protocol family?" y &&
config_query NOVELL "Novell IPX/SPX protocol family?" y &&
config_query APPLETALK "Appletalk DDP protocol family?" y &&
diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index b67e803..0104c66 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/$SOURCE

SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
- PATCHLEVEL=9
+ PATCHLEVEL=10
LICENSE[0]=GPL
WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
ENTERED=20010922
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index 8159539..7a11807 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,7 +1,21 @@
+2007-09-05 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: patchlevel++
+
+2007-09-04 David Brown <dmlb2000 AT gmail.com>
+ * ifup, ifdown: added BRIDGE_PORTS for creating bridges around
+ interfaces.
+
+2007-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: fixed typo #13970
+
2007-05-14 David Kowis <dkowis AT shlrm.org>
* ifup, ifdown: fixing the stupidity with these things, bug 13773
* DETAILS: PATCHLEVEL++

+2007-04-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, kernel-headers.patch: patch to make it compile with
+ vanilla kernel headers
+
2007-03-09 Thomas Orgis <sobukus AT sourcemage.org>
* ifdown, DETAILS: fix ifdown to work with bash 3.2
(no quoting of regex pattern), PATCHLEVEL++
diff --git a/net/net-tools/PRE_BUILD b/net/net-tools/PRE_BUILD
new file mode 100755
index 0000000..3733546
--- /dev/null
+++ b/net/net-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/kernel-headers.patch
diff --git a/net/net-tools/ifdown b/net/net-tools/ifdown
index 106e00a..1917cf7 100644
--- a/net/net-tools/ifdown
+++ b/net/net-tools/ifdown
@@ -15,8 +15,18 @@ exists_in_text()
return 1
}

+_set_bridge()
+{
+ for port in "$@"
+ do
+ brctl delif $DEV $port
+ ifconfig $port 0.0.0.0 down
+ done
+}
+
_do_device_down()
{
+ [[ -n "$BRIDGE_PORTS" ]] && _set_bridge $BRIDGE_PORTS
if [[ "$MODE" =~ ^dynamic ]]; then
echo "Stopping dhcpcd on $DEV ..."
dhcpcd -k $DEV &&
@@ -24,6 +34,7 @@ _do_device_down()
fi
echo "Shutting down network interface $DEV ..."
ifconfig $DEV 0.0.0.0 down
+ [[ -n "$BRIDGE_PORTS" ]] && brctl delbr $DEV
}

_do_route_down()
diff --git a/net/net-tools/ifup b/net/net-tools/ifup
index cee462b..fba1147 100644
--- a/net/net-tools/ifup
+++ b/net/net-tools/ifup
@@ -33,6 +33,23 @@ _set_wlan()
IWC="$IWC $*"
}

+_set_bridge()
+{
+ # if the bridge doesn't exist add it
+ if ! brctl show | grep $DEV
+ then
+ brctl addbr $DEV
+ fi
+ for port in "$@"
+ do
+ if ! brctl show $DEV | grep $port
+ then
+ brctl addif $DEV $port
+ fi &&
+ ifconfig $port 0.0.0.0 promisc up
+ done
+}
+
_do_device_up()
{
# collect settings for iwconfig
@@ -48,6 +65,7 @@ _do_device_up()
[[ -n "$WIFI_DEFAULTKEY" ]] && _set_wlan key "[$WIFI_DEFAULTKEY]"
[[ -n "$WIFI_SECMODE" ]] && _set_wlan key $WIFI_SECMODE
[[ -n "$WIFI_KEY" ]] && _set_wlan key $WIFI_KEY
+ [[ -n "$BRIDGE_PORTS" ]] && _set_bridge $BRIDGE_PORTS

# make sure the wifi settings are applied if any of them are present
[[ -n "$IWC" ]] && iwconfig $DEV commit && sleep 2
diff --git a/net/net-tools/kernel-headers.patch
b/net/net-tools/kernel-headers.patch
new file mode 100644
index 0000000..2cd83bb
--- /dev/null
+++ b/net/net-tools/kernel-headers.patch
@@ -0,0 +1,10 @@
+--- lib/fddi.c.orig 2007-04-01 10:41:24.000000000 +0200
++++ lib/fddi.c 2007-04-01 10:41:33.000000000 +0200
+@@ -27,6 +27,7 @@
+ #error "Disable HW Type FDDI"
+ #endif
+ #if __GLIBC__ >= 2
++#define __be16 __u16
+ #include <netinet/if_fddi.h>
+ #else
+ #include <linux/if_fddi.h>
diff --git a/net/netconf/DETAILS b/net/netconf/DETAILS
index 536f29d..f206641 100755
--- a/net/netconf/DETAILS
+++ b/net/netconf/DETAILS
@@ -1,5 +1,5 @@
SPELL=netconf
- VERSION=1.8.1
+ VERSION=1.8.2
ENTERED=20030722
KEYWORDS="net"
SHORT='Source Mage network configuration tool'
diff --git a/net/netconf/HISTORY b/net/netconf/HISTORY
index b0b44ab..4ce5402 100644
--- a/net/netconf/HISTORY
+++ b/net/netconf/HISTORY
@@ -1,3 +1,7 @@
+2007-09-05 David Brown <dmlb2000 AT gmail.com>
+ * netconf: added BRIDGE_PORTS variable
+ * DETAILS: version++
+
2007-01-17 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.8.1, removed UPDATED.
* netconf: Removed DEVICE_MAC feature, now handled by udev (bug
diff --git a/net/netconf/netconf b/net/netconf/netconf
index 283a613..e3ee998 100644
--- a/net/netconf/netconf
+++ b/net/netconf/netconf
@@ -46,6 +46,9 @@
#---------------------------------------------------------------------#
#
# ------------------------- ChangeLog ------------------------------- #
+# 2007-09-04 David Brown <dmlb2000 AT gmail.com>
+# - Added BRIDGE_PORTS variable to netconf
+#
# 2007-01-17 Juuso Alasuutari <iuso AT sourcemage.org>
# - Removed DEVICE_MAC feature (bug #13401).
# - Version 1.8.1.
@@ -806,6 +809,7 @@ function check_devdir() {
## @Global CUSTOM: any custom options.<br>
## @Global UP_ON_BOOT: 'no' if device should not be brought up on boot<br>
## @Global NEEDS: specifies on which device this device depends
+## @Global BRIDGE_PORTS: specifies the interfaces which we bridge around
#---
function loadnetdev() {
if [ -z "$1" ]; then
@@ -818,7 +822,7 @@ function loadnetdev() {
unset MODULE MODE IP BROADCAST NETMASK GATEWAY POINTOPOINT MTU \
WIFI_NWID WIFI_ESSID WIFI_RATE WIFI_MODE WIFI_SECMODE \
WIFI_KEY WIFI_KEY1 WIFI_KEY2 WIFI_KEY3 WIFI_KEY4
WIFI_DEFAULTKEY \
- MAC CUSTOM UP_ON_BOOT NEEDS
+ MAC CUSTOM UP_ON_BOOT NEEDS BRIDGE_PORTS

devname=$(get_basename $1 .dev)

@@ -1476,6 +1480,29 @@ function cfg_needs_dev() {
fi
}

+#--- cfg_bridge_ports()
+##
+## This sets the name of the interfaces to bridge around
+## Useful for things like Virtualization or multiple interfaces
+##
+## @Global BRIDGE_PORTS: specifies the interfaces we bridge around
+## @External dialog
+#---
+function cfg_bridge_ports() {
+ COMMAND=`$DIALOG --backtitle "$BACKTITLE" \
+ --stdout \
+ --title "Configure bridge ports" \
+ --ok-label "$BTN_ACCEPT" \
+ --cancel-label "$BTN_CANCEL" \
+ --inputbox \
+ "Enter the names of the interfaces you would like to
bridge around (ex. \"eth0 eth1\")" \
+ 0 0 ${BRIDGE_PORTS}`
+
+ if [ $? -eq 0 ]; then
+ BRIDGE_PORTS="${COMMAND}"
+ fi
+}
+

#--- cfg_custom()
##
@@ -1628,6 +1655,7 @@ function confirm_save() {
## @Global CUSTOM: any custom options.<br>
## @Global UP_ON_BOOT: 'no' if device should not be brought up on
boot.<br>
## @Global NEEDS: specifies on which device this device depends.
+## @Global BRIDGE_PORTS: specifies the interfaces which we bridge around.
## @External cat, date
#---
function save_new() {
@@ -1696,6 +1724,9 @@ EOF
if [ ! -z "$NEEDS" ]; then
echo "NEEDS='${NEEDS}'" >> $1
fi
+ if [ ! -z "$BRIDGE_PORTS" ]; then
+ echo "BRIDGE_PORTS=${BRIDGE_PORTS}" >> $1
+ fi
}

#--- save_update()
@@ -1733,6 +1764,7 @@ EOF
## @Global CUSTOM: any custom options.<br>
## @Global UP_ON_BOOT: 'no' if device should not be brought up on
boot.<br>
## @Global NEEDS: specifies on which device this device depends.
+## @Global BRIDGE_PORTS: specifies the interfaces we bridge around.
## @External date
#---
function save_update() {
@@ -1830,6 +1862,12 @@ function save_update() {
sed -i '/^NEEDS=.*/d' $1
fi

+ if [ ! -z "${BRIDGE_PORTS}" ]; then
+ cat_or_sedit "^BRIDGE_PORTS=.*" "BRIDGE_PORTS='${BRIDGE_PORTS}'" $1
+ else
+ sed -i '/^BRIDGE_PORTS=.*/d' $1
+ fi
+
# removing leftovers from older netconf versions
sed -i '/^WIFI=.*/d' $1
sed -i '/^WIFI_ADVANCED=.*/d' $1
@@ -1914,6 +1952,7 @@ function add_device() {
## @Global CUSTOM: any custom options.<br>
## @Global UP_ON_BOOT: 'no' if device should not be brought up on
boot.<br>
## @Global NEEDS: specifies on which device this device depends.
+## @Global BRIDGE_PORTS: specifies the interfaces we bridge around.
## @External dialog
#---
function cfg_device() {
@@ -1968,6 +2007,7 @@ function cfg_device() {
"CUSTOM" "Custom options" \
"UP_ON_BOOT" "${UP_ON_BOOT}" \
"NEEDS" "${NEEDS}" \
+ "BRIDGE_PORTS" "${BRIDGE_PORTS}" \
"Remove" "Remove this network device" \
"Save" "Save this device file"`
;;
@@ -1989,6 +2029,7 @@ function cfg_device() {
"CUSTOM" "Custom options" \
"UP_ON_BOOT" "${UP_ON_BOOT}" \
"NEEDS" "${NEEDS}" \
+ "BRIDGE_PORTS" "${BRIDGE_PORTS}" \
"Remove" "Remove this network device" \
"Save" "Save this device file"`
;;
@@ -2014,6 +2055,7 @@ function cfg_device() {
"CUSTOM" "Custom options" \
"UP_ON_BOOT" "${UP_ON_BOOT}" \
"NEEDS" "${NEEDS}" \
+ "BRIDGE_PORTS" "${BRIDGE_PORTS}" \
"Remove" "Remove this network device" \
"Save" "Save this device file"`
;;
@@ -2038,6 +2080,7 @@ function cfg_device() {
'CUSTOM') cfg_custom ;;
'UP_ON_BOOT') toggle_boot ;;
'NEEDS') cfg_needs_dev ;;
+ 'BRIDGE_PORTS')cfg_bridge_ports ;;
'Remove') remove_device "$1" ;;
'Save') confirm_save "$1" ;;
esac
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index 0142aea..ce470bb 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Requires group ppp to exist during INSTALL
+
2007-01-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Incremented SECURITY_PATCH for Arjan's security
update to 2.4.4 on 2006-07-13
diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD
new file mode 100755
index 0000000..491b985
--- /dev/null
+++ b/net/ppp/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+create_group ppp
diff --git a/net/samba/BUILD b/net/samba/BUILD
index 44f68ea..94d0bcc 100755
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -7,14 +7,14 @@ OPTS="--with-swatdir=/usr/share/swat \
$SAMBA_QUOTA \
$OPTS" &&

-pushd source &&
+cd source &&
make_single &&
default_build &&

if [[ "$SAMBA_CIFS" == "y" ]]; then
gcc $CFLAGS $LDFLAGS client/mount.cifs.c \
-o client/mount.cifs
-fi
+fi &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
ORG_DIR=`pwd`
@@ -23,5 +23,3 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
make &&
cd $ORG_DIR
fi
-
-
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 06f4603..0ab7a65 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,13 +1,11 @@
SPELL=samba
- VERSION=3.0.25b
-
SOURCE_HASH=sha512:7300db3f892e69e43d42864d040a02fb099d347687c59547317fdd6e1b42fa49de18964041e630a149b0a2f2f93f3f37dea84d79a2fca76c9af6df83dee68b8b
+ VERSION=3.0.26a
+
SOURCE_HASH=sha512:00fddae80001d0dbd8cc8fe8b7fb1fdc0e5befcba4431fcba95b9f424abb687d17e9f698ec127a8fdd6522b144bfd6de021c7043be7f5e51aa37049c70ca51e2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://us1.samba.org/samba/ftp/$SOURCE
- SOURCE_URL[1]=ftp://us2.samba.org/pub/$SPELL/$SOURCE
-
SOURCE_URL[2]=ftp://www.mirror.ac.uk/sites/ftp.samba.org/pub/$SPELL/$SOURCE
- SOURCE_URL[3]=ftp://de.samba.org/samba.org/$SOURCE
- SOURCE_URL[4]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
+ SOURCE_URL[1]=ftp://de.samba.org/samba.org/$SOURCE
+ SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
@@ -15,7 +13,7 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 888e563..21e862d 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,27 @@
+2007-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.26a, SECURITY_PATCH=4, CVE-2007-4138
+ * PRE_BUILD, samba-3.0.25c-python_bindings_fix.patch: removed patch
+
+2007-09-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * INSTALL: run python_install only when python was chosen
+
+2007-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * INSTALL: added python_install target, the final nail for #13967
+
+2007-08-31 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * PRE_BUILD, samba-3.0.25c-python_bindings_fix.patch: fix python
bindings (Bug #13967)
+
+2007-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * BUILD, INSTALL: added some && to fail properly [Bug 13967]
+
+2007-08-26 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: removed pushd for cd doesn't work in devel sorcery
+ * INSTALL: removed popd for cd ..
+
+2007-08-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated spell to 3.0.25c
+ Removed non-working SOURCE_URL[1] & SOURCE_URL[2]
+
2007-06-27 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 3.0.25b

diff --git a/net/samba/INSTALL b/net/samba/INSTALL
index f30ac4b..67badf5 100755
--- a/net/samba/INSTALL
+++ b/net/samba/INSTALL
@@ -1,12 +1,15 @@
make_normal &&
-default_install &&
+make install &&
+if is_depends_enabled $SPELL python; then
+ make python_install
+fi &&

if [[ "$SAMBA_CIFS" == "y" ]]; then
install -m 755 client/mount.cifs \
$INSTALL_ROOT/sbin/mount.cifs
fi &&

-popd &&
+cd .. &&

mkdir -p $INSTALL_ROOT/usr/share/samba/codepages &&
mkdir -p $INSTALL_ROOT/var/{spool,cache,log}/samba &&
@@ -55,18 +58,17 @@ if [[ "$SAMBA_SUID" = "y" ]]; then
chmod u+s ${INSTALL_ROOT}/sbin/mount.cifs \
${INSTALL_ROOT}/usr/sbin/umount.cifs
fi
-fi
+fi &&

# Setup the symlink for CUPS:
if spell_ok cups; then
if ! [ -e ${INSTALL_ROOT}/usr/lib/cups/backend/smb ]; then
ln -s ${INSTALL_ROOT}/usr/bin/smbspool
${INSTALL_ROOT}/usr/lib/cups/backend/smb
fi
-fi
+fi &&

if [[ $SAMBA_VSCAN == 'y' ]] ; then
cd $SOURCE_DIRECTORY/examples/VFS/$SPELL-vscan-$VSCAN_VERSION &&
make install &&
cd $SOURCE_DIRECTORY
fi
-
diff --git a/net/sfllaw.gpg b/net/sfllaw.gpg
deleted file mode 100644
index aa877ac..0000000
Binary files a/net/sfllaw.gpg and /dev/null differ
diff --git a/net/shorewall-common/BUILD b/net/shorewall-common/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-common/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-common/CONFLICTS b/net/shorewall-common/CONFLICTS
new file mode 100755
index 0000000..ccb8609
--- /dev/null
+++ b/net/shorewall-common/CONFLICTS
@@ -0,0 +1 @@
+conflicts shorewall-lite
diff --git a/net/shorewall-common/DEPENDS b/net/shorewall-common/DEPENDS
new file mode 100755
index 0000000..ac5521d
--- /dev/null
+++ b/net/shorewall-common/DEPENDS
@@ -0,0 +1,6 @@
+message "You need one of the compilers" &&
+optional_depends shorewall-perl "" "" "for the perl compiler (reccomended)"
&&
+optional_depends shorewall-shell "" "" "for the shell compiler" &&
+depends iproute2 &&
+depends iptables &&
+depends SYSTEM-LOGGER
diff --git a/net/shorewall-common/DETAILS b/net/shorewall-common/DETAILS
new file mode 100755
index 0000000..08745b3
--- /dev/null
+++ b/net/shorewall-common/DETAILS
@@ -0,0 +1,38 @@
+ SPELL=shorewall-common
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is only one part of the entire shorewall system. You need this and a
+engine. Try shorewall-perl, unless you can't stand perl (it's lots faster).
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-common/FINAL b/net/shorewall-common/FINAL
new file mode 100755
index 0000000..b04e1d1
--- /dev/null
+++ b/net/shorewall-common/FINAL
@@ -0,0 +1,3 @@
+message "\n${MESSAGE_COLOR}If this is your first install, you will need"
\
+ "to edit the files in \n/etc/shorewall/ to configure the firewall"
\
+ "settings.${DEFAULT_COLOR}\n"
diff --git a/net/shorewall-common/HISTORY b/net/shorewall-common/HISTORY
new file mode 100644
index 0000000..8800af6
--- /dev/null
+++ b/net/shorewall-common/HISTORY
@@ -0,0 +1,4 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, PRE_BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
+ * CONFLICTS: conflicts with shorewall-lite
diff --git a/net/shorewall-common/INSTALL b/net/shorewall-common/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-common/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-common/PRE_BUILD b/net/shorewall-common/PRE_BUILD
new file mode 100755
index 0000000..c7a1074
--- /dev/null
+++ b/net/shorewall-common/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Disable init script install
+sed -i "s/install_file_with_backup init.*/true/" install.sh &&
+sed -i "s/ln -s.*init.*/true/" install.sh
diff --git a/net/shorewall-common/init.d/shorewall
b/net/shorewall-common/init.d/shorewall
new file mode 100644
index 0000000..3379f8f
--- /dev/null
+++ b/net/shorewall-common/init.d/shorewall
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+RUNLEVEL=3
+PROGRAM=/sbin/shorewall
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/shorewall
+
+start()
+{
+ # Shorewall needs /var/log/messages to exist
+ if [[ ! -f /var/log/messages ]]
+ then
+ touch /var/log/messages
+ fi &&
+ # Create shorewall log file if it doesn't exist
+ if [[ ! -f $SHOREWALL_LOG ]]
+ then
+ touch $SHOREWALL_LOG
+ fi &&
+ # Shorewall needs subsys
+ if [[ ! -d /var/lock/subsys/ ]]
+ then
+ mkdir -p /var/lock/subsys/
+ fi &&
+ echo Starting Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+stop()
+{
+ echo Stopping Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+status()
+{
+ ( unset -f echo; ${PROGRAM} status ; )
+}
+
+reload()
+{
+ ( unset -f echo; ${PROGRAM} refresh ; )
+}
diff --git a/net/shorewall-common/init.d/shorewall.conf
b/net/shorewall-common/init.d/shorewall.conf
new file mode 100644
index 0000000..e1b712f
--- /dev/null
+++ b/net/shorewall-common/init.d/shorewall.conf
@@ -0,0 +1,5 @@
+# Full path to the log file.
+SHOREWALL_LOG=/var/log/shorewall.log
+
+# As described in 'man date'. The value must begin with a + symbol.
+DATE_FORMAT="+%F %T"
diff --git a/net/shorewall-common/shorewall.gpg.key
b/net/shorewall-common/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-common/shorewall.gpg.key differ
diff --git a/net/shorewall-docs-html/BUILD b/net/shorewall-docs-html/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-docs-html/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-docs-html/DETAILS b/net/shorewall-docs-html/DETAILS
new file mode 100755
index 0000000..b066915
--- /dev/null
+++ b/net/shorewall-docs-html/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=shorewall-docs-html
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is just the html documentation for shorewall.
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-docs-html/HISTORY b/net/shorewall-docs-html/HISTORY
new file mode 100644
index 0000000..d15a1ec
--- /dev/null
+++ b/net/shorewall-docs-html/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-docs-html/INSTALL b/net/shorewall-docs-html/INSTALL
new file mode 100755
index 0000000..3af32ab
--- /dev/null
+++ b/net/shorewall-docs-html/INSTALL
@@ -0,0 +1,3 @@
+cd $SOURCE_DIRECTORY &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/shorewall/html &&
+cp -av * $INSTALL_ROOT/usr/share/doc/shorewall/html/.
diff --git a/net/shorewall-docs-html/shorewall.gpg.key
b/net/shorewall-docs-html/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-docs-html/shorewall.gpg.key differ
diff --git a/net/shorewall-docs-xml/BUILD b/net/shorewall-docs-xml/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-docs-xml/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-docs-xml/DETAILS b/net/shorewall-docs-xml/DETAILS
new file mode 100755
index 0000000..f8b13d9
--- /dev/null
+++ b/net/shorewall-docs-xml/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=shorewall-docs-xml
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is just the xml documentation for shorewall.
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-docs-xml/HISTORY b/net/shorewall-docs-xml/HISTORY
new file mode 100644
index 0000000..d15a1ec
--- /dev/null
+++ b/net/shorewall-docs-xml/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-docs-xml/INSTALL b/net/shorewall-docs-xml/INSTALL
new file mode 100755
index 0000000..b9bb9e8
--- /dev/null
+++ b/net/shorewall-docs-xml/INSTALL
@@ -0,0 +1,3 @@
+cd $SOURCE_DIRECTORY &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/shorewall/xml &&
+cp -av * $INSTALL_ROOT/usr/share/doc/shorewall/xml/.
diff --git a/net/shorewall-docs-xml/shorewall.gpg.key
b/net/shorewall-docs-xml/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-docs-xml/shorewall.gpg.key differ
diff --git a/net/shorewall-lite/BUILD b/net/shorewall-lite/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-lite/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-lite/CONFLICTS b/net/shorewall-lite/CONFLICTS
new file mode 100755
index 0000000..bc392f7
--- /dev/null
+++ b/net/shorewall-lite/CONFLICTS
@@ -0,0 +1 @@
+conflicts shorewall-common
diff --git a/net/shorewall-lite/DEPENDS b/net/shorewall-lite/DEPENDS
new file mode 100755
index 0000000..dbeb825
--- /dev/null
+++ b/net/shorewall-lite/DEPENDS
@@ -0,0 +1,3 @@
+depends iproute2 &&
+depends iptables &&
+depends SYSTEM-LOGGER
diff --git a/net/shorewall-lite/DETAILS b/net/shorewall-lite/DETAILS
new file mode 100755
index 0000000..05d8d53
--- /dev/null
+++ b/net/shorewall-lite/DETAILS
@@ -0,0 +1,39 @@
+ SPELL=shorewall-lite
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is the shorewall-lite package. It can function on its own, but only to
run
+compiled scripts. The scripts must be compiled on a different machine.
+Ref: http://www.shorewall.net/CompiledPrograms.html#Lite
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-lite/HISTORY b/net/shorewall-lite/HISTORY
new file mode 100644
index 0000000..383e500
--- /dev/null
+++ b/net/shorewall-lite/HISTORY
@@ -0,0 +1,4 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, PRE_BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
+ * CONFLICTS: conflicts with shorewall-common
diff --git a/net/shorewall-lite/INSTALL b/net/shorewall-lite/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-lite/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-lite/PRE_BUILD b/net/shorewall-lite/PRE_BUILD
new file mode 100755
index 0000000..c7a1074
--- /dev/null
+++ b/net/shorewall-lite/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Disable init script install
+sed -i "s/install_file_with_backup init.*/true/" install.sh &&
+sed -i "s/ln -s.*init.*/true/" install.sh
diff --git a/net/shorewall-lite/init.d/shorewall
b/net/shorewall-lite/init.d/shorewall
new file mode 100644
index 0000000..3379f8f
--- /dev/null
+++ b/net/shorewall-lite/init.d/shorewall
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+RUNLEVEL=3
+PROGRAM=/sbin/shorewall
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/shorewall
+
+start()
+{
+ # Shorewall needs /var/log/messages to exist
+ if [[ ! -f /var/log/messages ]]
+ then
+ touch /var/log/messages
+ fi &&
+ # Create shorewall log file if it doesn't exist
+ if [[ ! -f $SHOREWALL_LOG ]]
+ then
+ touch $SHOREWALL_LOG
+ fi &&
+ # Shorewall needs subsys
+ if [[ ! -d /var/lock/subsys/ ]]
+ then
+ mkdir -p /var/lock/subsys/
+ fi &&
+ echo Starting Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+stop()
+{
+ echo Stopping Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+status()
+{
+ ( unset -f echo; ${PROGRAM} status ; )
+}
+
+reload()
+{
+ ( unset -f echo; ${PROGRAM} refresh ; )
+}
diff --git a/net/shorewall-lite/init.d/shorewall.conf
b/net/shorewall-lite/init.d/shorewall.conf
new file mode 100644
index 0000000..e1b712f
--- /dev/null
+++ b/net/shorewall-lite/init.d/shorewall.conf
@@ -0,0 +1,5 @@
+# Full path to the log file.
+SHOREWALL_LOG=/var/log/shorewall.log
+
+# As described in 'man date'. The value must begin with a + symbol.
+DATE_FORMAT="+%F %T"
diff --git a/net/shorewall-lite/shorewall.gpg.key
b/net/shorewall-lite/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-lite/shorewall.gpg.key differ
diff --git a/net/shorewall-perl/BUILD b/net/shorewall-perl/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-perl/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-perl/DEPENDS b/net/shorewall-perl/DEPENDS
new file mode 100755
index 0000000..1dd0168
--- /dev/null
+++ b/net/shorewall-perl/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/net/shorewall-perl/DETAILS b/net/shorewall-perl/DETAILS
new file mode 100755
index 0000000..75da237
--- /dev/null
+++ b/net/shorewall-perl/DETAILS
@@ -0,0 +1,40 @@
+ SPELL=shorewall-perl
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+You need the shorewall-common package to actually do anything. This is just
+a compiler.
+This is only one part of the entire shorewall system. This is the reccomended
+compiler, because it's nice and fast :D
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY
new file mode 100644
index 0000000..66886ec
--- /dev/null
+++ b/net/shorewall-perl/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-perl/INSTALL b/net/shorewall-perl/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-perl/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-perl/shorewall.gpg.key
b/net/shorewall-perl/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-perl/shorewall.gpg.key differ
diff --git a/net/shorewall-shell/BUILD b/net/shorewall-shell/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-shell/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS
new file mode 100755
index 0000000..37434e4
--- /dev/null
+++ b/net/shorewall-shell/DETAILS
@@ -0,0 +1,40 @@
+ SPELL=shorewall-shell
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+You need the shorewall-common package to actually do anything. This is just
+a compiler.
+This is only one part of the entire shorewall system. This is one of the
+compilers, shorewall-perl is reccomended over this, as it's faster.
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY
new file mode 100644
index 0000000..66886ec
--- /dev/null
+++ b/net/shorewall-shell/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-shell/INSTALL b/net/shorewall-shell/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-shell/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-shell/shorewall.gpg.key
b/net/shorewall-shell/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-shell/shorewall.gpg.key differ
diff --git a/net/shorewall/DEPENDS b/net/shorewall/DEPENDS
index dbeb825..b0d7f0c 100755
--- a/net/shorewall/DEPENDS
+++ b/net/shorewall/DEPENDS
@@ -1,3 +1,3 @@
-depends iproute2 &&
-depends iptables &&
-depends SYSTEM-LOGGER
+depends shorewall-common &&
+optional_depends shorewall-docs-html "" "" "for html documentation" &&
+optional_depends shorewall-docs-xml "" "" "for xml documentation"
diff --git a/net/shorewall/DETAILS b/net/shorewall/DETAILS
index 53fd681..cd06abf 100755
--- a/net/shorewall/DETAILS
+++ b/net/shorewall/DETAILS
@@ -1,23 +1,5 @@
SPELL=shorewall
- VERSION=3.4.5
- MAINVER=${VERSION:0:3}
- RELEASE=$SPELL-$VERSION
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SPELL-$VERSION.tar.bz2.asc
-
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[1]=http://www.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
- SOURCE_URL[2]=http://shorewall.de/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[3]=http://www1.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[4]=http://shorewall.viisage.com/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[5]=http://www.shorewall.com.ar/pub/$SPELL/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[1]=http://www.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
- SOURCE2_URL[2]=http://shorewall.de/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[3]=http://www1.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[5]=http://www.shorewall.com.ar/pub/$SPELL/$SPELL/$MAINVER/$RELEASE/$SOURCE2
- SOURCE2_IGNORE=signature
- SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+ VERSION=4.0.3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.shorewall.net/
ENTERED=20020513
@@ -25,6 +7,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="firewall net"
SHORT="A high-level tool for configuring Netfilter."
cat << EOF
+This is a roll up package so that you can still cast "shorewall" to get it
+all installed easily.
The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
tool for configuring Netfilter. You describe your firewall/gateway
requirements using entries in a set of configuration files. Shorewall reads
diff --git a/net/shorewall/FINAL b/net/shorewall/FINAL
deleted file mode 100755
index b04e1d1..0000000
--- a/net/shorewall/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-message "\n${MESSAGE_COLOR}If this is your first install, you will need"
\
- "to edit the files in \n/etc/shorewall/ to configure the firewall"
\
- "settings.${DEFAULT_COLOR}\n"
diff --git a/net/shorewall/HISTORY b/net/shorewall/HISTORY
index b947aff..5300b87 100644
--- a/net/shorewall/HISTORY
+++ b/net/shorewall/HISTORY
@@ -1,3 +1,8 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to version 4.0.3 and turned into a spell to just cast
+ the correct packages
+ * PRE_BUILD, INSTALL: made to do nothing
+
2007-07-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 3.4.5.
* services: Deleted, not needed anymore.
diff --git a/net/shorewall/INSTALL b/net/shorewall/INSTALL
index b816bbc..27ba77d 100755
--- a/net/shorewall/INSTALL
+++ b/net/shorewall/INSTALL
@@ -1 +1 @@
-PREFIX="$INSTALL_ROOT" ./install.sh
+true
diff --git a/net/shorewall/PREPARE b/net/shorewall/PREPARE
new file mode 100755
index 0000000..9bff15c
--- /dev/null
+++ b/net/shorewall/PREPARE
@@ -0,0 +1,12 @@
+if [[ "$(installed_version shorewall)" =~ 3.* ]]; then
+message "${ERROR_COLLOR}There is a high potential for breakage in this
upgrade" &&
+message "It will NOT be installed unattendedly. It is the spell author's" &&
+message "reccomendation that you take a few hours to go through this
upgrade.${DEFAULT_COLOR}" &&
+unset SHOREWALL_GOT_TIME &&
+config_query SHOREWALL_GOT_TIME "Do you have a few hours?" n
+fi &&
+
+if [[ "$SHOREWALL_GOT_TIME" == "n" ]]; then
+ return 1
+fi
+
diff --git a/net/shorewall/PRE_BUILD b/net/shorewall/PRE_BUILD
index c7a1074..27ba77d 100755
--- a/net/shorewall/PRE_BUILD
+++ b/net/shorewall/PRE_BUILD
@@ -1,6 +1 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# Disable init script install
-sed -i "s/install_file_with_backup init.*/true/" install.sh &&
-sed -i "s/ln -s.*init.*/true/" install.sh
+true
diff --git a/net/shorewall/init.d/shorewall b/net/shorewall/init.d/shorewall
deleted file mode 100644
index 3379f8f..0000000
--- a/net/shorewall/init.d/shorewall
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-RUNLEVEL=3
-PROGRAM=/sbin/shorewall
-NEEDS="+network +remote_fs"
-
-. /etc/init.d/smgl_init
-. /etc/sysconfig/shorewall
-
-start()
-{
- # Shorewall needs /var/log/messages to exist
- if [[ ! -f /var/log/messages ]]
- then
- touch /var/log/messages
- fi &&
- # Create shorewall log file if it doesn't exist
- if [[ ! -f $SHOREWALL_LOG ]]
- then
- touch $SHOREWALL_LOG
- fi &&
- # Shorewall needs subsys
- if [[ ! -d /var/lock/subsys/ ]]
- then
- mkdir -p /var/lock/subsys/
- fi &&
- echo Starting Shorewall... &&
- ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
- ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
-}
-
-stop()
-{
- echo Stopping Shorewall... &&
- ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
- ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
-}
-
-status()
-{
- ( unset -f echo; ${PROGRAM} status ; )
-}
-
-reload()
-{
- ( unset -f echo; ${PROGRAM} refresh ; )
-}
diff --git a/net/shorewall/init.d/shorewall.conf
b/net/shorewall/init.d/shorewall.conf
deleted file mode 100644
index e1b712f..0000000
--- a/net/shorewall/init.d/shorewall.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Full path to the log file.
-SHOREWALL_LOG=/var/log/shorewall.log
-
-# As described in 'man date'. The value must begin with a + symbol.
-DATE_FORMAT="+%F %T"
diff --git a/net/shorewall/shorewall.gpg.key b/net/shorewall/shorewall.gpg.key
deleted file mode 100644
index 7aaeeb4..0000000
Binary files a/net/shorewall/shorewall.gpg.key and /dev/null differ
diff --git a/net/strongswan/DETAILS b/net/strongswan/DETAILS
index e06ae2e..b864a44 100755
--- a/net/strongswan/DETAILS
+++ b/net/strongswan/DETAILS
@@ -1,6 +1,6 @@
SPELL=strongswan
if [ "$STRONGSWAN_IKEV2" = "y" ]; then
- VERSION=4.1.5
+ VERSION=4.1.6
else
VERSION=2.8.6
fi
diff --git a/net/strongswan/HISTORY b/net/strongswan/HISTORY
index a591255..57236c7 100644
--- a/net/strongswan/HISTORY
+++ b/net/strongswan/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.1.6
+
2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.5 /2.8.6
* PREPARE: update the prompt, as 4.1 is now stable
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 2f63aa7..f743fd5 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,8 +1,8 @@
SPELL=tor

if [ "$TOR_DEVEL" == "y" ]; then
- VERSION=0.2.0.4-alpha
- SECURITY_PATCH=1
+ VERSION=0.2.0.6-alpha
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE
SOURCE2=$SOURCE.asc
@@ -10,8 +10,8 @@ if [ "$TOR_DEVEL" == "y" ]; then
SOURCE_GPG=28988BF5.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
else
- VERSION=0.1.2.16
- SECURITY_PATCH=1
+ VERSION=0.1.2.17
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 4b8aa60..c2111f3 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,11 @@
+2007-09-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated TOR_DEVEL=y to 0.2.0.6-alpha
+ SECURITY_PATCH++
+
+2007-08-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated TOR_DEVEL=n to 0.1.2.17
+ SECURITY_PATCH++
+
2007-08-05 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated TOR_DEVEL=y to 0.2.0.4-alpha
SECURITY_PATCH++
diff --git a/net/wlach.gpg b/net/wlach.gpg
new file mode 100644
index 0000000..6497586
Binary files /dev/null and b/net/wlach.gpg differ
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 6c0da74..010d4c5 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2007-09-18 Eric Sandall <sandalle AT sourcemage.org>
+ * init.d/wpa_supplicant: Also except off/any ESSID as non-associated
+
2007-07-20 Robin Cook <rcook AT wryms.net>
* PRE_BUILD: cd to correct directory if devel
* BUILD: cd to correct directory if devel
diff --git a/net/wpa_supplicant/init.d/wpa_supplicant
b/net/wpa_supplicant/init.d/wpa_supplicant
index 8625691..5660a3f 100755
--- a/net/wpa_supplicant/init.d/wpa_supplicant
+++ b/net/wpa_supplicant/init.d/wpa_supplicant
@@ -16,8 +16,9 @@ start()
required_executable /usr/sbin/iwconfig
local IWCONFIG=`builtin echo $(/usr/sbin/iwconfig $INTERFACE 2>&1)`

- if [[ "$IWCONFIG" == $INTERFACE\ unassociated* ||
- "$IWCONFIG" == $INTERFACE\ *ESSID:\"\"* ]]
+ if [[ "$IWCONFIG" == $INTERFACE\ unassociated* ||
+ "$IWCONFIG" == $INTERFACE\ *ESSID:off/any* ||
+ "$IWCONFIG" == $INTERFACE\ *ESSID:\"\"* ]]
then
echo Starting wpa_supplicant...
$PROGRAM -B -i $INTERFACE -D $DRIVER -c $CONFIG -g $CONTROL
diff --git a/net/wvdial/DETAILS b/net/wvdial/DETAILS
index 4b2b7a8..b2866b4 100755
--- a/net/wvdial/DETAILS
+++ b/net/wvdial/DETAILS
@@ -1,11 +1,11 @@
SPELL=wvdial
- VERSION=1.56
+ VERSION=1.60
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://open.nit.ca/download/$SOURCE
+ SOURCE_URL[0]=http://alumnit.ca/download/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=sfllaw.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE_GPG=wlach.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://open.nit.ca/wiki/?page=WvDial
ENTERED=20040601
diff --git a/net/wvdial/HISTORY b/net/wvdial/HISTORY
index 27123c2..b5448b1 100644
--- a/net/wvdial/HISTORY
+++ b/net/wvdial/HISTORY
@@ -1,3 +1,7 @@
+2007-08-19 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: updated version to 1.60, changed SOURCE_URL to match
upstream,
+ changed gpg keyring name
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/wvstreams/DETAILS b/net/wvstreams/DETAILS
index 2249588..0c3fa94 100755
--- a/net/wvstreams/DETAILS
+++ b/net/wvstreams/DETAILS
@@ -1,16 +1,15 @@
SPELL=wvstreams
- VERSION=4.2.2
+ VERSION=4.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://open.nit.ca/download/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=sfllaw.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE_URL[0]=http://wvstreams.googlecode.com/files/$SOURCE
+ SOURCE2_URL[0]=http://alumnit.ca/download/$SOURCE2
+ SOURCE_GPG=wlach.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://open.nit.ca/wiki/?page=WvStreams
ENTERED=20040601
- UPDATED=20041013
KEYWORDS="net"
SHORT="A network programming library written in C++."
cat << EOF
diff --git a/net/wvstreams/HISTORY b/net/wvstreams/HISTORY
index 92c9a39..60e36ac 100644
--- a/net/wvstreams/HISTORY
+++ b/net/wvstreams/HISTORY
@@ -1,3 +1,8 @@
+2007-08-19 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: updated version to 4.4, changed SOURCE_URL and SOURCE2_URL
to match
+ upstream, changed gpg keyring name
+ * gcc4.1.patch, PRE_BUILD: no longer needed
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/wvstreams/PRE_BUILD b/net/wvstreams/PRE_BUILD
deleted file mode 100755
index b74e75f..0000000
--- a/net/wvstreams/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/gcc4.1.patch
diff --git a/net/wvstreams/gcc4.1.patch b/net/wvstreams/gcc4.1.patch
deleted file mode 100644
index f99f257..0000000
--- a/net/wvstreams/gcc4.1.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- include/uniconfkey.h~ 2005-11-24 20:46:46.000000000 +0100
-+++ include/uniconfkey.h 2006-03-15 10:14:37.000000000 +0100
-@@ -113,7 +113,7 @@
- bool iswild() const;
-
- /** Returns true if the key has a trailing slash. */
-- bool UniConfKey::hastrailingslash() const;
-+ bool hastrailingslash() const;
-
- /**
- * Returns the number of segments in this path.
---- include/wvhttppool.h~ 2005-11-24 20:46:46.000000000 +0100
-+++ include/wvhttppool.h 2006-03-15 10:26:08.000000000 +0100
-@@ -57,7 +57,7 @@
- WvString linkname;
- WvUrl url;
-
-- WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url)
-+ WvUrlLink(WvStringParm _linkname, WvStringParm _url)
- : linkname(_linkname), url(_url)
- {}
- };
---- include/wvstring.h~ 2005-11-24 20:46:46.000000000 +0100
-+++ include/wvstring.h 2006-03-15 10:12:01.000000000 +0100
-@@ -393,7 +393,7 @@
-
- protected:
- void copy_constructor(const WvFastString &s);
-- inline void WvString::construct(const char *_str)
-+ inline void construct(const char *_str)
- {
- link(&nullbuf, _str);
-
---- include/wvx509.h~ 2006-01-09 22:42:53.000000000 +0100
-+++ include/wvx509.h 2006-03-15 10:20:39.000000000 +0100
-@@ -349,19 +349,19 @@
- * Set the Certificate to use X509v3, since that's all modern
- * PKI uses anyways :)
- */
-- void WvX509Mgr::set_version();
-+ void set_version();
-
- /**
- * Get and set the keyUsage field.
- */
-- WvString WvX509Mgr::get_key_usage();
-- void WvX509Mgr::set_key_usage(WvStringParm values);
-+ WvString get_key_usage();
-+ void set_key_usage(WvStringParm values);
-
- /**
- * Get and set the extendedKeyUsage field.
- */
-- WvString WvX509Mgr::get_ext_key_usage();
-- void WvX509Mgr::set_ext_key_usage(WvStringParm values);
-+ WvString get_ext_key_usage();
-+ void set_ext_key_usage(WvStringParm values);
-
- /**
- * Return the Subject alt name if it exists, and WvString::null if
diff --git a/net/xrdp/DEPENDS b/net/xrdp/DEPENDS
new file mode 100755
index 0000000..ba88de5
--- /dev/null
+++ b/net/xrdp/DEPENDS
@@ -0,0 +1,2 @@
+depends linux-pam
+depends X11-SERVER
diff --git a/net/xrdp/DETAILS b/net/xrdp/DETAILS
index 505d046..410ffbf 100755
--- a/net/xrdp/DETAILS
+++ b/net/xrdp/DETAILS
@@ -1,9 +1,9 @@
SPELL=xrdp
- VERSION=0.3.2
+ VERSION=0.4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:14eea8ce2294bcc54717a15571e22c605e6b236f652a8195b0bb93c17ccfe42e71119945e344493e18970c1b3c07a682394eb4a612e4afe3dde2060906ba0e29
+
SOURCE_HASH=sha512:3459de0d32f40fa9b55badd97ae806809cfe7ae7b382087a6d9e50498d4eface83e48e4c731a348ab4d45b1148aa5647adbfe4c961b0f1bfe63ad7abc5c17da6

WEB_SITE=http://xrdp.sourceforge.net/
ENTERED=20070507
LICENSE[0]=GPL
diff --git a/net/xrdp/HISTORY b/net/xrdp/HISTORY
index 2d5ae49..b5e95ef 100644
--- a/net/xrdp/HISTORY
+++ b/net/xrdp/HISTORY
@@ -1,3 +1,7 @@
+2007-09-11 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 0.4.0
+ * DEPENDS: linux pam and some x server
+
2007-05-07 Ladislav Hagara <hgr AT vabo.cz>
* *: created this spell, version 0.3.2

diff --git a/news/liferea/BUILD b/news/liferea/BUILD
index 93fcff6..c5a1b51 100755
--- a/news/liferea/BUILD
+++ b/news/liferea/BUILD
@@ -3,7 +3,7 @@ if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
OPTS="$OPTS --enable-gecko=seamonkey --disable-xulrunner"
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS --enable-xulrunner"
+ OPTS="$OPTS --enable-xulrunner --disable-gecko"
elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
OPTS="$OPTS --enable-gecko=mozilla --disable-xulrunner"
fi &&
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index a8b0827..70e1ac3 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -1,9 +1,7 @@
depends gtk+2 &&
depends gconf2 &&
depends libxml2 &&
-if [ "$LIFEREA_DEVEL" == "y" ]; then
- depends sqlite
-fi &&
+depends sqlite &&
optional_depends libgtkhtml \
"--enable-gtkhtml2" \
"" \
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index 11d78bf..2e63329 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -1,9 +1,9 @@
SPELL=liferea
if [ "$LIFEREA_DEVEL" == "y" ]; then
- VERSION=1.4-RC3
+ VERSION=1.4.2b
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- VERSION=1.2.20
+ VERSION=1.4.2b
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index c64d019..6143a4a 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,24 @@
+2007-09-20 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 1.4.2b
+
+2007-09-16 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated stable to 1.4.1
+ * DEPENDS: Now depends sqlite.
+ * BUILD: Added --disable-gecko for xulrunner
+
+2007-09-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated devel to 1.4.1
+
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated stable to 1.2.23
+ updated devel to 1.4.0
+
+2007-08-19 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated LIFEREA_DEVEL=n to 1.2.22
+
+2007-08-16 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated LIFEREA_DEVEL=n to 1.2.21
+
2007-07-23 George Sherwood <george AT beernabeer.com>
* DETAILS: updated LIFEREA_DEVEL=y to 1.4-RC3

diff --git a/news/liferea/liferea-1.2.20.tar.gz.sig
b/news/liferea/liferea-1.2.20.tar.gz.sig
deleted file mode 100644
index 3b2c6a4..0000000
Binary files a/news/liferea/liferea-1.2.20.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.4-RC3.tar.gz.sig
b/news/liferea/liferea-1.4-RC3.tar.gz.sig
deleted file mode 100644
index 332c345..0000000
Binary files a/news/liferea/liferea-1.4-RC3.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.4.2b.tar.gz.sig
b/news/liferea/liferea-1.4.2b.tar.gz.sig
new file mode 100644
index 0000000..d4d0979
Binary files /dev/null and b/news/liferea/liferea-1.4.2b.tar.gz.sig differ
diff --git a/odbc-drivers/myodbc/DETAILS b/odbc-drivers/myodbc/DETAILS
index c3eca06..50accba 100755
--- a/odbc-drivers/myodbc/DETAILS
+++ b/odbc-drivers/myodbc/DETAILS
@@ -1,12 +1,13 @@
SPELL=myodbc
SPELLX=mysql-connector-odbc
- FTP_NAME=MyODBC3
- VERSION=3.51.16r494
-
SOURCE_HASH=sha512:459e1233fc243c8e3534fa6083c89fb9895e2f0116a7c0049b03e04c55622361552ce3fed7c747fa4a1aa7226c276db9596f599e2b4c70cb78afc4a07e5fc909
+ VERSION=3.51.20r750
+
SOURCE_HASH=sha512:d46bdf859e1e742da7eadfd0c74489517710da89fe0bf1740ac6ff691998142c620fb6abf19cb872a6f1fc2989ed2b192a326c230b36602a22111202a503866a
SOURCE=$SPELLX-$VERSION.tar.gz
+ FTP_NAME=Downloads/Connector-ODBC/3.51/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-
SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/$FTP_NAME/$SOURCE
- SOURCE_URL[1]=http://mysql.mirror.anlx.net/Downloads/$FTP_NAME/$SOURCE
+ SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/$FTP_NAME
+ SOURCE_URL[1]=http://mysql.mirror.anlx.net/$FTP_NAME
+ SOURCE_URL[2]=ftp://ftp.inria.fr/pub/MySQL/$FTP_NAME
WEB_SITE=http://www.mysql.com
ENTERED=20030401
LICENSE[0]=GPL
diff --git a/odbc-drivers/myodbc/HISTORY b/odbc-drivers/myodbc/HISTORY
index 1c21ff1..0ee7094 100644
--- a/odbc-drivers/myodbc/HISTORY
+++ b/odbc-drivers/myodbc/HISTORY
@@ -1,3 +1,8 @@
+2007-09-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.51.20r750
+ URLS, change to directory structure
+ add a French URL
+
2006-06-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.51.16r494

diff --git a/perl-cpan/compress-zlib/DEPENDS b/perl-cpan/compress-zlib/DEPENDS
index 9784761..1a2e3c6 100755
--- a/perl-cpan/compress-zlib/DEPENDS
+++ b/perl-cpan/compress-zlib/DEPENDS
@@ -1 +1,3 @@
-depends perl
\ No newline at end of file
+depends perl &&
+depends compress-raw-zlib &&
+depends io-compress-zlib
diff --git a/perl-cpan/compress-zlib/HISTORY b/perl-cpan/compress-zlib/HISTORY
index cc0a24f..de73586 100644
--- a/perl-cpan/compress-zlib/HISTORY
+++ b/perl-cpan/compress-zlib/HISTORY
@@ -1,3 +1,6 @@
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Updated depends compress-raw-zlib, io-compress-zlib
+
2007-07-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.005

diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 9750229..a6c18b9 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbi
- VERSION=1.54
-
SOURCE_HASH=sha512:6729dc6a7dc8bafa1e996e123868a55d65e0677e32fcbd94222bfd15a083d3aab8e53792ba97830a17a8b537b8562d65e0e9d11587635ab48a53f7a964a05d42
+ VERSION=1.59
+
SOURCE_HASH=sha512:9b326905f8c3a1f99fe8cd1c4298f12eaaea444a0a4917817e3b4776eefc7403a4dedd5c8664cbc7ab2233b6c4111f3d982fc3e5ef8a559781d4d3545a9cd38d
SOURCE=DBI-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index f764582..849488f 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.59
+
2007-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.54

diff --git a/perl-cpan/file-tail/DETAILS b/perl-cpan/file-tail/DETAILS
index 9bb8f15..0d4e314 100755
--- a/perl-cpan/file-tail/DETAILS
+++ b/perl-cpan/file-tail/DETAILS
@@ -1,9 +1,9 @@
SPELL=file-tail
- VERSION=0.98
+ VERSION=0.99.3
SOURCE=File-Tail-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/File-Tail-$VERSION
SOURCE_URL[0]=http://www.cpan.org/modules/by-module/File/${SOURCE}
-
SOURCE_HASH=sha512:e986c5ef5b790121f06691539c968efe930269bc01ee57027d9abede4fe45843a817f2d0b38e28846eeea171ac9df07de05e49ca43cb715760ff21acb721bfe7
+
SOURCE_HASH=sha512:8ecc2c7e6ed4a6d6578635034e66922c927d6965659606e6d9f8816d4ddefe441c3299126d713d4a5232d96042da8990bb4b2b2118333cc0871f1c4a8c0d44bc
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=File::Tail";
ENTERED=20030726
diff --git a/perl-cpan/file-tail/HISTORY b/perl-cpan/file-tail/HISTORY
index e60e874..153a72b 100644
--- a/perl-cpan/file-tail/HISTORY
+++ b/perl-cpan/file-tail/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 0.99.3
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/perl-cpan/io-compress-base/IO-Compress-Base-2.004.tar.gz.sig
b/perl-cpan/io-compress-base/IO-Compress-Base-2.004.tar.gz.sig
deleted file mode 100644
index 3ca3db1..0000000
Binary files a/perl-cpan/io-compress-base/IO-Compress-Base-2.004.tar.gz.sig
and /dev/null differ
diff --git a/perl-cpan/io-compress-zlib/IO-Compress-Zlib-2.004.tar.gz.sig
b/perl-cpan/io-compress-zlib/IO-Compress-Zlib-2.004.tar.gz.sig
deleted file mode 100644
index adfa822..0000000
Binary files a/perl-cpan/io-compress-zlib/IO-Compress-Zlib-2.004.tar.gz.sig
and /dev/null differ
diff --git a/perl-cpan/lwp/DETAILS b/perl-cpan/lwp/DETAILS
index 8b0131d..56703e0 100755
--- a/perl-cpan/lwp/DETAILS
+++ b/perl-cpan/lwp/DETAILS
@@ -1,6 +1,6 @@
SPELL=lwp
- VERSION=5.805
-
SOURCE_HASH=sha512:b82d02546d495c3d7ef671f0ca1f5efc7cad2fec82625a3730f0f2a773df4414a2ccbd34b2e022a1c5fa679cf26b48601f459b02d0769849de8df395043effda
+ VERSION=5.808
+
SOURCE_HASH=sha512:da49bec36c295587d0c4f7d9114463ebff3c843d66eac2e96fddfdac1c826b903e9f7f6e83f1247d52efb0821492b60c5dd5cdecf9762937e63051fd6cb4f5de
SOURCE=libwww-perl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libwww-perl-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/lwp/HISTORY b/perl-cpan/lwp/HISTORY
index ab6608b..12eedbb 100644
--- a/perl-cpan/lwp/HISTORY
+++ b/perl-cpan/lwp/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.808
+
2006-11-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.805

diff --git a/perl-cpan/mp3-tag/DEPENDS b/perl-cpan/mp3-tag/DEPENDS
index 7c66af8..59c0cb2 100755
--- a/perl-cpan/mp3-tag/DEPENDS
+++ b/perl-cpan/mp3-tag/DEPENDS
@@ -1,3 +1,5 @@
depends perl &&
-depends compress-zlib
-
+depends compress-zlib &&
+depends io-compress-base &&
+depends compress-raw-zlib &&
+depends io-compress-zlib
diff --git a/perl-cpan/mp3-tag/HISTORY b/perl-cpan/mp3-tag/HISTORY
index 67dc27b..916bbb6 100644
--- a/perl-cpan/mp3-tag/HISTORY
+++ b/perl-cpan/mp3-tag/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added missing deps, fixes #11810
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/perl-cpan/pdf-api2/DEPENDS b/perl-cpan/pdf-api2/DEPENDS
index c1a1bc6..eaa9c76 100755
--- a/perl-cpan/pdf-api2/DEPENDS
+++ b/perl-cpan/pdf-api2/DEPENDS
@@ -1 +1,2 @@
-depends perl
+depends perl &&
+depends compress-zlib
diff --git a/perl-cpan/pdf-api2/DETAILS b/perl-cpan/pdf-api2/DETAILS
index b79c7fa..1ba1acb 100755
--- a/perl-cpan/pdf-api2/DETAILS
+++ b/perl-cpan/pdf-api2/DETAILS
@@ -1,8 +1,8 @@
SPELL=pdf-api2
- VERSION=0.58
+ VERSION=0.62
SOURCE="PDF-API2-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.cpan.org/authors/id/A/AR/AREIBENS/${SOURCE}
-
SOURCE_HASH=sha512:7673337ed13e4f81a34f6c7fce38800e89117b85a9cfc531c2f9bc85bfeb97179ad6b867fc5a1e5ed25f95f62720b5c6c46352fb24c7adb8d93439e394a3af7e
+
SOURCE_HASH=sha512:48a9267ad3d953a4980b8f32d09cddfca2c8e2417ecdba5bff5cc2d64eb594af5673eae70d59ecbf44db674b78a067529840e9d245c8c1ecf13e2a32c9f13bbb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/PDF-API2-${VERSION}"
WEB_SITE="http://search.cpan.org/~AREIBENS/PDF-API2/";
LICENSE[0]=ART
diff --git a/perl-cpan/pdf-api2/HISTORY b/perl-cpan/pdf-api2/HISTORY
index e5bfb77..42d71c5 100644
--- a/perl-cpan/pdf-api2/HISTORY
+++ b/perl-cpan/pdf-api2/HISTORY
@@ -1,2 +1,6 @@
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.62
+ * DEPENDS: Added depends compress-zlib
+
2007-03-16 David Kowis <dkowis AT shlrm.org>
* DETAILS, DEPENDS, BUILD, HISTORY: created spell
diff --git a/perl-cpan/perl-fuse/DETAILS b/perl-cpan/perl-fuse/DETAILS
index eefce1e..77f6f20 100755
--- a/perl-cpan/perl-fuse/DETAILS
+++ b/perl-cpan/perl-fuse/DETAILS
@@ -1,6 +1,6 @@
SPELL=perl-fuse
- VERSION=0.07
-
SOURCE_HASH=sha512:6b33b2af352f1e140791c967ad674f7caba48e425b41515cb29ad5c6416c90fa96b830c7de463106dcccc7ece7c8bfa1e3ea2d06446e5855a5e79c07e8029ff2
+ VERSION=0.09_1
+
SOURCE_HASH=sha512:2f8f6cfaf4b4fb0ada56247f41c951a7c82e98b204ad6861cdeb55b69ad291fc34f4bd8442deddd026414fb3a080f51d81ff5e3a8916256239545b9e433b570c
# eventually the BUILD file can be removed for this var
# BUILD_CMD=default_build_perl
SOURCE=Fuse-$VERSION.tar.gz
diff --git a/perl-cpan/perl-fuse/HISTORY b/perl-cpan/perl-fuse/HISTORY
index 5f4df21..cdb8fc8 100644
--- a/perl-cpan/perl-fuse/HISTORY
+++ b/perl-cpan/perl-fuse/HISTORY
@@ -1,3 +1,6 @@
+2007-09-14 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: version bump 0.09_1
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/perl-cpan/perl-gtk2-simple-list/BUILD
b/perl-cpan/perl-gtk2-simple-list/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/perl-gtk2-simple-list/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/perl-gtk2-simple-list/DEPENDS
b/perl-cpan/perl-gtk2-simple-list/DEPENDS
new file mode 100755
index 0000000..b9b1452
--- /dev/null
+++ b/perl-cpan/perl-gtk2-simple-list/DEPENDS
@@ -0,0 +1 @@
+depends perl-gtk2
diff --git a/perl-cpan/perl-gtk2-simple-list/DETAILS
b/perl-cpan/perl-gtk2-simple-list/DETAILS
new file mode 100755
index 0000000..6d7123b
--- /dev/null
+++ b/perl-cpan/perl-gtk2-simple-list/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=perl-gtk2-simple-list
+ SNAME=Gtk2-Ex-Simple-List
+ VERSION=0.50
+ SOURCE=$SNAME-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
+
SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl-Ex/$SOURCE
+
SOURCE_HASH=sha512:df57509eb386aff41630b7da2d9b810b1e9308dec407dbe792a4282f2d7331cb3639755af8232bf6312e0537784dab5f1d035c919909a53e584173ce24aa6a09

+ WEB_SITE=http://gtk2-perl.sourceforge.net/
+ ENTERED=20070825
+ LICENSE[0]=GPL
+ KEYWORDS="gtk perl"
+ SHORT="libgtkhtml2 bindings for perl, from gtk2-perl"
+cat << EOF
+ligtkhtml2 bindings for perl, from gtk2-perl
+EOF
diff --git a/perl-cpan/perl-gtk2-simple-list/HISTORY
b/perl-cpan/perl-gtk2-simple-list/HISTORY
new file mode 100644
index 0000000..5ecbf30
--- /dev/null
+++ b/perl-cpan/perl-gtk2-simple-list/HISTORY
@@ -0,0 +1,3 @@
+2007-08-25 George Sherwood <george AT beernabeer.com>
+ * BUILD, DEPENDS, DETAILS, HISTORY: created spell
+
diff --git a/perl-cpan/perl-gtk2/DETAILS b/perl-cpan/perl-gtk2/DETAILS
index 2d43520..a23022d 100755
--- a/perl-cpan/perl-gtk2/DETAILS
+++ b/perl-cpan/perl-gtk2/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-gtk2
SNAME=Gtk2
- VERSION=1.145
-
SOURCE_HASH=sha512:d790183927310f446df56150b8fdf00b9049d3c1fe6526d25da1b457af0bc720fb4444482298b7b06a527acf5593f8da9b1ae6c87a62893474fde1fcb301e907
+ VERSION=1.146
+
SOURCE_HASH=sha512:95ea77ce3b4d812a6ebf5a082efe68ebc94a26d91889c2feee6be5d5f0619c17862e1d30e0541728374dbe5417d41c1a53b0bdfe9db77a05cf5056afb5ac4134
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-gtk2/HISTORY b/perl-cpan/perl-gtk2/HISTORY
index 8d1e6bd..b8c7846 100644
--- a/perl-cpan/perl-gtk2/HISTORY
+++ b/perl-cpan/perl-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2007-08-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 1.146
+
2007-07-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 1.145

diff --git a/perl-cpan/xml-libxml/HISTORY b/perl-cpan/xml-libxml/HISTORY
index 32fd198..3cde14e 100644
--- a/perl-cpan/xml-libxml/HISTORY
+++ b/perl-cpan/xml-libxml/HISTORY
@@ -1,4 +1,7 @@
-2007-0620 Treeve Jelbert <treeve AT sourcemage.org>
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Fails to install with multiple make jobs
+
+2007-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.63

2006-11-13 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/perl-cpan/xml-libxml/INSTALL b/perl-cpan/xml-libxml/INSTALL
new file mode 100755
index 0000000..1988708
--- /dev/null
+++ b/perl-cpan/xml-libxml/INSTALL
@@ -0,0 +1,2 @@
+make_single &&
+default_install
diff --git a/php-pear/pear-xml_serializer/BUILD
b/php-pear/pear-xml_serializer/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/php-pear/pear-xml_serializer/BUILD
@@ -0,0 +1 @@
+true
diff --git a/php-pear/pear-xml_serializer/DEPENDS
b/php-pear/pear-xml_serializer/DEPENDS
index 7a58a8f..cb33fd9 100755
--- a/php-pear/pear-xml_serializer/DEPENDS
+++ b/php-pear/pear-xml_serializer/DEPENDS
@@ -1 +1,3 @@
-depends PHP
+depends PHP &&
+runtime_depends pear-xml_parser &&
+runtime_depends pear-xml_util
diff --git a/php-pear/pear-xml_serializer/HISTORY
b/php-pear/pear-xml_serializer/HISTORY
new file mode 100644
index 0000000..bf885ec
--- /dev/null
+++ b/php-pear/pear-xml_serializer/HISTORY
@@ -0,0 +1,4 @@
+2007-08-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: added #13906
+ * DEPENDS: added pear-xml_util and pear-xml_parser #13907
+ * HISTORY: added #12619
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 0b83a36..afdd78a 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,12 +1,12 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.2.3 # last was 5.1.0RC6
-
SOURCE_HASH=sha512:6dfd7fecc01fc284e93b76d7dd7ce81e528fc56720792151d0c62bf267c072d701533f31e84862d3d548ea9ba2ac7ec515acf43ca7957c5a5632d7739fbd35e2
+ VERSION=5.2.4
+
SOURCE_HASH=sha512:283fda35fe122c843db1b1f941ded842322031f30128f01ec2a406b9197127b7e2d504a16d4ce4c511baf83d404b117fa59fd23c1b7b153352466c9350d4dba1
else
- VERSION=5.2.3
-
SOURCE_HASH=sha512:6dfd7fecc01fc284e93b76d7dd7ce81e528fc56720792151d0c62bf267c072d701533f31e84862d3d548ea9ba2ac7ec515acf43ca7957c5a5632d7739fbd35e2
+ VERSION=5.2.4
+
SOURCE_HASH=sha512:283fda35fe122c843db1b1f941ded842322031f30128f01ec2a406b9197127b7e2d504a16d4ce4c511baf83d404b117fa59fd23c1b7b153352466c9350d4dba1
fi
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index ae4cdf0..eb0d59e 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2007-08-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.2.4, SECURITY_PATCH=5
+
2007-08-15 George Sherwood <george AT beernabeer.com>
* CONFIGURE, BUILD: Added option for multibyte support. Bug #13943

diff --git a/printer/a2ps/DEPENDS b/printer/a2ps/DEPENDS
index 7378e8b..0538377 100755
--- a/printer/a2ps/DEPENDS
+++ b/printer/a2ps/DEPENDS
@@ -1,3 +1,3 @@
depends psutils &&
depends imagemagick &&
-depends tetex
+optional_depends tetex "" "" "for TeX delegation"
diff --git a/printer/a2ps/HISTORY b/printer/a2ps/HISTORY
index c7c54f8..573f890 100644
--- a/printer/a2ps/HISTORY
+++ b/printer/a2ps/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Lalo Martis <lalo AT sourcemage.org>
+ * DEPENDS: Dependency on TeX is optional
+
2007-02-03 Thomas Orgis <sobukus AT sourcemage.org>
* a2ps-alphaev67.patch, PRE_BUILD: make it work with alphaev67

diff --git a/printer/cups-drivers/DEPENDS b/printer/cups-drivers/DEPENDS
index f195df0..6204ecc 100755
--- a/printer/cups-drivers/DEPENDS
+++ b/printer/cups-drivers/DEPENDS
@@ -1 +1 @@
-depends CUPS
+depends ghostscript
diff --git a/printer/cups-drivers/DETAILS b/printer/cups-drivers/DETAILS
index 681e60b..a38971a 100755
--- a/printer/cups-drivers/DETAILS
+++ b/printer/cups-drivers/DETAILS
@@ -1,22 +1,8 @@
SPELL=cups-drivers
- VERSION=0.3.6
- SOURCE=$SPELL-all-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/cups/$SOURCE
- WEB_SITE=http://sourceforge.net/projects/cups
- LICENSE[0]=http://www.cups.org/faq0003.html
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- ENTERED=20010922
- ARCHIVE="off"
- KEYWORDS="cups printer"
- SHORT="cups-drivers provides drivers for cups."
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-
-CUPS is a wonderful printing system that uses the emerging IPP protocol. The
-only drawback is that there is quite no free driver available to print with.
-CUPS-drivers address this issue by providing a generic printer driver using
-GNU GhostScript. Not many printers are supported to date, but all is in
-place to support as many printers as GS can. If GS supports your printer,
-then CUPS-drivers will support it as well. Help and feedback are welcomed.
-
+deprecated spell [replaced by ghostscript]
EOF
+
diff --git a/printer/cups-drivers/DOWNLOAD b/printer/cups-drivers/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/cups-drivers/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/printer/cups-drivers/HISTORY b/printer/cups-drivers/HISTORY
index c383dd5..cd5943e 100644
--- a/printer/cups-drivers/HISTORY
+++ b/printer/cups-drivers/HISTORY
@@ -1,81 +1,4 @@
-2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
-2006-06-25 George Sherwood <george AT beernabeer.com>
- * DEPENDS: Changed to CUPS from cups
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-10-01 Jason Flatt <jflatt AT sourcemage.org>
- * BUILD, cups-drivers-all-0.3.6.tar.gz.sig, DETAILS, INSTALL,
- PRE_BUILD: Added, updated or removed for BUILD_API 2.
- * DETAILS: Removed MAINTAINER field.
- Converted from MD5 to GPG checking.
- Changed WEB_SITE.
- * PREPARE: Deleted as I believe it is no longer needed.
-
-2003-10-20 Jason Flatt <jason AT flattfamily.com>
- * HISTORY: Reformatted this file based on new standard.
-
-2003-10-04 Jason Flatt <jason AT flattfamily.com>
- * POST_INSTALL: removed for no starting and stopping of services.
-
-2003-06-23 hgg <hgreig AT bigpond.net.au>
- * DETAILS: ARCHIVE="off" fix in bugzilla bug #1068, reverting change
13315,
- keeping 13321
- * PREPARE: Added to remove cache after fixing bug #1068
-
-2003-05-19 Jason Flatt <jason AT flattfamily.com>
- * BUILD: Update for ${INSTALL_ROOT}.
-
-2003-04-25 Jason Flatt <jason AT flattfamily.com>
- * DETAILS: Updated MAINTAINER e-mail address.
-
-2003-04-15 Jason Flatt <jason AT flattfamily.com>
- * BUILD: Modified to place files in a hopefully better location (bug
#3068).
-
-2003-01-17 Jason Flatt <jasonflatt AT wizard.com>
- * PRE_BUILD: Added MD5 info.
-
-2002-11-20 Jason Flatt <jasonflatt AT wizard.com>
- * POST_INSTALL: Modified to conform to cups changes (bug #1752).
-
-2002-10-07 Jason Flatt <jasonflatt AT wizard.com>
- * DEPENDS: Removed espgs as cups has it.
- * HISTORY: Reformatted this HISTORY file based on Grimoire Guru
Handbook.
-
-2002-08-15 Jason Flatt <jasonflatt AT wizard.com>
- * DEPENDS: Changed from ghostscript to espgs, thanks to Jose Bernardo
Silva.
-
-2002-08-02 Jason Flatt <jasonflatt AT wizard.com>
- * DETAILS: Changed LICENSE= and MD5= to LICENSE[x]= and MD5[x]=.
- * HISTORY: Reformatted this HISTORY file.
-
-2002-07-04 Jason Flatt <jasonflatt AT wizard.com>
- * DETAILS: Modified SOURCE_URL[0] to use $SOURCEFORGE_URL variable.
- Removed SOURCE_URL[1] and SOURCE_URL[2].
-
-2002-06-22 Jason Flatt <jasonflatt AT wizard.com>
- * DETAILS: Added LICENSE and MD5 to DETAILS.
-
-2002-06-10 Jason Flatt <jasonflatt AT wizard.com>
- * USEGCC2: Removed as it compiles w/gcc 3.1 and executes.
-
-2002-05-29 Jason Flatt <jasonflatt AT wizard.com>
- * USEGCC2: Added in preparation for gcc3 upgrade.
-
-2002-05-08 Jason Flatt <jasonflatt AT wizard.com>
- * HISTORY: Reformatted HISTORY file to conform to new template.
-
-2002-05-07 Jason Flatt <jasonflatt AT wizard.com>
- * DETAILS: Updated SOURCE_URLs to reflect SourceForge mirror change.
- Modified long description for improved readability when executing
"gaze
- what cups-drivers" command.
-
-2002-03-24 Jason Flatt <jasonflatt AT wizard.com>
- * HISTORY: Added.
-
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by ghostscript]
diff --git a/printer/cups-drivers/INSTALL b/printer/cups-drivers/INSTALL
index cb4ea96..27ba77d 100755
--- a/printer/cups-drivers/INSTALL
+++ b/printer/cups-drivers/INSTALL
@@ -1,5 +1 @@
-mkdir -p ${INSTALL_ROOT}/etc/cups &&
-cp -r var/cups/conf/* ${INSTALL_ROOT}/etc/cups &&
-cp -r usr/* ${INSTALL_ROOT}/usr &&
-cp -r var/cups/filter ${INSTALL_ROOT}/usr/lib/cups &&
-cp -r var/cups/utils ${INSTALL_ROOT}/usr/lib/cups
+true
diff --git a/printer/cups-drivers/PRE_BUILD b/printer/cups-drivers/PRE_BUILD
index 107d0e5..27ba77d 100755
--- a/printer/cups-drivers/PRE_BUILD
+++ b/printer/cups-drivers/PRE_BUILD
@@ -1,3 +1 @@
-mk_source_dir ${SOURCE_DIRECTORY} &&
-cd ${SOURCE_DIRECTORY} &&
-unpack_file ''
+true
diff --git a/printer/cups-drivers/TRIGGERS b/printer/cups-drivers/TRIGGERS
new file mode 100755
index 0000000..bf35a2b
--- /dev/null
+++ b/printer/cups-drivers/TRIGGERS
@@ -0,0 +1 @@
+on_cast cups-drivers dispel_self
diff --git a/printer/cups-drivers/cups-drivers-all-0.3.6.tar.gz.sig
b/printer/cups-drivers/cups-drivers-all-0.3.6.tar.gz.sig
deleted file mode 100644
index 86c5e67..0000000
Binary files a/printer/cups-drivers/cups-drivers-all-0.3.6.tar.gz.sig and
/dev/null differ
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index d8c0033..a8becc4 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -1,14 +1,9 @@
SPELL=cups
- VERSION=1.3.0
-
SOURCE_HASH=sha512:c7740fb3283d57631d670d0ecf421533ebc96f1fd60f5e0f995f1dd77ce483541afd24ede66010b82c56b771f6e98b623c32009bfa31dd052208275208974574
+ VERSION=1.3.2
+
SOURCE_HASH=sha512:80dd06123db9a31ea29385deaae45abf78571dc43e738d9c7db9107cb64fb8eec946c8b08900af73d7b13e27e2e8e1f5865695e241e534ccd74b334e9a1d3fe2
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/$SOURCE
## Oregon, USA
-# SOURCE_URL[1]=ftp://ftp.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
# Oregon, USA
-# SOURCE_URL[2]=ftp://ftp2.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
## Maryland, USA
- SOURCE_URL[1]=ftp://ftp3.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
# California, USA
-#
SOURCE_URL[4]=http://www.nu6.org/_/mirror/ftp.easysw.com/pub/ghostscript/${VERSION}/${SOURCE}
## Gustavsberg, Sweden
-#
SOURCE_URL[5]=ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/${SPELL}/${VERSION}/${SOURCE}
## Braunschweig, Germany
+ SOURCE_URL[0]=ftp://ftp.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
WEB_SITE=http://www.cups.org
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
ENTERED=20010922
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index c45ff12..7ad5a56 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,9 @@
+2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.2
+
+2007-09-15 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.3.1. Removed all broken mirrors.
+
2007-08-14 David Brown <dmlb2000 AT gmail.com>
* DEPENDS: fixed syntax errors in previous commit

diff --git a/printer/ghostscript/CONFLICTS b/printer/ghostscript/CONFLICTS
index e6523e4..51bc0d4 100755
--- a/printer/ghostscript/CONFLICTS
+++ b/printer/ghostscript/CONFLICTS
@@ -1,2 +1,2 @@
conflicts espgs y
-conflicts gs-afpl
+conflicts gs-afpl y
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 61b6ce6..ac9e414 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: gs-afpl is also deprecated
+
2007-08-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFLICTS: default to yes for dispelling espgs as that's deprecated

diff --git a/printer/gtklp/DETAILS b/printer/gtklp/DETAILS
index 85c4a37..4192d85 100755
--- a/printer/gtklp/DETAILS
+++ b/printer/gtklp/DETAILS
@@ -1,6 +1,6 @@
SPELL=gtklp
- VERSION=1.2.4
-
SOURCE_HASH=sha512:22f3863483210415d6c28e4b70a5876c243c5bcad1946624dd2aaf2265317213c602a134de4dfef4638000bc8282cdd5eae4763c570d108f8b60b0c1be93d7e0
+ VERSION=1.2.5
+
SOURCE_HASH=sha512:da65f64e89ff92834d687ffd6e0fb06d14885cbe506a143e00466c4d7b3ea87cd03d86281baf183525141fedbff1768adc2e03eb1489c073dfad32b042dfdd1a
SOURCE=${SPELL}-${VERSION}.src.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/printer/gtklp/HISTORY b/printer/gtklp/HISTORY
index b850108..07e4155 100644
--- a/printer/gtklp/HISTORY
+++ b/printer/gtklp/HISTORY
@@ -1,3 +1,6 @@
+2007-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.5
+
2007-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.4

diff --git a/printer/photoprint/DEPENDS b/printer/photoprint/DEPENDS
index 671f67b..af0a7e2 100755
--- a/printer/photoprint/DEPENDS
+++ b/printer/photoprint/DEPENDS
@@ -4,5 +4,5 @@ depends gtk+2 &&
depends lcms &&
depends jpeg &&
depends tiff &&
-depends netpbm
+optional_depends netpbm '' '' 'additional graphic formats'

diff --git a/printer/photoprint/HISTORY b/printer/photoprint/HISTORY
index c733211..ecbc2de 100644
--- a/printer/photoprint/HISTORY
+++ b/printer/photoprint/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: netpbm is optional
+
2007-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.5

diff --git a/protected b/protected
index 33b991f..79b87d0 100644
--- a/protected
+++ b/protected
@@ -1,3 +1,4 @@
^/usr/lib/python[^/]*/site-packages/easy-install.pth
^/usr/share/pear/\.filemap$
^/etc/httpd/httpd\.conf$
+^/usr/lib/ghc.*/package\.conf.*$
diff --git a/python-devel/cherrypy/DETAILS b/python-devel/cherrypy/DETAILS
index 76a32f3..afbf52e 100755
--- a/python-devel/cherrypy/DETAILS
+++ b/python-devel/cherrypy/DETAILS
@@ -1,8 +1,8 @@
SPELL=cherrypy
SPELLX=CherryPy
if [[ "$CP_VER" == "3.x" ]];then
- VERSION=3.0.1
-
SOURCE_HASH=sha512:e342e70f0d9a02368c15b714c0f1d026367efc8d928e74bf2784e7f634b4990edd0588ea359ceeee490386b89b73add89557037b9a77034fc22f735b5e211a8f
+ VERSION=3.0.2
+
SOURCE_HASH=sha512:12e4969acd16c91559979751e544b95e99455e9359ad0050081dfcb3e7e3dda5960c9f49f0121114311b5c7f6c3772aed3b4e17f880f702f884a30bd0428d801
else
VERSION=2.2.1

SOURCE_HASH=sha512:7b30a376891191240651ce14490aec373c50e27638e737ce9459128d9f59333c263ffac81d9ed99033b89aaf27fdef5c85ec6acbdc469eb61339193f51b403b0
diff --git a/python-devel/cherrypy/HISTORY b/python-devel/cherrypy/HISTORY
index 3e52a2e..983a870 100644
--- a/python-devel/cherrypy/HISTORY
+++ b/python-devel/cherrypy/HISTORY
@@ -1,3 +1,6 @@
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.2
+
2007-07-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: delinting

diff --git a/python-devel/django/DEPENDS b/python-devel/django/DEPENDS
new file mode 100755
index 0000000..ead14e8
--- /dev/null
+++ b/python-devel/django/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+optional_depends bash-completion "" "" "to install django bash completion"
diff --git a/python-devel/django/DETAILS b/python-devel/django/DETAILS
new file mode 100755
index 0000000..4ab98fd
--- /dev/null
+++ b/python-devel/django/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=django
+ VERSION=0.96
+ SOURCE=Django-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://media.djangoproject.com/releases/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:34457f3827c223c9ce4a938dcd87b49f7f68ad6440428004983e85316688681344c37ad016c41d80fbd47d3b0da84327716ae43f1fec18a518b411c90ef67387
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Django-${VERSION}
+ WEB_SITE="http://www.djangoproject.com/";
+ LICENSE[0]=BSD
+ KEYWORDS="web python devel"
+ ENTERED=20070821
+ SHORT="Django is a high-level Python Web framework"
+cat << EOF
+Django is a high-level Python Web framework that encourages rapid development
+and clean, pragmatic design.
+
+Developed and used over two years by a fast-moving online-news operation,
+Django was designed to handle two challenges: the intensive deadlines of a
+newsroom and the stringent requirements of the experienced Web developers who
+wrote it. It lets you build high-performing, elegant Web applications
quickly.
+EOF
diff --git a/python-devel/django/HISTORY b/python-devel/django/HISTORY
new file mode 100644
index 0000000..a420710
--- /dev/null
+++ b/python-devel/django/HISTORY
@@ -0,0 +1,9 @@
+2007-09-03 Alexander Tsamutali <astsmtl AT gmail.com>
+ * CONFIGURE: Removed
+ * DEPENDS: Added optional dependency on bash-completion
+
+2007-09-02 Alexander Tsamutali <astsmtl AT gmail.com>
+ * CONFIGURE, INSTALL: Added option to install bash completion
+
+2007-08-21 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, DEPENDS: created spell
diff --git a/python-devel/django/INSTALL b/python-devel/django/INSTALL
new file mode 100755
index 0000000..0ec999a
--- /dev/null
+++ b/python-devel/django/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if is_depends_enabled $SPELL bash-completion ; then
+ install -v -m 644 ${SOURCE_DIRECTORY}/extras/django_bash_completion \
+ ${INSTALL_ROOT}/etc/bash_completion.d/
+fi
diff --git a/python-devel/itools/DETAILS b/python-devel/itools/DETAILS
index 09472fe..337922a 100755
--- a/python-devel/itools/DETAILS
+++ b/python-devel/itools/DETAILS
@@ -1,6 +1,6 @@
SPELL=itools
- VERSION=0.16.4
-
SOURCE_HASH=sha512:39aaef6f76381cebd4ae55eeed382c05f0e3652d6bc1a5e9a5cc65db64a59dbe5913ba5868b828aaec6bb0e010dfef385e3309de67a21262b98a6f11566e8a43
+ VERSION=0.16.8
+
SOURCE_HASH=sha512:0658630c3fc92f0f43339e83f889df95d06c470011afff182fa845b01779d6a5986b8f529409636e7a956461c56725fafd1be6693c35e0d9046ddc2c96d5c2ca
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ikaaro.org
diff --git a/python-devel/itools/HISTORY b/python-devel/itools/HISTORY
index 11098ca..305c446 100644
--- a/python-devel/itools/HISTORY
+++ b/python-devel/itools/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.16.8
+
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.16.6
+
2007-07-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.16.4

diff --git a/python-devel/numpy/DETAILS b/python-devel/numpy/DETAILS
index 66a9d9e..f778bcb 100755
--- a/python-devel/numpy/DETAILS
+++ b/python-devel/numpy/DETAILS
@@ -1,6 +1,6 @@
SPELL=numpy
- VERSION=1.0.3-2
-
SOURCE_HASH=sha512:b52acba0602b276754924522c832527b4ba1aaee15e80c0a68acacb392e27013c0358ffeba282c139160d28487235dc3d123a0b585c862719bb1faef07af56d3
+ VERSION=1.0.3.1
+
SOURCE_HASH=sha512:c7740e133c983c2cacdf7fe939c027d4384c14e51087bbf42ccfe91e5d6bdf95635ad02f83ff4e18657a4a36d19b036c11f59209e25d20e04b2a744eafdef440
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-?}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-devel/numpy/HISTORY b/python-devel/numpy/HISTORY
index 1c075ba..d353d2b 100644
--- a/python-devel/numpy/HISTORY
+++ b/python-devel/numpy/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.3.1
+
2007-06-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.3-2

diff --git a/python-devel/paste/DETAILS b/python-devel/paste/DETAILS
index c45f438..34ef52b 100755
--- a/python-devel/paste/DETAILS
+++ b/python-devel/paste/DETAILS
@@ -1,7 +1,7 @@
SPELL=paste
CHEESESHOP_PKG=Paste
- VERSION=1.4
-
SOURCE_HASH=sha512:520d955fb0588647a42b90280b4ff053cd621e45761508454039b0eb00e0b41edf81507db87137c44cbc8ae1b29a7e4aa7c917508f598a5a896e72f5fd2ed7cd
+ VERSION=1.4.2
+
SOURCE_HASH=sha512:abe8b442039d70a51e9cb4e2a449ea75085cf8126f639a595c4d6839c961a8a79ae4c099129199f7036ddef607d1bb0c4b4e3280b295ca6f5aa3b8edc2b1e350
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
diff --git a/python-devel/paste/HISTORY b/python-devel/paste/HISTORY
index b4308a8..74d4a85 100644
--- a/python-devel/paste/HISTORY
+++ b/python-devel/paste/HISTORY
@@ -1,3 +1,6 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.2
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4

diff --git a/python-devel/pastescript/DETAILS
b/python-devel/pastescript/DETAILS
index 169d99e..c6f67f7 100755
--- a/python-devel/pastescript/DETAILS
+++ b/python-devel/pastescript/DETAILS
@@ -1,7 +1,7 @@
SPELL=pastescript
CHEESESHOP_PKG=PasteScript
- VERSION=1.3.5
-
SOURCE_HASH=sha512:80b2fa3e9c37dffeb9f81225a142c52591f6b4b3d8e8f94334082755c4c7e00c629554343861816b05c3730f31944869f0e1ef4cac5ed5bd3d8ba817289dd8e4
+ VERSION=1.3.6
+
SOURCE_HASH=sha512:e65799ef89a871d2c8051bfb5c19c7661556082df89d28c06d4975d75147b4a0ebae5c878623d26010993f0da69ade1c4124b6b6cdcf59fd5053e81b273d5530
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
diff --git a/python-devel/pastescript/HISTORY
b/python-devel/pastescript/HISTORY
index 62da8c9..cfeac2c 100644
--- a/python-devel/pastescript/HISTORY
+++ b/python-devel/pastescript/HISTORY
@@ -1,3 +1,6 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.6
+
2007-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.5

diff --git a/python-devel/python-markdown/DEPENDS
b/python-devel/python-markdown/DEPENDS
new file mode 100755
index 0000000..6e84a0e
--- /dev/null
+++ b/python-devel/python-markdown/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-devel/python-markdown/DETAILS
b/python-devel/python-markdown/DETAILS
new file mode 100755
index 0000000..516ab6c
--- /dev/null
+++ b/python-devel/python-markdown/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=python-markdown
+ VERSION=1.6b
+ SOURCE="markdown-${VERSION}.zip"
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:76a4a43396308c19ece36a2ea33dcd522cad1c373838f9a4c73fc608bc7dba49c569376c7425b1dc43a824304346c64623dcf52f1a254a224de48eb5709af02f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/markdown-${VERSION}"
+ WEB_SITE="http://www.freewisdom.org/projects/python-markdown/";
+ LICENSE[0]=GPL
+ ENTERED=20070910
+ SHORT="a Python implementation of John Gruber's Markdown"
+cat << EOF
+This is a Python implementation of John Gruber's Markdown. It is almost
+completely compliant with the reference implementation, though there are
+a few known issues. Python Markdown offers a flexible extension mechanism,
+which makes it possible to change the behavior of the module without having
+to edit the actual script files.
+EOF
diff --git a/python-devel/python-markdown/HISTORY
b/python-devel/python-markdown/HISTORY
new file mode 100644
index 0000000..9d42fc6
--- /dev/null
+++ b/python-devel/python-markdown/HISTORY
@@ -0,0 +1,2 @@
+2007-09-10 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS, DEPENDS, PRE_BUILD, HISTORY: created spell
diff --git a/python-devel/python-markdown/PRE_BUILD
b/python-devel/python-markdown/PRE_BUILD
new file mode 100755
index 0000000..983d211
--- /dev/null
+++ b/python-devel/python-markdown/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+rm -rf ${BUILD_DIRECTORY}/releases
diff --git a/python-devel/soappy/HISTORY b/python-devel/soappy/HISTORY
index 301d891..06348cf 100644
--- a/python-devel/soappy/HISTORY
+++ b/python-devel/soappy/HISTORY
@@ -1,3 +1,6 @@
+2007-09-10 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, import-error.patch: added to fix building errors
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/python-devel/soappy/PRE_BUILD b/python-devel/soappy/PRE_BUILD
new file mode 100755
index 0000000..b2b6236
--- /dev/null
+++ b/python-devel/soappy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < ${SCRIPT_DIRECTORY}/import-error.patch
diff --git a/python-devel/soappy/import-error.patch
b/python-devel/soappy/import-error.patch
new file mode 100644
index 0000000..185d587
--- /dev/null
+++ b/python-devel/soappy/import-error.patch
@@ -0,0 +1,54 @@
+diff -Nuar SOAPpy-0.12.0.orig/SOAPpy/Client.py SOAPpy-0.12.0/SOAPpy/Client.py
+--- SOAPpy-0.12.0.orig/SOAPpy/Client.py 2005-02-22 01:27:09.000000000
+0500
++++ SOAPpy-0.12.0/SOAPpy/Client.py 2007-09-10 00:52:45.000000000 +0500
+@@ -1,3 +1,5 @@
++from __future__ import nested_scopes
++
+ """
+
################################################################################
+ #
+@@ -43,8 +45,6 @@
+ ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import urllib
+ from types import *
+diff -Nuar SOAPpy-0.12.0.orig/SOAPpy/Server.py SOAPpy-0.12.0/SOAPpy/Server.py
+--- SOAPpy-0.12.0.orig/SOAPpy/Server.py 2005-02-15 21:32:22.000000000
+0500
++++ SOAPpy-0.12.0/SOAPpy/Server.py 2007-09-10 00:47:21.000000000 +0500
+@@ -1,3 +1,5 @@
++from __future__ import nested_scopes
++
+ """
+
################################################################################
+ #
+@@ -43,8 +45,6 @@
+ ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import re
+ import socket
+diff -Nuar SOAPpy-0.12.0.orig/SOAPpy/Types.py SOAPpy-0.12.0/SOAPpy/Types.py
+--- SOAPpy-0.12.0.orig/SOAPpy/Types.py 2005-02-22 09:29:43.000000000 +0500
++++ SOAPpy-0.12.0/SOAPpy/Types.py 2007-09-10 00:47:38.000000000 +0500
+@@ -1,3 +1,5 @@
++from __future__ import nested_scopes
++
+ """
+
################################################################################
+ # Copyright (c) 2003, Pfizer
+@@ -36,8 +38,6 @@
+ ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+-
+ import UserList
+ import base64
+ import cgi
diff --git a/python-devel/sqlalchemy/DETAILS b/python-devel/sqlalchemy/DETAILS
index 5bf6e3c..3c2ddf6 100755
--- a/python-devel/sqlalchemy/DETAILS
+++ b/python-devel/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.4.0beta2
-
SOURCE_HASH=sha512:9d81e11da805e0a02ed510d5f1c51ce76aafc421738f5ce3a079ad5eb9432885e615bc4e728669e841ada78217581a041574521b482cf0ea98d399391f382b74
+ VERSION=0.4.0beta5
+
SOURCE_HASH=sha512:34fe7242b5846bcbfe73046da38a9090a40a425a9cbf2c4bfd80ba23ef495478840183ed264b8359f38b37d7e89ae96e1afa08a7b55f5a5f6eaab18ecd4bcc2d
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-devel/sqlalchemy/HISTORY b/python-devel/sqlalchemy/HISTORY
index 4bcd615..8f356f1 100644
--- a/python-devel/sqlalchemy/HISTORY
+++ b/python-devel/sqlalchemy/HISTORY
@@ -1,3 +1,12 @@
+2007-09-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0beta5
+
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0beta4
+
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0beta3
+
2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.0beta2

diff --git a/python-devel/turbogears/DETAILS b/python-devel/turbogears/DETAILS
index ae8f5f5..8ad9eaa 100755
--- a/python-devel/turbogears/DETAILS
+++ b/python-devel/turbogears/DETAILS
@@ -1,6 +1,6 @@
SPELL=turbogears
- VERSION=1.0.3.2
-
SOURCE_HASH=sha512:068769e005f22b552dd1ddcf21992ec392a8dd49300d295c0aa1e7d38bf9050d36fcf45fbf40353722a014a02e16b3511063019176ca87aef361a536e4ea6a7e
+ VERSION=1.0.4b1
+
SOURCE_HASH=sha512:1b6e17a7e56f618a8f5d1ae83e2af6ed1cacd66d7d00352039e9c305e3fb2722bdf3f1c1a45da780fddff1431dc1d3ba729ba2f8796bcc07be23ed08f74a6620
SOURCE=TurboGears-$VERSION.zip
SOURCE_URL[0]="http://files.turbogears.org/eggs/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/TurboGears-$VERSION"
diff --git a/python-devel/turbogears/HISTORY b/python-devel/turbogears/HISTORY
index 9ba85e4..93d8ec6 100644
--- a/python-devel/turbogears/HISTORY
+++ b/python-devel/turbogears/HISTORY
@@ -1,3 +1,6 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>.2
+ * DETAILS: version 1.0.4b1
+
2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>.2
* DETAILS: version 1.0.3.2

diff --git a/python-devel/turbokid/DETAILS b/python-devel/turbokid/DETAILS
index 81f1d79..4c78eff 100755
--- a/python-devel/turbokid/DETAILS
+++ b/python-devel/turbokid/DETAILS
@@ -1,7 +1,7 @@
SPELL=turbokid
SPELLX=TurboKid
- VERSION=1.0.2
-
SOURCE_HASH=sha512:38f0c9f0d1efa9d116317cd97a71f8af5745acf4da3a02bc9712db57881ffbc5f41422fdd2873a350b603c23d3680aec3c62c0b994fb9520f88a52da870edcb8
+ VERSION=1.0.3
+
SOURCE_HASH=sha512:aa1087852e07fcc6ff977994d59ae66883207fc29a35611256e168db96461f31fb92e8fdbd1bac925a8eda88412109260ed3a5f8c7bcee39e643688330b9a430
SOURCE="$SPELLX-$VERSION.tar.gz"
SOURCE_URL[0]="http://files.turbogears.org/eggs/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-devel/turbokid/HISTORY b/python-devel/turbokid/HISTORY
index f176f0e..e17bb2a 100644
--- a/python-devel/turbokid/HISTORY
+++ b/python-devel/turbokid/HISTORY
@@ -1,3 +1,6 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.3
+
2007-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.2

diff --git a/science-libs/glpk/DEPENDS b/science-libs/glpk/DEPENDS
new file mode 100755
index 0000000..8cecf43
--- /dev/null
+++ b/science-libs/glpk/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends gmp '--enable-gmp' \
+ '--disable-gmp' \
+ 'use GNU MP library'
+
diff --git a/science-libs/glpk/DETAILS b/science-libs/glpk/DETAILS
new file mode 100755
index 0000000..9f2e3d5
--- /dev/null
+++ b/science-libs/glpk/DETAILS
@@ -0,0 +1,30 @@
+ SPELL=glpk
+ VERSION=4.21
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+
+WEB_SITE=http:http://www.gnu.org/software/glpk/
+ LICENSE[0]=GPL
+ ENTERED=20070909
+ KEYWORDS="maths"
+ SHORT="GNU Linear Programming Kit"
+cat << EOF
+The GLPK (GNU Linear Programming Kit) package is intended for solving
+large-scale linear programming (LP), mixed integer programming (MIP), and
+other related problems. It is a set of routines written in ANSI C and
+organized in the form of a callable library.
+ GLPK supports the GNU MathProg language, which is a subset of the AMPL
+language.
+ The GLPK package includes the following main components:
+ Revised simplex method.
+ Primal-dual interior point method.
+ Branch-and-bound method.
+ Translator for GNU MathProg.
+ Application program interface (API).
+ Stand-alone LP/MIP solver.
+EOF
diff --git a/science-libs/glpk/HISTORY b/science-libs/glpk/HISTORY
new file mode 100644
index 0000000..b234126
--- /dev/null
+++ b/science-libs/glpk/HISTORY
@@ -0,0 +1,7 @@
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: gmp is optional
+
+2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.21
+ spell created
+
diff --git a/science-libs/octave-forge/BUILD b/science-libs/octave-forge/BUILD
index 2704c5b..fc4a64e 100755
--- a/science-libs/octave-forge/BUILD
+++ b/science-libs/octave-forge/BUILD
@@ -1,3 +1,8 @@
-./configure &&
-make &&
-make check
+for subdir in */*; do
+ tar xzf $subdir
+ subdir=${subdir#*/} &&
+ cd ${subdir%.tar.gz} &&
+# default_build &&
+make
+ cd -
+done
diff --git a/science-libs/octave-forge/DETAILS
b/science-libs/octave-forge/DETAILS
index c7fde01..c778e9d 100755
--- a/science-libs/octave-forge/DETAILS
+++ b/science-libs/octave-forge/DETAILS
@@ -1,15 +1,19 @@
SPELL=octave-forge
- VERSION=2005.06.13
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=20070726
+ SOURCE=$SPELL-bundle-$VERSION.tar.gz
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-bundle-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/octave/$SOURCE
WEB_SITE=http://sourceforge.net/projects/octave/
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:9797a896f4f4f60c68bd04e789d23287428f905931bf027e7c4d666d79b691515dfcb75e73c2149ab3cf9d787f851faf7847f1195c6591ffdba0f1d9ea8d816d
+
SOURCE_HASH=sha512:ef47b4ddf42ab7f672253d645078efa4e76eaf360922cfa8fdea220e14528d6ef8689aa19d65aab9707bf00afdbebb44d8c2312b4a81fd9c2495aa24a29a2bad
ENTERED=20041114
KEYWORDS="science libs"
SHORT="Octave-forge is a central location for custom scripts,
functions and extensions for GNU Octave"

cat << EOF
-Octave-forge, the GNU Octave Repository, is intended to be a central
location for custom scripts, functions and extensions for GNU Octave. If you
are interested in helping to develop this site or if you have custom scripts
to contribute, you can join the repository mailing list (archives) or simply
send a message to: cgijobs AT users.sourceforge.net.
+Octave-forge, the GNU Octave Repository, is intended to be a central
+location for custom scripts, functions and extensions for GNU Octave. If
+you are interested in helping to develop this site or if you have custom
+scripts to contribute, you can join the repository mailing list (archives)
+or simply send a message to: cgijobs AT users.sourceforge.net.
EOF
diff --git a/science-libs/octave-forge/HISTORY
b/science-libs/octave-forge/HISTORY
index d39041e..98e8d6c 100644
--- a/science-libs/octave-forge/HISTORY
+++ b/science-libs/octave-forge/HISTORY
@@ -1,3 +1,10 @@
+2007-08-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed long description wrap
+ updated spell to 2007.07.26
+ * BUILD: removed, fixes #12395
+ added, new build system
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/science/ginac/DETAILS b/science/ginac/DETAILS
index be2a782..6eb726e 100755
--- a/science/ginac/DETAILS
+++ b/science/ginac/DETAILS
@@ -1,15 +1,19 @@
SPELL=ginac
- VERSION=1.3.2
+ VERSION=1.3.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ginac-$VERSION
SOURCE_URL[0]=http://www.ginac.de/$SOURCE
SOURCE_URL[1]=ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/$SOURCE
-
SOURCE_HASH=sha512:90e95df671420667950fc664a967f8e28ba9e37eadcb016364191668a93ab454d38bd7b30afddc985ff6b4ce96bf5f18abc7f8ee43b219e357e2bb5422e8e8fa
+
SOURCE_HASH=sha512:07d0e4877e86aa6dac6361f2a7bc8430dcae18d3072011fbf50d296f30cc0718ed30808ed4136df5b5cd4260834f2716d0306526daed9b47e4fce414ea0f9de2
WEB_SITE=http://www.ginac.de
ENTERED=20041114
LICENSE[0]=GPL
KEYWORDS="science"
SHORT="GiNaC is designed to allow the creation of integrated
systems that embed symbolic manipulations together with more established
areas of computer science (like computation- intense numeric applications,
graphical interfaces, etc.) under one roof"
cat << EOF
-GiNaC is an iterated and recursive acronym for GiNaC is Not a CAS, where CAS
stands for Computer Algebra System. It is designed to allow the creation of
integrated systems that embed symbolic manipulations together with more
established areas of computer science (like computation- intense numeric
applications, graphical interfaces, etc.) under one roof.
+GiNaC is an iterated and recursive acronym for GiNaC is Not a CAS, where
+CAS stands for Computer Algebra System. It is designed to allow the creation
+of integrated systems that embed symbolic manipulations together with more
+established areas of computer science (like computation- intense numeric
+applications, graphical interfaces, etc.) under one roof.
EOF
diff --git a/science/ginac/HISTORY b/science/ginac/HISTORY
index 5c54212..590330a 100644
--- a/science/ginac/HISTORY
+++ b/science/ginac/HISTORY
@@ -1,3 +1,7 @@
+2007-08-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.7
+ fixed long description wrap
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/science/kst/DETAILS b/science/kst/DETAILS
index 960e4bd..93195ff 100755
--- a/science/kst/DETAILS
+++ b/science/kst/DETAILS
@@ -1,8 +1,8 @@
SPELL=kst
- VERSION=1.3.1
+ VERSION=1.4.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$KDE_URL/stable/apps/KDE3.x/scientific/${SOURCE}
-
SOURCE_HASH=sha512:e0f2bb708d77eab4b99cd45e374e7067755e3412e0cf0bcbebae3718747db9b47574a8df5b5308aa9bf84a02118ae76a849fe0fe28d5aa73e56b82b694f06fe2
+
SOURCE_HASH=sha512:ea5965f552613b8e161ac1a5ed34ccf07056f0968f771a5384681ce9a64a119b8f9bbae127dae1c8c995fd5bfff5e4381dde7620c666d1b14dff2efb2105634d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://kst.kde.org/";
LICENSE[0]=GPL
diff --git a/science/kst/HISTORY b/science/kst/HISTORY
index 50337ad..dc59436 100644
--- a/science/kst/HISTORY
+++ b/science/kst/HISTORY
@@ -1,2 +1,5 @@
+2007-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.0
+
2007-02-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/science/octave-devel/DEPENDS b/science/octave-devel/DEPENDS
index 7e9f6e4..32dd483 100755
--- a/science/octave-devel/DEPENDS
+++ b/science/octave-devel/DEPENDS
@@ -1,2 +1,32 @@
depends fortran &&
-optional_depends gnuplot '' '' 'for 2d and 3d graphs'
+
+optional_depends gnuplot \
+ '' \
+ '' \
+ 'for 2d and 3d graphs' &&
+
+optional_depends readline \
+ '--with-readline' \
+ '--without-readline' \
+ 'for better command-line support' &&
+
+#
+# Can't find the MPI libraries
+#
+#optional_depends mpich2 \
+# '--with-mpi' \
+# '--without-mpi' \
+# 'for Message Passing Interface support' &&
+
+#
+# Untested
+#
+optional_depends atlas \
+ '--with-blas' \
+ '--without-blas' \
+ 'for automatically tuned linear algebra support' &&
+
+optional_depends fftw \
+ '--with-fftw' \
+ '--without-fftw' \
+ 'use the system-installed fftw'
diff --git a/science/octave-devel/FINAL b/science/octave-devel/FINAL
index 193b172..5362a0c 100755
--- a/science/octave-devel/FINAL
+++ b/science/octave-devel/FINAL
@@ -1,4 +1,6 @@
-if ! grep -q "\/usr\/lib\/octave" ${INSTALL_ROOT}/etc/ld.so.conf; then
- echo "${TRACK_ROOT}/usr/lib/octave" >> ${INSTALL_ROOT}/etc/ld.so.conf
-fi &&
+ln -sf ${INSTALL_ROOT}/usr/lib/octave-$VERSION
${INSTALL_ROOT}/usr/lib/octave &&
+
+if ! grep -q "\/usr\/lib\/octave" /etc/ld.so.conf; then
+ echo '/usr/lib/octave' >> /etc/ld.so.conf
+fi &&
ldconfig
diff --git a/science/octave-devel/HISTORY b/science/octave-devel/HISTORY
index a3eb5a7..7dc0c1b 100644
--- a/science/octave-devel/HISTORY
+++ b/science/octave-devel/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS, DEPENDS, FINAL, INSTALL: synced from octave
+
2007-08-11 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 2.9.13

diff --git a/science/octave-devel/INSTALL b/science/octave-devel/INSTALL
deleted file mode 100755
index 168f5ab..0000000
--- a/science/octave-devel/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_install &&
-
-ln -sf ${TRACK_ROOT}/usr/lib/octave-$VERSION ${INSTALL_ROOT}/usr/lib/octave
diff --git a/science/octave/DEPENDS b/science/octave/DEPENDS
index b1d2ebd..32dd483 100755
--- a/science/octave/DEPENDS
+++ b/science/octave/DEPENDS
@@ -1,4 +1,3 @@
-depends gcc34 &&
depends fortran &&

optional_depends gnuplot \
diff --git a/science/octave/DETAILS b/science/octave/DETAILS
index e01b23d..34868a6 100755
--- a/science/octave/DETAILS
+++ b/science/octave/DETAILS
@@ -1,13 +1,12 @@
SPELL=octave
- VERSION=2.1.73
-
SOURCE_HASH=sha512:c2af4ac9607b3638893981cf68dc5743a1c0dca014dc6bbeeac4141995ce16b11810cf81a9473f517aa8f836d1a5824d43fbdf43c7e1c8d20f9aebb92f915960
+ VERSION=2.9.13
+
SOURCE_HASH=sha512:1835508274a928b349dbbb901c1c1ffa27173c6dd49d4e319fced8f3da6cbe25a16296c69c73572fa582a2487cfdd3e398847fc33145558f37a1c6b85cbfba38
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.octave.org/pub/$SPELL/bleeding-edge/$SOURCE
WEB_SITE=http://www.octave.org
LICENSE[0]=GPL
ENTERED=20020319
- GCC_VERSION=3.4
KEYWORDS="science"
SHORT="Octave is a MATLAB clone"

diff --git a/science/octave/FINAL b/science/octave/FINAL
index 261a630..5362a0c 100755
--- a/science/octave/FINAL
+++ b/science/octave/FINAL
@@ -1,6 +1,6 @@
-ln -s ${INSTALL_ROOT}/usr/lib/octave-$VERSION ${INSTALL_ROOT}/usr/lib/octave
&&
+ln -sf ${INSTALL_ROOT}/usr/lib/octave-$VERSION
${INSTALL_ROOT}/usr/lib/octave &&

if ! grep -q "\/usr\/lib\/octave" /etc/ld.so.conf; then
echo '/usr/lib/octave' >> /etc/ld.so.conf
-fi
+fi &&
ldconfig
diff --git a/science/octave/HISTORY b/science/octave/HISTORY
index 0689456..a0ff1a2 100644
--- a/science/octave/HISTORY
+++ b/science/octave/HISTORY
@@ -1,3 +1,7 @@
+2007-08-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS, DEPENDS: updated spell to 2.9.13, no more gcc3
+ * FINAL: overwrite the symlink
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/science/qalculate-gtk/DEPENDS b/science/qalculate-gtk/DEPENDS
index f8131c0..1ae1cfe 100755
--- a/science/qalculate-gtk/DEPENDS
+++ b/science/qalculate-gtk/DEPENDS
@@ -1,7 +1,7 @@
depends qalculate &&
depends gtk+2 &&
depends libglade2 &&
-depends scrollkeeper &&
+depends rarian &&

optional_depends yelp "" "" "for manual support"

diff --git a/science/qalculate-gtk/HISTORY b/science/qalculate-gtk/HISTORY
index 6beb7d7..9223f1b 100644
--- a/science/qalculate-gtk/HISTORY
+++ b/science/qalculate-gtk/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/science/viking/BUILD b/science/viking/BUILD
new file mode 100755
index 0000000..589720d
--- /dev/null
+++ b/science/viking/BUILD
@@ -0,0 +1,2 @@
+make_single &&
+default_build
diff --git a/science/viking/DEPENDS b/science/viking/DEPENDS
new file mode 100755
index 0000000..782e9b7
--- /dev/null
+++ b/science/viking/DEPENDS
@@ -0,0 +1,4 @@
+depends X11-LIBS &&
+depends gtk+2 &&
+depends expat &&
+depends curl
diff --git a/science/viking/DETAILS b/science/viking/DETAILS
new file mode 100755
index 0000000..1b1350b
--- /dev/null
+++ b/science/viking/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=viking
+ VERSION=0.9.2
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:2c41eb08234861dfc59fecebfbcbdcb03028b28c04800f7a2baa1018367c375a370d302f01105fc948cd257747b3b750e396f2cb08d4accb4dae1fa448a38df2
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://viking.sf.net/ "
+ LICENSE[0]=GPL
+ ENTERED=20070910
+ SHORT="A GPS data editor and topo viewer."
+cat << EOF
+Viking is a GTK2-based GPS data editor and viewer. It can download and
+show Terraserver maps, import and draw tracks and waypoints over them,
+add coordinate lines, make new tracks and waypoints, hide different things,
+and more. It uses a hierarchical layering system to organize GPS data, maps,
+and other layer types with spatial data (such as coordinate lines).
+EOF
diff --git a/science/viking/HISTORY b/science/viking/HISTORY
new file mode 100644
index 0000000..ab84aff
--- /dev/null
+++ b/science/viking/HISTORY
@@ -0,0 +1,2 @@
+2007-09-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, BUILD, HISTORY: created spell
diff --git a/security/audit/DETAILS b/security/audit/DETAILS
new file mode 100755
index 0000000..1f013db
--- /dev/null
+++ b/security/audit/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=audit
+ VERSION=1.6.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:20ee80365a6c39bb331c7a7b7023a8334f554d74a5b159cad0cd4d654628fc40bd352d068855390d4ef3f1c1036ae52f81f1421346422d713935bb708876517d

+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://people.redhat.com/sgrubb/$SPELL/$SOURCE
+ WEB_SITE=http://people.redhat.com/sgrubb/audit/
+ ENTERED=20040815
+ LICENSE[0]=GPL
+ SHORT="Userspace Tools for Linux Auditing Framework"
+cat << EOF
+The main goals were to provide system call auditing with 1) as low
+overhead as possible, and 2) without duplicating functionality that is
+already provided by SELinux (and/or other security infrastructures).
+This framework will work "stand-alone", but is not designed to provide,
+e.g., CAPP functionality without another security component in place.
+EOF
diff --git a/security/audit/HISTORY b/security/audit/HISTORY
new file mode 100644
index 0000000..a3ac637
--- /dev/null
+++ b/security/audit/HISTORY
@@ -0,0 +1,2 @@
+2007-09-13 David Brown <dmlb2000 AT gmail.com>
+ * ALL: created spell
diff --git a/security/audit/PRE_BUILD b/security/audit/PRE_BUILD
new file mode 100755
index 0000000..33efff7
--- /dev/null
+++ b/security/audit/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+./autogen.sh
diff --git a/security/fwknop/BUILD b/security/fwknop/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/security/fwknop/BUILD
@@ -0,0 +1 @@
+true
diff --git a/security/fwknop/CONFIGURE b/security/fwknop/CONFIGURE
new file mode 100755
index 0000000..9688856
--- /dev/null
+++ b/security/fwknop/CONFIGURE
@@ -0,0 +1,10 @@
+config_query_option FWKNOP_SERVER \
+ "Install server component?" y \
+ "" \
+ "--client-only" &&
+
+if [[ $FWKNOP_SERVER == '--client-only' ]]
+then
+ message "${MESSAGE_COLOR}The init script is useful only" \
+ "with the server component.$DEFAULT_COLOR"
+fi
diff --git a/security/fwknop/DEPENDS b/security/fwknop/DEPENDS
new file mode 100755
index 0000000..387478a
--- /dev/null
+++ b/security/fwknop/DEPENDS
@@ -0,0 +1,8 @@
+depends perl &&
+depends psmisc &&
+
+if [[ $FWKNOP_SERVER != '--client-only' ]]
+then
+ depends iptables &&
+ depends libcap
+fi
diff --git a/security/fwknop/DETAILS b/security/fwknop/DETAILS
new file mode 100755
index 0000000..6ed6bdc
--- /dev/null
+++ b/security/fwknop/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=fwknop
+ VERSION=1.8.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=http://www.cipherdyne.org/fwknop/download/$SOURCE
+ SOURCE2_URL[0]=http://www.cipherdyne.org/fwknop/download/$SOURCE2
+ SOURCE_GPG=fwknop.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.cipherdyne.org/fwknop/
+ ENTERED=20070821
+ LICENSE[0]=GPL
+ KEYWORDS="security"
+ SHORT="A Single Packet Authorization (SPA) implementation."
+cat << EOF
+fwknop stands for the "FireWall KNock OPerator", and implements an
+authorization scheme called Single Packet Authorization (SPA) that is
+based around iptables and libpcap. SPA requires only a single encrypted
+packet in order to communicate various pieces of information including
+desired access through an iptables policy and/or complete commands to
+execute on the target system. By using iptables to maintain a "default
+drop" stance, the main application of this program is to protect services
+such as OpenSSH with an additional layer of security in order to make the
+exploitation of vulnerabilities (both 0-day and unpatched code) much more
+difficult. With fwknop deployed, anyone using nmap to look for sshd can't
+even tell that it is listening; it makes no difference if they have a
+0-day exploit or not.
+EOF
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
new file mode 100644
index 0000000..daf2f10
--- /dev/null
+++ b/security/fwknop/HISTORY
@@ -0,0 +1,4 @@
+2007-08-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD, INSTALL,
+ fwknopd, fwknop.gpg, homedir_hack.diff, init_hack.diff:
+ Created spell.
diff --git a/security/fwknop/INSTALL b/security/fwknop/INSTALL
new file mode 100755
index 0000000..765d39e
--- /dev/null
+++ b/security/fwknop/INSTALL
@@ -0,0 +1 @@
+./install.pl --Defaults $FWKNOP_SERVER
diff --git a/security/fwknop/PRE_BUILD b/security/fwknop/PRE_BUILD
new file mode 100755
index 0000000..7870077
--- /dev/null
+++ b/security/fwknop/PRE_BUILD
@@ -0,0 +1,17 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+#
+# Prevent client-only installation from putting files under /root
+#
+patch -p0 < "$SCRIPT_DIRECTORY/homedir_hack.diff" &&
+
+#
+# Prevent init script installation
+#
+patch -p0 < "$SCRIPT_DIRECTORY/init_hack.diff" &&
+
+#
+# Change client-only installation's lib path from /lib to /usr/lib
+#
+sed -i "s|\$homedir/lib|\$homedir/usr/lib|g" install.pl
diff --git a/security/fwknop/fwknop.gpg b/security/fwknop/fwknop.gpg
new file mode 100644
index 0000000..94142f8
Binary files /dev/null and b/security/fwknop/fwknop.gpg differ
diff --git a/security/fwknop/homedir_hack.diff
b/security/fwknop/homedir_hack.diff
new file mode 100644
index 0000000..7abaf95
--- /dev/null
+++ b/security/fwknop/homedir_hack.diff
@@ -0,0 +1,18 @@
+--- install.pl~ 2007-06-04 02:13:34.000000000 +0000
++++ install.pl 2007-08-21 11:57:27.000000000 +0000
+@@ -224,15 +224,7 @@
+
+ if ($client_install) {
+
+- ### we are installing as a normal user instead of root, so see
+- ### if it is ok to install within the user's home directory
+ $homedir = '';
+- if ($config_homedir) {
+- $homedir = $config_homedir;
+- } else {
+- $homedir = $ENV{'HOME'} or die '[*] Could not get home ',
+- "directory, set the $config_homedir var.";
+- }
+
+ print
+ " The fwknop client will be installed at $homedir/bin/fwknop, and a
few\n",
diff --git a/security/fwknop/init.d/fwknopd b/security/fwknop/init.d/fwknopd
new file mode 100644
index 0000000..3b135ad
--- /dev/null
+++ b/security/fwknop/init.d/fwknopd
@@ -0,0 +1,24 @@
+PROGRAM=/usr/sbin/fwknopd
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ echo "Starting the fwknop daemons..."
+ /usr/sbin/fwknopd
+ evaluate_retval
+}
+
+stop()
+{
+ echo "Stopping the fwknop daemons..."
+ /usr/sbin/fwknopd --Kill
+ evaluate_retval
+}
+
+status()
+{
+ /usr/sbin/fwknopd --Status
+}
diff --git a/security/fwknop/init_hack.diff b/security/fwknop/init_hack.diff
new file mode 100644
index 0000000..5246cfb
--- /dev/null
+++ b/security/fwknop/init_hack.diff
@@ -0,0 +1,20 @@
+--- install.pl~ 2007-06-04 02:13:34.000000000 +0000
++++ install.pl 2007-08-21 13:27:36.000000000 +0000
+@@ -640,16 +640,12 @@
+ }
+ }
+
+- if (-d $INIT_DIR) {
+- &enable_fwknop_at_boot($distro) unless $data_method =~
/client/i;
+- }
+-
+ if ($data_method =~ /client/i) {
+ print "\n[+] fwknop has been installed!\n\n";
+ } else {
+ print
+ "\n[+] fwknop has been installed! To start in server mode, run\n\n",
+-" \"/etc/init.d/fwknop start\"\n\n",
++" \"telinit run fwknopd start\"\n\n",
+ " Note: You will need to edit $config{'FWKNOP_CONF_DIR'}/access.conf for
fwknop to\n",
+ " function properly in server mode. More information can be found in\n",
+ " the fwknop manpage.\n\n";
diff --git a/security/pam_skey/BUILD b/security/pam_skey/BUILD
new file mode 100755
index 0000000..2532203
--- /dev/null
+++ b/security/pam_skey/BUILD
@@ -0,0 +1,2 @@
+OPTS="--libdir=$INSTALL_ROOT/lib $OPTS" &&
+default_build
diff --git a/security/pam_skey/DEPENDS b/security/pam_skey/DEPENDS
new file mode 100755
index 0000000..9b7f608
--- /dev/null
+++ b/security/pam_skey/DEPENDS
@@ -0,0 +1,2 @@
+depends skey &&
+depends linux-pam
diff --git a/security/pam_skey/DETAILS b/security/pam_skey/DETAILS
new file mode 100755
index 0000000..bff7887
--- /dev/null
+++ b/security/pam_skey/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=pam_skey
+ VERSION=1.1.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://dkorunic.net/tarballs/${SOURCE}
+
SOURCE_HASH=sha512:c4249b97c0b58fac6c128f28f6bfa7617dbee40f236588eaecd40679652cf46c1f0f101730660f1566668ff1d7c83fcbebfae215a3bb8fcab007004f1a2a3aa9
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://freshmeat.net/projects/pam_skey";
+ LICENSE[0]=GPL
+ ENTERED=20070903
+ SHORT="PAM S/Key module based on original Wietse Venema's
logdaemon package."
+cat << EOF
+PAM S/Key is a module based on the original S/Key suite from Wietse Venema's
+logdaemon. It is written to work with all PAM-based Unices, including
FreeBSD,
+Solaris, and Linux. It should work with any S/Key library that is fully
+interface-compatible with logdaemon.
+EOF
diff --git a/security/pam_skey/HISTORY b/security/pam_skey/HISTORY
new file mode 100644
index 0000000..be35290
--- /dev/null
+++ b/security/pam_skey/HISTORY
@@ -0,0 +1,3 @@
+2007-09-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, HISTORY: created spell
+ * pam_skey-1.1.4-gentoo.patch: created spell
diff --git a/security/pam_skey/PRE_BUILD b/security/pam_skey/PRE_BUILD
new file mode 100755
index 0000000..f48810e
--- /dev/null
+++ b/security/pam_skey/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/pam_skey-1.1.4-gentoo.patch
diff --git a/security/pam_skey/pam_skey-1.1.4-gentoo.patch
b/security/pam_skey/pam_skey-1.1.4-gentoo.patch
new file mode 100644
index 0000000..a1403d0
--- /dev/null
+++ b/security/pam_skey/pam_skey-1.1.4-gentoo.patch
@@ -0,0 +1,1706 @@
+diff -Nur pam_skey-1.1.4/INSTALL pam_skey/INSTALL
+--- pam_skey-1.1.4/INSTALL 2005-06-18 14:11:24.000000000 +0200
++++ pam_skey/INSTALL 2006-03-06 09:26:55.000000000 +0100
+@@ -1,5 +1,39 @@
+ $Id: INSTALL,v 1.1.1.1 2005/06/18 12:11:24 kreator Exp $
+
++Gentoo patch
++------------
++Most everything below still holds, though the libraries required are now
++those used by Gentoo. Other S/Key libraries may work with a bit of
++tweaking.
++
++The options listed for the module below are no longer valid. See the
++Gentoo patch section in README for details.
++
++The intended method for configuring PAM is by using the newer module
++specification, with a line like:
++
++auth [success=done ignore=ignore auth_err=die default=bad]
/lib/security/pam_skey.so
++
++This is a combination of the standard "sufficient" and "requisite"
++specifications:
++
++- If the module returns PAM_SUCCESS, we are authenticated and no other
++ modules should be tested.
++- If the module returns PAM_IGNORE, then the module didn't accept its
++ input as an S/Key response, and the next module should try using
++ the input (using the try_first_pass option).
++- If the module returns PAM_AUTH_ERR, then the module accepted an
++ S/Key input but it was invalid. Do not try any more modules in the
++ stack; the user already chose S/Key authentication.
++- If the module returns any other code, it is a simple error in processing.
++ Set the error flag but try other modules, just in case.
++
++The module is intended to be placed before another authentication module,
++like pam_unix.so; if not, it should be placed before pam_deny.so.
++
++If the newer module specification is unavailable in your version of PAM,
++the "sufficient" specification will work.
++
+ Required
+ --------
+ For building this package you will probably need original Wietse Venema's
+diff -Nur pam_skey-1.1.4/Makefile.in pam_skey/Makefile.in
+--- pam_skey-1.1.4/Makefile.in 2005-06-18 14:11:24.000000000 +0200
++++ pam_skey/Makefile.in 2006-03-06 09:26:55.000000000 +0100
+@@ -12,42 +12,26 @@
+ LIBS=@LIBS@ @SKEYLIB@ @PAMLIB@
+ LDFLAGS=@LDFLAGS@
+
+-INSTALL=@INSTALL@ -m 644
++INSTALL=@INSTALL@
++INSTALL_LIB=${INSTALL} -m 755
+ RM=@RM@ -f
+ CP=@CP@ -f
+ LN=@LN@ -s
+ AWK=@AWK@
+
+-PAM_FILES=pam_skey.so.1 pam_skey_access.so.1
++PAM_FILES=pam_skey.so
+
+ all: $(PAM_FILES)
+
+-pam_skey.so.1: pam_skey.o
+- $(CC) $(CFLAGS) -o $@ $< $(LIBS) $(LDFLAGS)
+-
+-pam_skey_access.so.1: pam_skey_access.o
++pam_skey.so: pam_skey.o
+ $(CC) $(CFLAGS) -o $@ $< $(LIBS) $(LDFLAGS)
+
+ lint-pam_skey:
+ lclint $(CFLAGS) pam_skey.c
+
+-lint-pam_skey_access:
+- lclint $(CFLAGS) pam_skey_access.c
+-
+-install:
+- @if test ! -d $(INSTALLDIR); then \
+- echo "Missing $(INSTALLDIR). Problem with PAM installation?";
\
+- else \
+- for file in $(PAM_FILES); do \
+- if test ! -f "$(INSTALLDIR)/$$file"; then \
+- echo "Installing $$file in $(INSTALLDIR)"; \
+- $(INSTALL) "$$file" "$(INSTALLDIR)/$$file"; \
+- (cd $(INSTALLDIR) && $(LN) "$$file" `echo
$$file | cut -d. -f1,2`); \
+- else \
+- echo "$$file exists - will not overwrite it";
\
+- fi \
+- done \
+- fi
++install: all
++ $(INSTALL) -d $(INSTALLDIR)
++ $(INSTALL_LIB) $(PAM_FILES) $(INSTALLDIR)
+
+ clean:
+ $(RM) a.out core *.so.1 *.o *.bak
+diff -Nur pam_skey-1.1.4/README pam_skey/README
+--- pam_skey-1.1.4/README 2005-06-18 14:36:18.000000000 +0200
++++ pam_skey/README 2006-03-06 09:26:55.000000000 +0100
+@@ -1,5 +1,77 @@
+ $Id: README,v 1.2 2005/06/18 12:36:18 kreator Exp $
+
++Gentoo patch
++------------
++
++The Gentoo pam_skey patch changes the original module in a number of ways.
++The behavior of the module is changed to make it more consistent with the
++PAM design, and several changes were made throughout the code to make the
++module interact better with the skey library used by Gentoo. Many of
++these changes will break pam_skey's compatibility with other systems and
++libraries, but this is, after all, the Gentoo patch.
++
++A (not necessarily) exhaustive list of the changes is as follows:
++- pam_skey_access.so is completely removed, since the Gentoo skey library
++ does not support the skey_access() call.
++- The pam_skey.so authentication code is completely rewritten. The
++ original code contained many references to the standard I/O library
++ (writing to stderr, etc.), as well as inconsistent communication with
++ the PAM libraries. Also, the authentication process is different, as
++ described below.
++- The options accepted by the pam_skey.so module are different, as
++ described below.
++
++Four options are accepted by the pam_skey.so module:
++ debug - This option turns on debug logging.
++ try_first_pass - This option tells the module to first try using
++ the authentication token passed from the
++ previous module as an S/Key response, before
++ informing the user of the challenge. If the
++ token is not valid, the module will proceed with
++ the standard process of challenging the user
++ and requesting a response, subject to the
++ no_default_skey option below.
++ use_first_pass - This option is identical to the try_first_pass
++ option, except that if the token is not valid,
++ it will return silently without challenging the
++ user.
++ no_default_skey - This flag changes the behavior of pam_skey.
++ Instead of immediately challenging the user with
++ an S/Key challenge, it will present the user with
++ a standard "Password: " prompt. If the user enters
++ the password "s/key" (case insensitive), it will
++ then challenge the user. Any other input will
++ cause the module to pass the given password to the
++ next module in the authentication stack (usually
++ pam_unix.so with the try_first_pass option).
++
++The exact behavior of pam_skey.so is detailed below:
++
++1. Retrieve username from PAM, possibly querying the user for it.
++2. If the user does not have any S/Key information, return PAM_IGNORE to
++ proceed to the next module in the stack.
++3. If *_first_pass is enabled, check the given authentication token to see
++ if it is a valid response to the current S/Key challenge. If so,
++ return PAM_SUCCESS.
++ 3a. If the token is invalid and use_first_pass is enabled, return
++ PAM_IGNORE.
++4. If no_default_skey is enabled, issue a "Password: " prompt.
++ 4a. If the response is anything besides "s/key" (case insensitive),
++ store it as the authentication token and return PAM_IGNORE.
++5. Display the current S/Key challenge and request a response, with
++ input not echoed. If no_default_skey is enabled, this will only be
++ an S/Key response request; otherwise, it will request either an
++ S/Key response or a system passsword.
++ 5a. If an empty response is given, request the S/Key response again,
++ this time with input echoed.
++ 5b. If the response is a valid S/Key response, return PAM_SUCCESS.
++ Otherwise, return PAM_AUTHERR.
++6. If the response is a valid S/Key response, return PAM_SUCCESS.
++7. Otherwise, if no_default_skey is enabled (the user specifically
++ requested "s/key" authentication), return PAM_AUTHERR.
++8. Otherwise, store the response as the authentication token and
++ return PAM_IGNORE.
++
+ About
+ -----
+ This is complete pam_skey modul as interface to existing S/Key
+diff -Nur pam_skey-1.1.4/autoconf/acconfig.h pam_skey/autoconf/acconfig.h
+--- pam_skey-1.1.4/autoconf/acconfig.h 2005-06-18 14:11:24.000000000 +0200
++++ pam_skey/autoconf/acconfig.h 2006-03-06 09:26:55.000000000 +0100
+@@ -1,17 +1,2 @@
+ /* Define if we can include both string.h and strings.h */
+ #undef STRING_WITH_STRINGS
+-
+-/* Define if you have Linux */
+-#undef LINUX
+-
+-/* Define if you have *BSD */
+-#undef BSD
+-
+-/* Define if not missing skeyaccess() */
+-#undef HAVE_SKEYACCESS
+-
+-/* Define if not missing skeyinfo() */
+-#undef HAVE_SKEYINFO
+-
+-/* Define if you have skeylookup() instead of skeyinfo() */
+-#undef HAVE_SKEYLOOKUP
+diff -Nur pam_skey-1.1.4/autoconf/configure.in pam_skey/autoconf/configure.in
+--- pam_skey-1.1.4/autoconf/configure.in 2005-06-18 14:11:24.000000000
+0200
++++ pam_skey/autoconf/configure.in 2006-03-06 09:26:55.000000000 +0100
+@@ -10,21 +10,9 @@
+ AC_LANG_C
+ AC_LANG_SAVE
+
+-dnl Get system type
+-AC_CANONICAL_HOST
+-MYHOST=$host_os
+-case "$host_os" in
+-*linux*)
+- AC_DEFINE(LINUX)
+- ;;
+-*bsd*)
+- AC_DEFINE(BSD)
+- ;;
+-esac
+-
+ dnl Package information
+ PACKAGE=pam_skey
+-VERSION=1.1
++VERSION=1.4r1
+
+ dnl Standard installation path
+ AC_PREFIX_DEFAULT(/usr)
+@@ -65,13 +53,9 @@
+ AC_ARG_WITH(skey-inc, [ --with-skey-inc=DIR Directory containing skey
include files], CFLAGS="${CFLAGS} -I${withval}")
+
+ dnl Check for skey library
+-AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(nsl, gethostbyname)
++AC_CHECK_LIB(socket, socket, LIBS="${LIBS} -lsocket")
++AC_CHECK_LIB(nsl, gethostbyname, LIBS="${LIBS} -lnsl")
+ AC_CHECK_LIB(skey, skeyverify, SKEYLIB="-lskey", AC_MSG_ERROR(skey library
not found or unknown interface))
+-AC_CHECK_LIB(skey, skeyaccess, AC_DEFINE(HAVE_SKEYACCESS))
+-AC_CHECK_LIB(skey, skeyinfo, AC_DEFINE(HAVE_SKEYINFO),
+- AC_CHECK_LIB(skey, skeylookup, AC_DEFINE(HAVE_SKEYLOOKUP))
+-)
+
+ dnl Check against -G linker flag
+ hold_ldflags=$LDFLAGS
+diff -Nur pam_skey-1.1.4/configure pam_skey/configure
+--- pam_skey-1.1.4/configure 2005-06-18 14:36:18.000000000 +0200
++++ pam_skey/configure 2006-03-06 09:27:41.000000000 +0100
+@@ -310,7 +310,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE RM LN CP AWK INSTALL_PROGRAM
INSTALL_SCRIPT INSTALL_DATA CPP EGREP SKEYLIB PAMLIB MYHOST PACKAGE VERSION
LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE RM LN CP AWK INSTALL_PROGRAM
INSTALL_SCRIPT INSTALL_DATA CPP EGREP SKEYLIB PAMLIB MYHOST PACKAGE VERSION
LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -720,13 +720,13 @@
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ srcdir=$ac_confdir
+- if test ! -r $srcdir/$ac_unique_file; then
++ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+ else
+ ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
++if test ! -r "$srcdir/$ac_unique_file"; then
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in
$ac_confdir or .." >&2
+ { (exit 1); exit 1; }; }
+@@ -735,7 +735,7 @@
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not
work" >&2
+ { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+@@ -831,10 +831,6 @@
+ _ACEOF
+
+ cat <<\_ACEOF
+-
+-System types:
+- --build=BUILD configure for building on BUILD [guessed]
+- --host=HOST cross-compile to build programs to run on HOST [BUILD]
+ _ACEOF
+ fi
+
+@@ -948,7 +944,7 @@
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
+
+@@ -1333,78 +1329,8 @@
+
+
+
+-# Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+- { (exit 1); exit 1; }; }
+-
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+-if test "${ac_cv_build+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+- ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:$LINENO: error: cannot guess build type; you must
specify one" >&5
+-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+- { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias
failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+- { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
+-build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+-if test "${ac_cv_host+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+- ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed"
>&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+- { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
+-host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-
+-MYHOST=$host_os
+-case "$host_os" in
+-*linux*)
+- cat >>confdefs.h <<\_ACEOF
+-#define LINUX 1
+-_ACEOF
+-
+- ;;
+-*bsd*)
+- cat >>confdefs.h <<\_ACEOF
+-#define BSD 1
+-_ACEOF
+-
+- ;;
+-esac
+-
+ PACKAGE=pam_skey
+-VERSION=1.1
++VERSION=1.4r1
+
+
+
+@@ -1976,7 +1902,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2034,7 +1961,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2150,7 +2078,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2204,7 +2133,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2249,7 +2179,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2293,7 +2224,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2881,7 +2813,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3051,7 +2984,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3124,7 +3058,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3278,7 +3213,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3431,7 +3367,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3533,7 +3470,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3583,7 +3521,6 @@
+ CFLAGS="${CFLAGS} -I${withval}"
+ fi;
+
+-
+ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+ echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_socket+set}" = set; then
+@@ -3622,7 +3559,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3648,15 +3586,9 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
+ if test $ac_cv_lib_socket_socket = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBSOCKET 1
+-_ACEOF
+-
+- LIBS="-lsocket $LIBS"
+-
++ LIBS="${LIBS} -lsocket"
+ fi
+
+-
+ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+@@ -3695,7 +3627,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3721,12 +3654,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBNSL 1
+-_ACEOF
+-
+- LIBS="-lnsl $LIBS"
+-
++ LIBS="${LIBS} -lnsl"
+ fi
+
+ echo "$as_me:$LINENO: checking for skeyverify in -lskey" >&5
+@@ -3767,7 +3695,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3800,218 +3729,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-echo "$as_me:$LINENO: checking for skeyaccess in -lskey" >&5
+-echo $ECHO_N "checking for skeyaccess in -lskey... $ECHO_C" >&6
+-if test "${ac_cv_lib_skey_skeyaccess+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lskey $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char skeyaccess ();
+-int
+-main ()
+-{
+-skeyaccess ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_skey_skeyaccess=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_skey_skeyaccess=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_skey_skeyaccess" >&5
+-echo "${ECHO_T}$ac_cv_lib_skey_skeyaccess" >&6
+-if test $ac_cv_lib_skey_skeyaccess = yes; then
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SKEYACCESS 1
+-_ACEOF
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking for skeyinfo in -lskey" >&5
+-echo $ECHO_N "checking for skeyinfo in -lskey... $ECHO_C" >&6
+-if test "${ac_cv_lib_skey_skeyinfo+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lskey $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char skeyinfo ();
+-int
+-main ()
+-{
+-skeyinfo ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_skey_skeyinfo=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_skey_skeyinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_skey_skeyinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_skey_skeyinfo" >&6
+-if test $ac_cv_lib_skey_skeyinfo = yes; then
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SKEYINFO 1
+-_ACEOF
+-
+-else
+- echo "$as_me:$LINENO: checking for skeylookup in -lskey" >&5
+-echo $ECHO_N "checking for skeylookup in -lskey... $ECHO_C" >&6
+-if test "${ac_cv_lib_skey_skeylookup+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lskey $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char skeylookup ();
+-int
+-main ()
+-{
+-skeylookup ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_skey_skeylookup=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_skey_skeylookup=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_skey_skeylookup" >&5
+-echo "${ECHO_T}$ac_cv_lib_skey_skeylookup" >&6
+-if test $ac_cv_lib_skey_skeylookup = yes; then
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SKEYLOOKUP 1
+-_ACEOF
+-
+-fi
+-
+-
+-fi
+-
+
+ hold_ldflags=$LDFLAGS
+ echo "$as_me:$LINENO: checking for the ld -shared flag" >&5
+@@ -4041,7 +3758,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4099,7 +3817,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4747,14 +4466,6 @@
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
+-s,@build@,$build,;t t
+-s,@build_cpu@,$build_cpu,;t t
+-s,@build_vendor@,$build_vendor,;t t
+-s,@build_os@,$build_os,;t t
+-s,@host@,$host,;t t
+-s,@host_cpu@,$host_cpu,;t t
+-s,@host_vendor@,$host_vendor,;t t
+-s,@host_os@,$host_os,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+ s,@LDFLAGS@,$LDFLAGS,;t t
+@@ -4945,6 +4656,11 @@
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -4983,12 +4699,6 @@
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+-
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+diff -Nur pam_skey-1.1.4/defs.h.in pam_skey/defs.h.in
+--- pam_skey-1.1.4/defs.h.in 2005-06-18 14:36:18.000000000 +0200
++++ pam_skey/defs.h.in 2006-03-06 09:26:55.000000000 +0100
+@@ -1,96 +1,49 @@
+-/* defs.h.in. Generated from configure.in by autoheader. */
+-/* Define if we can include both string.h and strings.h */
+-#undef STRING_WITH_STRINGS
+-
+-/* Define if you have Linux */
+-#undef LINUX
+-
+-/* Define if you have *BSD */
+-#undef BSD
++/* defs.h.in. Generated automatically from configure.in by autoheader. */
+
+-/* Define if not missing skeyaccess() */
+-#undef HAVE_SKEYACCESS
+-
+-/* Define if not missing skeyinfo() */
+-#undef HAVE_SKEYINFO
++/* Define if you have the ANSI C header files. */
++#undef STDC_HEADERS
+
+-/* Define if you have skeylookup() instead of skeyinfo() */
+-#undef HAVE_SKEYLOOKUP
++/* Define if we can include both string.h and strings.h */
++#undef STRING_WITH_STRINGS
+
+-/* Define to 1 if you have the `fprintf' function. */
++/* Define if you have the fprintf function. */
+ #undef HAVE_FPRINTF
+
+-/* Define to 1 if you have the <inttypes.h> header file. */
+-#undef HAVE_INTTYPES_H
++/* Define if you have the gethostbyname function. */
++#undef HAVE_GETHOSTBYNAME
+
+-/* Define to 1 if you have the `nsl' library (-lnsl). */
+-#undef HAVE_LIBNSL
++/* Define if you have the snprintf function. */
++#undef HAVE_SNPRINTF
+
+-/* Define to 1 if you have the `socket' library (-lsocket). */
+-#undef HAVE_LIBSOCKET
++/* Define if you have the strncmp function. */
++#undef HAVE_STRNCMP
+
+-/* Define to 1 if you have the <memory.h> header file. */
+-#undef HAVE_MEMORY_H
++/* Define if you have the syslog function. */
++#undef HAVE_SYSLOG
+
+-/* Define to 1 if you have the <pwd.h> header file. */
++/* Define if you have the <pwd.h> header file. */
+ #undef HAVE_PWD_H
+
+-/* Define to 1 if you have the <security/pam_appl.h> header file. */
++/* Define if you have the <security/pam_appl.h> header file. */
+ #undef HAVE_SECURITY_PAM_APPL_H
+
+-/* Define to 1 if you have the <security/pam_modules.h> header file. */
++/* Define if you have the <security/pam_modules.h> header file. */
+ #undef HAVE_SECURITY_PAM_MODULES_H
+
+-/* Define to 1 if you have the `snprintf' function. */
+-#undef HAVE_SNPRINTF
+-
+-/* Define to 1 if you have the <stdint.h> header file. */
+-#undef HAVE_STDINT_H
+-
+-/* Define to 1 if you have the <stdlib.h> header file. */
++/* Define if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+
+-/* Define to 1 if you have the <strings.h> header file. */
+-#undef HAVE_STRINGS_H
+-
+-/* Define to 1 if you have the <string.h> header file. */
++/* Define if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+
+-/* Define to 1 if you have the `strncmp' function. */
+-#undef HAVE_STRNCMP
+-
+-/* Define to 1 if you have the `syslog' function. */
+-#undef HAVE_SYSLOG
+-
+-/* Define to 1 if you have the <syslog.h> header file. */
+-#undef HAVE_SYSLOG_H
+-
+-/* Define to 1 if you have the <sys/stat.h> header file. */
+-#undef HAVE_SYS_STAT_H
++/* Define if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
+
+-/* Define to 1 if you have the <sys/syslog.h> header file. */
++/* Define if you have the <sys/syslog.h> header file. */
+ #undef HAVE_SYS_SYSLOG_H
+
+-/* Define to 1 if you have the <sys/types.h> header file. */
++/* Define if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+
+-/* Define to 1 if you have the <unistd.h> header file. */
+-#undef HAVE_UNISTD_H
+-
+-/* Define to the address where bug reports for this package should be sent.
*/
+-#undef PACKAGE_BUGREPORT
+-
+-/* Define to the full name of this package. */
+-#undef PACKAGE_NAME
+-
+-/* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
+-
+-/* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
+-
+-/* Define to the version of this package. */
+-#undef PACKAGE_VERSION
+-
+-/* Define to 1 if you have the ANSI C header files. */
+-#undef STDC_HEADERS
++/* Define if you have the <syslog.h> header file. */
++#undef HAVE_SYSLOG_H
+diff -Nur pam_skey-1.1.4/pam_skey.c pam_skey/pam_skey.c
+--- pam_skey-1.1.4/pam_skey.c 2005-06-18 14:36:18.000000000 +0200
++++ pam_skey/pam_skey.c 2006-03-06 09:26:55.000000000 +0100
+@@ -1,5 +1,6 @@
+ /*
+- * (c) 2001 Dinko Korunic, kreator AT srce.hr
++ * Rewrite (c) 2005 Dani Church, dani.church AT gmail.com
++ * Original (c) 2001 Dinko Korunic, kreator AT srce.hr
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+@@ -33,272 +34,146 @@
+ #include <pwd.h>
+ #include <sys/types.h>
+ #include <syslog.h>
++#include <ctype.h>
+
+ #define PAM_EXTERN extern
+ #undef PAM_STATIC
+
+ #include <security/pam_appl.h>
+ #include <security/pam_modules.h>
++#include <security/_pam_macros.h>
+
+ #include "skey.h"
+ #include "pam_skey.h"
+ #include "misc.h"
+
++#define LOGDEBUG(x) if (mod_opt & _MOD_DEBUG) { syslog x ;}
++#define QUERY_USERNAME NULL /* Use default username prompt */
++#define QUERY_PASSWORD "Password: "
++#define QUERY_RESPONSE_OR_PASSWORD "S/Key response or system password: "
++#define QUERY_RESPONSE "S/Key response: "
++
+ PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags,
+ int argc, const char **argv)
+ {
+ return PAM_SUCCESS;
+ }
+
++/*
++ * The authentication module will return the following status codes:
++ * PAM_SUCCESS: Successful authentication via S/Key.
++ * PAM_IGNORE: The user doesn't have S/Key or doesn't want to use it.
++ * Continue with the next module, using try_first_pass.
++ * PAM_AUTH_ERR: The user asked to use S/Key, but failed the authentication.
++ * Don't try any more PAM modules.
++ * others: random errors, try next authentication method
++ */
++
+ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,
+ int argc, const char **argv)
+ {
+- char challenge[CHALLENGE_MAXSIZE]; /* challenge to print in conv */
+- char msg_text[PAM_MAX_MSG_SIZE]; /* text for pam conv */
+- char *username = NULL; /* username spacer */
++ const char *challenge; /* challenge to print in conv */
++ const char *username = NULL; /* username spacer */
+ char *response = NULL; /* response spacer */
+- struct skey skey; /* structure that contains skey information */
+ int status; /* return status spacer */
+- unsigned mod_opt = _MOD_NONE_ON; /* module options */
++ unsigned mod_opt=_MOD_NONE_ON; /* module options */
+
+ /* Get module options */
+ mod_getopt(&mod_opt, argc, argv);
+
+- /* Get username */
+-#if defined LINUX || defined BSD
+- if (pam_get_user(pamh, (const char **)&username, "login:")
+-#else
+- if (pam_get_user(pamh, (char **)&username, "login:")
+-#endif
+- != PAM_SUCCESS)
+- {
+- fprintf(stderr, "cannot determine username\n");
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "cannot determine username");
+- return PAM_USER_UNKNOWN;
+- }
+-
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "got username %s", username);
+-
+-#ifdef HAVE_SKEYACCESS
+- /* Check S/Key access permissions - user, host and port. Also include
+- * sanity checks */
+- if (mod_opt & _MOD_ACCESS_CHECK)
+- {
+- char *host; /* points to host */
+- char *port; /* points to port */
+- struct passwd *pwuser; /* structure for getpw() */
+-
+- /* Get host.. */
+-#if defined LINUX || defined BSD
+- if (pam_get_item(pamh, PAM_RHOST, (const void **)&host)
+-#else
+- if (pam_get_item(pamh, PAM_RHOST, (void **)&host)
+-#endif
+- != PAM_SUCCESS)
+- host = NULL; /* couldn't get host */
+- /* ..and port */
+-#if defined LINUX || defined BSD
+- if (pam_get_item(pamh, PAM_TTY, (const void **)&port)
+-#else
+- if (pam_get_item(pamh, PAM_TTY, (void **)&port)
+-#endif
+- != PAM_SUCCESS)
+- port = NULL; /* couldn't get port */
+-
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "checking s/key access for user %s,"
+- " host %s, port %s", username,
+- (host != NULL) ? host : "*unknown*",
+- (port != NULL) ? port : "*unknown*");
+-
+- /* Get information from passwd file */
+- if ((pwuser = getpwnam(username)) == NULL)
+- {
+- fprintf(stderr, "no such user\n");
+- syslog(LOG_NOTICE, "cannot find user %s", username);
+- return PAM_USER_UNKNOWN; /* perhaps even return PAM_ABORT here? */
++ /* Get username (taken mainly from pam_unix) */
++ status = pam_get_user(pamh, &username, QUERY_USERNAME);
++ if (status == PAM_SUCCESS) {
++ if (username == NULL || !isalnum(*username)) {
++ syslog(LOG_ERR, "bad username [%s]", username);
++ return PAM_USER_UNKNOWN;
+ }
++ LOGDEBUG((LOG_DEBUG, "username [%s] obtained", username));
++ } else {
++ LOGDEBUG((LOG_DEBUG, "trouble reading username"));
++ if (status == PAM_CONV_AGAIN)
++ return PAM_INCOMPLETE;
++ return status;
++ }
+
+- /* Do actual checking - we assume skeyaccess() returns PERMIT which is
+- * by default 1. Notice 4th argument is NULL - we will not perform
+- * address checks on host itself */
+- if (skeyaccess(pwuser, port, host, NULL) != 1)
+- {
+- fprintf(stderr, "no s/key access permissions\n");
+- syslog(LOG_NOTICE, "no s/key access permissions for %s",
+- username);
+- return PAM_AUTH_ERR;
+- }
++ /* Check whether or not this user has an S/Key */
++ if (skey_haskey(username) != 0) {
++ LOGDEBUG((LOG_DEBUG, "user [%s] has no S/Key entry", username));
++ return PAM_IGNORE;
+ }
+- else
+
+-#endif /* HAVE_SKEYACCESS */
+-
+- /* Only do check whether user has passwd entry */
+- if (getpwnam(username) == NULL)
+- {
+- fprintf(stderr, "no such user\n");
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "cannot find user %s",
+- username);
+- return PAM_USER_UNKNOWN;
++ if ((mod_opt & _MOD_TRY_FIRST_PASS) || (mod_opt & _MOD_USE_FIRST_PASS)) {
++ status = pam_get_item(pamh, PAM_AUTHTOK, (const void **) &response);
++ if (status != PAM_SUCCESS) {
++ syslog(LOG_ALERT, "pam_get_item returned error to pam_skey");
++ return status;
++ } else if (response != NULL) {
++ if (skey_passcheck(username, response) != -1) {
++ return PAM_SUCCESS;
++ } else if (mod_opt & _MOD_USE_FIRST_PASS) {
++ return PAM_IGNORE;
++ }
++ } else if (mod_opt & _MOD_USE_FIRST_PASS) {
++ return PAM_AUTHTOK_RECOVER_ERR;
+ }
+-
+- /* Get S/Key information on user with skeyinfo() */
+-#ifdef HAVE_SKEYINFO
+- switch (skeyinfo(&skey, username, NULL))
+-#else
+-#ifdef HAVE_SKEYLOOKUP
+- switch (skeylookup(&skey, username))
+-#endif /* HAVE_SKEYLOOKUP */
+-#endif /* HAVE_SKEYINFO */
+- {
+- /* 0: OK */
+- case 0:
+- break;
+- /* -1: File error */
+- case -1:
+-#if 0
+- /* XXX- This seems broken in (at least) logdaemon-5.8. It returns -1
+- * when user not found in keyfile. -kre */
+- fprintf(stderr, "s/key database error\n");
+- syslog(LOG_NOTICE, "s/key database error");
+- return PAM_AUTH_ERR;
+-#endif
+- /* 1: No such user in database */
+- case 1:
+- /* We won't confuse the ordinary user telling him about missing skeys
+- * -kre */
+-#if 0
+- fprintf(stderr, "no s/key for %s\n", username);
+-#endif
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "no s/key for %s\n", username);
+- return PAM_AUTH_ERR;
+ }
+-
+- /* Make challenge string */
+-#if defined(SKEY_MAX_HASHNAME_LEN) && defined(SKEY_MAX_SEED_LEN)
+- snprintf(challenge, CHALLENGE_MAXSIZE, "otp-%.*s %d %.*s",
+- SKEY_MAX_HASHNAME_LEN, skey_get_algorithm(), skey.n - 1,
SKEY_MAX_SEED_LEN, skey.seed);
+-#else
+- snprintf(challenge, CHALLENGE_MAXSIZE, "s/key %d %s",
+- skey.n - 1, skey.seed);
+-#endif
+-
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "got challenge %s for %s", challenge,
+- username);
+-
+- /* Read response from last module's PAM_AUTHTOK */
+- if (mod_opt & _MOD_USE_FIRST_PASS)
+- {
+- /* Try to extract authtoken */
+-#if defined LINUX || defined BSD
+- if (pam_get_item(pamh, PAM_AUTHTOK, (const void **)&response)
+-#else
+- if (pam_get_item(pamh, PAM_AUTHTOK, (void **)&response)
+-#endif
+- != PAM_SUCCESS)
+- {
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "could not get PAM_AUTHTOK");
+- mod_opt &= ~_MOD_USE_FIRST_PASS;
++
++ if (mod_opt & _MOD_NO_DEFAULT_SKEY) {
++ status = mod_talk_touser(pamh, mod_opt, NULL, QUERY_PASSWORD, 0,
&response);
++ if (status != PAM_SUCCESS) {
++ _pam_delete(response)
++ return status;
+ }
+- else
+- {
+- /* Got AUTHTOK, but it was empty */
+- if (empty_authtok(response))
+- {
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "empty PAM_AUTHTOK");
+- mod_opt &= ~_MOD_USE_FIRST_PASS;
+- }
+- else
+- /* All OK, print challenge information */
+- fprintf(stderr, "challenge %s\n", challenge);
++ if (strcasecmp(response,"s/key")!=0) {
++ status = pam_set_item(pamh, PAM_AUTHTOK, response);
++ if (status != PAM_SUCCESS)
++ return status;
++ return PAM_IGNORE;
+ }
++ _pam_delete(response);
+ }
+
+- /* There was no PAM_AUTHTOK, or there was no such option in pam-conf
+- * file */
+- if (!(mod_opt & _MOD_USE_FIRST_PASS))
+- {
+- /* Prepare a complete message for conversation */
+- snprintf(msg_text, PAM_MAX_MSG_SIZE,
+- "challenge %s\npassword: ", challenge);
+-
+- /* Talk with user */
+- if (mod_talk_touser(pamh, &mod_opt, msg_text, &response)
+- != PAM_SUCCESS)
+- return PAM_SERVICE_ERR;
+-
+- /* Simulate standard S/Key login procedure - if empty token, turn on
+- * ECHO and prompt again */
+- if (empty_authtok(response) && !(mod_opt & _MOD_ONLY_ONE_TRY))
+- {
+- /* Was there echo off? */
+- if (mod_opt & _MOD_ECHO_OFF)
+- {
+- _pam_delete(response);
+- fprintf(stderr, "(turning echo on)\n");
+- mod_opt &= ~_MOD_ECHO_OFF;
+-
+- /* Prepare a complete message for conversation */
+- snprintf(msg_text, PAM_MAX_MSG_SIZE, "password: ");
+-
+- /* Talk with user */
+- if (mod_talk_touser(pamh, &mod_opt, msg_text, &response)
+- != PAM_SUCCESS)
+- return PAM_SERVICE_ERR;
+-
+- /* Got again empty response. Bailout and don't save auth token */
+- if (empty_authtok(response))
+- return PAM_AUTH_ERR;
+- }
+- else
+- /* There was echo on already - just get out and don't save auth token
+- * for other modules */
+- return PAM_AUTH_ERR;
+- }
++ challenge = skey_keyinfo(username);
++ if (challenge == NULL) {
++ syslog(LOG_ALERT, "Could not retrieve S/Key challenge for [%s]",
username);
++ return PAM_AUTHINFO_UNAVAIL;
++ }
+
+- /* XXX - ECHO ON puts '\n' at the end in Solaris 2.7! This is
+- * cludge to get rid of this nasty `feature' -kre */
+- _pam_degarbage(response);
+-
+- /* Store auth token - that next module can use with `use_first_pass' */
+- if (pam_set_item(pamh, PAM_AUTHTOK, response) != PAM_SUCCESS)
+- {
+- syslog(LOG_NOTICE, "unable to save auth token");
+- return PAM_SERVICE_ERR;
+- }
++ if (mod_opt & _MOD_NO_DEFAULT_SKEY)
++ status = mod_talk_touser(pamh, mod_opt, challenge, QUERY_RESPONSE, 0,
&response);
++ else
++ status = mod_talk_touser(pamh, mod_opt, challenge,
QUERY_RESPONSE_OR_PASSWORD, 0, &response);
+
+- /* cleanup conversation */
++ if (status != PAM_SUCCESS)
++ return status;
++
++ if (*response == '\0') {
+ _pam_delete(response);
+- }
+-
+- /* Verify S/Key */
+- status = skeyverify(&skey, response);
++ status = mod_talk_touser(pamh, mod_opt, NULL, QUERY_RESPONSE, 1,
&response);
++ if (status != PAM_SUCCESS)
++ return status;
++ status = pam_set_item(pamh, PAM_AUTHTOK, response);
++ status = skey_passcheck(username, response);
++ _pam_delete(response);
++ if (status != -1)
++ return PAM_SUCCESS;
++ return PAM_AUTH_ERR;
++ }
+
+- switch (status)
+- {
+- /* 0: Verify successful, database updated */
+- case 0:
+- break;
+- /* -1: Error of some sort; database unchanged */
+- /* 1: Verify failed, database unchanged */
+- case -1:
+- case 1:
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "verify for %s failed, database"
+- " unchanged", username);
+- return PAM_AUTH_ERR;
++ status = pam_set_item(pamh, PAM_AUTHTOK, response);
++ status = skey_passcheck(username, response);
++ if (status != -1) {
++ _pam_delete(response);
++ return PAM_SUCCESS;
++ }
++
++ if (mod_opt & _MOD_NO_DEFAULT_SKEY) {
++ _pam_delete(response);
++ return PAM_AUTH_ERR;
+ }
+
+- /* Success by default */
+- return PAM_SUCCESS;
++ status = pam_set_item(pamh, PAM_AUTHTOK, response);
++ return PAM_IGNORE;
+ }
+
+ /* Get module optional parameters */
+@@ -332,50 +207,43 @@
+ }
+
+ /* This will talk to user through PAM_CONV */
+-static int mod_talk_touser(pam_handle_t *pamh, unsigned *mod_opt,
+- char *msg_text, char **response)
++static int mod_talk_touser(pam_handle_t *pamh, unsigned mod_opt,
++ const char *info_text, const char *prompt_text, int echo_on, char
**response)
+ {
+- struct pam_message message;
+- const struct pam_message *pmessage = &message;
++ struct pam_message message[2], *pmessage[2];
+ struct pam_conv *conv = NULL;
+ struct pam_response *presponse = NULL;
+-
++ int i=0;
++
+ /* Better safe than sorry */
+ *response = NULL;
+
+ /* Be paranoid */
+ memset(&message, 0, sizeof(message));
+
+- /* Turn on/off PAM echo */
+- if (*mod_opt & _MOD_ECHO_OFF)
+- message.msg_style = PAM_PROMPT_ECHO_OFF;
+- else
+- message.msg_style = PAM_PROMPT_ECHO_ON;
++ pmessage[0] = &message[0];
++ pmessage[1] = &message[1];
++
++ /* Set info text, if any */
++ if (info_text) {
++ message[i].msg = info_text;
++ message[i].msg_style = PAM_TEXT_INFO;
++ i++;
++ }
+
+- /* Point to conversation text */
+- message.msg = msg_text;
++ /* Set prompt text */
++ message[i].msg = prompt_text;
++ message[i].msg_style = echo_on ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF;
++ i++;
+
+ /* Do conversation and see if all is OK */
+-#if defined LINUX || defined BSD
+- if (pam_get_item(pamh, PAM_CONV, (const void **)&conv)
+-#else
+- if (pam_get_item(pamh, PAM_CONV, (void **)&conv)
+-#endif
+- != PAM_SUCCESS)
+- {
+- if (*mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "error in conversation");
++ if (pam_get_item(pamh, PAM_CONV, (const void **)&conv) != PAM_SUCCESS) {
++ LOGDEBUG((LOG_DEBUG, "error in conversation"));
+ return PAM_SERVICE_ERR;
+ }
+-
+- /* Convert into pam_response - only 1 reply expected */
+-#if defined LINUX || defined BSD
+- if (conv->conv(1, &pmessage, &presponse,
++ /* Convert into pam_response */
++ if (conv->conv(i, (const struct pam_message **)pmessage, &presponse,
+ conv->appdata_ptr)
+-#else
+- if (conv->conv(1, (struct pam_message **)&pmessage, &presponse,
+- conv->appdata_ptr)
+-#endif
+ != PAM_SUCCESS)
+ {
+ _pam_delete(presponse->resp);
+@@ -385,10 +253,10 @@
+ if (presponse != NULL)
+ {
+ /* Save address */
+- *response = presponse->resp;
++ *response = presponse[i-1].resp;
+ /* To ensure that response address will not be erased */
+- presponse->resp = NULL;
+- _pam_drop(presponse);
++ presponse[i-1].resp = NULL;
++ _pam_drop_reply(presponse,i);
+ }
+ else
+ return PAM_SERVICE_ERR;
+diff -Nur pam_skey-1.1.4/pam_skey.h pam_skey/pam_skey.h
+--- pam_skey-1.1.4/pam_skey.h 2005-06-18 14:36:18.000000000 +0200
++++ pam_skey/pam_skey.h 2006-03-06 09:26:55.000000000 +0100
+@@ -22,29 +22,25 @@
+ */
+
+ /* Prototypes */
+-#ifndef BSD
+-extern int skeyinfo(struct skey *, char *, char *); /* ORGH! Not in skey.h
*/
+-#endif
+-
+ static void mod_getopt(unsigned *, int, const char **);
+-static int mod_talk_touser(pam_handle_t *, unsigned *, char *, char **);
++static int mod_talk_touser(pam_handle_t *, unsigned, const char *, const
char *, int, char **);
+
+ /* free() macro */
+-#define _pam_drop(X) \
++/*#define _pam_drop(X) \
+ if (X != NULL) \
+ { \
+ free(X); \
+ X = NULL; \
+-}
++}*/
+
+ /* Secure overwrite */
+-#define _pam_overwrite(x) \
++/*#define _pam_overwrite(x) \
+ { \
+ register char *__xx__; \
+ if ((__xx__ = (x))) \
+ while (*__xx__) \
+ *__xx__++ = '\0'; \
+-}
++}*/
+
+ /* Drop-in secure replacement - we do not want cleartext passwords lying
+ * scattered around */
+@@ -56,7 +52,7 @@
+
+ /* This will get us rid of first '\n' in response string and cut-off the
+ * rest of the string. It should be ASCIIZ, of course */
+-#define _pam_degarbage(x) \
++/*#define _pam_degarbage(x) \
+ { \
+ register char *__xx__; \
+ if ((__xx__ = (x))) \
+@@ -70,30 +66,25 @@
+ else \
+ __xx__++; \
+ } \
+-}
++}*/
+
+ /* Handy empty AUTHTOK macro */
+ #define empty_authtok(a) (a == NULL || !*a || *a == '\n')
+
+-/* Maximum challenge size. It should be 64, but be sure */
+-#define CHALLENGE_MAXSIZE 128
+-
+ /* Define module flags */
+-#define _MOD_NONE_ON 0x0000 /* Generic flag */
+-#define _MOD_ALL_ON (~_MOD_NONE_ON) /* Generic mask */
+-#define _MOD_DEBUG 0x0001 /* Debugging options on */
+-#define _MOD_ECHO_OFF 0x0002 /* PAM_ECHO_OFF */
+-#define _MOD_ACCESS_CHECK 0x0004 /* Check S/Key access permissions */
+-#define _MOD_USE_FIRST_PASS 0x0008 /* Use PAM_AUTHTOK */
+-#define _MOD_ONLY_ONE_TRY 0x0010 /* Only one try, no matter of echo
*/
+-#define _MOD_SPACER 0x0020 /* Currently unused */
++#define _MOD_NONE_ON 0x0000 /* Generic flag */
++#define _MOD_ALL_ON (~_MOD_NONE_ON) /* Generic mask */
++#define _MOD_DEBUG 0x0001 /* Debugging options on */
++#define _MOD_TRY_FIRST_PASS 0x0002 /* Attempt using PAM_AUTHTOK */
++#define _MOD_USE_FIRST_PASS 0x0004 /* Only use PAM_AUTHTOK */
++#define _MOD_NO_DEFAULT_SKEY 0x0008 /* Don't use S/Key by default */
+
+ /* Setup defaults - use echo off only */
+-#define _MOD_DEFAULT_FLAG _MOD_ECHO_OFF
++#define _MOD_DEFAULT_FLAG _MOD_NONE_ON
+ #define _MOD_DEFAULT_MASK _MOD_ALL_ON
+
+ /* Number of parameters currently known */
+-#define _MOD_ARGS 8
++#define _MOD_ARGS 4
+
+ /* Structure for flexible argument parsing */
+ typedef struct
+@@ -108,11 +99,7 @@
+ {
+ /* String Mask Flag */
+ {"debug", _MOD_ALL_ON, _MOD_DEBUG},
+- {"echo=off", _MOD_ALL_ON, _MOD_ECHO_OFF},
+- {"echo=on", _MOD_ALL_ON^_MOD_ECHO_OFF, _MOD_NONE_ON},
+- {"access_check=on", _MOD_ALL_ON, _MOD_ACCESS_CHECK},
+- {"access_check=off", _MOD_ALL_ON^_MOD_ACCESS_CHECK, _MOD_NONE_ON},
++ {"try_first_pass", _MOD_ALL_ON, _MOD_TRY_FIRST_PASS},
+ {"use_first_pass", _MOD_ALL_ON, _MOD_USE_FIRST_PASS},
+- {"try_first_pass", _MOD_ALL_ON, _MOD_USE_FIRST_PASS},
+- {"only_one_try", _MOD_ALL_ON, _MOD_ONLY_ONE_TRY}
++ {"no_default_skey", _MOD_ALL_ON, _MOD_NO_DEFAULT_SKEY}
+ };
+diff -Nur pam_skey-1.1.4/pam_skey_access.c pam_skey/pam_skey_access.c
+--- pam_skey-1.1.4/pam_skey_access.c 2005-06-18 14:36:18.000000000 +0200
++++ pam_skey/pam_skey_access.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,161 +0,0 @@
+-/*
+- * (c) 2001 Dinko Korunic, kreator AT srce.hr
+- *
+- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- *
+- * S/KEY is a trademark of Bellcore.
+- * Mink is the former name of the S/KEY authentication system.
+- *
+- * Programs that had some influence in development of this source:
+- * Wietse Venema's logdaemon package
+- * Olaf Kirch's Linux S/Key package
+- * Linux-PAM modules and templates
+- * Wyman Miles' pam_securid module
+- *
+- * Should you choose to use and/or modify this source code, please do so
+- * under the terms of the GNU General Public License under which this
+- * program is distributed.
+- */
+-
+-static char rcsid[] = "$Id: pam_skey_access.c,v 1.2 2005/06/18 12:36:18
kreator Exp $";
+-
+-#include "defs.h"
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#ifdef STRING_WITH_STRINGS
+-# include <strings.h>
+-#endif
+-#include <unistd.h>
+-#include <pwd.h>
+-#include <sys/types.h>
+-#include <syslog.h>
+-
+-#define PAM_EXTERN extern
+-#undef PAM_STATIC
+-
+-#include <security/pam_appl.h>
+-#include <security/pam_modules.h>
+-
+-#include "skey.h"
+-#include "pam_skey.h"
+-#include "misc.h"
+-
+-PAM_EXTERN int pam_sm_setcred (pam_handle_t *pamh, int flags,
+- int argc, const char **argv)
+-{
+- return PAM_SUCCESS;
+-}
+-
+-PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,
+- int argc, const char **argv)
+-{
+- char *username = NULL; /* will point to username */
+- unsigned mod_opt = _MOD_NONE_ON; /* module options */
+- char *host; /* will point to host */
+- char *port; /* will point to port */
+- struct passwd *pwuser;
+-
+- /* Get module options */
+- mod_getopt(&mod_opt, argc, argv);
+-
+- /* Get username */
+-#if defined LINUX || defined BSD
+- if (pam_get_user(pamh, (const char **)&username, "login:")!=PAM_SUCCESS)
+-#else
+- if (pam_get_user(pamh, (char **)&username, "login:")!=PAM_SUCCESS)
+-#endif
+- {
+- fprintf(stderr, "cannot determine username\n");
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "cannot determine username");
+- return PAM_AUTHINFO_UNAVAIL;
+- }
+-
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "got username %s", username);
+-
+- /* Check S/Key access permissions - user, host and port. Also include
+- * sanity checks */
+- /* Get host.. */
+-#if defined LINUX || defined BSD
+- if (pam_get_item(pamh, PAM_RHOST, (const void **)&host)
+-#else
+- if (pam_get_item(pamh, PAM_RHOST, (void **)&host)
+-#endif
+- != PAM_SUCCESS)
+- host = NULL;
+- /* ..and port */
+-#ifdef LINUX
+- if (pam_get_item(pamh, PAM_TTY, (const void **)&port)
+-#else
+- if (pam_get_item(pamh, PAM_TTY, (void **)&port)
+-#endif
+- != PAM_SUCCESS)
+- port = NULL;
+-
+- if (mod_opt & _MOD_DEBUG)
+- syslog(LOG_DEBUG, "checking s/key access for user %s,"
+- " host %s, port %s", username,
+- (host != NULL) ? host : "*unknown*",
+- (port != NULL) ? port : "*unknown*");
+-
+- /* Get information from passwd file */
+- if ((pwuser = getpwnam(username)) == NULL)
+- {
+- fprintf(stderr, "no such user\n");
+- syslog(LOG_NOTICE, "cannot find user %s",
+- username);
+- return PAM_AUTHINFO_UNAVAIL;
+- }
+-
+-#ifdef HAVE_SKEYACCESS
+-
+- /* Do actual checking - we assume skeyaccess() returns PERMIT which is
+- * by default 1. Notice 4th argument is NULL - we will not perform
+- * address checks on host itself */
+- if (skeyaccess(pwuser, port, host, NULL) != 1)
+- {
+- fprintf(stderr, "no s/key access permissions\n");
+- syslog(LOG_NOTICE, "no s/key access permissions for %s",
+- username);
+- return PAM_AUTH_ERR;
+- }
+-
+-#endif /* HAVE_SKEYACCESS */
+-
+- return PAM_SUCCESS;
+-}
+-
+-/* Get module optional parameters */
+-static void mod_getopt(unsigned *mod_opt, int mod_argc, const char
**mod_argv)
+-{
+- int i;
+-
+- /* Setup runtime defaults */
+- *mod_opt |= _MOD_DEFAULT_FLAG;
+- *mod_opt &= _MOD_DEFAULT_MASK;
+-
+- /* Setup runtime options */
+- while (mod_argc--)
+- {
+- for (i = 0; i < _MOD_ARGS; ++i)
+- {
+- if (mod_args[i].token != NULL &&
+- !strncmp(*mod_argv, mod_args[i].token,
+- strlen(mod_args[i].token)))
+- break;
+- }
+- if (i >= _MOD_ARGS)
+- syslog(LOG_ERR, "unknown option %s", *mod_argv);
+- else
+- {
+- *mod_opt &= mod_args[i].mask; /* Turn off */
+- *mod_opt |= mod_args[i].flag; /* Turn on */
+- }
+- ++mod_argv;
+- }
+-}
+
diff --git a/security/rsbac-admin/DETAILS b/security/rsbac-admin/DETAILS
index 419e576..ea5dfbf 100755
--- a/security/rsbac-admin/DETAILS
+++ b/security/rsbac-admin/DETAILS
@@ -1,5 +1,5 @@
SPELL=rsbac-admin
- VERSION=1.3.4
+ VERSION=1.3.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.rsbac.org/code/$VERSION/$SOURCE
SOURCE_URL[1]=ftp://rsbac.org/download/code/$VERSION/$SOURCE
diff --git a/security/rsbac-admin/HISTORY b/security/rsbac-admin/HISTORY
index c94b056..d110f00 100644
--- a/security/rsbac-admin/HISTORY
+++ b/security/rsbac-admin/HISTORY
@@ -1,3 +1,6 @@
+2007-08-24 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.3.5.
+
2007-07-18 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.3.4, fixed broken path in ftp://rsbac.org
source URLs.
diff --git a/security/seedit/BUILD b/security/seedit/BUILD
new file mode 100755
index 0000000..670718b
--- /dev/null
+++ b/security/seedit/BUILD
@@ -0,0 +1,4 @@
+for dir in core policy gui
+do
+ make -C $dir
+done
diff --git a/security/seedit/DETAILS b/security/seedit/DETAILS
new file mode 100755
index 0000000..183d305
--- /dev/null
+++ b/security/seedit/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=seedit
+ VERSION=2.1.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL-$VERSION.tar.gz
+ WEB_SITE=http://seedit.sf.net/
+
SOURCE_HASH=sha512:cc0af4bce6aadeab631f1c1d44f48a23ffe7a92e596d5942d1dcead05d762163c141d5ec1fb766d33dbe374a6dfd559bbd33b17e698e503a15e7d826d20497ed

+ LICENSE=GPL
+ KEYWORDS="selinux security editor"
+ SHORT="selinux policy editor"
+cat << EOF
+selinux policy editor developed by Hitachi Software.
+EOF
diff --git a/security/seedit/HISTORY b/security/seedit/HISTORY
new file mode 100644
index 0000000..6e4317f
--- /dev/null
+++ b/security/seedit/HISTORY
@@ -0,0 +1,8 @@
+2007-09-15 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added patch for core lib fixes
+ * BUILD: build each component
+ * INSTALL: install each component and python2.5 instead of 2.4
+ * seedit-core.patch: fixes incompatible type errors
+
+2007-09-14 David Brown <dmlb2000 AT gmail.com>
+ * ALL: created spell
diff --git a/security/seedit/INSTALL b/security/seedit/INSTALL
new file mode 100755
index 0000000..8905f54
--- /dev/null
+++ b/security/seedit/INSTALL
@@ -0,0 +1,4 @@
+for dir in core policy gui
+do
+ make -C $dir DESTDIR="${INSTALL_ROOT}"
PYTHON_SITELIB="${INSTALL_ROOT}/usr/lib/python2.5/site-packages" install
+done
diff --git a/security/seedit/PRE_BUILD b/security/seedit/PRE_BUILD
new file mode 100755
index 0000000..e273902
--- /dev/null
+++ b/security/seedit/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/seedit-core.patch
diff --git a/security/seedit/seedit-core.patch
b/security/seedit/seedit-core.patch
new file mode 100644
index 0000000..386d670
--- /dev/null
+++ b/security/seedit/seedit-core.patch
@@ -0,0 +1,11 @@
+--- a/core/lib/middle_lang.l 2007-09-16 06:17:23.341935926 +0000
++++ b/core/lib/middle_lang.l 2007-09-16 06:17:31.386708646 +0000
+@@ -32,7 +32,7 @@
+ #include <seedit/common.h>
+
+ #ifndef YYSTYPE
+-#define YYSTYPE char *
++#define YYSTYPE int
+ #endif
+
+ extern YYSTYPE yylval;
diff --git a/security/skey/BUILD b/security/skey/BUILD
new file mode 100755
index 0000000..767a909
--- /dev/null
+++ b/security/skey/BUILD
@@ -0,0 +1,2 @@
+OPTS="--sysconfdir=${INSTALL_ROOT}/etc/skey $OPTS" &&
+default_build
diff --git a/security/skey/DEPENDS b/security/skey/DEPENDS
new file mode 100755
index 0000000..f1e2f9d
--- /dev/null
+++ b/security/skey/DEPENDS
@@ -0,0 +1,3 @@
+depends perl &&
+depends shadow &&
+depends cracklib
diff --git a/security/skey/DETAILS b/security/skey/DETAILS
new file mode 100755
index 0000000..b397b76
--- /dev/null
+++ b/security/skey/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=skey
+ VERSION=1.1.5
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=ftp://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/${SOURCE}
+
SOURCE_HASH=sha512:4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="no site"
+ LICENSE[0]=BSD
+ ENTERED=20070903
+ SHORT="Linux Port of OpenBSD Single-key Password System"
+cat << EOF
+Linux Port of OpenBSD Single-key Password System
+EOF
diff --git a/security/skey/FINAL b/security/skey/FINAL
new file mode 100755
index 0000000..7d05b70
--- /dev/null
+++ b/security/skey/FINAL
@@ -0,0 +1,4 @@
+mkdir -vp $INSTALL_ROOT/etc/skey &&
+touch $INSTALL_ROOT/etc/skey/skeykeys &&
+chmod 0700 $INSTALL_ROOT/etc/skey &&
+chmod 0600 $INSTALL_ROOT/etc/skey/skeykeys
diff --git a/security/skey/HISTORY b/security/skey/HISTORY
new file mode 100644
index 0000000..77a0312
--- /dev/null
+++ b/security/skey/HISTORY
@@ -0,0 +1,7 @@
+2007-09-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, PRE_BUILD: created spell
+ * BUILD, INSTALL, FINAL, HISTORY: created spell
+ * skey-1.1.5-gentoo.patch, skey-1.1.5-bind-now.patch: created spell
+ * skey-1.1.5-otp.patch, skey-1.1.5-fPIC.patch: created spell
+ * skey-login_name_max.patch: created spell
+
diff --git a/security/skey/INSTALL b/security/skey/INSTALL
new file mode 100755
index 0000000..d96d3fa
--- /dev/null
+++ b/security/skey/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+chmod 4755 ${INSTALL_ROOT}/usr/bin/{skeyinit,skeyinfo} &&
+ln -s ${INSTALL_ROOT}/usr/bin/skey ${INSTALL_ROOT}/usr/bin/otp-md4 &&
+ln -s ${INSTALL_ROOT}/usr/bin/skey ${INSTALL_ROOT}/usr/bin/otp-md5 &&
+ln -s ${INSTALL_ROOT}/usr/bin/skey ${INSTALL_ROOT}/usr/bin/otp-sha1
diff --git a/security/skey/PRE_BUILD b/security/skey/PRE_BUILD
new file mode 100755
index 0000000..7616985
--- /dev/null
+++ b/security/skey/PRE_BUILD
@@ -0,0 +1,18 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# various updates, fixes and features
+patch -p1 < ${SPELL_DIRECTORY}/skey-1.1.5-gentoo.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/skey-login_name_max.patch &&
+patch -p0 < ${SPELL_DIRECTORY}/skey-1.1.5-fPIC.patch &&
+patch -p0 < ${SPELL_DIRECTORY}/skey-1.1.5-bind-now.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/skey-1.1.5-otp.patch &&
+sedit \
+ "s:/etc/skeykeys:${INSTALL_ROOT}/etc/skey/skeykeys:g" \
+ skeyprune.pl &&
+sedit \
+ "s:/etc/skeykeys:${INSTALL_ROOT}/etc/skey/skeykeys:g" \
+ skeyprune.8 &&
+sedit 's:\(if ( ! /.*/\):\1i:g' skeyprune.pl &&
+sedit '/^.*\${TOUCH}.*$/d' Makefile.in
+
+
diff --git a/security/skey/skey-1.1.5-bind-now.patch
b/security/skey/skey-1.1.5-bind-now.patch
new file mode 100644
index 0000000..a56f81e
--- /dev/null
+++ b/security/skey/skey-1.1.5-bind-now.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.orig 2005-08-19 18:14:48.000000000 -0400
++++ Makefile.in 2005-08-19 18:15:45.000000000 -0400
+@@ -67,10 +67,10 @@
+ ${CC} -o $@ ${SKEYOBJS} ${LDFLAGS} -lskey ${LIBS}
+
+ skeyinit: libskey.so ${SKEYINITOBJS}
+- ${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS}
++ ${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS} -Wl,-z,now
+
+ skeyinfo: libskey.so ${SKEYINFOOBJS}
+- ${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS}
++ ${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS} -Wl,-z,now
+
+ ${MANPAGES} ${SCRIPTS}::
+ ${FIXPATHSCMD} ${srcdir}/$@
diff --git a/security/skey/skey-1.1.5-fPIC.patch
b/security/skey/skey-1.1.5-fPIC.patch
new file mode 100644
index 0000000..924cfb4
--- /dev/null
+++ b/security/skey/skey-1.1.5-fPIC.patch
@@ -0,0 +1,12 @@
+--- Makefile.in 2004-02-25 10:16:15.219448392 +0000
++++ Makefile.in 2004-02-25 10:16:39.087583762 +0000
+@@ -50,6 +50,9 @@
+
+ ${LIBOBJS}: config.h
+
++${LIBOBJS}: %.o: %.c
++ ${CC} ${CFLAGS} -fPIC -c $< -o $@
++
+ libskey.a: ${LIBOBJS}
+ ${AR} rv $@ ${LIBOBJS}
+ ${RANLIB} $@
diff --git a/security/skey/skey-1.1.5-gentoo.patch
b/security/skey/skey-1.1.5-gentoo.patch
new file mode 100644
index 0000000..56e7e25
--- /dev/null
+++ b/security/skey/skey-1.1.5-gentoo.patch
@@ -0,0 +1,5380 @@
+diff -ruN skey-1.1.5.orig/CHANGES skey-1.1.5/CHANGES
+--- skey-1.1.5.orig/CHANGES 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/CHANGES 2003-11-06 17:46:45.000000000 +0000
+@@ -1,6 +1,19 @@
+ *** Changes in version 1.1.5
+
+ - Bug fixes for errx/warnx
++(05/11/2003) taviso AT gentoo.org
++ - ported some updates from the NetBSD project to Linux.
++ - removed a load of cast to voids.
++ - syntax changes.
++ - killing skeyaudit, using a shell script modified from NetBSD.
++ - cleanups to stop warnings with gcc.
++ - building a library for dynamic linking.
++ - swapping some str{cat,cpy} for strn{cat,cpy}
++ - killing rmd160 support.
++ - removing strlcpy function, not useful.
++ - quick hack for shadow support.
++ - quick hack for cracklib support.
++ - various other stuff.
+
+ *** Changes in version 1.1.4
+
+diff -ruN skey-1.1.5.orig/config.h.in skey-1.1.5/config.h.in
+--- skey-1.1.5.orig/config.h.in 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/config.h.in 2003-11-06 17:46:45.000000000 +0000
+@@ -109,6 +109,9 @@
+ /* Define if you have the strtol function. */
+ #undef HAVE_STRTOL
+
++/* Define if you have the <crack.h> header file. */
++#undef HAVE_CRACK_H
++
+ /* Define if you have the <crypt.h> header file. */
+ #undef HAVE_CRYPT_H
+
+@@ -130,12 +133,12 @@
+ /* Define if you have the <md5global.h> header file. */
+ #undef HAVE_MD5GLOBAL_H
+
+-/* Define if you have the <rmd160.h> header file. */
+-#undef HAVE_RMD160_H
+-
+ /* Define if you have the <sha1.h> header file. */
+ #undef HAVE_SHA1_H
+
++/* Define if you have the <shadow.h> header file. */
++#undef HAVE_SHADOW_H
++
+ /* Define if you have the <sys/cdefs.h> header file. */
+ #undef HAVE_SYS_CDEFS_H
+
+diff -ruN skey-1.1.5.orig/configure skey-1.1.5/configure
+--- skey-1.1.5.orig/configure 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/configure 2003-11-06 17:47:49.000000000 +0000
+@@ -960,47 +960,11 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+-# Extract the first word of "sendmail", so it can be a program name with
args.
+-set dummy sendmail; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:967: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- case "$SENDMAIL" in
+- /*)
+- ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a
path.
+- ;;
+- ?:/*)
+- ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a
dos path.
+- ;;
+- *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+- ac_dummy="$PATH:/usr/sbin:/usr/lib:/usr/bin"
+- for ac_dir in $ac_dummy; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
+- break
+- fi
+- done
+- IFS="$ac_save_ifs"
+- test -z "$ac_cv_path_SENDMAIL" && ac_cv_path_SENDMAIL="/usr/lib/sendmail"
+- ;;
+-esac
+-fi
+-SENDMAIL="$ac_cv_path_SENDMAIL"
+-if test -n "$SENDMAIL"; then
+- echo "$ac_t""$SENDMAIL" 1>&6
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+
+
+
+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:1004: checking for crypt in -lcrypt" >&5
++echo "configure:968: checking for crypt in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1008,7 +972,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1012 "configure"
++#line 976 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1019,7 +983,7 @@
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1040,7 +1004,7 @@
+ fi
+
+ echo $ac_n "checking for flock in -lucb""... $ac_c" 1>&6
+-echo "configure:1044: checking for flock in -lucb" >&5
++echo "configure:1008: checking for flock in -lucb" >&5
+ ac_lib_var=`echo ucb'_'flock | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1048,7 +1012,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lucb $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1052 "configure"
++#line 1016 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1059,7 +1023,7 @@
+ flock()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1079,10 +1043,50 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
++echo $ac_n "checking for FascistCheck in -lcrack""... $ac_c" 1>&6
++echo "configure:1048: checking for FascistCheck in -lcrack" >&5
++ac_lib_var=`echo crack'_'FascistCheck | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ ac_save_LIBS="$LIBS"
++LIBS="-lcrack $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1056 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char FascistCheck();
++
++int main() {
++FascistCheck()
++; return 0; }
++EOF
++if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=yes"
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ LIBS="$LIBS -lcrack"
++else
++ echo "$ac_t""no" 1>&6
++fi
++
+
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1086: checking how to run the C preprocessor" >&5
++echo "configure:1090: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -1097,13 +1101,13 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 1101 "configure"
++#line 1105 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1114,13 +1118,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 1118 "configure"
++#line 1122 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1131,13 +1135,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 1135 "configure"
++#line 1139 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1162,12 +1166,12 @@
+ echo "$ac_t""$CPP" 1>&6
+
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1166: checking for ANSI C header files" >&5
++echo "configure:1170: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1171 "configure"
++#line 1175 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1175,7 +1179,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -1192,7 +1196,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1196 "configure"
++#line 1200 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1210,7 +1214,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1214 "configure"
++#line 1218 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1231,7 +1235,7 @@
+ :
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1235 "configure"
++#line 1239 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1242,7 +1246,7 @@
+ exit (0); }
+
+ EOF
+-if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ :
+ else
+@@ -1266,12 +1270,12 @@
+ fi
+
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c"
1>&6
+-echo "configure:1270: checking for sys/wait.h that is POSIX.1 compatible"
>&5
++echo "configure:1274: checking for sys/wait.h that is POSIX.1 compatible"
>&5
+ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1275 "configure"
++#line 1279 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -1287,7 +1291,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1295: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ ac_cv_header_sys_wait_h=yes
+ else
+@@ -1307,21 +1311,21 @@
+
+ fi
+
+-for ac_hdr in fcntl.h limits.h sys/file.h sys/time.h sys/cdefs.h syslog.h
unistd.h sha1.h rmd160.h md4.h md5.h md5global.h err.h crypt.h
++for ac_hdr in fcntl.h limits.h sys/file.h sys/time.h sys/cdefs.h syslog.h
unistd.h sha1.h md4.h md5.h md5global.h err.h crypt.h shadow.h crack.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1315: checking for $ac_hdr" >&5
++echo "configure:1319: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1320 "configure"
++#line 1324 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -1349,12 +1353,12 @@
+
+
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1353: checking for working const" >&5
++echo "configure:1357: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1358 "configure"
++#line 1362 "configure"
+ #include "confdefs.h"
+
+ int main() {
+@@ -1403,7 +1407,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1407: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
+@@ -1424,14 +1428,14 @@
+ fi
+
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:1428: checking whether byte ordering is bigendian" >&5
++echo "configure:1432: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 1435 "configure"
++#line 1439 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -1442,11 +1446,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1446: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1450: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat > conftest.$ac_ext <<EOF
+-#line 1450 "configure"
++#line 1454 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -1457,7 +1461,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1461: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_bigendian=yes
+ else
+@@ -1477,7 +1481,7 @@
+ { echo "configure: error: can not run test program while cross
compiling" 1>&2; exit 1; }
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1481 "configure"
++#line 1485 "configure"
+ #include "confdefs.h"
+ main () {
+ /* Are we little or big endian? From Harbison&Steele. */
+@@ -1490,7 +1494,7 @@
+ exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_c_bigendian=no
+ else
+@@ -1514,12 +1518,12 @@
+ fi
+
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:1518: checking for uid_t in sys/types.h" >&5
++echo "configure:1522: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1523 "configure"
++#line 1527 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -1548,12 +1552,12 @@
+ fi
+
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:1552: checking for off_t" >&5
++echo "configure:1556: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1557 "configure"
++#line 1561 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1581,12 +1585,12 @@
+ fi
+
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:1585: checking for size_t" >&5
++echo "configure:1589: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1590 "configure"
++#line 1594 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1614,12 +1618,12 @@
+ fi
+
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""...
$ac_c" 1>&6
+-echo "configure:1618: checking whether struct tm is in sys/time.h or
time.h" >&5
++echo "configure:1622: checking whether struct tm is in sys/time.h or
time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1623 "configure"
++#line 1627 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -1627,7 +1631,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1631: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1635: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ ac_cv_struct_tm=time.h
+ else
+@@ -1649,7 +1653,7 @@
+
+
+ echo $ac_n "checking size of char""... $ac_c" 1>&6
+-echo "configure:1653: checking size of char" >&5
++echo "configure:1657: checking size of char" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1657,7 +1661,7 @@
+ ac_cv_sizeof_char=1
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1661 "configure"
++#line 1665 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1668,7 +1672,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_sizeof_char=`cat conftestval`
+ else
+@@ -1688,7 +1692,7 @@
+
+
+ echo $ac_n "checking size of short int""... $ac_c" 1>&6
+-echo "configure:1692: checking size of short int" >&5
++echo "configure:1696: checking size of short int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1696,7 +1700,7 @@
+ ac_cv_sizeof_short_int=2
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1700 "configure"
++#line 1704 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1707,7 +1711,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_sizeof_short_int=`cat conftestval`
+ else
+@@ -1727,7 +1731,7 @@
+
+
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:1731: checking size of int" >&5
++echo "configure:1735: checking size of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1735,7 +1739,7 @@
+ ac_cv_sizeof_int=4
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1739 "configure"
++#line 1743 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1746,7 +1750,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:1750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_sizeof_int=`cat conftestval`
+ else
+@@ -1766,7 +1770,7 @@
+
+
+ echo $ac_n "checking size of long int""... $ac_c" 1>&6
+-echo "configure:1770: checking size of long int" >&5
++echo "configure:1774: checking size of long int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1774,7 +1778,7 @@
+ ac_cv_sizeof_long_int=4
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1778 "configure"
++#line 1782 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1785,7 +1789,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:1789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_sizeof_long_int=`cat conftestval`
+ else
+@@ -1805,7 +1809,7 @@
+
+
+ echo $ac_n "checking size of long long int""... $ac_c" 1>&6
+-echo "configure:1809: checking size of long long int" >&5
++echo "configure:1813: checking size of long long int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set";
then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1813,7 +1817,7 @@
+ ac_cv_sizeof_long_long_int=8
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1817 "configure"
++#line 1821 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1824,7 +1828,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_sizeof_long_long_int=`cat conftestval`
+ else
+@@ -1854,7 +1858,7 @@
+ fi
+ CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+ echo $ac_n "checking for HPUX trusted system password database""...
$ac_c" 1>&6
+-echo "configure:1858: checking for HPUX trusted system password database"
>&5
++echo "configure:1862: checking for HPUX trusted system password database"
>&5
+ if test -f /tcb/files/auth/system/default; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+@@ -1903,16 +1907,16 @@
+
+
+ echo $ac_n "checking for intXX_t types""... $ac_c" 1>&6
+-echo "configure:1907: checking for intXX_t types" >&5
++echo "configure:1911: checking for intXX_t types" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1909 "configure"
++#line 1913 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int main() {
+ int16_t a; int32_t b; a = 1235; b = 1235;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1916: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+@@ -1932,16 +1936,16 @@
+ rm -f conftest*
+
+ echo $ac_n "checking for u_intXX_t types""... $ac_c" 1>&6
+-echo "configure:1936: checking for u_intXX_t types" >&5
++echo "configure:1940: checking for u_intXX_t types" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1938 "configure"
++#line 1942 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int main() {
+ u_int16_t c; u_int32_t d; c = 1235; d = 1235;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1945: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1949: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+@@ -1964,9 +1968,9 @@
+ "x$ac_cv_header_sys_bitypes_h" = "xyes"
+ then
+ echo $ac_n "checking for intXX_t and u_intXX_t types in
sys/bitypes.h""... $ac_c" 1>&6
+-echo "configure:1968: checking for intXX_t and u_intXX_t types in
sys/bitypes.h" >&5
++echo "configure:1972: checking for intXX_t and u_intXX_t types in
sys/bitypes.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1970 "configure"
++#line 1974 "configure"
+ #include "confdefs.h"
+ #include <sys/bitypes.h>
+ int main() {
+@@ -1978,7 +1982,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1982: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+@@ -2002,16 +2006,16 @@
+ fi
+
+ echo $ac_n "checking for uintXX_t types""... $ac_c" 1>&6
+-echo "configure:2006: checking for uintXX_t types" >&5
++echo "configure:2010: checking for uintXX_t types" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2008 "configure"
++#line 2012 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int main() {
+ uint16_t c; uint32_t d; c = 1235; d = 1235;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2015: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:2019: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+@@ -2054,7 +2058,7 @@
+
+
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+-echo "configure:2058: checking for 8-bit clean memcmp" >&5
++echo "configure:2062: checking for 8-bit clean memcmp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2062,7 +2066,7 @@
+ ac_cv_func_memcmp_clean=no
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2066 "configure"
++#line 2070 "configure"
+ #include "confdefs.h"
+
+ main()
+@@ -2072,7 +2076,7 @@
+ }
+
+ EOF
+-if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_func_memcmp_clean=yes
+ else
+@@ -2090,12 +2094,12 @@
+ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:2094: checking return type of signal handlers" >&5
++echo "configure:2098: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2099 "configure"
++#line 2103 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2112,7 +2116,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2116: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ ac_cv_type_signal=void
+ else
+@@ -2131,12 +2135,12 @@
+
+
+ echo $ac_n "checking for strftime""... $ac_c" 1>&6
+-echo "configure:2135: checking for strftime" >&5
++echo "configure:2139: checking for strftime" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2140 "configure"
++#line 2144 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char strftime(); below. */
+@@ -2159,7 +2163,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_strftime=yes"
+ else
+@@ -2181,7 +2185,7 @@
+ echo "$ac_t""no" 1>&6
+ # strftime is in -lintl on SCO UNIX.
+ echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
+-echo "configure:2185: checking for strftime in -lintl" >&5
++echo "configure:2189: checking for strftime in -lintl" >&5
+ ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2189,7 +2193,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2193 "configure"
++#line 2197 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2200,7 +2204,7 @@
+ strftime()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2227,12 +2231,12 @@
+ fi
+
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:2231: checking for vprintf" >&5
++echo "configure:2235: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2236 "configure"
++#line 2240 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char vprintf(); below. */
+@@ -2255,7 +2259,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+@@ -2279,12 +2283,12 @@
+
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:2283: checking for _doprnt" >&5
++echo "configure:2287: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2288 "configure"
++#line 2292 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _doprnt(); below. */
+@@ -2307,7 +2311,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+@@ -2334,12 +2338,12 @@
+ for ac_func in gethostname strcspn strdup strerror strspn strtol flock
fcntl lockf strlcpy setusercontext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2338: checking for $ac_func" >&5
++echo "configure:2342: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2343 "configure"
++#line 2347 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2362,7 +2366,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+diff -ruN skey-1.1.5.orig/configure.in skey-1.1.5/configure.in
+--- skey-1.1.5.orig/configure.in 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/configure.in 2003-11-06 17:47:14.000000000 +0000
+@@ -9,19 +9,19 @@
+ AC_CHECK_PROG(AR, ar, ar)
+ AC_PATH_PROG(PERL, perl)
+ AC_PATH_PROG(TOUCH, touch)
+-AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
$PATH:/usr/sbin:/usr/lib:/usr/bin)
+ AC_SUBST(PERL)
+ AC_SUBST(SENDMAIL)
+
+ dnl Checks for libraries.
+ AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
+ AC_CHECK_LIB(ucb, flock, LIBS="$LIBS -lucb" LDFLAGS="$LDFLAGS
-L/usr/ucblib")
++AC_CHECK_LIB(crack, FascistCheck, LIBS="$LIBS -lcrack")
+
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/time.h sys/cdefs.h
syslog.h unistd.h sha1.h rmd160.h md4.h md5.h md5global.h err.h crypt.h)
++AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/time.h sys/cdefs.h
syslog.h unistd.h sha1.h md4.h md5.h md5global.h err.h crypt.h shadow.h
crack.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff -ruN skey-1.1.5.orig/login_cap.c skey-1.1.5/login_cap.c
+--- skey-1.1.5.orig/login_cap.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/login_cap.c 2003-11-06 17:46:45.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <pwd.h>
++#include <grp.h>
+ #include <syslog.h>
+
+ /*
+diff -ruN skey-1.1.5.orig/Makefile.in skey-1.1.5/Makefile.in
+--- skey-1.1.5.orig/Makefile.in 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/Makefile.in 2003-11-06 17:47:42.000000000 +0000
+@@ -27,12 +27,11 @@
+ TOUCH=@TOUCH@
+ LDFLAGS=-L. @LDFLAGS@
+
+-TARGETS=skey skeyinit skeyinfo skeyaudit
+-LIBOBJS=skeylogin.o skeysubr.o put.o errx.o md4c.o md5c.o rmd160.o
rmd160hl.o sha1.o sha1hl.o flock.o strlcpy.o login_cap.o
++TARGETS=skey skeyinit skeyinfo libskey.a
++LIBOBJS=skeylogin.o skeysubr.o put.o errx.o md4c.o md5c.o sha1.o sha1hl.o
flock.o login_cap.o
+ SKEYOBJS=skey.o
+ SKEYINITOBJS=skeyinit.o
+ SKEYINFOOBJS=skeyinfo.o
+-SKEYAUDITOBJS=skeyaudit.o
+
+
+ SCRIPTS=skeyprune.pl
+@@ -41,11 +40,11 @@
+ CATMAN = skey.0 skeyinit.0 skeyinfo.0 skeyaudit.0 skeyprune.0
+ MANPAGES = @MANTYPE@
+
+-PATHSUBS = -D/etc/skeykeys=${sysconfdir}/skeykeys
-D/usr/bin/perl=${PERL} -D/usr/lib/sendmail=${SENDMAIL}
++PATHSUBS = -D/etc/skeykeys=${sysconfdir}/skeykeys
-D/usr/bin/perl=${PERL}
+
+ FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
+
+-HDRS= skey.h sha1.h rmd160.h
++HDRS= skey.h sha1.h
+
+ all: ${TARGETS} ${MANPAGES}
+
+@@ -55,24 +54,27 @@
+ ${AR} rv $@ ${LIBOBJS}
+ ${RANLIB} $@
+
+-skey: libskey.a ${SKEYOBJS}
++libskey.so: ${LIBOBJS}
++ ${CC} ${LDFLAGS} -shared -Wl,-soname,libskey.so.1 -o libskey.so.1.1.5
${LIBOBJS}
++ ln -fs libskey.so.1.1.5 libskey.so
++ ln -fs libskey.so.1.1.5 libskey.so.1
++ ln -fs libskey.so.1.1.5 libskey.so.1.1
++
++skey: libskey.so ${SKEYOBJS}
+ ${CC} -o $@ ${SKEYOBJS} ${LDFLAGS} -lskey ${LIBS}
+
+-skeyinit: libskey.a ${SKEYINITOBJS}
++skeyinit: libskey.so ${SKEYINITOBJS}
+ ${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS}
+
+-skeyinfo: libskey.a ${SKEYINFOOBJS}
++skeyinfo: libskey.so ${SKEYINFOOBJS}
+ ${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS}
+
+-skeyaudit: libskey.a ${SKEYAUDITOBJS}
+- ${CC} -o $@ ${SKEYAUDITOBJS} ${LDFLAGS} -lskey ${LIBS}
+-
+ ${MANPAGES} ${SCRIPTS}::
+ ${FIXPATHSCMD} ${srcdir}/$@
+
+ clean:
+ rm -f *.o *.a ${TARGETS} config.status config.cache config.log
+- rm -f *.out core
++ rm -f *.out core *.so *.so.*
+
+ distclean: clean
+ rm -f Makefile config.h core *~
+@@ -97,6 +99,10 @@
+ $(INSTALL) -d $(DESTDIR)$(includedir)
+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)
+ ${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir)
++ ${INSTALL_DATA} libskey.so.1.1.5 $(DESTDIR)$(libdir)
++ ${INSTALL_DATA} libskey.so.1.1 $(DESTDIR)$(libdir)
++ ${INSTALL_DATA} libskey.so.1 $(DESTDIR)$(libdir)
++ ${INSTALL_DATA} libskey.so $(DESTDIR)$(libdir)
+ ${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir)
+ @for target in ${TARGETS}; do \
+ ${INSTALL_PROGRAM} $$target $(DESTDIR)$(bindir); \
+@@ -119,9 +125,9 @@
+ -rm -f $(DESTDIR)$(bindir)/skeyaudit
+ -rm -f $(DESTDIR)$(bindir)/skeyprune
+ -rm -f $(DESTDIR)$(libdir)/libskey.a
++ -rm -f $(DESTDIR)$(libdir)/libskey.so*
+ -rm -f $(DESTDIR)$(includedir)/skey.h
+ -rm -f $(DESTDIR)$(includedir)/sha1.h
+- -rm -f $(DESTDIR)$(includedir)/rmd160.h
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/skey.1
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinfo.1
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinit.1
+diff -ruN skey-1.1.5.orig/put.c skey-1.1.5/put.c
+--- skey-1.1.5.orig/put.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/put.c 2003-11-06 17:46:45.000000000 +0000
+@@ -14,7 +14,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <assert.h>
+-/*#include <ctype.h>*/
++#include <ctype.h>
+ #include "config.h"
+
+ #include "skey.h"
+@@ -22,10 +22,10 @@
+ static unsigned int extract __P ((char *s, int start, int length));
+ static void standard __P ((char *word));
+ static void insert __P ((char *s, int x, int start, int length));
+-static int wsrch __P ((char *w, int low, int high));
++static int wsrch __P ((const char *w, int low, int high));
+
+ /* Dictionary for integer-word translations */
+-static char Wp[2048][4] = {
++char Wp[2048][4] = {
+ "A",
+ "ABE",
+ "ACE",
+@@ -2079,19 +2079,13 @@
+ /* Encode 8 bytes in 'c' as a string of English words.
+ * Returns a pointer to a static buffer
+ */
+-char *
+-btoe(engout, c)
+- char *c;
+- char *engout;
++char *btoe(char *engout, const char *c)
+ {
+- char cp[10]; /* add in room for the parity 2 bits + extract() slop
*/
++ char cp[9]; /* add in room for the parity 2 bits */
+ int p, i;
+
+ engout[0] = '\0';
+-
+- /* workaround for extract() reads beyond end of data */
+- (void)memset(cp, 0, sizeof(cp));
+- (void)memcpy(cp, c, 8);
++ memcpy(cp, c, 8);
+
+ /* compute parity */
+ for (p = 0, i = 0; i < 64; i += 2)
+@@ -2099,20 +2093,20 @@
+
+ cp[8] = (char)p << 6;
+
+- (void)strncat(engout, &Wp[extract (cp, 0, 11)][0], 4);
+- (void)strcat(engout, " ");
+- (void)strncat(engout, &Wp[extract (cp, 11, 11)][0], 4);
+- (void)strcat(engout, " ");
+- (void)strncat(engout, &Wp[extract (cp, 22, 11)][0], 4);
+- (void)strcat(engout, " ");
+- (void)strncat(engout, &Wp[extract (cp, 33, 11)][0], 4);
+- (void)strcat(engout, " ");
+- (void)strncat(engout, &Wp[extract (cp, 44, 11)][0], 4);
+- (void)strcat(engout, " ");
+- (void)strncat(engout, &Wp[extract (cp, 55, 11)][0], 4);
++ strncat(engout, &Wp[extract (cp, 0, 11)][0], 4);
++ strcat(engout, " ");
++ strncat(engout, &Wp[extract (cp, 11, 11)][0], 4);
++ strcat(engout, " ");
++ strncat(engout, &Wp[extract (cp, 22, 11)][0], 4);
++ strcat(engout, " ");
++ strncat(engout, &Wp[extract (cp, 33, 11)][0], 4);
++ strcat(engout, " ");
++ strncat(engout, &Wp[extract (cp, 44, 11)][0], 4);
++ strcat(engout, " ");
++ strncat(engout, &Wp[extract (cp, 55, 11)][0], 4);
+
+ #ifdef notdef
+- (void)fprintf(stderr, "engout is %s\n\r", engout);
++ printf ("engout is %s\n\r", engout);
+ #endif
+ return(engout);
+ }
+@@ -2123,41 +2117,42 @@
+ * -1 badly formed in put ie > 4 char word
+ * -2 words OK but parity is wrong
+ */
+-int
+-etob(out, e)
+- char *out;
+- char *e;
++int etob(char *out, const char *e)
+ {
+ char *word;
+ int i, p, v, l, low, high;
+- char b[SKEY_BINKEY_SIZE+1];
++ char b[9];
+ char input[36];
++ char *last;
+
+ if (e == NULL)
+- return(-1);
++ return -1;
+
+- (void)strncpy(input, e, sizeof(input) - 1);
+- input[sizeof(input) - 1] = '\0';
+- (void)memset(b, 0, sizeof(b));
+- (void)memset(out, 0, SKEY_BINKEY_SIZE);
+- for (i = 0, p = 0; i < 6; i++, p += 11) {
+- if ((word = strtok(i == 0 ? input : NULL, " ")) == NULL)
+- return(-1);
+-
+- l = strlen(word);
+- if (l > 4 || l < 1) {
+- return(-1);
+- } else if (l < 4) {
++ strncpy (input, e, sizeof(input));
++ memset(b, 0, sizeof(b));
++ memset(out, 0, 8);
++ for (i = 0, p = 0; i < 6; i++, p += 11)
++ {
++ if ((word = strtok_r(i == 0 ? input : NULL, " ", &last)) ==
NULL)
++ return -1;
++
++ l = strlen (word);
++ if (l > 4 || l < 1)
++ return -1;
++ else if (l < 4)
++ {
+ low = 0;
+ high = 570;
+- } else {
++ }
++ else
++ {
+ low = 571;
+ high = 2047;
+ }
+ standard(word);
+
+ if ((v = wsrch(word, low, high)) < 0)
+- return(0);
++ return 0;
+
+ insert(b, v, p, 11);
+ }
+@@ -2167,55 +2162,47 @@
+ p += extract (b, i, 2);
+
+ if ((p & 3) != extract (b, 64, 2))
+- return(-2);
++ return -2;
+
+- (void)memcpy(out, b, SKEY_BINKEY_SIZE);
++ memcpy(out, b, 8);
+
+- return(1);
++ return 1;
+ }
+
+ /* Display 8 bytes as a series of 16-bit hex digits */
+-char *
+-put8(out, s)
+- char *out;
+- char *s;
++char *put8(char *out, const char *s)
+ {
+- (void)sprintf(out, "%02X%02X %02X%02X %02X%02X %02X%02X",
++ sprintf(out, "%02X%02X %02X%02X %02X%02X %02X%02X",
+ s[0] & 0xff, s[1] & 0xff, s[2] & 0xff,
+ s[3] & 0xff, s[4] & 0xff, s[5] & 0xff,
+ s[6] & 0xff, s[7] & 0xff);
+- return(out);
++ return out;
+ }
+
+ #ifdef notdef
+ /* Encode 8 bytes in 'cp' as stream of ascii letters.
+ * Provided as a possible alternative to btoe()
+ */
+-char *
+-btoc(cp)
+- char *cp;
++char *btoc(char *cp)
+ {
+ int i;
+ static char out[31];
+
+ /* code out put by characters 6 bits each added to 0x21 (!) */
+- for (i = 0; i <= 10; i++) {
++ for (i = 0; i <= 10; i++)
++ {
+ /* last one is only 4 bits not 6 */
+ out[i] = '!' + extract (cp, 6 * i, i >= 10 ? 4 : 6);
+ }
+ out[i] = '\0';
+- return(out);
++ return out;
+ }
+ #endif
+
+ /* Internal subroutines for word encoding/decoding */
+
+ /* Dictionary binary search */
+-static int
+-wsrch(w, low, high)
+- char *w;
+- int low;
+- int high;
++static int wsrch(const char *w, int low, int high)
+ {
+ int i, j;
+
+@@ -2223,18 +2210,18 @@
+ i = (low + high) / 2;
+
+ if ((j = strncmp(w, Wp[i], 4)) == 0)
+- return(i); /* Found it */
+-
+- if (high == low + 1) {
++ return i; /* Found it */
++ if (high == low + 1)
++ {
+ /* Avoid effects of integer truncation in /2 */
+ if (strncmp(w, Wp[high], 4) == 0)
+- return(high);
++ return high;
+ else
+- return(-1);
++ return -1;
+ }
+
+ if (low >= high)
+- return(-1); /* I don't *think* this can happen...
*/
++ return -1; /* I don't *think* this can happen...
*/
+ if (j < 0)
+ high = i; /* Search lower half */
+ else
+@@ -2242,12 +2229,7 @@
+ }
+ }
+
+-static void
+-insert(s, x, start, length)
+- char *s;
+- int x;
+- int start;
+- int length;
++static void insert(char *s, int x, int start, int length)
+ {
+ unsigned char cl;
+ unsigned char cc;
+@@ -2261,25 +2243,28 @@
+ assert(start + length <= 66);
+
+ shift = ((8 - ((start + length) % 8)) % 8);
+- y = x << shift;
++ y = (int) x << shift;
+ cl = (y >> 16) & 0xff;
+ cc = (y >> 8) & 0xff;
+ cr = y & 0xff;
+- if (shift + length > 16) {
++ if (shift + length > 16)
++ {
+ s[start / 8] |= cl;
+ s[start / 8 + 1] |= cc;
+ s[start / 8 + 2] |= cr;
+- } else if (shift + length > 8) {
++ }
++ else if (shift + length > 8)
++ {
+ s[start / 8] |= cc;
+ s[start / 8 + 1] |= cr;
+- } else {
++ }
++ else
++ {
+ s[start / 8] |= cr;
+ }
+ }
+
+-static void
+-standard(word)
+- register char *word;
++static void standard(char *word)
+ {
+ while (*word) {
+ if (!isascii(*word))
+@@ -2297,11 +2282,7 @@
+ }
+
+ /* Extract 'length' bits from the char array 's' starting with bit 'start'
*/
+-static unsigned int
+-extract(s, start, length)
+- char *s;
+- int start;
+- int length;
++static unsigned int extract(char *s, int start, int length)
+ {
+ unsigned char cl;
+ unsigned char cc;
+@@ -2320,5 +2301,5 @@
+ x = x >> (24 - (length + (start % 8)));
+ x = (x & (0xffff >> (16 - length)));
+
+- return(x);
++ return x;
+ }
+diff -ruN skey-1.1.5.orig/rmd160.c skey-1.1.5/rmd160.c
+--- skey-1.1.5.orig/rmd160.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/rmd160.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,428 +0,0 @@
+-/********************************************************************\
+- *
+- * FILE: rmd160.c
+- *
+- * CONTENTS: A sample C-implementation of the RIPEMD-160
+- * hash-function.
+- * TARGET: any computer with an ANSI C compiler
+- *
+- * AUTHOR: Antoon Bosselaers, ESAT-COSIC
+- * (Arranged for libc by Todd C. Miller)
+- * DATE: 1 March 1996
+- * VERSION: 1.0
+- *
+- * Copyright (c) Katholieke Universiteit Leuven
+- * 1996, All Rights Reserved
+- *
+-\********************************************************************/
+-#ifndef HAVE_RMD160_H
+-
+-/* header files */
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <sys/types.h>
+-#include "config.h"
+-#include "rmd160.h"
+-
+-/********************************************************************/
+-
+-/* macro definitions */
+-
+-/* collect four bytes into one word: */
+-#define BYTES_TO_DWORD(strptr) \
+- (((u_int32_t) *((strptr)+3) << 24) | \
+- ((u_int32_t) *((strptr)+2) << 16) | \
+- ((u_int32_t) *((strptr)+1) << 8) | \
+- ((u_int32_t) *(strptr)))
+-
+-/* ROL(x, n) cyclically rotates x over n bits to the left */
+-/* x must be of an unsigned 32 bits type and 0 <= n < 32. */
+-#define ROL(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+-
+-/* the three basic functions F(), G() and H() */
+-#define F(x, y, z) ((x) ^ (y) ^ (z))
+-#define G(x, y, z) (((x) & (y)) | (~(x) & (z)))
+-#define H(x, y, z) (((x) | ~(y)) ^ (z))
+-#define I(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+-#define J(x, y, z) ((x) ^ ((y) | ~(z)))
+-
+-/* the eight basic operations FF() through III() */
+-#define FF(a, b, c, d, e, x, s) { \
+- (a) += F((b), (c), (d)) + (x); \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define GG(a, b, c, d, e, x, s) { \
+- (a) += G((b), (c), (d)) + (x) + 0x5a827999U; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define HH(a, b, c, d, e, x, s) { \
+- (a) += H((b), (c), (d)) + (x) + 0x6ed9eba1U; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define II(a, b, c, d, e, x, s) { \
+- (a) += I((b), (c), (d)) + (x) + 0x8f1bbcdcU; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define JJ(a, b, c, d, e, x, s) { \
+- (a) += J((b), (c), (d)) + (x) + 0xa953fd4eU; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define FFF(a, b, c, d, e, x, s) { \
+- (a) += F((b), (c), (d)) + (x); \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define GGG(a, b, c, d, e, x, s) { \
+- (a) += G((b), (c), (d)) + (x) + 0x7a6d76e9U; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define HHH(a, b, c, d, e, x, s) { \
+- (a) += H((b), (c), (d)) + (x) + 0x6d703ef3U; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define III(a, b, c, d, e, x, s) { \
+- (a) += I((b), (c), (d)) + (x) + 0x5c4dd124U; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-#define JJJ(a, b, c, d, e, x, s) { \
+- (a) += J((b), (c), (d)) + (x) + 0x50a28be6U; \
+- (a) = ROL((a), (s)) + (e); \
+- (c) = ROL((c), 10); \
+-}
+-
+-/********************************************************************/
+-
+-void
+-RMD160Init(context)
+- RMD160_CTX *context;
+-{
+-
+- /* ripemd-160 initialization constants */
+- context->state[0] = 0x67452301U;
+- context->state[1] = 0xefcdab89U;
+- context->state[2] = 0x98badcfeU;
+- context->state[3] = 0x10325476U;
+- context->state[4] = 0xc3d2e1f0U;
+- context->length[0] = context->length[1] = 0;
+- context->buflen = 0;
+-}
+-
+-/********************************************************************/
+-
+-void
+-RMD160Transform(state, block)
+- u_int32_t state[5];
+- const u_int32_t block[16];
+-{
+- u_int32_t aa = state[0], bb = state[1], cc = state[2],
+- dd = state[3], ee = state[4];
+- u_int32_t aaa = state[0], bbb = state[1], ccc = state[2],
+- ddd = state[3], eee = state[4];
+-
+- /* round 1 */
+- FF(aa, bb, cc, dd, ee, block[ 0], 11);
+- FF(ee, aa, bb, cc, dd, block[ 1], 14);
+- FF(dd, ee, aa, bb, cc, block[ 2], 15);
+- FF(cc, dd, ee, aa, bb, block[ 3], 12);
+- FF(bb, cc, dd, ee, aa, block[ 4], 5);
+- FF(aa, bb, cc, dd, ee, block[ 5], 8);
+- FF(ee, aa, bb, cc, dd, block[ 6], 7);
+- FF(dd, ee, aa, bb, cc, block[ 7], 9);
+- FF(cc, dd, ee, aa, bb, block[ 8], 11);
+- FF(bb, cc, dd, ee, aa, block[ 9], 13);
+- FF(aa, bb, cc, dd, ee, block[10], 14);
+- FF(ee, aa, bb, cc, dd, block[11], 15);
+- FF(dd, ee, aa, bb, cc, block[12], 6);
+- FF(cc, dd, ee, aa, bb, block[13], 7);
+- FF(bb, cc, dd, ee, aa, block[14], 9);
+- FF(aa, bb, cc, dd, ee, block[15], 8);
+-
+- /* round 2 */
+- GG(ee, aa, bb, cc, dd, block[ 7], 7);
+- GG(dd, ee, aa, bb, cc, block[ 4], 6);
+- GG(cc, dd, ee, aa, bb, block[13], 8);
+- GG(bb, cc, dd, ee, aa, block[ 1], 13);
+- GG(aa, bb, cc, dd, ee, block[10], 11);
+- GG(ee, aa, bb, cc, dd, block[ 6], 9);
+- GG(dd, ee, aa, bb, cc, block[15], 7);
+- GG(cc, dd, ee, aa, bb, block[ 3], 15);
+- GG(bb, cc, dd, ee, aa, block[12], 7);
+- GG(aa, bb, cc, dd, ee, block[ 0], 12);
+- GG(ee, aa, bb, cc, dd, block[ 9], 15);
+- GG(dd, ee, aa, bb, cc, block[ 5], 9);
+- GG(cc, dd, ee, aa, bb, block[ 2], 11);
+- GG(bb, cc, dd, ee, aa, block[14], 7);
+- GG(aa, bb, cc, dd, ee, block[11], 13);
+- GG(ee, aa, bb, cc, dd, block[ 8], 12);
+-
+- /* round 3 */
+- HH(dd, ee, aa, bb, cc, block[ 3], 11);
+- HH(cc, dd, ee, aa, bb, block[10], 13);
+- HH(bb, cc, dd, ee, aa, block[14], 6);
+- HH(aa, bb, cc, dd, ee, block[ 4], 7);
+- HH(ee, aa, bb, cc, dd, block[ 9], 14);
+- HH(dd, ee, aa, bb, cc, block[15], 9);
+- HH(cc, dd, ee, aa, bb, block[ 8], 13);
+- HH(bb, cc, dd, ee, aa, block[ 1], 15);
+- HH(aa, bb, cc, dd, ee, block[ 2], 14);
+- HH(ee, aa, bb, cc, dd, block[ 7], 8);
+- HH(dd, ee, aa, bb, cc, block[ 0], 13);
+- HH(cc, dd, ee, aa, bb, block[ 6], 6);
+- HH(bb, cc, dd, ee, aa, block[13], 5);
+- HH(aa, bb, cc, dd, ee, block[11], 12);
+- HH(ee, aa, bb, cc, dd, block[ 5], 7);
+- HH(dd, ee, aa, bb, cc, block[12], 5);
+-
+- /* round 4 */
+- II(cc, dd, ee, aa, bb, block[ 1], 11);
+- II(bb, cc, dd, ee, aa, block[ 9], 12);
+- II(aa, bb, cc, dd, ee, block[11], 14);
+- II(ee, aa, bb, cc, dd, block[10], 15);
+- II(dd, ee, aa, bb, cc, block[ 0], 14);
+- II(cc, dd, ee, aa, bb, block[ 8], 15);
+- II(bb, cc, dd, ee, aa, block[12], 9);
+- II(aa, bb, cc, dd, ee, block[ 4], 8);
+- II(ee, aa, bb, cc, dd, block[13], 9);
+- II(dd, ee, aa, bb, cc, block[ 3], 14);
+- II(cc, dd, ee, aa, bb, block[ 7], 5);
+- II(bb, cc, dd, ee, aa, block[15], 6);
+- II(aa, bb, cc, dd, ee, block[14], 8);
+- II(ee, aa, bb, cc, dd, block[ 5], 6);
+- II(dd, ee, aa, bb, cc, block[ 6], 5);
+- II(cc, dd, ee, aa, bb, block[ 2], 12);
+-
+- /* round 5 */
+- JJ(bb, cc, dd, ee, aa, block[ 4], 9);
+- JJ(aa, bb, cc, dd, ee, block[ 0], 15);
+- JJ(ee, aa, bb, cc, dd, block[ 5], 5);
+- JJ(dd, ee, aa, bb, cc, block[ 9], 11);
+- JJ(cc, dd, ee, aa, bb, block[ 7], 6);
+- JJ(bb, cc, dd, ee, aa, block[12], 8);
+- JJ(aa, bb, cc, dd, ee, block[ 2], 13);
+- JJ(ee, aa, bb, cc, dd, block[10], 12);
+- JJ(dd, ee, aa, bb, cc, block[14], 5);
+- JJ(cc, dd, ee, aa, bb, block[ 1], 12);
+- JJ(bb, cc, dd, ee, aa, block[ 3], 13);
+- JJ(aa, bb, cc, dd, ee, block[ 8], 14);
+- JJ(ee, aa, bb, cc, dd, block[11], 11);
+- JJ(dd, ee, aa, bb, cc, block[ 6], 8);
+- JJ(cc, dd, ee, aa, bb, block[15], 5);
+- JJ(bb, cc, dd, ee, aa, block[13], 6);
+-
+- /* parallel round 1 */
+- JJJ(aaa, bbb, ccc, ddd, eee, block[ 5], 8);
+- JJJ(eee, aaa, bbb, ccc, ddd, block[14], 9);
+- JJJ(ddd, eee, aaa, bbb, ccc, block[ 7], 9);
+- JJJ(ccc, ddd, eee, aaa, bbb, block[ 0], 11);
+- JJJ(bbb, ccc, ddd, eee, aaa, block[ 9], 13);
+- JJJ(aaa, bbb, ccc, ddd, eee, block[ 2], 15);
+- JJJ(eee, aaa, bbb, ccc, ddd, block[11], 15);
+- JJJ(ddd, eee, aaa, bbb, ccc, block[ 4], 5);
+- JJJ(ccc, ddd, eee, aaa, bbb, block[13], 7);
+- JJJ(bbb, ccc, ddd, eee, aaa, block[ 6], 7);
+- JJJ(aaa, bbb, ccc, ddd, eee, block[15], 8);
+- JJJ(eee, aaa, bbb, ccc, ddd, block[ 8], 11);
+- JJJ(ddd, eee, aaa, bbb, ccc, block[ 1], 14);
+- JJJ(ccc, ddd, eee, aaa, bbb, block[10], 14);
+- JJJ(bbb, ccc, ddd, eee, aaa, block[ 3], 12);
+- JJJ(aaa, bbb, ccc, ddd, eee, block[12], 6);
+-
+- /* parallel round 2 */
+- III(eee, aaa, bbb, ccc, ddd, block[ 6], 9);
+- III(ddd, eee, aaa, bbb, ccc, block[11], 13);
+- III(ccc, ddd, eee, aaa, bbb, block[ 3], 15);
+- III(bbb, ccc, ddd, eee, aaa, block[ 7], 7);
+- III(aaa, bbb, ccc, ddd, eee, block[ 0], 12);
+- III(eee, aaa, bbb, ccc, ddd, block[13], 8);
+- III(ddd, eee, aaa, bbb, ccc, block[ 5], 9);
+- III(ccc, ddd, eee, aaa, bbb, block[10], 11);
+- III(bbb, ccc, ddd, eee, aaa, block[14], 7);
+- III(aaa, bbb, ccc, ddd, eee, block[15], 7);
+- III(eee, aaa, bbb, ccc, ddd, block[ 8], 12);
+- III(ddd, eee, aaa, bbb, ccc, block[12], 7);
+- III(ccc, ddd, eee, aaa, bbb, block[ 4], 6);
+- III(bbb, ccc, ddd, eee, aaa, block[ 9], 15);
+- III(aaa, bbb, ccc, ddd, eee, block[ 1], 13);
+- III(eee, aaa, bbb, ccc, ddd, block[ 2], 11);
+-
+- /* parallel round 3 */
+- HHH(ddd, eee, aaa, bbb, ccc, block[15], 9);
+- HHH(ccc, ddd, eee, aaa, bbb, block[ 5], 7);
+- HHH(bbb, ccc, ddd, eee, aaa, block[ 1], 15);
+- HHH(aaa, bbb, ccc, ddd, eee, block[ 3], 11);
+- HHH(eee, aaa, bbb, ccc, ddd, block[ 7], 8);
+- HHH(ddd, eee, aaa, bbb, ccc, block[14], 6);
+- HHH(ccc, ddd, eee, aaa, bbb, block[ 6], 6);
+- HHH(bbb, ccc, ddd, eee, aaa, block[ 9], 14);
+- HHH(aaa, bbb, ccc, ddd, eee, block[11], 12);
+- HHH(eee, aaa, bbb, ccc, ddd, block[ 8], 13);
+- HHH(ddd, eee, aaa, bbb, ccc, block[12], 5);
+- HHH(ccc, ddd, eee, aaa, bbb, block[ 2], 14);
+- HHH(bbb, ccc, ddd, eee, aaa, block[10], 13);
+- HHH(aaa, bbb, ccc, ddd, eee, block[ 0], 13);
+- HHH(eee, aaa, bbb, ccc, ddd, block[ 4], 7);
+- HHH(ddd, eee, aaa, bbb, ccc, block[13], 5);
+-
+- /* parallel round 4 */
+- GGG(ccc, ddd, eee, aaa, bbb, block[ 8], 15);
+- GGG(bbb, ccc, ddd, eee, aaa, block[ 6], 5);
+- GGG(aaa, bbb, ccc, ddd, eee, block[ 4], 8);
+- GGG(eee, aaa, bbb, ccc, ddd, block[ 1], 11);
+- GGG(ddd, eee, aaa, bbb, ccc, block[ 3], 14);
+- GGG(ccc, ddd, eee, aaa, bbb, block[11], 14);
+- GGG(bbb, ccc, ddd, eee, aaa, block[15], 6);
+- GGG(aaa, bbb, ccc, ddd, eee, block[ 0], 14);
+- GGG(eee, aaa, bbb, ccc, ddd, block[ 5], 6);
+- GGG(ddd, eee, aaa, bbb, ccc, block[12], 9);
+- GGG(ccc, ddd, eee, aaa, bbb, block[ 2], 12);
+- GGG(bbb, ccc, ddd, eee, aaa, block[13], 9);
+- GGG(aaa, bbb, ccc, ddd, eee, block[ 9], 12);
+- GGG(eee, aaa, bbb, ccc, ddd, block[ 7], 5);
+- GGG(ddd, eee, aaa, bbb, ccc, block[10], 15);
+- GGG(ccc, ddd, eee, aaa, bbb, block[14], 8);
+-
+- /* parallel round 5 */
+- FFF(bbb, ccc, ddd, eee, aaa, block[12] , 8);
+- FFF(aaa, bbb, ccc, ddd, eee, block[15] , 5);
+- FFF(eee, aaa, bbb, ccc, ddd, block[10] , 12);
+- FFF(ddd, eee, aaa, bbb, ccc, block[ 4] , 9);
+- FFF(ccc, ddd, eee, aaa, bbb, block[ 1] , 12);
+- FFF(bbb, ccc, ddd, eee, aaa, block[ 5] , 5);
+- FFF(aaa, bbb, ccc, ddd, eee, block[ 8] , 14);
+- FFF(eee, aaa, bbb, ccc, ddd, block[ 7] , 6);
+- FFF(ddd, eee, aaa, bbb, ccc, block[ 6] , 8);
+- FFF(ccc, ddd, eee, aaa, bbb, block[ 2] , 13);
+- FFF(bbb, ccc, ddd, eee, aaa, block[13] , 6);
+- FFF(aaa, bbb, ccc, ddd, eee, block[14] , 5);
+- FFF(eee, aaa, bbb, ccc, ddd, block[ 0] , 15);
+- FFF(ddd, eee, aaa, bbb, ccc, block[ 3] , 13);
+- FFF(ccc, ddd, eee, aaa, bbb, block[ 9] , 11);
+- FFF(bbb, ccc, ddd, eee, aaa, block[11] , 11);
+-
+- /* combine results */
+- ddd += cc + state[1]; /* final result for state[0] */
+- state[1] = state[2] + dd + eee;
+- state[2] = state[3] + ee + aaa;
+- state[3] = state[4] + aa + bbb;
+- state[4] = state[0] + bb + ccc;
+- state[0] = ddd;
+-}
+-
+-/********************************************************************/
+-
+-void
+-RMD160Update(context, data, nbytes)
+- RMD160_CTX *context;
+- const u_char *data;
+- u_int32_t nbytes;
+-{
+- u_int32_t X[16];
+- u_int32_t ofs = 0;
+- u_int32_t i;
+-#ifdef WORDS_BIGENDIAN
+- u_int32_t j;
+-#endif
+-
+- /* update length[] */
+- if (context->length[0] + nbytes < context->length[0])
+- context->length[1]++; /* overflow to msb of length
*/
+- context->length[0] += nbytes;
+-
+- (void)memset(X, 0, sizeof(X));
+-
+- if ( context->buflen + nbytes < 64 )
+- {
+- (void)memcpy(context->bbuffer + context->buflen, data,
nbytes);
+- context->buflen += nbytes;
+- }
+- else
+- {
+- /* process first block */
+- ofs = 64 - context->buflen;
+- (void)memcpy(context->bbuffer + context->buflen, data, ofs);
+-#ifndef WORDS_BIGENDIAN
+- (void)memcpy(X, context->bbuffer, sizeof(X));
+-#else
+- for (j=0; j < 16; j++)
+- X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
+-#endif
+- RMD160Transform(context->state, X);
+- nbytes -= ofs;
+-
+- /* process remaining complete blocks */
+- for (i = 0; i < (nbytes >> 6); i++) {
+-#ifndef WORDS_BIGENDIAN
+- (void)memcpy(X, data + (64 * i) + ofs, sizeof(X));
+-#else
+- for (j=0; j < 16; j++)
+- X[j] = BYTES_TO_DWORD(data + (64 * i) + (4
* j) + ofs);
+-#endif
+- RMD160Transform(context->state, X);
+- }
+-
+- /*
+- * Put last bytes from data into context's buffer
+- */
+- context->buflen = nbytes & 63;
+- memcpy(context->bbuffer, data + (64 * i) + ofs,
context->buflen);
+- }
+-}
+-
+-/********************************************************************/
+-
+-void
+-RMD160Final(digest, context)
+- u_char digest[20];
+- RMD160_CTX *context;
+-{
+- u_int32_t i;
+- u_int32_t X[16];
+-#ifdef WORDS_BIGENDIAN
+- u_int32_t j;
+-#endif
+-
+- /* append the bit m_n == 1 */
+- context->bbuffer[context->buflen] = '\200';
+-
+- (void)memset(context->bbuffer + context->buflen + 1, 0,
+- 63 - context->buflen);
+-#ifndef WORDS_BIGENDIAN
+- (void)memcpy(X, context->bbuffer, sizeof(X));
+-#else
+- for (j=0; j < 16; j++)
+- X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
+-#endif
+- if ((context->buflen) > 55) {
+- /* length goes to next block */
+- RMD160Transform(context->state, X);
+- (void)memset(X, 0, sizeof(X));
+- }
+-
+- /* append length in bits */
+- X[14] = context->length[0] << 3;
+- X[15] = (context->length[0] >> 29) |
+- (context->length[1] << 3);
+- RMD160Transform(context->state, X);
+-
+- if (digest != NULL) {
+- for (i = 0; i < 20; i += 4) {
+- /* extracts the 8 least significant bits. */
+- digest[i] = context->state[i>>2];
+- digest[i + 1] = (context->state[i>>2] >> 8);
+- digest[i + 2] = (context->state[i>>2] >> 16);
+- digest[i + 3] = (context->state[i>>2] >> 24);
+- }
+- }
+-}
+-
+-/************************ end of file rmd160.c **********************/
+-#endif
+diff -ruN skey-1.1.5.orig/rmd160.h skey-1.1.5/rmd160.h
+--- skey-1.1.5.orig/rmd160.h 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/rmd160.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,48 +0,0 @@
+-/* $OpenBSD: rmd160.h,v 1.4 1999/08/16 09:59:04 millert Exp $ */
+-
+-/********************************************************************\
+- *
+- * FILE: rmd160.h
+- *
+- * CONTENTS: Header file for a sample C-implementation of the
+- * RIPEMD-160 hash-function.
+- * TARGET: any computer with an ANSI C compiler
+- *
+- * AUTHOR: Antoon Bosselaers, ESAT-COSIC
+- * DATE: 1 March 1996
+- * VERSION: 1.0
+- *
+- * Copyright (c) Katholieke Universiteit Leuven
+- * 1996, All Rights Reserved
+- *
+-\********************************************************************/
+-
+-#ifndef _RMD160_H /* make sure this file is read only once */
+-#define _RMD160_H
+-
+-/********************************************************************/
+-
+-/* structure definitions */
+-
+-typedef struct {
+- u_int32_t state[5]; /* state (ABCDE) */
+- u_int32_t length[2]; /* number of bits */
+- u_char bbuffer[64]; /* overflow buffer */
+- u_int32_t buflen; /* number of chars in bbuffer */
+-} RMD160_CTX;
+-
+-/********************************************************************/
+-
+-/* function prototypes */
+-
+-void RMD160Init __P((RMD160_CTX *context));
+-void RMD160Transform __P((u_int32_t state[5], const u_int32_t block[16]));
+-void RMD160Update __P((RMD160_CTX *context, const u_char *data, u_int32_t
nbytes));
+-void RMD160Final __P((u_char digest[20], RMD160_CTX *context));
+-char *RMD160End __P((RMD160_CTX *, char *));
+-char *RMD160File __P((char *, char *));
+-char *RMD160Data __P((const u_char *, size_t, char *));
+-
+-#endif /* _RMD160_H */
+-
+-/*********************** end of file rmd160.h ***********************/
+diff -ruN skey-1.1.5.orig/rmd160hl.c skey-1.1.5/rmd160hl.c
+--- skey-1.1.5.orig/rmd160hl.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/rmd160hl.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,85 +0,0 @@
+-/* rmd160hl.c
+- *
----------------------------------------------------------------------------
+- * "THE BEER-WARE LICENSE" (Revision 42):
+- * <phk AT login.dkuug.dk> wrote this file. As long as you retain this notice
you
+- * can do whatever you want with this stuff. If we meet some day, and you
think
+- * this stuff is worth it, you can buy me a beer in return. Poul-Henning
Kamp
+- *
----------------------------------------------------------------------------
+- */
+-
+-#if defined(LIBC_SCCS) && !defined(lint)
+-static char rcsid[] = "$OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12
millert Exp $";
+-#endif /* LIBC_SCCS and not lint */
+-
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <errno.h>
+-#include <fcntl.h>
+-#include <sys/types.h>
+-#include <sys/uio.h>
+-#include <unistd.h>
+-#include "config.h"
+-#ifdef HAVE_RMD160_H
+-#include <rmd160.h>
+-#else
+-#include "rmd160.h"
+-#endif
+-
+-/* ARGSUSED */
+-char *
+-RMD160End(ctx, buf)
+- RMD160_CTX *ctx;
+- char *buf;
+-{
+- int i;
+- char *p = buf;
+- u_char digest[20];
+- static const char hex[]="0123456789abcdef";
+-
+- if (p == NULL && (p = malloc(41)) == NULL)
+- return 0;
+-
+- RMD160Final(digest,ctx);
+- for (i = 0; i < 20; i++) {
+- p[i + i] = hex[digest[i] >> 4];
+- p[i + i + 1] = hex[digest[i] & 0x0f];
+- }
+- p[i + i] = '\0';
+- return(p);
+-}
+-
+-char *
+-RMD160File (filename, buf)
+- char *filename;
+- char *buf;
+-{
+- u_char buffer[BUFSIZ];
+- RMD160_CTX ctx;
+- int fd, num, oerrno;
+-
+- RMD160Init(&ctx);
+-
+- if ((fd = open(filename, O_RDONLY)) < 0)
+- return(0);
+-
+- while ((num = read(fd, buffer, sizeof(buffer))) > 0)
+- RMD160Update(&ctx, buffer, num);
+-
+- oerrno = errno;
+- close(fd);
+- errno = oerrno;
+- return(num < 0 ? 0 : RMD160End(&ctx, buf));
+-}
+-
+-char *
+-RMD160Data (data, len, buf)
+- const u_char *data;
+- size_t len;
+- char *buf;
+-{
+- RMD160_CTX ctx;
+-
+- RMD160Init(&ctx);
+- RMD160Update(&ctx, data, len);
+- return(RMD160End(&ctx, buf));
+-}
+diff -ruN skey-1.1.5.orig/skey.1 skey-1.1.5/skey.1
+--- skey-1.1.5.orig/skey.1 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skey.1 2003-11-06 17:46:45.000000000 +0000
+@@ -1,95 +1,165 @@
+-.\" $OpenBSD: skey.1,v 1.21 2000/11/09 17:52:38 aaron Exp $
+-.\" @(#)skey.1 1.1 10/28/93
++.\" $NetBSD: skey.1,v 1.21 2003/09/07 16:22:24 wiz Exp $
+ .\"
+-.Dd October 28, 1993
++.\" from: @(#)skey.1 1.1 10/28/93
++.\"
++.Dd July 25, 2001
+ .Dt SKEY 1
+ .Os
+ .Sh NAME
+-.Nm skey, otp-md4, otp-md5, otp-sha1, otp-rmd160
++.Nm skey
+ .Nd respond to an OTP challenge
+ .Sh SYNOPSIS
+-.Nm skey
+-.Op Fl x
+-.Oo
+-.Fl md4 | Fl md5 | Fl sha1 |
+-.Fl rmd160
+-.Oc
++.Nm
+ .Op Fl n Ar count
+-.Op Fl p Ar passwd
+-<sequence#>[/] key
++.Op Fl p Ar password
++.Op Fl t Ar hash
++.Op Fl x
++.Ar sequence#
++.Op /
++.Ar key
+ .Sh DESCRIPTION
+-.Nm S/key
+-is a procedure for using one-time passwords to authenticate access to
+-computer systems.
+-It uses 64 bits of information transformed by the
+-MD4, MD5, SHA1, or RIPEMD-160 algorithms.
+-The user supplies the 64 bits
+-in the form of 6 English words that are generated by a secure computer.
+-This implementation of
+-.Nm s/key
+-is RFC 1938 compliant.
++.Em S/Key
++is a One Time Password (OTP) authentication system.
++It is intended to be used when the communication channel between
++a user and host is not secure (e.g. not encrypted or hardwired).
++Since each password is used only once, even if it is "seen" by a
++hostile third party, it cannot be used again to gain access to the host.
+ .Pp
+-When
+-.Nm skey
+-is invoked as
+-.Nm otp-method ,
+-.Nm skey
+-will use
+-.Ar method
+-as the hash function where
+-.Ar method
+-is currently one of md4, md5, sha1, or rmd160.
++.Em S/Key
++uses 64 bits of information, transformed by the
++.Tn MD4
++algorithm into 6 English words.
++The user supplies the words to authenticate himself to programs like
++.Xr login 1
++or
++.Xr ftpd 8 .
++.Pp
++Example use of the
++.Em S/Key
++program
++.Nm :
++.Bd -literal -offset indent
++% skey 99 th91334
++Enter password: \*[Lt]your secret password is entered here\*[Gt]
++OMEN US HORN OMIT BACK AHOY
++%
++.Ed
++.Pp
++The string that is given back by
++.Nm
++can then be used to log into a system.
++.Pp
++The programs that are part of the
++.Em S/Key
++system are:
++.Bl -tag -width skeyauditxxx
++.It Xr skeyinit 1
++used to set up your
++.Em S/Key .
++.It Nm
++used to get the one time password(s).
++.It Xr skeyinfo 1
++used to initialize the
++.Em S/Key
++database for the specified user.
++It also tells the user what the next challenge will be.
++.It Xr skeyaudit 1
++used to inform users that they will soon have to rerun
++.Xr skeyinit 1 .
++.El
+ .Pp
+-If you misspell your password while running
+-.Nm skey ,
++When you run
++.Xr skeyinit 1
++you inform the system of your
++secret password.
++Running
++.Nm
++then generates the
++one-time password(s), after requiring your secret password.
++If however, you misspell your secret password that you have given to
++.Xr skeyinit 1
++while running
++.Xr skey 1
+ you will get a list of passwords
+-that will not work, and no indication of the problem.
++that will not work, and no indication about the problem.
+ .Pp
+-Password sequence numbers count backwards.
++Password sequence numbers count backward from 99.
+ You can enter the passwords using small letters, even though
+-.Nm skey
++.Xr skey 1
+ prints them capitalized.
+ .Pp
+-The options are as follows:
+-.Bl -tag -width Ds
+-.It Fl n Ar count
+-Prints out
++The
++.Fl n Ar count
++argument asks for
+ .Ar count
+-one-time passwords.
+-The default is to print one.
+-.It Fl p Ar password
+-Uses
+-.Ar password
+-as the secret password.
+-Use of this option is discouraged as
+-your secret password could be visible in a process listing.
+-.It Fl x
+-Causes output to be in hexadecimal instead of ASCII.
+-.It Fl md4
+-Selects MD4 as the hash algorithm.
+-.It Fl md5
+-Selects MD5 as the hash algorithm.
+-.It Fl sha1
+-Selects SHA-1 (NIST Secure Hash Algorithm Revision 1) as the hash algorithm.
+-.It Fl rmd160
+-Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
+-.El
++password sequences to be printed out ending with the requested
++sequence number.
++.Pp
++The hash algorithm is selected using the
++.Fl t Ar hash
++option, possible choices here are md4, md5 or sha1.
++.Pp
++The
++.Fl p Ar password
++allows the user to specify the
++.Em S/Key
++password on the command line.
++.Pp
++To output the S/Key list in hexadecimal instead of words,
++use the
++.Fl x
++option.
+ .Sh EXAMPLES
+-.sp 0
+- % skey 99 th91334
+-.sp 0
+- Enter secret password: <your secret password is entered here>
+-.sp 0
+- OMEN US HORN OMIT BACK AHOY
+-.sp 0
+- %
++Initialize generation of one time passwords:
++.Bd -literal -offset indent
++host% skeyinit
++Password: \*[Lt]normal login password\*[Gt]
++[Adding username]
++Enter secret password: \*[Lt]new secret password\*[Gt]
++Again secret password: \*[Lt]new secret password again\*[Gt]
++ID username s/key is 99 host12345
++Next login password: SOME SIX WORDS THAT WERE COMPUTED
++.Ed
++.Pp
++Produce a list of one time passwords to take with to a conference:
++.Bd -literal -offset indent
++host% skey -n 3 99 host12345
++Enter secret password: \*[Lt]secret password as used with skeyinit\*[Gt]
++97: NOSE FOOT RUSH FEAR GREY JUST
++98: YAWN LEO DEED BIND WACK BRAE
++99: SOME SIX WORDS THAT WERE COMPUTED
++.Ed
++.Pp
++Logging in to a host where
++.Nm
++is installed:
++.Bd -literal -offset indent
++host% telnet host
++
++login: \*[Lt]username\*[Gt]
++Password [s/key 97 host12345]:
++.Ed
++.Pp
++Note that the user can use either his/her
++.Em S/Key
++password at the prompt but also the normal one unless the
++.Fl s
++flag is given to
++.Xr login 1 .
+ .Sh SEE ALSO
+ .Xr login 1 ,
++.Xr skeyaudit 1 ,
+ .Xr skeyinfo 1 ,
+-.Xr skeyinit 1
++.Xr skeyinit 1 ,
++.Xr ftpd 8
+ .Pp
+-.Em RFC1938
++.Em RFC 2289
+ .Sh TRADEMARKS AND PATENTS
+-S/Key is a Trademark of Bellcore.
++.Em S/Key
++is a trademark of
++.Tn Bellcore .
+ .Sh AUTHORS
+-Phil Karn, Neil M. Haller, John S. Walden, Scott Chasin
++Phil Karn,
++Neil M. Haller,
++John S. Walden,
++Scott Chasin
+diff -ruN skey-1.1.5.orig/skey.3 skey-1.1.5/skey.3
+--- skey-1.1.5.orig/skey.3 1970-01-01 01:00:00.000000000 +0100
++++ skey-1.1.5/skey.3 2003-11-06 17:46:45.000000000 +0000
+@@ -0,0 +1,264 @@
++.\" $NetBSD: skey.3,v 1.8 2003/06/06 13:42:50 wiz Exp $
++.\"
++.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
++.\" All rights reserved.
++.\"
++.\" This code is derived from software contributed to The NetBSD Foundation
++.\" by Gregory McGarry.
++.\"
++.\" Redistribution and use in source and binary forms, with or without
++.\" modification, are permitted provided that the following conditions
++.\" are met:
++.\" 1. Redistributions of source code must retain the above copyright
++.\" notice, this list of conditions and the following disclaimer.
++.\" 2. Redistributions in binary form must reproduce the above copyright
++.\" notice, this list of conditions and the following disclaimer in the
++.\" documentation and/or other materials provided with the distribution.
++.\" 3. All advertising materials mentioning features or use of this software
++.\" must display the following acknowledgement:
++.\" This product includes software developed by the NetBSD
++.\" Foundation, Inc. and its contributors.
++.\" 4. Neither the name of The NetBSD Foundation nor the names of its
++.\" contributors may be used to endorse or promote products derived
++.\" from this software without specific prior written permission.
++.\"
++.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
CONTRIBUTORS
++.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED
++.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR
++.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS
++.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE
++.\" POSSIBILITY OF SUCH DAMAGE.
++.\"
++.Dd November 10, 2001
++.Dt SKEY 3
++.Os
++.Sh NAME
++.Nm skey ,
++.Nm skeychallenge ,
++.Nm skeylookup ,
++.Nm skeygetnext ,
++.Nm skeyverify ,
++.Nm skeyzero ,
++.Nm getskeyprompt ,
++.Nm skey_set_algorithm ,
++.Nm skey_get_algorithm ,
++.Nm skey_haskey ,
++.Nm skey_keyinfo ,
++.Nm skey_passcheck ,
++.Nm skey_authenticate
++.Nd one-time password (OTP) library
++.Sh LIBRARY
++S/key One-Time Password Library (libskey, -lskey)
++.Sh SYNOPSIS
++.In skey.h
++.Ft int
++.Fn skeychallenge "struct skey *mp" "const char *name" "char *ss" \
++"size_t sslen"
++.Ft int
++.Fn skeylookup "struct skey *mp" "const char *name"
++.Ft int
++.Fn skeygetnext "struct skey *mp"
++.Ft int
++.Fn skeyverify "struct skey *mp" "char *response"
++.Ft int
++.Fn skeyzero "struct skey *mp" "char *response"
++.Ft int
++.Fn getskeyprompt "struct skey *mp" "char *name" "char *prompt"
++.Ft const char *
++.Fn skey_set_algorithm "const char *new"
++.Ft const char *
++.Fn skey_get_algorithm "void"
++.Ft int
++.Fn skey_haskey "const char *username"
++.Ft const char *
++.Fn skey_keyinfo "const char *username"
++.Ft int
++.Fn skey_passcheck "const char *username" "char *passwd"
++.Ft int
++.Fn skey_authenticate "const char *username"
++.Ft void
++.Fn f "char *x"
++.Ft int
++.Fn keycrunch "char *result" "const char *seed" "const char *passwd"
++.Ft void
++.Fn rip "char *buf"
++.Ft char *
++.Fn readpass "char *buf " "int n"
++.Ft char *
++.Fn readskey "char *buf" "int n"
++.Ft int
++.Fn atob8 "char *out" "const char *in"
++.Ft int
++.Fn btoa8 "char *out" "const char *in"
++.Ft int
++.Fn htoi "int c"
++.Ft const char *
++.Fn skipspace "const char *cp"
++.Ft void
++.Fn backspace "char *buf"
++.Ft void
++.Fn sevenbit "char *buf"
++.Ft char *
++.Fn btoe "char *engout" "const char *c"
++.Ft int
++.Fn etob "char *out" "const char *e"
++.Ft char *
++.Fn put8 "char *out" "const char *s"
++.Sh DESCRIPTION
++The
++.Nm
++library provides routines for accessing
++.Nx Ns 's
++one-time password (OTP) authentication system.
++.Pp
++Most S/Key operations take a pointer to a
++.Em struct skey ,
++which should be considered as an opaque identifier.
++.Sh FUNCTIONS
++The following high-level functions are available:
++.Bl -tag -width compact
++.It Fn skeychallenge "mp" "name" "ss" "sslen"
++Return a S/Key challenge for user
++.Fa name .
++If successful, the caller's skey structure
++.Fa mp
++is filled and 0 is returned.
++If unsuccessful (e.g. if name is unknown),
++\-1 is returned.
++.It Fn skeylookup "mp" "name"
++Find an entry for user
++.Fa name
++in the one-time password database.
++Returns 0 if the entry is found and 1 if the entry is not found.
++If an error occurs accessing the database, \-1 is returned.
++.It Fn skeygetnext "mp"
++Get the next entry in the one-time password database.
++Returns 0 on success and the entry is stored in
++.Ar mp
++and 1 if no more entries are available.
++If an error occurs accessing the database, \-1 is returned.
++.It Fn skeyverify "mp" "response"
++Verify response
++.Fa response
++to a S/Key challenge.
++Returns 0 if the verification is successful and 1 if the verification
failed.
++If an error occurs accessing the database, \-1 is returned.
++.It Fn skeyzero "mp" "response"
++Comment out user's entry in the S/Key database.
++Returns 0 on success and the database is updated,
++otherwise \-1 is returned and the database remains unchanged.
++.It Fn getskeyprompt "mp" "name" "prompt"
++Issue a S/Key challenge for user
++.Ar name .
++If successful, fill in the caller's skey structure
++.Fa mp
++and return 0.
++If unsuccessful (e.g. if name is unknown) \-1 is returned.
++.El
++.Pp
++The following lower-level functions are available:
++.Bl -tag -width compact
++.It Fn skey_set_algorithm "new"
++Set hash algorithm type.
++Valid values for
++.Fa new
++are "md4", "md5" and "sha1".
++.It Fn skey_get_algorithm "void"
++Get current hash type.
++.It Fn skey_haskey "username"
++Returns 0 if the user
++.Fa username
++exists and 1 if the user doesn't exist.
++Returns \-1 on file error.
++.It Fn skey_keyinfo "username"
++Returns the current sequence number and seed for user
++.Ar username .
++.It Fn skey_passcheck "username" "passwd"
++Checks to see if answer is the correct one to the current challenge.
++.It Fn skey_authenticate "username"
++Used when calling program will allow input of the user's response to
++the challenge.
++Returns zero on success or \-1 on failure.
++.El
++.Pp
++The following miscellaneous functions are available:
++.Bl -tag -width compact
++.It Fn f "x"
++One-way function to take 8 bytes pointed to by
++.Fa x
++and return 8 bytes in place.
++.It Fn keycrunch "char *result" "const char *seed" "const char *passwd"
++Crunch a key.
++.It Fn rip "buf"
++Strip trailing CR/LF characters from a line of text
++.Fa buf .
++.It Fn readpass "buf" "n"
++Read in secret passwd (turns off echo).
++.It Fn readskey "buf" "n"
++Read in an s/key OTP (does not turn off echo).
++.It Fn atob8 "out" "in"
++Convert 8-byte hex-ascii string
++.Fa in
++to binary array
++.Fa out .
++Returns 0 on success, \-1 on error.
++.It Fn btoa8 "out" "in"
++Convert 8-byte binary array
++.Fa in
++to hex-ascii string
++.Fa out .
++Returns 0 on success, \-1 on error.
++.It Fn htoi "int c"
++Convert hex digit to binary integer.
++.It Fn skipspace "cp"
++Skip leading spaces from the string
++.Fa cp .
++.It Fn backspace "buf"
++Remove backspaced over characters from the string
++.Fa buf .
++.It Fn sevenbit "buf"
++Ensure line
++.Fa buf
++is all seven bits.
++.It Fn btoe "engout" "c"
++Encode 8 bytes in
++.Ar c
++as a string of English words.
++Returns a pointer to a static buffer in
++.Fa engout .
++.It Fn etob "out" "e"
++Convert English to binary.
++Returns 0 if the word is not in the database, 1 if all good words and
++parity is valid, \-1 if badly formed input (i.e. \*[Gt] 4 char word)
++and -2 if words are valid but parity is wrong.
++.It Fn put8 "out" "s"
++Display 8 bytes
++.Fa s
++as a series of 16-bit hex digits.
++.El
++.Sh FILES
++.Bl -tag -width /usr/lib/libskey_p.a -compact
++.It Pa /usr/lib/libskey.a
++static skey library
++.It Pa /usr/lib/libskey.so
++dynamic skey library
++.It Pa /usr/lib/libskey_p.a
++static skey library compiled for profiling
++.El
++.Sh SEE ALSO
++.Xr skey 1 ,
++.Xr skeyaudit 1 ,
++.Xr skeyinfo 1
++.Sh BUGS
++The
++.Nm
++library functions are not re-entrant or thread-safe.
++.Pp
++The
++.Nm
++library defines many poorly named functions which pollute the name space.
+diff -ruN skey-1.1.5.orig/skeyaudit.1 skey-1.1.5/skeyaudit.1
+--- skey-1.1.5.orig/skeyaudit.1 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyaudit.1 2003-11-06 17:46:45.000000000 +0000
+@@ -1,46 +1,29 @@
+-.\" $OpenBSD: skeyaudit.1,v 1.8 2000/11/09 17:52:38 aaron Exp $
++.\" $NetBSD: skeyaudit.1,v 1.6 2001/04/09 12:34:14 wiz Exp $
+ .\"
+-.Dd 22 July 1997
++.Dd June 9, 1994
+ .Dt SKEYAUDIT 1
+ .Os
+ .Sh NAME
+ .Nm skeyaudit
+ .Nd warn users if their S/Key will soon expire
+ .Sh SYNOPSIS
+-.Nm skeyaudit
+-.Op Fl a
+-.Op Fl i
+-.Op Fl l Ar limit
++.Nm
++.Op Ar limit
+ .Sh DESCRIPTION
+ .Nm
+ searches through the file
+-.Pa /etc/skeykeys
++.Dq Pa /etc/skey/skeykeys
+ for users whose S/Key sequence number is less than
+ .Ar limit ,
+-and mails them a reminder to run
++and sends them a reminder to run
+ .Xr skeyinit 1
+-soon.
+-.Pp
+-The options are as follows:
+-.Bl -tag -width Ds
+-.It Fl a
+-Check all keys in
+-.Pa /etc/skeykeys .
+-This option is only available to the superuser and
+-is useful to run regularly via
+-.Xr cron 8 .
+-.It Fl i
+-Interactive mode.
+-Don't send mail, just print to the standard output.
+-.It Fl l Ar limit
+-The limit used to determine whether or not a user should be notified.
+-The default is to notify if there are fewer than 12 keys left.
+-.El
++soon. If no limit is specified a default of 12 is used.
+ .Sh FILES
+-.Bl -tag -width /etc/skeykeys -compact
+-.It Pa /etc/skeykeys
+-S/Key key information database
++.Bl -tag -width /etc/skey/skeykeys -compact
++.It Pa /etc/skey/skeykeys
++The S/Key key information database
+ .El
+ .Sh SEE ALSO
+ .Xr skey 1 ,
++.Xr skeyinfo 1 ,
+ .Xr skeyinit 1
+diff -ruN skey-1.1.5.orig/skeyaudit.c skey-1.1.5/skeyaudit.c
+--- skey-1.1.5.orig/skeyaudit.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyaudit.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,236 +0,0 @@
+-/* $OpenBSD: skeyaudit.c,v 1.10 2000/09/20 21:53:49 pjanzen Exp $ */
+-
+-/*
+- * Copyright (c) 1997, 2000 Todd C. Miller <Todd.Miller AT courtesan.com>
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- * derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES,
+- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS;
+- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#include <errno.h>
+-/*#include <limits.h>*/
+-#include <pwd.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <unistd.h>
+-#include <netdb.h>
+-#include "config.h"
+-#ifdef HAVE_ERR_H
+-#include <err.h>
+-#else
+-#include "err.h"
+-#endif
+-#include "skey.h"
+-
+-#include <sys/types.h>
+-#include <sys/param.h>
+-#include <sys/wait.h>
+-
+-#ifdef HAVE_LOGIN_CAP_H
+-# include <login_cap.h>
+-#else
+-# include "login_cap.h"
+-#endif
+-
+-char *__progname;
+-
+-void notify __P((struct passwd *, int, int));
+-FILE *runsendmail __P((struct passwd *, int *));
+-void usage __P((void));
+-
+-int
+-main(argc, argv)
+- int argc;
+- char **argv;
+-{
+- struct passwd *pw;
+- struct skey key;
+- int ch, errs = 0, left = 0, aflag = 0, iflag = 0, limit = 12;
+- char *name;
+-
+- __progname = argv[0];
+-
+- if (geteuid() != 0)
+- errx(1, "must be setuid root");
+-
+- while ((ch = getopt(argc, argv, "ail:")) != -1)
+- switch(ch) {
+- case 'a':
+- aflag = 1;
+- if (getuid() != 0)
+- errx(1, "only root may use the -a flag");
+- break;
+- case 'i':
+- iflag = 1;
+- break;
+- case 'l':
+- errno = 0;
+- if ((limit = (int)strtol(optarg, NULL, 10)) == 0)
+- errno = ERANGE;
+- if (errno) {
+- warn("key limit");
+- usage();
+- }
+- break;
+- default:
+- usage();
+- }
+-
+- if (argc - optind > 0)
+- usage();
+-
+- /* Need key.keyfile zero'd at the very least */
+- (void)memset(&key, 0, sizeof(key));
+-
+- if (aflag) {
+- while ((ch = skeygetnext(&key)) == 0) {
+- left = key.n - 1;
+- if ((pw = getpwnam(key.logname)) == NULL)
+- continue;
+- if (left >= limit)
+- continue;
+- notify(pw, left, iflag);
+- }
+- if (ch == -1)
+- errx(-1, "cannot open %s", SKEYKEYS);
+- else
+- (void)fclose(key.keyfile);
+- } else {
+- if ((pw = getpwuid(getuid())) == NULL)
+- errx(1, "no passwd entry for uid %u", getuid());
+- if ((name = strdup(pw->pw_name)) == NULL)
+- err(1, "cannot allocate memory");
+- sevenbit(name);
+-
+- errs = skeylookup(&key, name);
+- switch (errs) {
+- case 0: /* Success! */
+- left = key.n - 1;
+- break;
+- case -1: /* File error */
+- errx(errs, "cannot open %s", SKEYKEYS);
+- break;
+- case 1: /* Unknown user */
+- warnx("%s is not listed in %s", name,
+- SKEYKEYS);
+- }
+- (void)fclose(key.keyfile);
+-
+- if (!errs && left < limit)
+- notify(pw, left, iflag);
+- }
+-
+- exit(errs);
+-}
+-
+-void
+-notify(pw, seq, interactive)
+- struct passwd *pw;
+- int seq;
+- int interactive;
+-{
+- static char hostname[MAXHOSTNAMELEN];
+- int pid;
+- FILE *out;
+-
+- /* Only set this once */
+- if (hostname[0] == '\0' && gethostname(hostname, sizeof(hostname)) ==
-1)
+- strcpy(hostname, "unknown");
+-
+- if (interactive)
+- out = stdout;
+- else
+- out = runsendmail(pw, &pid);
+-
+- if (!interactive)
+- (void)fprintf(out,
+- "To: %s\nSubject: IMPORTANT action required\n",
pw->pw_name);
+-
+- if (seq)
+- (void)fprintf(out,
+-"\nYou are nearing the end of your current S/Key sequence for account\n\
+-%s on system %s.\n\n\
+-Your S/Key sequence number is now %d. When it reaches zero\n\
+-you will no longer be able to use S/Key to log into the system.\n\n",
+-pw->pw_name, hostname, seq);
+- else
+- (void)fprintf(out,
+-"\nYou are at the end of your current S/Key sequence for account\n\
+-%s on system %s.\n\n\
+-At this point you can no longer use S/Key to log into the system.\n\n",
+-pw->pw_name, hostname);
+- (void)fprintf(out,
+-"Type \"skeyinit -s\" to reinitialize your sequence number.\n\n");
+-
+- (void)fclose(out);
+- if (!interactive)
+- (void)waitpid(pid, NULL, 0);
+-}
+-
+-FILE *
+-runsendmail(pw, pidp)
+- struct passwd *pw;
+- int *pidp;
+-{
+- FILE *fp;
+- int pfd[2], pid;
+-
+- if (pipe(pfd) < 0)
+- return(NULL);
+-
+- switch (pid = fork()) {
+- case -1: /* fork(2) failed */
+- (void)close(pfd[0]);
+- (void)close(pfd[1]);
+- return(NULL);
+- case 0: /* In child */
+- (void)close(pfd[1]);
+- (void)dup2(pfd[0], STDIN_FILENO);
+- (void)close(pfd[0]);
+-
+- /* Run sendmail as target user not root */
+- if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) {
+- warn("cannot set user context");
+- _exit(127);
+- }
+-
+- execl(SENDMAIL, "sendmail", "-t", NULL);
+- warn("cannot run \"%s -t\"", SENDMAIL);
+- _exit(127);
+- }
+-
+- /* In parent */
+- *pidp = pid;
+- fp = fdopen(pfd[1], "w");
+- (void)close(pfd[0]);
+-
+- return(fp);
+-}
+-void
+-usage()
+-{
+- (void)fprintf(stderr, "Usage: %s [-i] [-l limit]\n",
+- __progname);
+- exit(1);
+-}
+diff -ruN skey-1.1.5.orig/skeyaudit.sh skey-1.1.5/skeyaudit.sh
+--- skey-1.1.5.orig/skeyaudit.sh 1970-01-01 01:00:00.000000000 +0100
++++ skey-1.1.5/skeyaudit.sh 2003-11-06 17:46:45.000000000 +0000
+@@ -0,0 +1,58 @@
++#!/bin/sh
++#
++# $NetBSD: skeyaudit.sh,v 1.2.12.2 2000/07/28 12:42:59 mjl Exp $
++#
++# This script will look thru the skeykeys file for
++# people with sequence numbers less than LOWLIMIT=12
++# and send them an e-mail reminder to use skeyinit soon
++#
++
++KEYDB=/etc/skey/skeykeys
++LOWLIMIT=12
++ADMIN=root
++SUBJECT="Reminder: Run skeyinit"
++HOST=`/bin/hostname`
++
++
++if [ "$1" != "" ]
++then
++ LOWLIMIT=$1
++fi
++
++if [ ! -s "${KEYDB}" ]; then
++ exit 0
++fi
++
++# an skeykeys entry looks like
++# jsw 0076 la13079 ba20a75528de9d3a
++# #oot md5 0005 aspa26398 9432d570ff4421f0 Jul 07,2000 01:36:43
++# mjl sha1 0099 alpha2 459a5dac23d20a90 Jul 07,2000 02:14:17
++# the sequence number is the second (or third) entry
++#
++
++SKEYS=`awk '/^#/ {next} {if($2 ~ /^[0-9]+$/) print $1,$2,$3; else print
$1,$3,$4; }' $KEYDB`
++
++set -- ${SKEYS}
++
++while [ "X$1" != "X" ]; do
++ USER=$1
++ SEQ=$2
++ KEY=$3
++ shift 3
++ # echo "$USER -- $SEQ -- $KEY"
++ if [ $SEQ -lt $LOWLIMIT ]; then
++ if [ $SEQ -lt 3 ]; then
++ SUBJECT="IMPORTANT action required"
++ fi
++ (
++ echo "You are nearing the end of your current S/Key sequence for
account $i"
++ echo "on system $HOST."
++ echo ""
++ echo "Your S/key sequence number is now $SEQ. When it reaches zero you"
++ echo "will no longer be able to use S/Key to login into the system. "
++ echo " "
++ echo "Use \"skeyinit -s\" to reinitialize your sequence number."
++ echo ""
++ ) | mail -s "$SUBJECT" $USER $ADMIN
++ fi
++done
+diff -ruN skey-1.1.5.orig/skey.c skey-1.1.5/skey.c
+--- skey-1.1.5.orig/skey.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skey.c 2003-11-06 17:46:45.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <ctype.h>
+ #include "config.h"
+
+ #ifdef HAVE_ERR_H
+@@ -35,102 +36,93 @@
+
+ #include "skey.h"
+
+-void usage __P((char *));
++int main(int, char **);
++void usage(char *);
+
+ int
+-main(argc, argv)
+- int argc;
+- char *argv[];
++main(int argc, char **argv)
+ {
+- int n, i, cnt = 1, pass = 0, hexmode = 0;
+- char passwd[SKEY_MAX_PW_LEN+1], key[SKEY_BINKEY_SIZE];
+- char buf[33], *seed, *slash;
+-
+- /* If we were called as otp-METHOD, set algorithm based on that */
+- if ((slash = strrchr(argv[0], '/')))
+- slash++;
+- else
+- slash = argv[0];
+- if (strncmp(slash, "otp-", 4) == 0) {
+- slash += 4;
+- if (skey_set_algorithm(slash) == NULL)
+- errx(1, "Unknown hash algorithm %s", slash);
+- }
+-
+- for (i = 1; i < argc && argv[i][0] == '-' && strcmp(argv[i], "--");) {
+- if (argv[i][2] == '\0') {
+- /* Single character switch */
+- switch (argv[i][1]) {
++ int n, cnt = 1, i, pass = 0, hexmode = 0;
++ char passwd[SKEY_MAX_PW_LEN+1], key[SKEY_BINKEY_SIZE];
++ char buf[33], *seed, *slash, *t;
++
++ while ((i = getopt(argc, argv, "fn:p:t:x")) != -1) {
++ switch(i) {
++ case 'f':
++ break; /* unused */
+ case 'n':
+- if (i + 1 == argc)
+- usage(argv[0]);
+- cnt = atoi(argv[++i]);
++ cnt = atoi(optarg);
+ break;
+ case 'p':
+- if (i + 1 == argc)
+- usage(argv[0]);
+- if (strlcpy(passwd, argv[++i],
sizeof(passwd)) >=
+- sizeof(passwd))
+- errx(1, "Password too long");
++ if (strncpy(passwd, optarg, sizeof(passwd))
== NULL)
++ errx(1, "Password too long");
+ pass = 1;
+ break;
++ case 't':
++ if (skey_set_algorithm(optarg) == NULL)
++ errx(1, "Unknown hash algorithm %s",
optarg);
++ break;
+ case 'x':
+ hexmode = 1;
+ break;
+ default:
+ usage(argv[0]);
+- }
+- } else {
+- /* Multi character switches are hash types */
+- if (skey_set_algorithm(&argv[i][1]) == NULL) {
+- warnx("Unknown hash algorithm %s",
&argv[i][1]);
+- usage(argv[0]);
+- }
++ break;
+ }
+- i++;
+ }
+
+- if (argc > i + 2)
+- usage(argv[0]);
+-
+- /* Could be in the form <number>/<seed> */
+- if (argc <= i + 1) {
++ /* could be in the form <number>/<seed> */
++ if (argc <= optind + 1) {
+ /* look for / in it */
+- if (argc <= i)
++ if (argc <= optind)
+ usage(argv[0]);
+- slash = strchr(argv[i], '/');
++ slash = strchr(argv[optind], '/');
+ if (slash == NULL)
+ usage(argv[0]);
+ *slash++ = '\0';
+ seed = slash;
+
+- if ((n = atoi(argv[i])) < 0) {
+- warnx("%d not positive", n);
++ if ((n = atoi(argv[optind])) < 0) {
++ fprintf(stderr, "%s is not positive\n", argv[optind]);
+ usage(argv[0]);
+ } else if (n > SKEY_MAX_SEQ) {
+ warnx("%d is larger than max (%d)", n, SKEY_MAX_SEQ);
+ usage(argv[0]);
+ }
+ } else {
+- if ((n = atoi(argv[i])) < 0) {
+- warnx("%d not positive", n);
++ if ((n = atoi(argv[optind])) < 0) {
++ fprintf(stderr, "%s not positive\n", argv[optind]);
+ usage(argv[0]);
+ } else if (n > SKEY_MAX_SEQ) {
+ warnx("%d is larger than max (%d)", n, SKEY_MAX_SEQ);
+ usage(argv[0]);
+ }
+- seed = argv[++i];
++ seed = argv[++optind];
++ }
++
++ for (t = seed; *t; t++) {
++ if (!isalnum(*t))
++ errx(1, "seed must be alphanumeric");
+ }
+
++ if (!*seed || strlen(seed) > SKEY_MAX_SEED_LEN)
++ errx(1, "seed must be between 1 and %d long",
SKEY_MAX_SEED_LEN);
++
+ /* Get user's secret password */
+ if (!pass) {
+- (void)fputs("Reminder - Do not use this program while logged
in via telnet or rlogin.\n", stderr);
+- (void)fputs("Enter secret password: ", stderr);
++ fputs("Reminder - Do not use this program while "
++ "logged in via telnet or rlogin.\n",
stderr);
++ fprintf(stderr, "Enter secret password: ");
+ readpass(passwd, sizeof(passwd));
+ if (passwd[0] == '\0')
+ exit(1);
+ }
+
++ if (strlen(passwd) < SKEY_MIN_PW_LEN)
++ warnx(
++ "RFC2289 states that password should be at least %d characters long",
++ SKEY_MIN_PW_LEN);
++
+ /* Crunch seed and password into starting key */
+ if (keycrunch(key, seed, passwd) != 0)
+ errx(1, "key crunch failed");
+@@ -138,16 +130,15 @@
+ if (cnt == 1) {
+ while (n-- != 0)
+ f(key);
+- (void)puts(hexmode ? put8(buf, key) : btoe(buf, key));
++ puts(hexmode ? put8(buf, key) : btoe(buf, key));
+ } else {
+ for (i = 0; i <= n - cnt; i++)
+ f(key);
+ for (; i <= n; i++) {
++ printf("%3d: %-29s", i, btoe(buf, key));
+ if (hexmode)
+- (void)printf("%d: %-29s %s\n", i,
+- btoe(buf, key), put8(buf, key));
+- else
+- (void)printf("%d: %-29s\n", i, btoe(buf,
key));
++ printf("\t%s", put8(buf, key));
++ puts("");
+ f(key);
+ }
+ }
+@@ -155,9 +146,10 @@
+ }
+
+ void
+-usage(s)
+- char *s;
++usage(char *s)
+ {
+- (void)fprintf(stderr, "Usage: %s [-x] [-md4|-md5|-sha1|-rmd160] [-n
count] [-p password] <sequence#>[/] key\n", s);
++ fprintf(stderr,
++"Usage: %s [-n count] [-p password] [-t hash] [-x] sequence# [/] key\n",
++ s);
+ exit(1);
+ }
+diff -ruN skey-1.1.5.orig/skey.h skey-1.1.5/skey.h
+--- skey-1.1.5.orig/skey.h 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skey.h 2003-11-06 17:46:45.000000000 +0000
+@@ -1,3 +1,5 @@
++/* $NetBSD: skey.h,v 1.8 2000/07/28 16:35:11 thorpej Exp $ */
++
+ /*
+ * S/KEY v1.1b (skey.h)
+ *
+@@ -11,86 +13,86 @@
+ * Todd C. Miller <Todd.Miller AT courtesan.com>
+ *
+ * Main client header
+- *
+- * $OpenBSD: skey.h,v 1.13 1999/07/15 14:33:48 provos Exp $
+ */
+
+ /* Server-side data structure for reading keys file during login */
+-struct skey {
+- FILE *keyfile;
+- char buf[256];
+- char *logname;
+- int n;
+- char *seed;
+- char *val;
+- long recstart; /* needed so reread of buffer is efficient */
++struct skey
++{
++ FILE *keyfile;
++ char buf[256];
++ char *logname;
++ int n;
++ char *seed;
++ char *val;
++ long recstart; /* needed so reread of buffer is efficient */
+ };
+
+ /* Client-side structure for scanning data stream for challenge */
+-struct mc {
+- char buf[256];
+- int skip;
+- int cnt;
++struct mc
++{
++ char buf[256];
++ int skip;
++ int cnt;
+ };
+
+ /* Maximum sequence number we allow */
+ #ifndef SKEY_MAX_SEQ
+-#define SKEY_MAX_SEQ 10000
++#define SKEY_MAX_SEQ 10000
+ #endif
+
+-/* Minimum secret password length (rfc1938) */
++/* Minimum secret password length (rfc2289) */
+ #ifndef SKEY_MIN_PW_LEN
+-#define SKEY_MIN_PW_LEN 10
++#define SKEY_MIN_PW_LEN 10
+ #endif
+
+-/* Max secret password length (rfc1938 says 63 but allows more) */
++/* Max secret password length (rfc2289 says 63 but allows more) */
+ #ifndef SKEY_MAX_PW_LEN
+-#define SKEY_MAX_PW_LEN 255
++#define SKEY_MAX_PW_LEN 255
+ #endif
+
+-/* Max length of an S/Key seed (rfc1938) */
++/* Max length of an S/Key seed (rfc2289) */
+ #ifndef SKEY_MAX_SEED_LEN
+-#define SKEY_MAX_SEED_LEN 16
++#define SKEY_MAX_SEED_LEN 16
+ #endif
+
+ /* Max length of S/Key challenge (otp-???? 9999 seed) */
+ #ifndef SKEY_MAX_CHALLENGE
+-#define SKEY_MAX_CHALLENGE (11 + SKEY_MAX_HASHNAME_LEN +
SKEY_MAX_SEED_LEN)
++#define SKEY_MAX_CHALLENGE (11 + SKEY_MAX_HASHNAME_LEN +
SKEY_MAX_SEED_LEN)
+ #endif
+
+ /* Max length of hash algorithm name (md4/md5/sha1/rmd160) */
+-#define SKEY_MAX_HASHNAME_LEN 6
++#define SKEY_MAX_HASHNAME_LEN 6
+
+ /* Size of a binary key (not NULL-terminated) */
+-#define SKEY_BINKEY_SIZE 8
++#define SKEY_BINKEY_SIZE 8
+
+ /* Location of random file for bogus challenges */
+-#define _SKEY_RAND_FILE_PATH_ "/var/db/host.random"
++#define _SKEY_RAND_FILE_PATH_ "/var/db/host.random"
+
+ /* Prototypes */
+-void f(char *x);
+-int keycrunch(char *result, char *seed, char *passwd);
+-char *btoe(char *engout, char *c);
+-char *put8(char *out, char *s);
+-int etob(char *out, char *e);
+-void rip(char *buf);
+-int skeychallenge(struct skey * mp, char *name, char *ss);
+-int skeylookup (struct skey * mp, char *name);
+-int skeyverify (struct skey * mp, char *response);
+-int skeyzero (struct skey * mp, char *response);
+-void sevenbit (char *s);
+-void backspace (char *s);
+-char *skipspace (char *s);
+-char *readpass (char *buf, int n);
+-char *readskey (char *buf, int n);
+-int skey_authenticate (char *username);
+-int skey_passcheck (char *username, char *passwd);
+-char *skey_keyinfo (char *username);
+-int skey_haskey (char *username);
+-int getskeyprompt (struct skey *mp, char *name, char *prompt);
+-int atob8 (char *out, char *in);
+-int btoa8 (char *out, char *in);
+-int htoi (int c);
+-const char *skey_get_algorithm (void);
+-char *skey_set_algorithm (char *new);
+-int skeygetnext (struct skey *mp);
++void f __P ((char *));
++int keycrunch __P ((char *, const char *, const char *));
++char *btoe __P ((char *, const char *));
++char *put8 __P ((char *, const char *));
++int etob __P ((char *, const char *));
++void rip __P ((char *));
++int skeychallenge __P ((struct skey *, const char *, char *, size_t));
++int skeylookup __P ((struct skey *, const char *));
++int skeyverify __P ((struct skey *, char *));
++void sevenbit __P ((char *));
++void backspace __P ((char *));
++const char *skipspace __P ((const char *));
++char *readpass __P ((char *, int));
++char *readskey __P ((char *, int));
++int skey_authenticate __P ((const char *));
++int skey_passcheck __P ((const char *, char *));
++const char *skey_keyinfo __P ((const char *));
++int skey_haskey __P ((const char *));
++int getskeyprompt __P ((struct skey *, char *, char *));
++int atob8 __P((char *, const char *));
++int btoa8 __P((char *, const char *));
++int htoi __P((int));
++const char *skey_get_algorithm __P((void));
++const char *skey_set_algorithm __P((const char *));
++int skeygetnext __P((struct skey *));
++int skeyzero __P((struct skey *, char *));
+diff -ruN skey-1.1.5.orig/skeyinfo.1 skey-1.1.5/skeyinfo.1
+--- skey-1.1.5.orig/skeyinfo.1 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyinfo.1 2003-11-06 17:46:45.000000000 +0000
+@@ -1,30 +1,19 @@
+-.\" $OpenBSD: skeyinfo.1,v 1.3 2000/03/11 21:40:02 aaron Exp $
++.\" $NetBSD: skeyinfo.1,v 1.5 2001/04/09 12:34:44 wiz Exp $
+ .\"
+-.Dd 22 July 1997
++.Dd June 9, 1994
+ .Dt SKEYINFO 1
+ .Os
+ .Sh NAME
+ .Nm skeyinfo
+ .Nd obtain the next S/Key challenge for a user
+ .Sh SYNOPSIS
+-.Nm skeyinfo
+-.Op Fl v
++.Nm
+ .Op Ar user
+ .Sh DESCRIPTION
+ .Nm
+ prints out the next S/Key challenge for the specified user or for the
+ current user if no user is specified.
+-.Pp
+-The options are as follows:
+-.Bl -tag -width Ds
+-.It Fl v
+-Print the hash algorithm as well.
+-.El
+-.Sh EXAMPLES
+-% skey -n <number of passwords to print> `skeyinfo` | lpr
+-.Pp
+-This would print out a list of S/Key passwords for use over
+-an untrusted network (perhaps for use at a conference).
+ .Sh SEE ALSO
+ .Xr skey 1 ,
++.Xr skeyaudit 1 ,
+ .Xr skeyinit 1
+diff -ruN skey-1.1.5.orig/skeyinfo.c skey-1.1.5/skeyinfo.c
+--- skey-1.1.5.orig/skeyinfo.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyinfo.c 2003-11-06 17:46:45.000000000 +0000
+@@ -1,9 +1,12 @@
+-/* $OpenBSD: skeyinfo.c,v 1.6 2001/02/05 16:58:11 millert Exp $ */
++/* $NetBSD: skeyinfo.c,v 1.4 2003/07/23 04:11:50 itojun Exp $ */
+
+-/*
+- * Copyright (c) 1997 Todd C. Miller <Todd.Miller AT courtesan.com>
++/*-
++ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
++ * This code is derived from software contributed to The NetBSD Foundation
++ * by Andrew Brown.
++ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+@@ -12,104 +15,79 @@
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- * derived from this software without specific prior written permission.
++ * 3. All advertising materials mentioning features or use of this software
++ * must display the following acknowledgement:
++ * This product includes software developed by the NetBSD
++ * Foundation, Inc. and its contributors.
++ * 4. Neither the name of The NetBSD Foundation nor the names of its
++ * contributors may be used to endorse or promote products derived
++ * from this software without specific prior written permission.
+ *
+- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES,
+- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS;
+- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
++ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED
++ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE
++ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-/*#include <limits.h>*/
+-#include <pwd.h>
+ #include <stdio.h>
+-#include <stdlib.h>
++#include <pwd.h>
++#include <err.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include "config.h"
+-#include "skey.h"
+-/*#include "defines.h"*/
+
+-char *__progname;
++#include "skey.h"
+
+-void usage(void);
++int main __P((int, char *[]));
+
+-int
+-main(argc, argv)
+- int argc;
+- char **argv;
++int main(int argc, char **argv)
+ {
+- struct passwd *pw;
+- struct skey key;
+- char *name = NULL;
+- int error, ch, verbose = 0;
+-
+- __progname=argv[0];
+-
+- if (geteuid() != 0)
+- errx(1, "must be setuid root");
+-
+- while ((ch = getopt(argc, argv, "v")) != -1)
+- switch(ch) {
+- case 'v':
+- verbose = 1;
+- break;
+- default:
+- usage();
++ struct skey skey;
++ char name[100], prompt[1024];
++ int uid;
++ struct passwd *pw = NULL;
++
++ argc--;
++ argv++;
++
++ if (geteuid())
++ errx(1, "must be root to read %s", SKEYKEYS);
++
++ uid = getuid();
++
++ if (!argc)
++ pw = getpwuid(uid);
++ else if (!uid)
++ pw = getpwnam(argv[0]);
++ else
++ errx(1, "permission denied to look other users skeys");
++
++ if (!pw) {
++ if (argc)
++ errx(1, "%s: no such user", argv[0]);
++ else
++ errx(1, "who are you?");
+ }
+- argc -= optind;
+- argv += optind;
+
+- if (argc == 1)
+- name = argv[0];
+- else if (argc > 1)
+- usage();
+-
+- if (name && getuid() != 0)
+- errx(1, "only root may specify an alternate user");
+-
+- if (name) {
+- if (strlen(name) > PASS_MAX)
+- errx(1, "username too long (%d chars max)", PASS_MAX);
+- if ((pw = getpwnam(name)) == NULL)
+- errx(1, "no passwd entry for %s", name);
+- } else {
+- if ((pw = getpwuid(getuid())) == NULL)
+- errx(1, "no passwd entry for uid %u", getuid());
+- }
++ strncpy(name, pw->pw_name, sizeof(name));
+
+- if ((name = strdup(pw->pw_name)) == NULL)
+- err(1, "cannot allocate memory");
+- sevenbit(name);
+-
+- error = skeylookup(&key, name);
+- switch (error) {
+- case 0: /* Success! */
+- if (verbose)
+- (void)printf("otp-%s ", skey_get_algorithm());
+- (void)printf("%d %s\n", key.n - 1, key.seed);
+- break;
+- case -1: /* File error */
+- warnx("cannot open %s", SKEYKEYS);
+- break;
+- case 1: /* Unknown user */
+- warnx("%s is not listed in %s", name, SKEYKEYS);
++ if (getskeyprompt(&skey, name, prompt) == -1) {
++ printf("%s %s no s/key\n",
++ argc ? name : "You",
++ argc ? "has" : "have");
+ }
+- (void)fclose(key.keyfile);
+-
+- exit(error);
+-}
+-
+-void
+-usage()
+-{
+- (void)fprintf(stderr, "Usage: %s [-v] [user]\n", __progname);
+- exit(1);
++ else {
++ if (argc)
++ printf("%s's ", pw->pw_name);
++ else
++ printf("Your ");
++ printf("next %s", prompt);
++ }
++ return 0;
+ }
+diff -ruN skey-1.1.5.orig/skeyinit.1 skey-1.1.5/skeyinit.1
+--- skey-1.1.5.orig/skeyinit.1 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyinit.1 2003-11-06 17:46:45.000000000 +0000
+@@ -1,22 +1,18 @@
+-.\" $OpenBSD: skeyinit.1,v 1.19 2000/11/09 17:52:39 aaron Exp $
+-.\" $NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
++.\" $NetBSD: skeyinit.1,v 1.11 2001/04/09 12:35:00 wiz Exp $
+ .\" @(#)skeyinit.1 1.1 10/28/93
+ .\"
+-.Dd February 24, 1998
++.Dd June 7, 2000
+ .Dt SKEYINIT 1
+ .Os
+ .Sh NAME
+ .Nm skeyinit
+ .Nd change password or add user to S/Key authentication system
+ .Sh SYNOPSIS
+-.Nm skeyinit
++.Nm
++.Op Fl n Ar count
+ .Op Fl s
++.Op Fl t Ar hash
+ .Op Fl z
+-.Op Fl n Ar count
+-.Oo
+-.Fl md4 | Fl md5 | Fl sha1 |
+-.Fl rmd160
+-.Oc
+ .Op Ar user
+ .Sh DESCRIPTION
+ .Nm
+@@ -30,52 +26,17 @@
+ .Nm
+ requires you to type a secret password, so it should be used
+ only on a secure terminal.
+-For example, on the console of a
+-workstation or over an encrypted network session.
+-If you are using
+-.Nm
+-while logged in over an untrusted network, follow the instructions
+-given below with the
+-.Fl s
+-option.
+-.Pp
+-Before initializing an S/Key entry, the user must authenticate
+-using either a standard password or an S/Key challenge.
+-When used over an untrusted network, a password of
+-.Sq s/key
+-should be used.
+-The user will then be presented with the standard
+-S/Key challenge and allowed to proceed if it is correct.
+-.Pp
+-The options are as follows:
++.Sh OPTIONS
+ .Bl -tag -width Ds
+-.It Fl x
+-Displays pass phrase in hexadecimal instead of ASCII.
+ .It Fl s
+-Set secure mode where the user is expected to have used a secure
+-machine to generate the first one-time password.
+-Without the
+-.Fl s
+-option the system will assume you are directly connected over secure
+-communications and prompt you for your secret password.
+-The
+-.Fl s
+-option also allows one to set the seed and count for complete
+-control of the parameters.
+-You can use
+-.Ic skeyinit -s
+-in combination with the
+-.Nm skey
+-command to set the seed and count if you do not like the defaults.
+-To do this run
+-.Nm
+-in one window and put in your count and seed, then run
+-.Nm skey
+-in another window to generate the correct 6 English words for that
+-count and seed.
+-You can then "cut-and-paste" or type the words into the
+-.Nm
+-window.
++allows the user to set the seed and count for complete control
++of the parameters.
++To do this run skeyinit in one window and put in your count and seed;
++then run
++.Xr skey 1
++in another window to generate the correct 6 english words
++for that count and seed.
++You can then "cut-and-paste" or type the words into the skeyinit window.
+ .It Fl z
+ Allows the user to zero their S/Key entry.
+ .It Fl n Ar count
+@@ -84,30 +45,22 @@
+ sequence at
+ .Ar count
+ (default is 100).
+-.It Fl md4
+-Selects MD4 as the hash algorithm.
+-.It Fl md5
+-Selects MD5 as the hash algorithm.
+-.It Fl sha1
+-Selects SHA (NIST Secure Hash Algorithm Revision 1) as the hash algorithm.
+-.It Fl rmd160
+-Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
++.It Fl t Ar hash
++Selects the hash algorithm to use.
++Available choices are md4 (the default), md5 or sha1.
+ .It Ar user
+ The username to be changed/added.
+-By default the current user is operated on.
++By default the current user is operated on, only root may
++change other user's entries.
+ .El
+-.Sh ERRORS
+-.Bl -tag -width "skey disabled"
+-.It skey disabled
+-.Pa /etc/skeykeys
+-does not exist.
+-It must be created by the superuser in order to use
+-.Nm skeyinit .
+ .Sh FILES
+-.Bl -tag -width /etc/skeykeys
+-.It Pa /etc/skeykeys
+-database of information for S/Key system
++.Bl -tag -width /etc/skey/skeykeys
++.It Pa /etc/skey/skeykeys
++data base of information for S/Key system.
++.El
+ .Sh SEE ALSO
+-.Xr skey 1
++.Xr skey 1 ,
++.Xr skeyaudit 1 ,
++.Xr skeyinfo 1
+ .Sh AUTHORS
+ Phil Karn, Neil M. Haller, John S. Walden, Scott Chasin
+diff -ruN skey-1.1.5.orig/skeyinit.c skey-1.1.5/skeyinit.c
+--- skey-1.1.5.orig/skeyinit.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyinit.c 2003-11-06 17:46:45.000000000 +0000
+@@ -43,6 +43,18 @@
+
+ #include <netdb.h>
+
++#ifdef HAVE_SHADOW_H
++#include <shadow.h>
++#endif
++
++#ifdef HAVE_CRACK_H
++#include <crack.h>
++#ifndef CRACKLIB_DICTPATH
++#define CRACKLIB_DICTPATH "/usr/lib/cracklib_dict"
++#endif
++#endif
++
++#include "err.h"
+ #include "skey.h"
+
+
+@@ -50,62 +62,80 @@
+ #define SKEY_NAMELEN 4
+ #endif
+
+-void usage __P((char *));
++int main __P((int, char **));
+
+-int
+-main(argc, argv)
+- int argc;
+- char *argv[];
++int main(int argc, char **argv)
+ {
+- int rval, nn, i, l, n=0, defaultsetup=1, zerokey=0, hexmode=0;
++ int rval, nn, i, l, n=0, defaultsetup=1, c, zerokey=0, hexmode=0;
+ time_t now;
+- struct utmp old_ut;
+-
+-#ifndef UT_LINESIZE
+-# define UT_LINESIZE (sizeof(old_ut.ut_line))
+-# define UT_NAMESIZE (sizeof(old_ut.ut_name))
+-# define UT_HOSTSIZE (sizeof(old_ut.ut_host))
+-# endif
+-
+- char hostname[MAXHOSTNAMELEN];
++ char hostname[MAXHOSTNAMELEN+1];
++ char seed[SKEY_MAX_PW_LEN+2], key[SKEY_BINKEY_SIZE];
++ char defaultseed[SKEY_MAX_SEED_LEN+1];
+ char passwd[SKEY_MAX_PW_LEN+2], passwd2[SKEY_MAX_PW_LEN+2];
+- char seed[SKEY_MAX_SEED_LEN+2], defaultseed[SKEY_MAX_SEED_LEN+1];
+- char tbuf[27], buf[80], key[SKEY_BINKEY_SIZE];
+- char lastc, me[UT_NAMESIZE+1], *salt, *p, *pw, *ht=NULL;
+- struct skey skey;
+- struct passwd *pp;
+- struct tm *tm;
++ char tbuf[27], buf[80];
++ char lastc, me[LOGIN_NAME_MAX+1], *p, *pw, *ht=NULL, *msg;
++ const char *salt;
++ struct skey skey;
++ struct passwd *pp;
++ struct tm *tm;
++#ifdef HAVE_SHADOW_H
++ struct spwd *sp;
++#endif
++
++ i = open(_PATH_DEVNULL, O_RDWR);
++ while (i >= 0 && i < 2)
++ i = dup(i);
++ if (i > 2)
++ close(i);
+
+ if (geteuid() != 0)
+ errx(1, "must be setuid root.");
+
+ if (gethostname(hostname, sizeof(hostname)) < 0)
+- err(1, "gethostname");
+- for (i = 0, p = defaultseed; hostname[i] && i < SKEY_NAMELEN; i++) {
+- if (isalpha(hostname[i])) {
+- if (isupper(hostname[i]))
+- hostname[i] = tolower(hostname[i]);
+- *p++ = hostname[i];
+- } else if (isdigit(hostname[i]))
+- *p++ = hostname[i];
++ err(1, "gethostname() error");
++
++ for (i = 0, l = 0; l < sizeof(defaultseed); i++) {
++ if (hostname[i] == '\0') {
++ defaultseed[l] = hostname[i];
++ break;
++ }
++ if (isalnum(hostname[i]))
++ defaultseed[l++] = hostname[i];
+ }
+- *p = '\0';
+- (void)time(&now);
+- (void)sprintf(tbuf, "%05ld", (long) (now % 100000));
+- (void)strncat(defaultseed, tbuf, sizeof(defaultseed) - 5);
++
++ defaultseed[SKEY_NAMELEN] = '\0';
++ time(&now);
++ snprintf(tbuf, sizeof(tbuf), "%05ld", (long) (now % 100000));
++ strncat(defaultseed, tbuf, sizeof(defaultseed));
+
+ if ((pp = getpwuid(getuid())) == NULL)
+- err(1, "no user with uid %d", getuid());
+- (void)strcpy(me, pp->pw_name);
++ err(1, "no user with uid %ld", (u_long)getuid());
++ strncpy(me, pp->pw_name, sizeof(me));
+
+ if ((pp = getpwnam(me)) == NULL)
+- err(1, "Who are you?");
++ err(1, "getpwnam() returned NULL, Who are you?");
++#ifdef HAVE_SHADOW_H
++ /* hacking in shadow support... */
++ else if (strcmp(pp->pw_passwd, "x") == 0) {
++ if ((sp = getspnam(me)) == NULL)
++ err(1, "Unable to verify Password");
++ pp->pw_passwd = sp->sp_pwdp;
++ }
++#endif
+ salt = pp->pw_passwd;
+
+- for (i = 1; i < argc && argv[i][0] == '-' && strcmp(argv[i], "--");) {
+- if (argv[i][2] == '\0') {
+- /* Single character switch */
+- switch (argv[i][1]) {
++ while((c = getopt(argc, argv, "n:t:sxz")) != -1) {
++ switch(c) {
++ case 'n':
++ n = atoi(optarg);
++ if (n < 1 || n > SKEY_MAX_SEQ)
++ errx(1, "count must be between 1 and
%d", SKEY_MAX_SEQ);
++ break;
++ case 't':
++ if(skey_set_algorithm(optarg) == NULL)
++ errx(1, "Unknown hash algorithm %s",
optarg);
++ ht = optarg;
++ break;
+ case 's':
+ defaultsetup = 0;
+ break;
+@@ -115,105 +145,51 @@
+ case 'z':
+ zerokey = 1;
+ break;
+- case 'n':
+- if (argv[++i] == NULL || argv[i][0] == '\0')
+- usage(argv[0]);
+- if ((n = atoi(argv[i])) < 1 || n >=
SKEY_MAX_SEQ)
+- errx(1, "count must be > 0 and < %d",
+- SKEY_MAX_SEQ);
+- break;
+ default:
+- usage(argv[0]);
+- }
+- } else {
+- /* Multi character switches are hash types */
+- if ((ht = skey_set_algorithm(&argv[i][1])) == NULL) {
+- warnx("Unknown hash algorithm %s",
&argv[i][1]);
+- usage(argv[0]);
++ errx(1, "Usage: %s [-n count] [-t
md4|md5|sha1] [-s] [-x] [-z] [user]", argv[0]);
+ }
+ }
+- i++;
+- }
++
++ if (argc > optind) {
++ pp = getpwnam(argv[optind]);
++ if (pp == NULL)
++ errx(1, "User %s unknown", argv[optind]);
++ }
+
+- /* check for optional user string */
+- if (argc - i > 1) {
+- usage(argv[0]);
+- } else if (argv[i]) {
+- if ((pp = getpwnam(argv[i])) == NULL) {
+- if (getuid() == 0) {
+- static struct passwd _pp;
+-
+- _pp.pw_name = argv[i];
+- pp = &_pp;
+- warnx("Warning, user unknown: %s", argv[i]);
+- } else {
+- errx(1, "User unknown: %s", argv[i]);
+- }
+- } else if (strcmp(pp->pw_name, me) != 0) {
++ if (strcmp(pp->pw_name, me) != 0) {
+ if (getuid() != 0) {
+ /* Only root can change other's passwds */
+ errx(1, "Permission denied.");
+ }
+ }
+- }
+
+ if (getuid() != 0) {
+- pw = getpass("Password (or `s/key'):");
+- if (strcasecmp(pw, "s/key") == 0) {
+- if (skey_haskey(me))
+- exit(1);
+- if (skey_authenticate(me))
+- errx(1, "Password incorrect.");
+- } else {
+- p = crypt(pw, salt);
+- if (strcmp(p, pp->pw_passwd))
+- errx(1, "Password incorrect.");
+- }
++ pw = getpass("Password: ");
++ p = crypt(pw, salt);
++ if (strcmp(p, pp->pw_passwd))
++ errx(1, "Password incorrect.");
+ }
+
+ rval = skeylookup(&skey, pp->pw_name);
+ switch (rval) {
+ case -1:
+- if (errno == ENOENT)
+- errx(1, "S/Key disabled");
+- else
+- err(1, "cannot open database");
+- break;
++ err(1, "cannot open database");
+ case 0:
+- /* comment out user if asked to */
+ if (zerokey)
+- exit(skeyzero(&skey, pp->pw_name));
++ exit (skeyzero(&skey, pp->pw_name));
++ printf("[Updating %s]\n", pp->pw_name);
++ printf("Old key: [%s] %s\n", skey_get_algorithm(),
skey.seed);
+
+- (void)printf("[Updating %s]\n", pp->pw_name);
+- (void)printf("Old key: [%s] %s\n",
skey_get_algorithm(),
+- skey.seed);
+-
+- /*
+- * Sanity check old seed.
+- */
+ l = strlen(skey.seed);
+- for (p = skey.seed; *p; p++) {
+- if (isalpha(*p)) {
+- if (isupper(*p))
+- *p = tolower(*p);
+- } else if (!isdigit(*p)) {
+- memmove(p, p + 1, l - (p -
skey.seed));
+- l--;
+- }
+- }
+-
+- /*
+- * Let's be nice if they have an skey.seed that
+- * ends in 0-8 just add one
+- */
+ if (l > 0) {
+ lastc = skey.seed[l - 1];
+- if (isdigit(lastc) && lastc != '9') {
+- (void)strcpy(defaultseed, skey.seed);
++ if (isdigit((unsigned char)lastc) && lastc !=
'9') {
++ strncpy(defaultseed, skey.seed,
sizeof(defaultseed));
+ defaultseed[l - 1] = lastc + 1;
+ }
+- if (isdigit(lastc) && lastc == '9' && l < 16)
{
+- (void)strcpy(defaultseed, skey.seed);
++ if (isdigit((unsigned char)lastc) && lastc ==
'9' &&
++ l < 16) {
++ strncpy(defaultseed, skey.seed,
sizeof(defaultseed));
+ defaultseed[l - 1] = '0';
+ defaultseed[l] = '0';
+ defaultseed[l + 1] = '\0';
+@@ -223,7 +199,7 @@
+ case 1:
+ if (zerokey)
+ errx(1, "You have no entry to zero.");
+- (void)printf("[Adding %s]\n", pp->pw_name);
++ printf("[Adding %s]\n", pp->pw_name);
+ break;
+ }
+ if (n == 0)
+@@ -237,37 +213,33 @@
+ }
+
+ if (!defaultsetup) {
+- (void)printf("You need the 6 english words generated from the
\"skey\" command.\n");
++ printf("You need the 6 english words generated from the
\"skey\" command.\n");
+ for (i = 0; ; i++) {
+ if (i >= 2)
+ exit(1);
+
+- (void)printf("Enter sequence count from 1 to %d: ",
+- SKEY_MAX_SEQ);
+- (void)fgets(buf, sizeof(buf), stdin);
++ printf("Enter sequence count from 1 to %d: ",
SKEY_MAX_SEQ);
++ fgets(buf, sizeof(buf), stdin);
+ n = atoi(buf);
+ if (n > 0 && n < SKEY_MAX_SEQ)
+ break; /* Valid range */
+- (void)printf("Error: Count must be > 0 and < %d\n",
+- SKEY_MAX_SEQ);
++ printf("\nError: Count must be between 0 and %d\n",
SKEY_MAX_SEQ);
+ }
+
+ for (i = 0;; i++) {
+ if (i >= 2)
+ exit(1);
+
+- (void)printf("Enter new key [default %s]: ",
+- defaultseed);
+- (void)fgets(seed, sizeof(seed), stdin);
++ printf("Enter new seed [default %s]: ", defaultseed);
++ fflush(stdout);
++ fgets(seed, sizeof(seed), stdin);
+ rip(seed);
+- if (seed[0] == '\0')
+- (void)strcpy(seed, defaultseed);
+ for (p = seed; *p; p++) {
+ if (isalpha(*p)) {
+ if (isupper(*p))
+ *p = tolower(*p);
+ } else if (!isdigit(*p)) {
+- (void)puts("Error: seed may only
contain alpha numeric characters");
++ puts("Error: seed may only contain
alpha numeric characters");
+ break;
+ }
+ }
+@@ -275,66 +247,75 @@
+ break; /* Valid seed */
+ }
+ if (strlen(seed) > SKEY_MAX_SEED_LEN) {
+- (void)printf("Notice: Seed truncated to %d
characters.\n",
+- SKEY_MAX_SEED_LEN);
++ printf("Notice: Seed truncated to %d characters.\n",
SKEY_MAX_SEED_LEN);
+ seed[SKEY_MAX_SEED_LEN] = '\0';
+ }
++ if (seed[0] == '\0')
++ strncpy(seed, defaultseed, sizeof(seed));
+
+ for (i = 0;; i++) {
+ if (i >= 2)
+ exit(1);
+
+- (void)printf("otp-%s %d %s\nS/Key access password: ",
++ printf("otp-%s %d %s\ns/key access password: ",
+ skey_get_algorithm(), n, seed);
+- (void)fgets(buf, sizeof(buf), stdin);
++ fgets(buf, sizeof(buf), stdin);
+ rip(buf);
+ backspace(buf);
+
+ if (buf[0] == '?') {
+- (void)puts("Enter 6 English words from secure
S/Key calculation.");
++ puts("Enter 6 English words from secure s/key
calculation.");
+ continue;
+ } else if (buf[0] == '\0')
+ exit(1);
+ if (etob(key, buf) == 1 || atob8(key, buf) == 0)
+ break; /* Valid format */
+- (void)puts("Invalid format - try again with 6 English
words.");
++ puts("Invalid format - try again with 6 English
words.");
+ }
+ } else {
+ /* Get user's secret password */
+- fputs("Reminder - Only use this method if you are directly
connected\n or have an encrypted channel. If you are using
telnet\n or rlogin, exit with no password and use skeyinit -s.\n",
stderr);
++ puts("Reminder - Only use this method if you are directly
connected\n"
++ "or have an encrypted channel. If you are using
telnet\n"
++ "or rlogin, exit with no password and use skeyinit
-s.\n");
+
+ for (i = 0;; i++) {
+- if (i > 2)
++ if (i >= 3)
+ exit(1);
+
+- (void)fputs("Enter secret password: ", stderr);
++ printf("Enter secret password: ");
+ readpass(passwd, sizeof(passwd));
+ if (passwd[0] == '\0')
+ exit(1);
+
+ if (strlen(passwd) < SKEY_MIN_PW_LEN) {
+- (void)fprintf(stderr,
+- "Your password must be at least %d
characters long.\n", SKEY_MIN_PW_LEN);
++ fprintf(stderr,
++ "Your password must be at least %d characters long.\n",
SKEY_MIN_PW_LEN);
+ continue;
+ } else if (strcmp(passwd, pp->pw_name) == 0) {
+- (void)fputs("Your password may not be the
same as your user name.\n", stderr);
+- continue;
+- } else if (strspn(passwd,
"abcdefghijklmnopqrstuvwxyz") == strlen(passwd)) {
+- (void)fputs("Your password must contain more
than just lower case letters.\nWhitespace, numbers, and puctuation are
suggested.\n", stderr);
++ fputs("Your password may not be the same as
your user name.\n", stderr);
+ continue;
++ }
++#ifdef HAVE_CRACK_H
++ if (msg = (char *) FascistCheck(passwd,
CRACKLIB_DICTPATH)) {
++ warnx("Warning: %s", msg);
++ /* if (!i) */ /* reject passwords cracklib
doesnt like the first time its entered... */
++ /* continue; */
+ }
++#endif
+
+- (void)fputs("Again secret password: ", stderr);
++ printf("Again secret password: ");
+ readpass(passwd2, sizeof(passwd));
++ if (passwd2[0] == '\0')
++ exit(1);
+
+ if (strcmp(passwd, passwd2) == 0)
+ break;
+
+- (void)fputs("Passwords do not match.\n", stderr);
++ puts("Passwords do not match.");
+ }
+
+ /* Crunch seed and password into starting key */
+- (void)strcpy(seed, defaultseed);
++ strncpy(seed, defaultseed, sizeof(seed));
+ if (keycrunch(key, seed, passwd) != 0)
+ err(2, "key crunch failed");
+
+@@ -342,16 +323,16 @@
+ while (nn-- != 0)
+ f(key);
+ }
+- (void)time(&now);
++ time(&now);
+ tm = localtime(&now);
+- (void)strftime(tbuf, sizeof(tbuf), " %b %d,%Y %T", tm);
++ strftime(tbuf, sizeof(tbuf), " %b %d,%Y %T", tm);
+
+ if ((skey.val = (char *)malloc(16 + 1)) == NULL)
+ err(1, "Can't allocate memory");
+
+- /* Zero out old key if necesary (entry would change size) */
++ /* Zero out old key if necessary (entry would change size) */
+ if (zerokey) {
+- (void)skeyzero(&skey, pp->pw_name);
++ skeyzero(&skey, pp->pw_name);
+ /* Re-open keys file and seek to the end */
+ if (skeylookup(&skey, pp->pw_name) == -1)
+ err(1, "cannot open database");
+@@ -376,26 +357,17 @@
+
+ /* Don't save algorithm type for md4 (keep record length same) */
+ if (strcmp(skey_get_algorithm(), "md4") == 0)
+- (void)fprintf(skey.keyfile, "%s %04d %-16s %s %-21s\n",
++ fprintf(skey.keyfile, "%s %04d %-16s %s %-21s\n",
+ pp->pw_name, n, seed, skey.val, tbuf);
+ else
+- (void)fprintf(skey.keyfile, "%s %s %04d %-16s %s %-21s\n",
++ fprintf(skey.keyfile, "%s %s %04d %-16s %s %-21s\n",
+ pp->pw_name, skey_get_algorithm(), n, seed, skey.val,
tbuf);
+
+- (void)fclose(skey.keyfile);
++ fclose(skey.keyfile);
+
+- (void)printf("\nID %s skey is otp-%s %d %s\n", pp->pw_name,
++ printf("\nID %s skey is otp-%s %d %s\n", pp->pw_name,
+ skey_get_algorithm(), n, seed);
+- (void)printf("Next login password: %s\n\n",
++ printf("Next login password: %s\n\n",
+ hexmode ? put8(buf, key) : btoe(buf, key));
+- exit(0);
+-}
+-
+-void
+-usage(s)
+- char *s;
+-{
+- (void)fprintf(stderr,
+- "Usage: %s [-s] [-x] [-z] [-n count]
[-md4|-md5|-sha1|-rmd160] [user]\n", s);
+- exit(1);
++ return 0;
+ }
+diff -ruN skey-1.1.5.orig/skeylogin.c skey-1.1.5/skeylogin.c
+--- skey-1.1.5.orig/skeylogin.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeylogin.c 2003-11-06 17:46:45.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <sys/quota.h>
+ #endif
+ #include <sys/stat.h>
++#include <sys/file.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/types.h>
+@@ -32,6 +33,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <grp.h>
+
+ #include "config.h"
+
+@@ -45,73 +47,85 @@
+ #include "sha1.h"
+ #endif
+
++#include "err.h"
+ #include "skey.h"
+
+-char *skipspace __P((char *));
+-int skeylookup __P((struct skey *, char *));
++#define OTP_FMT "otp-%.*s %d %.*s"
+
+ /* Issue a skey challenge for user 'name'. If successful,
+- * fill in the caller's skey structure and return(0). If unsuccessful
+- * (e.g., if name is unknown) return(-1).
++ * fill in the caller's skey structure and return 0. If unsuccessful
++ * (e.g., if name is unknown) return -1.
+ *
+ * The file read/write pointer is left at the start of the
+ * record.
+ */
+-int
+-getskeyprompt(mp, name, prompt)
+- struct skey *mp;
+- char *name;
+- char *prompt;
++int getskeyprompt(struct skey *mp, char *name, char *prompt)
+ {
+ int rval;
+
+ sevenbit(name);
+ rval = skeylookup(mp, name);
+- (void)strcpy(prompt, "otp-md0 55 latour1\n");
++
++ *prompt = '\0';
+ switch (rval) {
+- case -1: /* File error */
+- return(-1);
+- case 0: /* Lookup succeeded, return challenge */
+- (void)sprintf(prompt, "otp-%.*s %d %.*s\n",
+- SKEY_MAX_HASHNAME_LEN, skey_get_algorithm(),
++ case -1: /* File error */
++ return -1;
++ case 0: /* Lookup succeeded, return challenge */
++ sprintf(prompt, OTP_FMT "\n",
++ SKEY_MAX_HASHNAME_LEN, skey_get_algorithm(),
+ mp->n - 1, SKEY_MAX_SEED_LEN, mp->seed);
+- return(0);
+- case 1: /* User not found */
+- (void)fclose(mp->keyfile);
+- return(-1);
++ return 0;
++ case 1: /* User not found */
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return -1;
+ }
+- return(-1); /* Can't happen */
++ return -1; /* Can't happen, never ever ever. ever. I'm serious.
*/
+ }
+
+ /* Return a skey challenge string for user 'name'. If successful,
+- * fill in the caller's skey structure and return(0). If unsuccessful
+- * (e.g., if name is unknown) return(-1).
++ * fill in the caller's skey structure and return 0. If unsuccessful
++ * (e.g., if name is unknown) return -1.
+ *
+ * The file read/write pointer is left at the start of the
+ * record.
+ */
+-int
+-skeychallenge(mp, name, ss)
+- struct skey *mp;
+- char *name;
+- char *ss;
++int skeychallenge(struct skey *mp, const char *name, char *ss, size_t sslen)
+ {
+ int rval;
+
+ rval = skeylookup(mp,name);
++ *ss = '\0';
+ switch(rval){
+- case -1: /* File error */
+- return(-1);
+- case 0: /* Lookup succeeded, issue challenge */
+- (void)sprintf(ss, "otp-%.*s %d %.*s", SKEY_MAX_HASHNAME_LEN,
++ case -1: /* File error */
++ return -1;
++ case 0: /* Lookup succeeded, issue challenge */
++ snprintf(ss, sslen, OTP_FMT, SKEY_MAX_HASHNAME_LEN,
+ skey_get_algorithm(), mp->n - 1,
+ SKEY_MAX_SEED_LEN, mp->seed);
+- return(0);
+- case 1: /* User not found */
+- (void)fclose(mp->keyfile);
+- return(-1);
++ return 0;
++ case 1: /* User not found */
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return -1;
++ }
++ return -1; /* Can't happen - or your money back */
++}
++
++static FILE *openskey(void)
++{
++ struct stat statbuf;
++ FILE *keyfile = NULL;
++
++ if (stat(SKEYKEYS, &statbuf) == 0 &&
++ (keyfile = fopen(SKEYKEYS, "r+"))) {
++ if ((statbuf.st_mode & 0007777) != 0600)
++ fchmod(fileno(keyfile), 0600);
++ } else {
++ keyfile = NULL;
+ }
+- return(-1); /* Can't happen */
++
++ return keyfile;
+ }
+
+ /* Find an entry in the One-time Password database.
+@@ -120,27 +134,19 @@
+ * 0: entry found, file R/W pointer positioned at beginning of record
+ * 1: entry not found, file R/W pointer positioned at EOF
+ */
+-int
+-skeylookup(mp, name)
+- struct skey *mp;
+- char *name;
++int skeylookup(struct skey *mp, const char *name)
+ {
+ int found = 0;
+ long recstart = 0;
+- char *cp, *ht = NULL;
+- struct stat statbuf;
+-
+- /* Open SKEYKEYS if it exists, else return an error */
+- if (stat(SKEYKEYS, &statbuf) == 0 &&
+- (mp->keyfile = fopen(SKEYKEYS, "r+")) != NULL) {
+- if ((statbuf.st_mode & 0007777) != 0600)
+- fchmod(fileno(mp->keyfile), 0600);
+- } else {
+- return(-1);
+- }
++ const char *ht = NULL;
++ char *last;
+
++ if(!(mp->keyfile = openskey()))
++ return -1;
++
+ /* Look up user name in database */
+ while (!feof(mp->keyfile)) {
++ char *cp;
+ recstart = ftell(mp->keyfile);
+ mp->recstart = recstart;
+ if (fgets(mp->buf, sizeof(mp->buf), mp->keyfile) != mp->buf)
+@@ -148,22 +154,22 @@
+ rip(mp->buf);
+ if (mp->buf[0] == '#')
+ continue; /* Comment */
+- if ((mp->logname = strtok(mp->buf, " \t")) == NULL)
++ if ((mp->logname = strtok_r(mp->buf, " \t", &last)) == NULL)
+ continue;
+- if ((cp = strtok(NULL, " \t")) == NULL)
++ if ((cp = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+ /* Save hash type if specified, else use md4 */
+- if (isalpha(*cp)) {
++ if (isalpha((u_char) *cp)) {
+ ht = cp;
+- if ((cp = strtok(NULL, " \t")) == NULL)
++ if ((cp = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+ } else {
+ ht = "md4";
+ }
+ mp->n = atoi(cp);
+- if ((mp->seed = strtok(NULL, " \t")) == NULL)
++ if ((mp->seed = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+- if ((mp->val = strtok(NULL, " \t")) == NULL)
++ if ((mp->val = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+ if (strcmp(mp->logname, name) == 0) {
+ found = 1;
+@@ -171,7 +177,7 @@
+ }
+ }
+ if (found) {
+- (void)fseek(mp->keyfile, recstart, SEEK_SET);
++ fseek(mp->keyfile, recstart, SEEK_SET);
+ /* Set hash type */
+ if (ht && skey_set_algorithm(ht) == NULL) {
+ warnx("Unknown hash algorithm %s, using %s", ht,
+@@ -189,27 +195,21 @@
+ * 0: next entry found and stored in mp
+ * 1: no more entries, file R/W pointer positioned at EOF
+ */
+-int
+-skeygetnext(mp)
+- struct skey *mp;
++int skeygetnext(struct skey *mp)
+ {
+ long recstart = 0;
+- char *cp;
+- struct stat statbuf;
++ char *last;
+
+ /* Open SKEYKEYS if it exists, else return an error */
+ if (mp->keyfile == NULL) {
+- if (stat(SKEYKEYS, &statbuf) == 0 &&
+- (mp->keyfile = fopen(SKEYKEYS, "r+")) != NULL) {
+- if ((statbuf.st_mode & 0007777) != 0600)
+- fchmod(fileno(mp->keyfile), 0600);
+- } else {
+- return(-1);
+- }
++ if(!(mp->keyfile = openskey()))
++ return -1;
+ }
+
+ /* Look up next user in database */
+ while (!feof(mp->keyfile)) {
++ char *cp;
++
+ recstart = ftell(mp->keyfile);
+ mp->recstart = recstart;
+ if (fgets(mp->buf, sizeof(mp->buf), mp->keyfile) != mp->buf)
+@@ -217,19 +217,19 @@
+ rip(mp->buf);
+ if (mp->buf[0] == '#')
+ continue; /* Comment */
+- if ((mp->logname = strtok(mp->buf, " \t")) == NULL)
++ if ((mp->logname = strtok_r(mp->buf, " \t", &last)) == NULL)
+ continue;
+- if ((cp = strtok(NULL, " \t")) == NULL)
++ if ((cp = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+ /* Save hash type if specified, else use md4 */
+- if (isalpha(*cp)) {
+- if ((cp = strtok(NULL, " \t")) == NULL)
++ if (isalpha((u_char) *cp)) {
++ if ((cp = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+ }
+ mp->n = atoi(cp);
+- if ((mp->seed = strtok(NULL, " \t")) == NULL)
++ if ((mp->seed = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+- if ((mp->val = strtok(NULL, " \t")) == NULL)
++ if ((mp->val = strtok_r(NULL, " \t", &last)) == NULL)
+ continue;
+ /* Got a real entry */
+ break;
+@@ -246,10 +246,7 @@
+ *
+ * The database file is always closed by this call.
+ */
+-int
+-skeyverify(mp, response)
+- struct skey *mp;
+- char *response;
++int skeyverify(struct skey *mp, char *response)
+ {
+ char key[SKEY_BINKEY_SIZE];
+ char fkey[SKEY_BINKEY_SIZE];
+@@ -257,29 +254,31 @@
+ time_t now;
+ struct tm *tm;
+ char tbuf[27];
+- char *cp;
++ char *cp, *last;
+ int i, rval;
+
+ time(&now);
+ tm = localtime(&now);
+- (void)strftime(tbuf, sizeof(tbuf), " %b %d,%Y %T", tm);
++ strftime(tbuf, sizeof(tbuf), " %b %d,%Y %T", tm);
+
+ if (response == NULL) {
+- (void)fclose(mp->keyfile);
+- return(-1);
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return -1;
+ }
+ rip(response);
+
+ /* Convert response to binary */
+ if (etob(key, response) != 1 && atob8(key, response) != 0) {
+ /* Neither english words or ascii hex */
+- (void)fclose(mp->keyfile);
+- return(-1);
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return -1;
+ }
+
+ /* Compute fkey = f(key) */
+- (void)memcpy(fkey, key, sizeof(key));
+- (void)fflush(stdout);
++ memcpy(fkey, key, sizeof(key));
++ fflush(stdout);
+ f(fkey);
+
+ /*
+@@ -298,26 +297,33 @@
+ }
+
+ /* Reread the file record NOW */
+- (void)fseek(mp->keyfile, mp->recstart, SEEK_SET);
++ fseek(mp->keyfile, mp->recstart, SEEK_SET);
+ if (fgets(mp->buf, sizeof(mp->buf), mp->keyfile) != mp->buf) {
+- (void)fclose(mp->keyfile);
+- return(-1);
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return -1;
+ }
+ rip(mp->buf);
+- mp->logname = strtok(mp->buf, " \t");
+- cp = strtok(NULL, " \t") ;
+- if (isalpha(*cp))
+- cp = strtok(NULL, " \t") ;
+- mp->seed = strtok(NULL, " \t");
+- mp->val = strtok(NULL, " \t");
++ if ((mp->logname = strtok_r(mp->buf, " \t", &last)) == NULL)
++ goto verify_failure;
++ if ((cp = strtok_r(NULL, " \t", &last)) == NULL)
++ goto verify_failure;
++ if (isalpha((u_char) *cp))
++ if ((cp = strtok_r(NULL, " \t", &last)) == NULL)
++ goto verify_failure;
++ if ((mp->seed = strtok_r(NULL, " \t", &last)) == NULL)
++ goto verify_failure;
++ if ((mp->val = strtok_r(NULL, " \t", &last)) == NULL)
++ goto verify_failure;
+ /* And convert file value to hex for comparison */
+ atob8(filekey, mp->val);
+
+ /* Do actual comparison */
+ if (memcmp(filekey, fkey, SKEY_BINKEY_SIZE) != 0){
+ /* Wrong response */
+- (void)fclose(mp->keyfile);
+- return(1);
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return 1;
+ }
+
+ /*
+@@ -327,19 +333,24 @@
+ */
+ btoa8(mp->val,key);
+ mp->n--;
+- (void)fseek(mp->keyfile, mp->recstart, SEEK_SET);
++ fseek(mp->keyfile, mp->recstart, SEEK_SET);
+ /* Don't save algorithm type for md4 (keep record length same) */
+ if (strcmp(skey_get_algorithm(), "md4") == 0)
+- (void)fprintf(mp->keyfile, "%s %04d %-16s %s %-21s\n",
++ fprintf(mp->keyfile, "%s %04d %-16s %s %-21s\n",
+ mp->logname, mp->n, mp->seed, mp->val, tbuf);
+ else
+- (void)fprintf(mp->keyfile, "%s %s %04d %-16s %s %-21s\n",
++ fprintf(mp->keyfile, "%s %s %04d %-16s %s %-21s\n",
+ mp->logname, skey_get_algorithm(), mp->n,
+ mp->seed, mp->val, tbuf);
+
+- (void)fclose(mp->keyfile);
+-
+- return(0);
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return 0;
++
++ verify_failure:
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
++ return -1;
+ }
+
+ /*
+@@ -348,13 +359,18 @@
+ * Returns: 1 user doesnt exist, -1 fle error, 0 user exists.
+ *
+ */
+-int
+-skey_haskey(username)
+- char *username;
++int skey_haskey(const char *username)
+ {
+ struct skey skey;
++ int i;
++
++ i = skeylookup(&skey, username);
+
+- return(skeylookup(&skey, username));
++ if (skey.keyfile != NULL) {
++ fclose(skey.keyfile);
++ skey.keyfile = NULL;
++ }
++ return i;
+ }
+
+ /*
+@@ -364,19 +380,21 @@
+ * seed for the passed user.
+ *
+ */
+-char *
+-skey_keyinfo(username)
+- char *username;
++const char *skey_keyinfo(const char *username)
+ {
+ int i;
+ static char str[SKEY_MAX_CHALLENGE];
+ struct skey skey;
+
+- i = skeychallenge(&skey, username, str);
++ i = skeychallenge(&skey, username, str, sizeof str);
+ if (i == -1)
+- return(0);
++ return 0;
+
+- return(str);
++ if (skey.keyfile != NULL) {
++ fclose(skey.keyfile);
++ skey.keyfile = NULL;
++ }
++ return str;
+ }
+
+ /*
+@@ -388,40 +406,38 @@
+ * Returns: 0 success, -1 failure
+ *
+ */
+-int
+-skey_passcheck(username, passwd)
+- char *username, *passwd;
++int skey_passcheck(const char *username, char *passwd)
+ {
+ int i;
+ struct skey skey;
+
+ i = skeylookup(&skey, username);
+ if (i == -1 || i == 1)
+- return(-1);
++ return -1;
+
+ if (skeyverify(&skey, passwd) == 0)
+- return(skey.n);
++ return skey.n;
+
+- return(-1);
++ return -1;
+ }
+
++#if DO_FAKE_CHALLENGE
+ #define ROUND(x) (((x)[0] << 24) + (((x)[1]) << 16) + (((x)[2]) << 8) + \
+ ((x)[3]))
+
+ /*
+ * hash_collapse()
+ */
+-static u_int32_t
+-hash_collapse(s)
+- u_char *s;
++static u_int32_t hash_collapse(u_char *s)
+ {
+- int len, target;
++ int len, target, slen;
+ u_int32_t i;
+-
+- if ((strlen(s) % sizeof(u_int32_t)) == 0)
+- target = strlen(s); /* Multiple of 4 */
++
++ slen = strlen((char *)s);
++ if ((slen % sizeof(u_int32_t)) == 0)
++ target = slen; /* Multiple of 4 */
+ else
+- target = strlen(s) - (strlen(s) % sizeof(u_int32_t));
++ target = slen - slen % sizeof(u_int32_t);
+
+ for (i = 0, len = 0; len < target; len += 4)
+ i ^= ROUND(s + len);
+@@ -429,6 +445,8 @@
+ return i;
+ }
+
++#endif
++
+ /*
+ * skey_authenticate()
+ *
+@@ -438,22 +456,22 @@
+ * Returns: 0 success, -1 failure
+ *
+ */
+-int
+-skey_authenticate(username)
+- char *username;
++int skey_authenticate(const char *username)
+ {
+ int i;
++ char pbuf[SKEY_MAX_PW_LEN+1], skeyprompt[SKEY_MAX_CHALLENGE+1];
++ struct skey skey;
++#if DO_FAKE_CHALLENGE
+ u_int ptr;
+ u_char hseed[SKEY_MAX_SEED_LEN], flg = 1, *up;
+- char pbuf[SKEY_MAX_PW_LEN+1], skeyprompt[SKEY_MAX_CHALLENGE+1];
+- char *secret;
+ size_t secretlen;
+- struct skey skey;
+ SHA1_CTX ctx;
+-
++#endif
++
+ /* Attempt an S/Key challenge */
+- i = skeychallenge(&skey, username, skeyprompt);
++ i = skeychallenge(&skey, username, skeyprompt, sizeof skeyprompt);
+
++#if DO_FAKE_CHALLENGE
+ /* Cons up a fake prompt if no entry in keys file */
+ if (i != 0) {
+ char *p, *u;
+@@ -465,11 +483,11 @@
+ if (gethostname(pbuf, sizeof(pbuf)) == -1)
+ *(p = pbuf) = '.';
+ else
+- for (p = pbuf; *p && isalnum(*p); p++)
+- if (isalpha(*p) && isupper(*p))
+- *p = tolower(*p);
++ for (p = pbuf; *p && isalnum((u_char)*p); p++)
++ if (isalpha((u_char)*p) &&
isupper((u_char)*p))
++ *p = tolower((u_char)*p);
+ if (*p && pbuf - p < 4)
+- (void)strncpy(p, "asjd", 4 - (pbuf - p));
++ strncpy(p, "asjd", 4 - (pbuf - p));
+ pbuf[4] = '\0';
+
+ /* Hash the username if possible */
+@@ -490,6 +508,7 @@
+ SEEK_SET) != -1 && read(fd, hseed,
+ SKEY_MAX_SEED_LEN) == SKEY_MAX_SEED_LEN) {
+ close(fd);
++ fd = -1;
+ secret = hseed;
+ secretlen = SKEY_MAX_SEED_LEN;
+ flg = 0;
+@@ -499,6 +518,8 @@
+ secretlen = strlen(secret);
+ flg = 0;
+ }
++ if (fd != -1)
++ close(fd);
+ }
+
+ /* Put that in your pipe and smoke it */
+@@ -531,7 +552,7 @@
+ memset(up, 0, 20); /* SHA1 specific */
+ free(up);
+
+- (void)sprintf(skeyprompt,
++ sprintf(skeyprompt,
+ "otp-%.*s %d %.*s",
+ SKEY_MAX_HASHNAME_LEN,
+ skey_get_algorithm(),
+@@ -554,29 +575,30 @@
+ } while (--i != 0);
+ pbuf[12] = '\0';
+
+- (void)sprintf(skeyprompt, "otp-%.*s %d %.*s",
++ sprintf(skeyprompt, "otp-%.*s %d %.*s",
+ SKEY_MAX_HASHNAME_LEN,
+ skey_get_algorithm(),
+ 99, SKEY_MAX_SEED_LEN, pbuf);
+ }
+ }
++#endif
+
+- (void)fprintf(stderr, "%s\n", skeyprompt);
+- (void)fflush(stderr);
++ fprintf(stderr, "[%s]\n", skeyprompt);
++ fflush(stderr);
+
+- (void)fputs("Response: ", stderr);
++ fputs("Response: ", stderr);
+ readskey(pbuf, sizeof(pbuf));
+
+ /* Is it a valid response? */
+ if (i == 0 && skeyverify(&skey, pbuf) == 0) {
+ if (skey.n < 5) {
+- (void)fprintf(stderr,
++ fprintf(stderr,
+ "\nWarning! Key initialization needed soon. (%d
logins left)\n",
+ skey.n);
+ }
+- return(0);
++ return 0;
+ }
+- return(-1);
++ return -1;
+ }
+
+ /* Comment out user's entry in the s/key database
+@@ -587,22 +609,21 @@
+ *
+ * The database file is always closed by this call.
+ */
+-int
+-skeyzero(mp, response)
+- struct skey *mp;
+- char *response;
++int skeyzero(struct skey *mp, char *response)
+ {
+ /*
+ * Seek to the right place and write comment character
+ * which effectively zero's out the entry.
+ */
+- (void)fseek(mp->keyfile, mp->recstart, SEEK_SET);
++ fseek(mp->keyfile, mp->recstart, SEEK_SET);
+ if (fputc('#', mp->keyfile) == EOF) {
+ fclose(mp->keyfile);
+- return(-1);
++ mp->keyfile = NULL;
++ return -1;
+ }
+
+- (void)fclose(mp->keyfile);
++ fclose(mp->keyfile);
++ mp->keyfile = NULL;
+
+- return(0);
++ return 0;
+ }
+diff -ruN skey-1.1.5.orig/skeyprune.8 skey-1.1.5/skeyprune.8
+--- skey-1.1.5.orig/skeyprune.8 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeyprune.8 2003-11-06 17:46:45.000000000 +0000
+@@ -13,7 +13,7 @@
+ .Sh DESCRIPTION
+ .Nm skeyprune
+ searches through the file
+-.Dq Pa /etc/skeykeys
++.Dq Pa /etc/skey/skeykeys
+ and prunes out users who have zeroed their entries via
+ .Xr skeyinit 1
+ as well as entries that have not been modified in
+@@ -22,8 +22,8 @@
+ .Ar days
+ is not specified only commented out entries are pruned.
+ .Sh FILES
+-.Bl -tag -width /etc/skeykeys -compact
+-.It Pa /etc/skeykeys
++.Bl -tag -width /etc/skey/skeykeys -compact
++.It Pa /etc/skey/skeykeys
+ S/Key key information database
+ .El
+ .Sh SEE ALSO
+@@ -33,7 +33,7 @@
+ Since
+ .Nm skeyprune
+ rewrites
+-.Dq Pa /etc/skeykeys ,
++.Dq Pa /etc/skey/skeykeys ,
+ there is a window where S/Key changes could get lost.
+ It is therefore suggested that
+ .Nm skeyprune
+diff -ruN skey-1.1.5.orig/skeysubr.c skey-1.1.5/skeysubr.c
+--- skey-1.1.5.orig/skeysubr.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/skeysubr.c 2003-11-06 17:46:45.000000000 +0000
+@@ -40,30 +40,26 @@
+ #else
+ #include "sha1.h"
+ #endif
+-#ifdef HAVE_RMD160_H
+-#include <rmd160.h>
+-#else
+-#include "rmd160.h"
+-#endif
+
+ #include "skey.h"
+
+ /* Default hash function to use (index into skey_hash_types array) */
+ #ifndef SKEY_HASH_DEFAULT
+-#define SKEY_HASH_DEFAULT 1
++#define SKEY_HASH_DEFAULT 0 /*MD4*/
+ #endif
+
+-static void f_md4 __P((char *x));
+-static void f_md5 __P((char *x));
+-static void f_sha1 __P((char *x));
+-static void f_rmd160 __P((char *x));
+-static int keycrunch_md4 __P((char *result, char *seed, char *passwd));
+-static int keycrunch_md5 __P((char *result, char *seed, char *passwd));
+-static int keycrunch_sha1 __P((char *result, char *seed, char *passwd));
+-static int keycrunch_rmd160 __P((char *result, char *seed, char *passwd));
+-static void lowcase __P((char *s));
+-static void skey_echo __P((int action));
+-static void trapped __P((int sig));
++static void f_md4 __P((char *));
++static void f_md5 __P((char *));
++static void f_sha1 __P((char *));
++/* static void f_rmd160 __P((char *x)); */
++static int keycrunch_md4 __P((char *, const char *, const char *));
++static int keycrunch_md5 __P((char *, const char *, const char *));
++static int keycrunch_sha1 __P((char *, const char *, const char *));
++/* static int keycrunch_rmd160 __P((char *result, char *seed, char
*passwd)); */
++static void lowcase __P((char *));
++static void skey_echo __P((int));
++static void trapped __P((int));
++static char *mkseedpassword(const char *, const char *, size_t *);
+
+ /* Current hash type (index into skey_hash_types array) */
+ static int skey_hash_type = SKEY_HASH_DEFAULT;
+@@ -72,17 +68,16 @@
+ * Hash types we support.
+ * Each has an associated keycrunch() and f() function.
+ */
+-#define SKEY_ALGORITH_LAST 4
+ struct skey_algorithm_table {
+ const char *name;
+- int (*keycrunch) (char *, char *, char *);
+- void (*f) (char *);
++ int (*keycrunch) __P((char *, const char *, const char *));
++ void (*f) __P((char *));
+ };
+ static struct skey_algorithm_table skey_algorithm_table[] = {
+ { "md4", keycrunch_md4, f_md4 },
+ { "md5", keycrunch_md5, f_md5 },
+ { "sha1", keycrunch_sha1, f_sha1 },
+- { "rmd160", keycrunch_rmd160, f_rmd160 }
++ { NULL }
+ };
+
+
+@@ -91,242 +86,172 @@
+ * concatenate the seed and the password, run through MD4/5 and
+ * collapse to 64 bits. This is defined as the user's starting key.
+ */
+-int
+-keycrunch(result, seed, passwd)
+- char *result; /* SKEY_BINKEY_SIZE result */
+- char *seed; /* Seed, any length */
+- char *passwd; /* Password, any length */
++int keycrunch(char *result, const char *seed, const char *passwd)
+ {
+ return(skey_algorithm_table[skey_hash_type].keycrunch(result, seed,
passwd));
+ }
+
+-static int
+-keycrunch_md4(result, seed, passwd)
+- char *result; /* SKEY_BINKEY_SIZE result */
+- char *seed; /* Seed, any length */
+- char *passwd; /* Password, any length */
++static char *mkseedpassword(const char *seed, const char *passwd, size_t
*buflen)
+ {
+ char *buf;
+- MD4_CTX md;
+- u_int32_t results[4];
+- unsigned int buflen;
+
+- buflen = strlen(seed) + strlen(passwd);
+- if ((buf = (char *)malloc(buflen+1)) == NULL)
+- return(-1);
+- (void)strcpy(buf, seed);
++ *buflen = strlen(seed) + strlen(passwd);
++ if ((buf = (char *) malloc(*buflen + 1)) == NULL)
++ return NULL;
++ strcpy(buf, seed);
+ lowcase(buf);
+- (void)strcat(buf, passwd);
++ strcat(buf, passwd);
++ sevenbit(buf);
++
++ return buf;
++}
+
++static int keycrunch_md4(char *result, const char *seed, const char *passwd)
++{
++ char *buf;
++ MD4_CTX md;
++ size_t buflen;
++ u_int32_t results[4];
++
++ if ((buf = mkseedpassword(seed, passwd, &buflen)) == NULL)
++ return -1;
++
+ /* Crunch the key through MD4 */
+- sevenbit(buf);
+ MD4Init(&md);
+ MD4Update(&md, (unsigned char *)buf, buflen);
+- MD4Final((unsigned char *)results, &md);
+- (void)free(buf);
++ MD4Final((unsigned char *) (void *) results, &md);
++ free(buf);
+
+ /* Fold result from 128 to 64 bits */
+ results[0] ^= results[2];
+ results[1] ^= results[3];
+
+- (void)memcpy((void *)result, (void *)results, SKEY_BINKEY_SIZE);
++ memcpy(result, results, SKEY_BINKEY_SIZE);
+
+- return(0);
++ return 0;
+ }
+
+-static int
+-keycrunch_md5(result, seed, passwd)
+- char *result; /* SKEY_BINKEY_SIZE result */
+- char *seed; /* Seed, any length */
+- char *passwd; /* Password, any length */
++static int keycrunch_md5(char *result, const char *seed, const char *passwd)
+ {
+ char *buf;
+ MD5_CTX md;
+ u_int32_t results[4];
+- unsigned int buflen;
++ size_t buflen;
+
+- buflen = strlen(seed) + strlen(passwd);
+- if ((buf = (char *)malloc(buflen+1)) == NULL)
+- return(-1);
+- (void)strcpy(buf, seed);
+- lowcase(buf);
+- (void)strcat(buf, passwd);
++ if ((buf = mkseedpassword(seed, passwd, &buflen)) == NULL)
++ return -1;
+
+ /* Crunch the key through MD5 */
+- sevenbit(buf);
+ MD5Init(&md);
+ MD5Update(&md, (unsigned char *)buf, buflen);
+- MD5Final((unsigned char *)results, &md);
+- (void)free(buf);
++ MD5Final((unsigned char *) (void *)results, &md);
++ free(buf);
+
+ /* Fold result from 128 to 64 bits */
+ results[0] ^= results[2];
+ results[1] ^= results[3];
+
+- (void)memcpy((void *)result, (void *)results, SKEY_BINKEY_SIZE);
++ memcpy((void *)result, (void *)results, SKEY_BINKEY_SIZE);
+
+ return(0);
+ }
+
+-static int
+-keycrunch_sha1(result, seed, passwd)
+- char *result; /* SKEY_BINKEY_SIZE result */
+- char *seed; /* Seed, any length */
+- char *passwd; /* Password, any length */
++static int keycrunch_sha1(char *result, const char *seed, const char
*passwd)
+ {
+ char *buf;
+ SHA1_CTX sha;
+- u_int32_t results[5];
+- unsigned int buflen;
+-
+- buflen = strlen(seed) + strlen(passwd);
+- if ((buf = (char *)malloc(buflen+1)) == NULL)
+- return(-1);
+- (void)strcpy(buf, seed);
+- lowcase(buf);
+- (void)strcat(buf, passwd);
++ size_t buflen;
++ int i, j;
+
++ if ((buf = mkseedpassword(seed, passwd, &buflen)) == NULL)
++ return -1;
++
+ /* Crunch the key through SHA1 */
+- sevenbit(buf);
+ SHA1Init(&sha);
+ SHA1Update(&sha, (unsigned char *)buf, buflen);
+- SHA1Final((unsigned char *)results, &sha);
+- (void)free(buf);
++ SHA1Final(NULL, &sha);
++ free(buf);
+
+ /* Fold 160 to 64 bits */
+- results[0] ^= results[2];
+- results[1] ^= results[3];
+- results[0] ^= results[4];
+-
+- (void)memcpy((void *)result, (void *)results, SKEY_BINKEY_SIZE);
+-
+- return(0);
+-}
+-
+-static int
+-keycrunch_rmd160(result, seed, passwd)
+- char *result; /* SKEY_BINKEY_SIZE result */
+- char *seed; /* Seed, any length */
+- char *passwd; /* Password, any length */
+-{
+- char *buf;
+- RMD160_CTX rmd;
+- u_int32_t results[5];
+- unsigned int buflen;
+-
+- buflen = strlen(seed) + strlen(passwd);
+- if ((buf = (char *)malloc(buflen+1)) == NULL)
+- return(-1);
+- (void)strcpy(buf, seed);
+- lowcase(buf);
+- (void)strcat(buf, passwd);
+-
+- /* Crunch the key through RMD-160 */
+- sevenbit(buf);
+- RMD160Init(&rmd);
+- RMD160Update(&rmd, (unsigned char *)buf, buflen);
+- RMD160Final((unsigned char *)results, &rmd);
+- (void)free(buf);
+-
+- /* Fold 160 to 64 bits */
+- results[0] ^= results[2];
+- results[1] ^= results[3];
+- results[0] ^= results[4];
+-
+- (void)memcpy((void *)result, (void *)results, SKEY_BINKEY_SIZE);
++ sha.state[0] ^= sha.state[2];
++ sha.state[1] ^= sha.state[3];
++ sha.state[0] ^= sha.state[4];
++
++ for (i=j=0; j<8; i++, j+=4) {
++ result[j] = (unsigned char)(sha.state[i] & 0xff);
++ result[j+1] = (unsigned char)((sha.state[i] >> 8) & 0xff);
++ result[j+2] = (unsigned char)((sha.state[i] >> 16) & 0xff);
++ result[j+3] = (unsigned char)((sha.state[i] >> 24) & 0xff);
++ }
+
+- return(0);
++ return 0;
+ }
+
+ /*
+ * The one-way function f().
+ * Takes SKEY_BINKEY_SIZE bytes and returns SKEY_BINKEY_SIZE bytes in place.
+ */
+-void
+-f(x)
+- char *x;
++void f(char *x)
+ {
+ skey_algorithm_table[skey_hash_type].f(x);
+ }
+
+-static void
+-f_md4(x)
+- char *x;
++static void f_md4(char *x)
+ {
+ MD4_CTX md;
+ u_int32_t results[4];
+
+ MD4Init(&md);
+ MD4Update(&md, (unsigned char *)x, SKEY_BINKEY_SIZE);
+- MD4Final((unsigned char *)results, &md);
++ MD4Final((unsigned char *) (void *) results, &md);
+
+ /* Fold 128 to 64 bits */
+ results[0] ^= results[2];
+ results[1] ^= results[3];
+
+- (void)memcpy((void *)x, (void *)results, SKEY_BINKEY_SIZE);
++ memcpy(x, results, SKEY_BINKEY_SIZE);
+ }
+
+-static void
+-f_md5(x)
+- char *x;
++static void f_md5(char *x)
+ {
+ MD5_CTX md;
+ u_int32_t results[4];
+
+ MD5Init(&md);
+ MD5Update(&md, (unsigned char *)x, SKEY_BINKEY_SIZE);
+- MD5Final((unsigned char *)results, &md);
++ MD5Final((unsigned char *) (void *) results, &md);
+
+ /* Fold 128 to 64 bits */
+ results[0] ^= results[2];
+ results[1] ^= results[3];
+
+- (void)memcpy((void *)x, (void *)results, SKEY_BINKEY_SIZE);
++ memcpy((void *)x, (void *)results, SKEY_BINKEY_SIZE);
+ }
+
+-static void
+-f_sha1(x)
+- char *x;
++static void f_sha1(char *x)
+ {
+ SHA1_CTX sha;
+- u_int32_t results[5];
++ int i, j;
+
+ SHA1Init(&sha);
+ SHA1Update(&sha, (unsigned char *)x, SKEY_BINKEY_SIZE);
+- SHA1Final((unsigned char *)results, &sha);
++ SHA1Final(NULL, &sha);
+
+ /* Fold 160 to 64 bits */
+- results[0] ^= results[2];
+- results[1] ^= results[3];
+- results[0] ^= results[4];
+-
+- (void)memcpy((void *)x, (void *)results, SKEY_BINKEY_SIZE);
+-}
+-
+-static void
+-f_rmd160(x)
+- char *x;
+-{
+- RMD160_CTX rmd;
+- u_int32_t results[5];
+-
+- RMD160Init(&rmd);
+- RMD160Update(&rmd, (unsigned char *)x, SKEY_BINKEY_SIZE);
+- RMD160Final((unsigned char *)results, &rmd);
+-
+- /* Fold 160 to 64 bits */
+- results[0] ^= results[2];
+- results[1] ^= results[3];
+- results[0] ^= results[4];
+-
+- (void)memcpy((void *)x, (void *)results, SKEY_BINKEY_SIZE);
++ sha.state[0] ^= sha.state[2];
++ sha.state[1] ^= sha.state[3];
++ sha.state[0] ^= sha.state[4];
++
++ for (i=j=0; j<8; i++, j+=4) {
++ x[j] = (unsigned char)(sha.state[i] & 0xff);
++ x[j+1] = (unsigned char)((sha.state[i] >> 8) & 0xff);
++ x[j+2] = (unsigned char)((sha.state[i] >> 16) & 0xff);
++ x[j+3] = (unsigned char)((sha.state[i] >> 24) & 0xff);
++ }
+ }
+
+ /* Strip trailing cr/lf from a line of text */
+-void
+-rip(buf)
+- char *buf;
++void rip(char *buf)
+ {
+ buf += strcspn(buf, "\r\n");
+
+@@ -335,12 +260,9 @@
+ }
+
+ /* Read in secret password (turns off echo) */
+-char *
+-readpass(buf, n)
+- char *buf;
+- int n;
++char *readpass(char *buf, int n)
+ {
+- void (*old_handler) ();
++ void *old_handler;
+
+ /* Turn off echoing */
+ skey_echo(0);
+@@ -348,131 +270,114 @@
+ /* Catch SIGINT and save old signal handler */
+ old_handler = signal(SIGINT, trapped);
+
+- (void)fgets(buf, n, stdin);
++ fgets(buf, n, stdin);
+ rip(buf);
+
+- (void)putc('\n', stderr);
+- (void)fflush(stderr);
++ putc('\n', stderr);
++ fflush(stderr);
+
+ /* Restore signal handler and turn echo back on */
+ if (old_handler != SIG_ERR)
+- (void)signal(SIGINT, old_handler);
++ signal(SIGINT, old_handler);
+ skey_echo(1);
+
+ sevenbit(buf);
+
+- return(buf);
++ return buf;
+ }
+
+ /* Read in an s/key OTP (does not turn off echo) */
+-char *
+-readskey(buf, n)
+- char *buf;
+- int n;
++char *readskey(char *buf, int n)
+ {
+- (void)fgets(buf, n, stdin);
++ fgets(buf, n, stdin);
+ rip(buf);
+
+ sevenbit(buf);
+
+- return(buf);
++ return buf;
+ }
+
+ /* Signal handler for trapping ^C */
+-static void
+-trapped(sig)
+- int sig;
++static void trapped(int sig)
+ {
+- (void)fputs("^C\n", stderr);
+- (void)fflush(stderr);
++ fputs("^C\n", stderr);
++ fflush(stderr);
+
+- /* Turn on echo if necesary */
++ /* Turn on echo if necemassary */
+ skey_echo(1);
+
+- exit(-1);
++ exit(1);
+ }
+
+ /*
+ * Convert 8-byte hex-ascii string to binary array
+ * Returns 0 on success, -1 on error
+ */
+-int
+-atob8(out, in)
+- register char *out;
+- register char *in;
++int atob8(char *out, const char *in)
+ {
+- register int i;
+- register int val;
++ int i;
++ int val;
+
+ if (in == NULL || out == NULL)
+- return(-1);
++ return -1;
+
+ for (i=0; i < 8; i++) {
+ if ((in = skipspace(in)) == NULL)
+- return(-1);
++ return -1;
+ if ((val = htoi(*in++)) == -1)
+- return(-1);
++ return -1;
+ *out = val << 4;
+
+ if ((in = skipspace(in)) == NULL)
+- return(-1);
++ return -1;
+ if ((val = htoi(*in++)) == -1)
+- return(-1);
++ return -1;
+ *out++ |= val;
+ }
+- return(0);
++ return 0;
+ }
+
+ /* Convert 8-byte binary array to hex-ascii string */
+-int
+-btoa8(out, in)
+- register char *out;
+- register char *in;
++int btoa8(char *out, const char *in)
+ {
+- register int i;
++ int i;
+
+ if (in == NULL || out == NULL)
+- return(-1);
++ return -1;
+
+ for (i=0; i < 8; i++) {
+- (void)sprintf(out, "%02x", *in++ & 0xff);
++ sprintf(out, "%02x", *in++ & 0xff);
+ out += 2;
+ }
+- return(0);
++ return 0;
+ }
+
+ /* Convert hex digit to binary integer */
+-int
+-htoi(c)
+- register int c;
++int htoi(int c)
+ {
+ if ('0' <= c && c <= '9')
+- return(c - '0');
++ return c - '0';
+ if ('a' <= c && c <= 'f')
+- return(10 + c - 'a');
++ return 10 + c - 'a';
+ if ('A' <= c && c <= 'F')
+- return(10 + c - 'A');
+- return(-1);
++ return 10 + c - 'A';
++ return -1;
+ }
+
+ /* Skip leading spaces from the string */
+-char *
+-skipspace(cp)
+- register char *cp;
++const char *skipspace(const char *cp)
+ {
+ while (*cp == ' ' || *cp == '\t')
+ cp++;
+
+ if (*cp == '\0')
+- return(NULL);
++ return NULL;
+ else
+- return(cp);
++ return cp;
+ }
+
+ /* Remove backspaced over characters from the string */
+-void
+-backspace(buf)
+- char *buf;
++void backspace(char *buf)
+ {
+ char bs = 0x8;
+ char *cp = buf;
+@@ -496,77 +401,68 @@
+ }
+
+ /* Make sure line is all seven bits */
+-void
+-sevenbit(s)
+- char *s;
++void sevenbit(char *s)
+ {
+ while (*s)
+ *s++ &= 0x7f;
+ }
+
+ /* Set hash algorithm type */
+-char *
+-skey_set_algorithm(new)
+- char *new;
++const char *skey_set_algorithm(const char *new)
+ {
+ int i;
+
+- for (i = 0; i < SKEY_ALGORITH_LAST; i++) {
++ for (i = 0; skey_algorithm_table[i].name; i++) {
+ if (strcmp(new, skey_algorithm_table[i].name) == 0) {
+ skey_hash_type = i;
+- return(new);
++ return new;
+ }
+ }
+
+- return(NULL);
++ return NULL;
+ }
+
+ /* Get current hash type */
+-const char *
+-skey_get_algorithm()
++const char *skey_get_algorithm()
+ {
+ return(skey_algorithm_table[skey_hash_type].name);
+ }
+
+ /* Turn echo on/off */
+-static void
+-skey_echo(action)
+- int action;
++static void skey_echo(int action)
+ {
+ static struct termios term;
+ static int echo = 0;
+
+ if (action == 0) {
+ /* Turn echo off */
+- (void) tcgetattr(fileno(stdin), &term);
++ tcgetattr(fileno(stdin), &term);
+ if ((echo = (term.c_lflag & ECHO))) {
+ term.c_lflag &= ~ECHO;
+ #ifdef TCSASOFT
+- (void) tcsetattr(fileno(stdin), TCSAFLUSH|TCSASOFT,
&term);
++ tcsetattr(fileno(stdin), TCSAFLUSH|TCSASOFT, &term);
+ #else
+- (void) tcsetattr(fileno(stdin), TCSAFLUSH, &term);
++ tcsetattr(fileno(stdin), TCSAFLUSH, &term);
+ #endif
+ }
+ } else if (action && echo) {
+ /* Turn echo on */
+ term.c_lflag |= ECHO;
+ #ifdef TCSASOFT
+- (void) tcsetattr(fileno(stdin), TCSAFLUSH|TCSASOFT, &term);
++ tcsetattr(fileno(stdin), TCSAFLUSH|TCSASOFT, &term);
+ #else
+- (void) tcsetattr(fileno(stdin), TCSAFLUSH, &term);
++ tcsetattr(fileno(stdin), TCSAFLUSH, &term);
+ #endif
+ echo = 0;
+ }
+ }
+
+ /* Convert string to lower case */
+-static void
+-lowcase(s)
+- char *s;
++static void lowcase(char *s)
+ {
+- char *p;
++ u_char *p;
+
+- for (p = s; *p; p++)
++ for (p = (u_char *) s; *p; p++)
+ if (isupper(*p))
+ *p = tolower(*p);
+ }
+diff -ruN skey-1.1.5.orig/strlcpy.c skey-1.1.5/strlcpy.c
+--- skey-1.1.5.orig/strlcpy.c 2001-05-10 17:10:49.000000000 +0100
++++ skey-1.1.5/strlcpy.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,72 +0,0 @@
+-/* $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $ */
+-
+-/*
+- * Copyright (c) 1998 Todd C. Miller <Todd.Miller AT courtesan.com>
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- * derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES,
+- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS;
+- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-#include "config.h"
+-#ifndef HAVE_STRLCPY
+-
+-#if defined(LIBC_SCCS) && !defined(lint)
+-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert
Exp $";
+-#endif /* LIBC_SCCS and not lint */
+-
+-#include <sys/types.h>
+-#include <string.h>
+-
+-/*
+- * Copy src to string dst of size siz. At most siz-1 characters
+- * will be copied. Always NUL terminates (unless siz == 0).
+- * Returns strlen(src); if retval >= siz, truncation occurred.
+- */
+-size_t strlcpy(dst, src, siz)
+- char *dst;
+- const char *src;
+- size_t siz;
+-{
+- register char *d = dst;
+- register const char *s = src;
+- register size_t n = siz;
+-
+- /* Copy as many bytes as will fit */
+- if (n != 0 && --n != 0) {
+- do {
+- if ((*d++ = *s++) == 0)
+- break;
+- } while (--n != 0);
+- }
+-
+- /* Not enough room in dst, add NUL and traverse rest of src */
+- if (n == 0) {
+- if (siz != 0)
+- *d = '\0'; /* NUL-terminate dst */
+- while (*s++)
+- ;
+- }
+-
+- return(s - src - 1); /* count does not include NUL */
+-}
+-
+-#endif
diff --git a/security/skey/skey-1.1.5-otp.patch
b/security/skey/skey-1.1.5-otp.patch
new file mode 100644
index 0000000..33c9b3d
--- /dev/null
+++ b/security/skey/skey-1.1.5-otp.patch
@@ -0,0 +1,59 @@
+diff -Nur skey-1.1.5.orig/skey.c skey-1.1.5/skey.c
+--- skey-1.1.5.orig/skey.c 2004-11-12 23:09:02.382529123 +0100
++++ skey-1.1.5/skey.c 2004-11-12 23:23:09.864378849 +0100
+@@ -46,6 +46,17 @@
+ char passwd[SKEY_MAX_PW_LEN+1], key[SKEY_BINKEY_SIZE];
+ char buf[33], *seed, *slash, *t;
+
++ /* If we were called as otp-METHOD, set algorithm based on that */
++ if ((slash = strrchr(argv[0], '/')))
++ slash++;
++ else
++ slash = argv[0];
++ if (strncmp(slash, "otp-", 4) == 0) {
++ slash += 4;
++ if (skey_set_algorithm(slash) == NULL)
++ errx(1, "Unknown hash algorithm %s", slash);
++ }
++
+ while ((i = getopt(argc, argv, "fn:p:t:x")) != -1) {
+ switch(i) {
+ case 'f':
+diff -Nur skey-1.1.5.orig/skey.1 skey-1.1.5/skey.1
+--- skey-1.1.5.orig/skey.1 2004-11-12 23:09:02.375530148 +0100
++++ skey-1.1.5/skey.1 2004-11-12 23:41:43.298268426 +0100
+@@ -6,7 +6,7 @@
+ .Dt SKEY 1
+ .Os
+ .Sh NAME
+-.Nm skey
++.Nm skey, otp-md4, otp-md5, otp-sha1
+ .Nd respond to an OTP challenge
+ .Sh SYNOPSIS
+ .Nm
+@@ -27,13 +27,24 @@
+ .Pp
+ .Em S/Key
+ uses 64 bits of information, transformed by the
+-.Tn MD4
++.Tn MD5
+ algorithm into 6 English words.
+ The user supplies the words to authenticate himself to programs like
+ .Xr login 1
+ or
+ .Xr ftpd 8 .
+ .Pp
++When
++.Nm skey
++is invoked as
++.Nm otp-method ,
++.Nm skey
++will use
++.Ar method
++as the hash function where
++.Ar method
++is currently one of md4, md5, or sha1.
++.Pp
+ Example use of the
+ .Em S/Key
+ program
diff --git a/security/skey/skey-login_name_max.patch
b/security/skey/skey-login_name_max.patch
new file mode 100644
index 0000000..b9725aa
--- /dev/null
+++ b/security/skey/skey-login_name_max.patch
@@ -0,0 +1,15 @@
+diff -ruN skey-1.1.5.orig/skeyinit.c skey-1.1.5/skeyinit.c
+--- skey-1.1.5.orig/skeyinit.c 2003-11-12 21:26:49.000000000 +0000
++++ skey-1.1.5/skeyinit.c 2003-11-12 21:28:24.000000000 +0000
+@@ -62,6 +62,11 @@
+ #define SKEY_NAMELEN 4
+ #endif
+
++/* #33315 */
++#ifndef LOGIN_NAME_MAX
++#define LOGIN_NAME_MAX 256
++#endif
++
+ int main __P((int, char **));
+
+ int main(int argc, char **argv)
diff --git a/security/snort/DETAILS b/security/snort/DETAILS
index 124c650..99c329b 100755
--- a/security/snort/DETAILS
+++ b/security/snort/DETAILS
@@ -1,5 +1,5 @@
SPELL=snort
- VERSION=2.7.0
+ VERSION=2.7.0.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE3=$SOURCE.sig
diff --git a/security/snort/HISTORY b/security/snort/HISTORY
index c7cac19..863d4c3 100644
--- a/security/snort/HISTORY
+++ b/security/snort/HISTORY
@@ -1,3 +1,6 @@
+2007-08-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 2.7.0.1
+
2007-07-15 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.7.0

diff --git a/shell-term-fm/bash/DEPENDS b/shell-term-fm/bash/DEPENDS
index 7dacac5..2df54f9 100755
--- a/shell-term-fm/bash/DEPENDS
+++ b/shell-term-fm/bash/DEPENDS
@@ -1,4 +1,5 @@
depends gnupg &&
depends "readline" "--with-installed-readline" &&
depends "ncurses" "--with-curses"
-depends smgl-fhs
+depends smgl-fhs &&
+depends autoconf
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index 6ffbf59..9c39ac6 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE3_GPG="gnu.gpg:${SOURCE3}.sig:UPSTREAM_KEY"
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
ENTERED=20010922
- PATCHLEVEL=12
+ PATCHLEVEL=13
LICENSE[0]=GPL2
KEYWORDS="console"
SHORT="Bourne Again SHell for the GNU operating system"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 9b2ad06..1fe89fc 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,11 @@
+2007-09-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: on autoconf
+
+2007-08-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added bash32-018-025
+ * bash32-018-025: Added new upstream patches
+
2007-08-16 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE, PRE_BUILD: added option to enable
NON_INTERACTIVE_LOGIN_SHELLS,
which makes all login shells read the config files (also those
started by
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index 25fd41a..5a063ac 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -18,6 +18,14 @@ patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-014 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-015 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-016 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-017 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-018 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-019 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-020 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-021 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-022 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-023 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-024 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-025 &&
if [[ "$BASH_NI_LOGIN" == y ]]; then
message "${MESSAGE_COLOR}Defining
NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/'
config-top.h
diff --git a/shell-term-fm/bash/patches/bash32-018
b/shell-term-fm/bash/patches/bash32-018
new file mode 100644
index 0000000..d729aaf
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-018
@@ -0,0 +1,98 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-018
+
+Bug-Reported-by: osicka AT post.cz
+Bug-Reference-ID: <228.177-19682-1132061412-1179356692 AT post.cz>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-05/msg00061.html
+
+Bug-Description:
+
+In certain cases, bash can lose the saved status of a background job, though
+it should still be reported by `wait'. Bash can also loop infinitely after
+creating and waiting for 4096 jobs.
+
+Patch:
+
+*** ../bash-20070510/jobs.c Thu Mar 8 16:05:50 2007
+--- jobs.c Fri May 18 11:40:14 2007
+***************
+*** 784,792 ****
+ {
+ old = js.j_firstj++;
+ while (js.j_firstj != old)
+ {
+ if (js.j_firstj >= js.j_jobslots)
+ js.j_firstj = 0;
+! if (jobs[js.j_firstj])
+ break;
+ js.j_firstj++;
+--- 784,794 ----
+ {
+ old = js.j_firstj++;
++ if (old >= js.j_jobslots)
++ old = js.j_jobslots - 1;
+ while (js.j_firstj != old)
+ {
+ if (js.j_firstj >= js.j_jobslots)
+ js.j_firstj = 0;
+! if (jobs[js.j_firstj] || js.j_firstj == old) /* needed if old == 0
*/
+ break;
+ js.j_firstj++;
+***************
+*** 798,806 ****
+ {
+ old = js.j_lastj--;
+ while (js.j_lastj != old)
+ {
+ if (js.j_lastj < 0)
+ js.j_lastj = js.j_jobslots - 1;
+! if (jobs[js.j_lastj])
+ break;
+ js.j_lastj--;
+--- 800,810 ----
+ {
+ old = js.j_lastj--;
++ if (old < 0)
++ old = 0;
+ while (js.j_lastj != old)
+ {
+ if (js.j_lastj < 0)
+ js.j_lastj = js.j_jobslots - 1;
+! if (jobs[js.j_lastj] || js.j_lastj == old) /* needed if old ==
js.j_jobslots */
+ break;
+ js.j_lastj--;
+***************
+*** 964,968 ****
+ realloc_jobs_list ();
+
+! return (js.j_lastj);
+ }
+
+--- 975,983 ----
+ realloc_jobs_list ();
+
+! #ifdef DEBUG
+! itrace("compact_jobs_list: returning %d", (js.j_lastj ||
jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
+! #endif
+!
+! return ((js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
+ }
+
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 17
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 18
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-019
b/shell-term-fm/bash/patches/bash32-019
new file mode 100644
index 0000000..647bd1f
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-019
@@ -0,0 +1,343 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-019
+
+Bug-Reported-by: Thomas Loeber <ifp AT loeber1.de>
+Bug-Reference-ID: <200703082223.08919.ifp AT loeber1.de>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html
+
+Bug-Description:
+
+When rl_read_key returns -1, indicating that bash's controlling terminal
+has been invalidated for some reason (e.g., receiving a SIGHUP), the error
+status was not reported correctly to the caller. This could cause input
+loops.
+
+Patch:
+
+*** ../bash-3.2-patched/lib/readline/complete.c Fri Jul 28 11:35:49
2006
+--- lib/readline/complete.c Tue Mar 13 08:50:16 2007
+***************
+*** 429,433 ****
+ if (c == 'n' || c == 'N' || c == RUBOUT)
+ return (0);
+! if (c == ABORT_CHAR)
+ _rl_abort_internal ();
+ if (for_pager && (c == NEWLINE || c == RETURN))
+--- 440,444 ----
+ if (c == 'n' || c == 'N' || c == RUBOUT)
+ return (0);
+! if (c == ABORT_CHAR || c < 0)
+ _rl_abort_internal ();
+ if (for_pager && (c == NEWLINE || c == RETURN))
+*** ../bash-3.2-patched/lib/readline/input.c Wed Aug 16 15:15:16 2006
+--- lib/readline/input.c Wed May 2 16:07:59 2007
+***************
+*** 514,518 ****
+ int size;
+ {
+! int mb_len = 0;
+ size_t mbchar_bytes_length;
+ wchar_t wc;
+--- 522,526 ----
+ int size;
+ {
+! int mb_len, c;
+ size_t mbchar_bytes_length;
+ wchar_t wc;
+***************
+*** 521,531 ****
+ memset(&ps, 0, sizeof (mbstate_t));
+ memset(&ps_back, 0, sizeof (mbstate_t));
+!
+ while (mb_len < size)
+ {
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! mbchar[mb_len++] = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+ mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+ if (mbchar_bytes_length == (size_t)(-1))
+--- 529,545 ----
+ memset(&ps, 0, sizeof (mbstate_t));
+ memset(&ps_back, 0, sizeof (mbstate_t));
+!
+! mb_len = 0;
+ while (mb_len < size)
+ {
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ break;
++
++ mbchar[mb_len++] = c;
++
+ mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+ if (mbchar_bytes_length == (size_t)(-1))
+***************
+*** 565,569 ****
+ c = first;
+ memset (mb, 0, mlen);
+! for (i = 0; i < mlen; i++)
+ {
+ mb[i] = (char)c;
+--- 579,583 ----
+ c = first;
+ memset (mb, 0, mlen);
+! for (i = 0; c >= 0 && i < mlen; i++)
+ {
+ mb[i] = (char)c;
+*** ../bash-3.2-patched/lib/readline/isearch.c Mon Dec 26 17:18:53 2005
+--- lib/readline/isearch.c Fri Mar 9 14:30:59 2007
+***************
+*** 328,333 ****
+
+ f = (rl_command_func_t *)NULL;
+!
+! /* Translate the keys we do something with to opcodes. */
+ if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+ {
+--- 328,340 ----
+
+ f = (rl_command_func_t *)NULL;
+!
+! if (c < 0)
+! {
+! cxt->sflags |= SF_FAILED;
+! cxt->history_pos = cxt->last_found_line;
+! return -1;
+! }
+!
+! /* Translate the keys we do something with to opcodes. */
+ if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+ {
+*** ../bash-3.2-patched/lib/readline/misc.c Mon Dec 26 17:20:46 2005
+--- lib/readline/misc.c Fri Mar 9 14:44:11 2007
+***************
+*** 147,150 ****
+--- 147,152 ----
+ rl_clear_message ();
+ RL_UNSETSTATE(RL_STATE_NUMERICARG);
++ if (key < 0)
++ return -1;
+ return (_rl_dispatch (key, _rl_keymap));
+ }
+*** ../bash-3.2-patched/lib/readline/readline.c Wed Aug 16 15:00:36
2006
+--- lib/readline/readline.c Fri Mar 9 14:47:24 2007
+***************
+*** 646,649 ****
+--- 669,677 ----
+ {
+ nkey = _rl_subseq_getchar (cxt->okey);
++ if (nkey < 0)
++ {
++ _rl_abort_internal ();
++ return -1;
++ }
+ r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
+ cxt->flags |= KSEQ_DISPATCHED;
+*** ../bash-3.2-patched/lib/readline/text.c Fri Jul 28 11:55:27 2006
+--- lib/readline/text.c Sun Mar 25 13:41:38 2007
+***************
+*** 858,861 ****
+--- 864,870 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ return -1;
++
+ #if defined (HANDLE_SIGNALS)
+ if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
+***************
+*** 1521,1524 ****
+--- 1530,1536 ----
+ mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
+
++ if (mb_len <= 0)
++ return -1;
++
+ if (count < 0)
+ return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
+***************
+*** 1537,1540 ****
+--- 1549,1555 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ return -1;
++
+ if (count < 0)
+ return (_rl_char_search_internal (-count, bdir, c));
+*** ../bash-3.2-patched/lib/readline/vi_mode.c Sat Jul 29 16:42:28 2006
+--- lib/readline/vi_mode.c Fri Mar 9 15:02:11 2007
+***************
+*** 887,890 ****
+--- 887,897 ----
+ c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
++
++ if (c < 0)
++ {
++ *nextkey = 0;
++ return -1;
++ }
++
+ *nextkey = c;
+
+***************
+*** 903,906 ****
+--- 910,918 ----
+ c = rl_read_key (); /* real command */
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ if (c < 0)
++ {
++ *nextkey = 0;
++ return -1;
++ }
+ *nextkey = c;
+ }
+***************
+*** 1225,1236 ****
+ _rl_callback_generic_arg *data;
+ {
+ #if defined (HANDLE_MULTIBYTE)
+! _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar,
MB_LEN_MAX);
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! _rl_vi_last_search_char = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+
+ _rl_callback_func = 0;
+ _rl_want_redisplay = 1;
+--- 1243,1262 ----
+ _rl_callback_generic_arg *data;
+ {
++ int c;
+ #if defined (HANDLE_MULTIBYTE)
+! c = _rl_vi_last_search_mblen = _rl_read_mbchar
(_rl_vi_last_search_mbchar, MB_LEN_MAX);
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+
++ if (c <= 0)
++ return -1;
++
++ #if !defined (HANDLE_MULTIBYTE)
++ _rl_vi_last_search_char = c;
++ #endif
++
+ _rl_callback_func = 0;
+ _rl_want_redisplay = 1;
+***************
+*** 1248,1251 ****
+--- 1274,1278 ----
+ int count, key;
+ {
++ int c;
+ #if defined (HANDLE_MULTIBYTE)
+ static char *target;
+***************
+*** 1294,1302 ****
+ {
+ #if defined (HANDLE_MULTIBYTE)
+! _rl_vi_last_search_mblen = _rl_read_mbchar
(_rl_vi_last_search_mbchar, MB_LEN_MAX);
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! _rl_vi_last_search_char = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ #endif
+ }
+--- 1321,1335 ----
+ {
+ #if defined (HANDLE_MULTIBYTE)
+! c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+! if (c <= 0)
+! return -1;
+! _rl_vi_last_search_mblen = c;
+ #else
+ RL_SETSTATE(RL_STATE_MOREINPUT);
+! c = rl_read_key ();
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ if (c < 0)
++ return -1;
++ _rl_vi_last_search_char = c;
+ #endif
+ }
+***************
+*** 1468,1471 ****
+--- 1501,1507 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
++ if (c < 0)
++ return -1;
++
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+***************
+*** 1486,1489 ****
+--- 1522,1528 ----
+ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+
++ if (c < 0)
++ return -1;
++
+ _rl_callback_func = 0;
+ _rl_want_redisplay = 1;
+***************
+*** 1517,1520 ****
+--- 1556,1562 ----
+ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+
++ if (c < 0)
++ return -1;
++
+ return (_rl_vi_change_char (count, c, mb));
+ }
+***************
+*** 1651,1655 ****
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+! if (ch < 'a' || ch > 'z')
+ {
+ rl_ding ();
+--- 1693,1697 ----
+ RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+! if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0
explicit */
+ {
+ rl_ding ();
+***************
+*** 1703,1707 ****
+ return 0;
+ }
+! else if (ch < 'a' || ch > 'z')
+ {
+ rl_ding ();
+--- 1745,1749 ----
+ return 0;
+ }
+! else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0
explicit */
+ {
+ rl_ding ();
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 18
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-020
b/shell-term-fm/bash/patches/bash32-020
new file mode 100644
index 0000000..8c7e328
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-020
@@ -0,0 +1,183 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-020
+
+Bug-Reported-by: Ian A Watson <WATSON_IAN_A AT LILLY.COM>
+Bug-Reference-ID:
<OFEC551808.69D02C7F-ON8525729A.0045708D-8525729A.0046150B AT EliLilly.lilly.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+In some cases of error processing, a jump back to the top-level processing
+loop from a builtin command would leave the shell in an inconsistent state.
+
+Patch:
+
+*** ../bash-3.2-patched/sig.c Wed Jan 25 14:57:59 2006
+--- sig.c Sat Mar 10 11:11:30 2007
+***************
+*** 351,354 ****
+--- 351,373 ----
+ #undef XHANDLER
+
++ /* Run some of the cleanups that should be performed when we run
++ jump_to_top_level from a builtin command context. XXX - might want to
++ also call reset_parser here. */
++ void
++ top_level_cleanup ()
++ {
++ /* Clean up string parser environment. */
++ while (parse_and_execute_level)
++ parse_and_execute_cleanup ();
++
++ #if defined (PROCESS_SUBSTITUTION)
++ unlink_fifo_list ();
++ #endif /* PROCESS_SUBSTITUTION */
++
++ run_unwind_protects ();
++ loop_level = continuing = breaking = 0;
++ return_catch_flag = 0;
++ }
++
+ /* What to do when we've been interrupted, and it is safe to handle it. */
+ void
+*** ../bash-3.2-patched/sig.h Wed Jan 25 14:50:27 2006
+--- sig.h Sat Mar 10 11:14:18 2007
+***************
+*** 122,125 ****
+--- 122,126 ----
+ extern void initialize_terminating_signals __P((void));
+ extern void reset_terminating_signals __P((void));
++ extern void top_level_cleanup __P((void));
+ extern void throw_to_top_level __P((void));
+ extern void jump_to_top_level __P((int)) __attribute__((__noreturn__));
+*** ../bash-3.2-patched/builtins/common.c Tue Apr 3 16:47:13 2007
+--- builtins/common.c Mon Apr 30 15:01:33 2007
+***************
+*** 132,135 ****
+--- 132,136 ----
+ {
+ builtin_error (_("too many arguments"));
++ top_level_cleanup ();
+ jump_to_top_level (DISCARD);
+ }
+***************
+*** 396,400 ****
+ throw_to_top_level ();
+ else
+! jump_to_top_level (DISCARD);
+ }
+ no_args (list->next);
+--- 410,417 ----
+ throw_to_top_level ();
+ else
+! {
+! top_level_cleanup ();
+! jump_to_top_level (DISCARD);
+! }
+ }
+ no_args (list->next);
+*** ../bash-3.2-patched/subst.c Tue Apr 3 16:47:19 2007
+--- subst.c Tue Jul 17 09:45:11 2007
+***************
+*** 1279,1283 ****
+ if (no_longjmp_on_fatal_error == 0)
+ { /* { */
+! report_error ("bad substitution: no closing `%s' in %s", "}",
string);
+ last_command_exit_value = EXECUTION_FAILURE;
+ exp_jump_to_top_level (DISCARD);
+--- 1290,1294 ----
+ if (no_longjmp_on_fatal_error == 0)
+ { /* { */
+! report_error (_("bad substitution: no closing `%s' in %s"), "}",
string);
+ last_command_exit_value = EXECUTION_FAILURE;
+ exp_jump_to_top_level (DISCARD);
+***************
+*** 7662,7665 ****
+--- 7706,7711 ----
+ expand_no_split_dollar_star = 0; /* XXX */
+ expanding_redir = 0;
++
++ top_level_cleanup (); /* from sig.c */
+
+ jump_to_top_level (v);
+***************
+*** 7880,7884 ****
+ {
+ report_error (_("no match: %s"), tlist->word->word);
+! jump_to_top_level (DISCARD);
+ }
+ else if (allow_null_glob_expansion == 0)
+--- 7927,7931 ----
+ {
+ report_error (_("no match: %s"), tlist->word->word);
+! exp_jump_to_top_level (DISCARD);
+ }
+ else if (allow_null_glob_expansion == 0)
+*** ../bash-3.2-patched/arrayfunc.c Thu Jul 27 09:37:59 2006
+--- arrayfunc.c Thu May 31 11:55:46 2007
+***************
+*** 619,622 ****
+--- 619,624 ----
+ {
+ last_command_exit_value = EXECUTION_FAILURE;
++
++ top_level_cleanup ();
+ jump_to_top_level (DISCARD);
+ }
+*** ../bash-3.2-patched/expr.c Wed Dec 28 17:47:03 2005
+--- expr.c Tue Apr 24 14:17:59 2007
+***************
+*** 930,933 ****
+--- 930,934 ----
+ {
+ expr_unwind ();
++ top_level_cleanup ();
+ jump_to_top_level (DISCARD);
+ }
+*** ../bash-3.2-patched/variables.c Fri Sep 8 13:33:32 2006
+--- variables.c Tue Jul 17 09:54:59 2007
+***************
+*** 1822,1830 ****
+ lval = evalexp (oval, &expok); /* ksh93 seems to do this */
+ if (expok == 0)
+! jump_to_top_level (DISCARD);
+ }
+ rval = evalexp (value, &expok);
+ if (expok == 0)
+! jump_to_top_level (DISCARD);
+ if (flags & ASS_APPEND)
+ rval += lval;
+--- 1855,1869 ----
+ lval = evalexp (oval, &expok); /* ksh93 seems to do this */
+ if (expok == 0)
+! {
+! top_level_cleanup ();
+! jump_to_top_level (DISCARD);
+! }
+ }
+ rval = evalexp (value, &expok);
+ if (expok == 0)
+! {
+! top_level_cleanup ();
+! jump_to_top_level (DISCARD);
+! }
+ if (flags & ASS_APPEND)
+ rval += lval;
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 20
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-021
b/shell-term-fm/bash/patches/bash32-021
new file mode 100644
index 0000000..003489c
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-021
@@ -0,0 +1,72 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-021
+
+Bug-Reported-by: BAGSHAW Paul RD-TECH-REN
<paul.bagshaw AT orange-ftgroup.com>
+Bug-Reference-ID:
<941BA0BF46DB8F4983FF7C8AFE800BC205EA7D4B AT ftrdmel3.rd.francetelecom.fr>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00065.html
+
+Bug-Description:
+
+When the parser read a backslash-escaped character that would be treated
+internally as an escape, it would double the number of escape characters.
+
+Patch:
+
+*** ../bash-3.2-patched/parse.y Mon Oct 30 17:22:00 2006
+--- parse.y Sat Mar 24 17:13:20 2007
+***************
+*** 3377,3381 ****
+ {
+ pass_next_character = 0;
+! goto got_character;
+ }
+
+--- 3377,3381 ----
+ {
+ pass_next_character = 0;
+! goto got_escaped_character;
+ }
+
+***************
+*** 3651,3660 ****
+ got_character:
+
+- all_digit_token &= DIGIT (character);
+- dollar_present |= character == '$';
+-
+ if (character == CTLESC || character == CTLNUL)
+ token[token_index++] = CTLESC;
+
+ token[token_index++] = character;
+
+--- 3651,3662 ----
+ got_character:
+
+ if (character == CTLESC || character == CTLNUL)
+ token[token_index++] = CTLESC;
+
++ got_escaped_character:
++
++ all_digit_token &= DIGIT (character);
++ dollar_present |= character == '$';
++
+ token[token_index++] = character;
+
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 20
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-022
b/shell-term-fm/bash/patches/bash32-022
new file mode 100644
index 0000000..d3679e6
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-022
@@ -0,0 +1,126 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-022
+
+Bug-Reported-by: Chet Ramey <chet.ramey AT cwru.edu>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+POSIX specifies that the `read' builtin invoked from an interative shell
+must prompt with $PS2 when a line is continued using a backslash while
+reading from a terminal.
+
+Patch:
+
+*** ../bash-3.2-patched/builtins/read.def Tue Sep 19 08:45:48 2006
+--- builtins/read.def Thu May 24 16:03:30 2007
+***************
+*** 128,133 ****
+ {
+ register char *varname;
+! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code;
+! int input_is_tty, input_is_pipe, unbuffered_read;
+ int raw, edit, nchars, silent, have_timeout, fd;
+ unsigned int tmout;
+--- 131,136 ----
+ {
+ register char *varname;
+! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code,
print_ps2;
+! int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc,
skip_ctlnul;
+ int raw, edit, nchars, silent, have_timeout, fd;
+ unsigned int tmout;
+***************
+*** 135,139 ****
+ char c;
+ char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname;
+! char *e, *t, *t1;
+ struct stat tsb;
+ SHELL_VAR *var;
+--- 138,142 ----
+ char c;
+ char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname;
+! char *e, *t, *t1, *ps2;
+ struct stat tsb;
+ SHELL_VAR *var;
+***************
+*** 149,152 ****
+--- 152,156 ----
+ USE_VAR(i);
+ USE_VAR(pass_next);
++ USE_VAR(print_ps2);
+ USE_VAR(saw_escape);
+ USE_VAR(input_is_pipe);
+***************
+*** 164,167 ****
+--- 168,172 ----
+ #endif
+ USE_VAR(list);
++ USE_VAR(ps2);
+
+ i = 0; /* Index into the string that we are reading. */
+***************
+*** 387,391 ****
+ #endif
+
+! for (eof = retval = 0;;)
+ {
+ #if defined (READLINE)
+--- 394,399 ----
+ #endif
+
+! ps2 = 0;
+! for (print_ps2 = eof = retval = 0;;)
+ {
+ #if defined (READLINE)
+***************
+*** 413,416 ****
+--- 421,433 ----
+ #endif
+
++ if (print_ps2)
++ {
++ if (ps2 == 0)
++ ps2 = get_string_value ("PS2");
++ fprintf (stderr, "%s", ps2 ? ps2 : "");
++ fflush (stderr);
++ print_ps2 = 0;
++ }
++
+ if (unbuffered_read)
+ retval = zread (fd, &c, 1);
+***************
+*** 441,445 ****
+ pass_next = 0;
+ if (c == '\n')
+! i--; /* back up over the CTLESC */
+ else
+ goto add_char;
+--- 458,466 ----
+ pass_next = 0;
+ if (c == '\n')
+! {
+! i--; /* back up over the CTLESC */
+! if (interactive && input_is_tty && raw == 0)
+! print_ps2 = 1;
+! }
+ else
+ goto add_char;
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-023
b/shell-term-fm/bash/patches/bash32-023
new file mode 100644
index 0000000..34a6394
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-023
@@ -0,0 +1,51 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-023
+
+Bug-Reported-by: Chet Ramey <chet.ramey AT cwru.edu>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+When an error occurs during the pattern removal word expansion, the shell
+can free unallocated memory or free memory multiple times.
+
+Patch:
+
+*** ../bash-3.2-patched/subst.c Tue Apr 3 16:47:19 2007
+--- subst.c Tue Jul 17 09:45:11 2007
+***************
+*** 3975,3979 ****
+ patstr++;
+
+! pattern = getpattern (patstr, quoted, 1);
+
+ temp1 = (char *)NULL; /* shut up gcc */
+--- 4008,4016 ----
+ patstr++;
+
+! /* Need to pass getpattern newly-allocated memory in case of expansion --
+! the expansion code will free the passed string on an error. */
+! temp1 = savestring (patstr);
+! pattern = getpattern (temp1, quoted, 1);
+! free (temp1);
+
+ temp1 = (char *)NULL; /* shut up gcc */
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-024
b/shell-term-fm/bash/patches/bash32-024
new file mode 100644
index 0000000..1575f37
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-024
@@ -0,0 +1,77 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-024
+
+Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
+Bug-Reference-ID: <1178376645.9063.25.camel@localhost>
+Bug-Reference-URL: http://bugs.gentoo.org/177095
+
+Bug-Description:
+
+The readline display code miscalculated the screen position when performing
+a redisplay in which the new text occupies more screen space that the old,
+but takes fewer bytes to do so (e.g., when replacing a shorter string
+containing multibyte characters with a longer one containing only ASCII).
+
+Patch:
+
+*** ../bash-3.2-patched/lib/readline/display.c Thu Apr 26 11:38:22 2007
+--- lib/readline/display.c Thu Jul 12 23:10:10 2007
+***************
+*** 1519,1527 ****
+ /* Non-zero if we're increasing the number of lines. */
+ int gl = current_line >= _rl_vis_botlin && inv_botlin >
_rl_vis_botlin;
+ /* Sometimes it is cheaper to print the characters rather than
+ use the terminal's capabilities. If we're growing the number
+ of lines, make sure we actually cause the new line to wrap
+ around on auto-wrapping terminals. */
+! if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff ||
_rl_term_IC) && (!_rl_term_autowrap || !gl))
+ {
+ /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
+--- 1568,1596 ----
+ /* Non-zero if we're increasing the number of lines. */
+ int gl = current_line >= _rl_vis_botlin && inv_botlin >
_rl_vis_botlin;
++ /* If col_lendiff is > 0, implying that the new string takes up more
++ screen real estate than the old, but lendiff is < 0, meaning that it
++ takes fewer bytes, we need to just output the characters starting
++ from the first difference. These will overwrite what is on the
++ display, so there's no reason to do a smart update. This can really
++ only happen in a multibyte environment. */
++ if (lendiff < 0)
++ {
++ _rl_output_some_chars (nfd, temp);
++ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
++ /* If nfd begins before any invisible characters in the prompt,
++ adjust _rl_last_c_pos to account for wrap_offset and set
++ cpos_adjusted to let the caller know. */
++ if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
++ {
++ _rl_last_c_pos -= wrap_offset;
++ cpos_adjusted = 1;
++ }
++ return;
++ }
+ /* Sometimes it is cheaper to print the characters rather than
+ use the terminal's capabilities. If we're growing the number
+ of lines, make sure we actually cause the new line to wrap
+ around on auto-wrapping terminals. */
+! else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff
|| _rl_term_IC) && (!_rl_term_autowrap || !gl))
+ {
+ /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-025
b/shell-term-fm/bash/patches/bash32-025
new file mode 100644
index 0000000..4d53d89
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-025
@@ -0,0 +1,79 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-025
+
+Bug-Reported-by: Tom Bjorkholm <tom.bjorkholm AT ericsson.com>
+Bug-Reference-ID:
<AEA1A32F001C6B4F98614B5B80D7647D01C075E9 AT esealmw115.eemea.ericsson.se>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html
+
+Bug-Description:
+
+An off-by-one error in readline's input buffering caused readline to drop
+each 511th character of buffered input (e.g., when pasting a large amount
+of data into a terminal window).
+
+Patch:
+
+*** ../bash-3.2-patched/lib/readline/input.c Wed Aug 16 15:15:16 2006
+--- lib/readline/input.c Tue Jul 17 09:24:21 2007
+***************
+*** 134,139 ****
+
+ *key = ibuffer[pop_index++];
+!
+ if (pop_index >= ibuffer_len)
+ pop_index = 0;
+
+--- 134,142 ----
+
+ *key = ibuffer[pop_index++];
+! #if 0
+ if (pop_index >= ibuffer_len)
++ #else
++ if (pop_index > ibuffer_len)
++ #endif
+ pop_index = 0;
+
+***************
+*** 251,255 ****
+ {
+ k = (*rl_getc_function) (rl_instream);
+! rl_stuff_char (k);
+ if (k == NEWLINE || k == RETURN)
+ break;
+--- 254,259 ----
+ {
+ k = (*rl_getc_function) (rl_instream);
+! if (rl_stuff_char (k) == 0)
+! break; /* some problem; no more room */
+ if (k == NEWLINE || k == RETURN)
+ break;
+***************
+*** 374,378 ****
+--- 378,386 ----
+ }
+ ibuffer[push_index++] = key;
++ #if 0
+ if (push_index >= ibuffer_len)
++ #else
++ if (push_index > ibuffer_len)
++ #endif
+ push_index = 0;
+
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/mrxvt/DETAILS b/shell-term-fm/mrxvt/DETAILS
index cdff523..88d742c 100755
--- a/shell-term-fm/mrxvt/DETAILS
+++ b/shell-term-fm/mrxvt/DETAILS
@@ -1,9 +1,9 @@
SPELL=mrxvt
- VERSION=0.5.2
+ VERSION=0.5.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/materm/$SOURCE
-
SOURCE_HASH=sha512:b3091103c3e25d6c3c12f1eedad61ae224b022fedcc5508cca9b1fbcfecbf44f5bca34b209b403657050b9e9a1dc97c82078919ce6269d54007a667896670188
+
SOURCE_HASH=sha512:73fb572275514243e23e35420fece4552bf34b3984922ea80e417e496b1b973be357f364d2d7d4df3d8a39b8319251b9461b34c297f893f2b6b5a1bd5f4f4167
WEB_SITE=http://materm.sourceforge.net/
ENTERED=20041110
LICENSE[0]=GPL
diff --git a/shell-term-fm/mrxvt/HISTORY b/shell-term-fm/mrxvt/HISTORY
index eeab67f..b334512 100644
--- a/shell-term-fm/mrxvt/HISTORY
+++ b/shell-term-fm/mrxvt/HISTORY
@@ -1,3 +1,7 @@
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.5.3
+ * PRE_BUILD, no_debug_x.patch: removed
+
2007-05-03 Javier Vasquez <jevv.cr AT gmail.com>
* PRE_BUILD, no_debug_x.patch: avoid debug performance loss #13754

diff --git a/shell-term-fm/mrxvt/PRE_BUILD b/shell-term-fm/mrxvt/PRE_BUILD
deleted file mode 100755
index e509d10..0000000
--- a/shell-term-fm/mrxvt/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SCRIPT_DIRECTORY/no_debug_x.patch"
diff --git a/shell-term-fm/mrxvt/no_debug_x.patch
b/shell-term-fm/mrxvt/no_debug_x.patch
deleted file mode 100644
index ca2f978..0000000
--- a/shell-term-fm/mrxvt/no_debug_x.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/init.c
-===================================================================
---- src/init.c (revision 195)
-+++ src/init.c (working copy)
-@@ -41,7 +41,7 @@
- # define DEBUG_X
- #else
- # define DEBUG_LEVEL 0
--# define DEBUG_X
-+# undef DEBUG_X
- #endif
-
- #if DEBUG_LEVEL
diff --git a/shell-term-fm/multi-gnome-terminal/DEPENDS
b/shell-term-fm/multi-gnome-terminal/DEPENDS
index f97f9bc..b3e6761 100755
--- a/shell-term-fm/multi-gnome-terminal/DEPENDS
+++ b/shell-term-fm/multi-gnome-terminal/DEPENDS
@@ -1,5 +1,5 @@
-depends libxml &&
-depends gnome-libs &&
-depends scrollkeeper &&
-depends gdk-pixbuf &&
+depends libxml &&
+depends gnome-libs &&
+depends rarian &&
+depends gdk-pixbuf &&
depends libglade
diff --git a/shell-term-fm/multi-gnome-terminal/HISTORY
b/shell-term-fm/multi-gnome-terminal/HISTORY
index 05148dc..d5f73c4 100644
--- a/shell-term-fm/multi-gnome-terminal/HISTORY
+++ b/shell-term-fm/multi-gnome-terminal/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed scrollkeeper to rarian
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/shell-term-fm/sakura/DETAILS b/shell-term-fm/sakura/DETAILS
index a9dceef..a390fe9 100755
--- a/shell-term-fm/sakura/DETAILS
+++ b/shell-term-fm/sakura/DETAILS
@@ -1,7 +1,7 @@
SPELL=sakura
- VERSION=1.1.5
+ VERSION=1.2.1
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:4e6f37ff911e4b5588fbf04e60d2ef240a2b8a6ebae39f5dd36e07ba0e03193e254ac11d44b067804dff20458c1228acd8e532ea70dd62237aa26102f61c4b7a
+
SOURCE_HASH=sha512:08f8aa64bf548a242b82ecba9ad9ac78b20a213b49b133491b6f3e492fb834590fe8177e113fb7dcd30a02ea2661b47cf17211a2836ebc1db0cc015cabd701df
SOURCE_URL[0]=http://pleyades.net/david/projects/sakura/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.pleyades.net/david/sakura.php
diff --git a/shell-term-fm/sakura/HISTORY b/shell-term-fm/sakura/HISTORY
index a273cf3..f242e1a 100644
--- a/shell-term-fm/sakura/HISTORY
+++ b/shell-term-fm/sakura/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 1.2.1
+
2007-06-16 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: Updated spell to 1.1.5

diff --git a/shell-term-fm/xfe/DETAILS b/shell-term-fm/xfe/DETAILS
index c786cda..17ea9e2 100755
--- a/shell-term-fm/xfe/DETAILS
+++ b/shell-term-fm/xfe/DETAILS
@@ -1,6 +1,6 @@
SPELL=xfe
- VERSION=0.99
-
SOURCE_HASH='sha512:0a0eabee16e8e9edee67fb0c9693d28d078c9dec8783a9f945f9aef268992b782484f3f4dc7a22143edd9c1e9e3b9ff8d30648d493d2d2017d55bf528fedbbed'
+ VERSION=1.04
+
SOURCE_HASH='sha512:a092b8aaca5b263b091b00371639a00057868cfa650f883c0264166d2eb8eec7e6a6af531d66bdabbb8ea75a0ca5f74c2d19ffef2dad9b43f84b9d75bd119d83'
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/shell-term-fm/xfe/HISTORY b/shell-term-fm/xfe/HISTORY
old mode 100755
new mode 100644
index 1c0671d..de07d8e
--- a/shell-term-fm/xfe/HISTORY
+++ b/shell-term-fm/xfe/HISTORY
@@ -1,3 +1,9 @@
+2007-09-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.04
+
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.00
+
2007-04-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.99

diff --git a/smgl/enthrall/DETAILS b/smgl/enthrall/DETAILS
index 29d3da2..3742590 100755
--- a/smgl/enthrall/DETAILS
+++ b/smgl/enthrall/DETAILS
@@ -1,5 +1,5 @@
SPELL=enthrall
- VERSION=0.5
+ VERSION=0.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL="http://download.sourcemage.org/projects/$SPELL/$SOURCE";
diff --git a/smgl/enthrall/HISTORY b/smgl/enthrall/HISTORY
index 0dee87a..c97fb2c 100644
--- a/smgl/enthrall/HISTORY
+++ b/smgl/enthrall/HISTORY
@@ -1,3 +1,6 @@
+2007-08-25 Arjan Bouter <abouter AT sourcemag.org>
+ * DETAILS: updated to 0.6
+
2007-06-24 Arjan Bouter <abouter AT sourcemag.org>
* DETAILS: updated to 0.5
switched sourcehash to gnupg sig
diff --git a/smgl/enthrall/enthrall-0.5.tar.bz2.sig
b/smgl/enthrall/enthrall-0.5.tar.bz2.sig
deleted file mode 100644
index 7ed7c15..0000000
Binary files a/smgl/enthrall/enthrall-0.5.tar.bz2.sig and /dev/null differ
diff --git a/smgl/enthrall/enthrall-0.6.tar.bz2.sig
b/smgl/enthrall/enthrall-0.6.tar.bz2.sig
new file mode 100644
index 0000000..aa75597
Binary files /dev/null and b/smgl/enthrall/enthrall-0.6.tar.bz2.sig differ
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index dab9e81..51e6a8b 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,5 +1,6 @@
SPELL=init.d
VERSION=2.2.2
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="smgl"
ENTERED=20030505
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index cc115d4..aaf775b 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,8 @@
+2007-09-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * files/rc: fix init script execution if a script exists in more than
+ one runlevel
+ * DETAILS: PATCHLEVEL++
+
2007-08-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: fix the workaround for #13363

diff --git a/smgl/init.d/files/rc b/smgl/init.d/files/rc
index b466169..8d31494 100755
--- a/smgl/init.d/files/rc
+++ b/smgl/init.d/files/rc
@@ -92,7 +92,10 @@ run_script()
local script=$1
shift 2
if [ $# -gt 0 ] ; then
- bash $RUNLEVELS_DIR/*/$script "$@"
+ # run the first matching script in case it exists in more than one
+ # runlevel
+ local scriptfile=$(builtin echo $RUNLEVELS_DIR/*/$script)
+ bash ${scriptfile%% *} "$@"
else
echo "missing script argument" > /dev/stderr && exit 1
fi
diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index b380c17..bf41249 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,9 +1,10 @@
SPELL=linux-initramfs
- VERSION=0.2
+ VERSION=0.4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE="http://www.sourcemage.org/";
ENTERED=20030803
GATHER_DOCS=off
+ PATCHLEVEL=1
KEYWORDS="kernels"
SHORT="This spell provides initramfs scripts that can be loaded
into the kernel"
cat << EOF
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 3a179c8..5dc3fdd 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,17 @@
+2007-09-20 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: make the initrd a little simpler with no symlinks...
+ * DETAILS: version++
+
+2007-09-09 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: forgot to blow away the cpio tmp root and quiet the
+ pushd/popd's
+ * DETAILS: patchlevel++
+
+2007-09-08 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: updated to not use the gen_init_cpio and to use the
regular
+ cpio executable
+ * DETAILS: version++
+
2007-04-15 David Brown <dmlb2000 AT gmail.com>
* examples/pre_kinit.sh.klibc: added for the default klibc supported
resume ip and nfsmount configurations
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 69e0c8a..4087159 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -30,6 +30,8 @@ REMOVE_OLD_INITRD=${REMOVE_OLD_INITRD:=false}
MODULES=${MODULES:=}
KVERSION=$(uname -r)
INITRD_FILE=${INITRD_FILE:=/boot/initrd.img-$KVERSION}
+CPIO_TMP_ROOT=$(mktemp -d -p ${TMP_DIR:-/tmp})
+

function usage()
{
@@ -46,7 +48,7 @@ function linuxrc_pre()

for module in \`cat /modules.lst\`
do
-/sbin/insmod \$module
+/bin/insmod \$module
done
EOF
}
@@ -56,7 +58,7 @@ function linuxrc_raid()
if $USE_RAID || $FORCE_RAID
then
cat <<-EOF
-/sbin/mdadm --assemble --scan
+/bin/mdadm --assemble --scan
EOF
fi
}
@@ -66,10 +68,10 @@ function linuxrc_lvm()
if $USE_LVM || $FORCE_LVM
then
cat <<-EOF
-/sbin/mount -t proc proc /proc
-/sbin/dmsetup mknodes
-/sbin/vgscan --ignorelockingfailure --mknodes
-/sbin/vgchange -ay --ignorelockingfailure
+/bin/mount -t proc proc /proc
+/bin/dmsetup mknodes
+/bin/vgscan --ignorelockingfailure --mknodes
+/bin/vgchange -ay --ignorelockingfailure
EOF
fi
}
@@ -93,17 +95,16 @@ function default_parts()
dir /dev 0755 0 0
nod /dev/console 0600 0 0 c 5 1
dir /root 0700 0 0
-slink /init linuxrc 0755 0 0
file /linuxrc /tmp/linuxrc 0755 0 0
+link /init /linuxrc 0755 0 0
EOF
}

function dir_parts()
{
cat <<-EOF
-slink /sbin bin 0755 0 0
dir /bin 0755 0 0
-slink /usr/sbin bin 0755 0 0
+dir /usr 0755 0 0
dir /usr/bin 0755 0 0
dir /lib 0755 0 0
dir /proc 0755 0 0
@@ -536,7 +537,7 @@ function raid_parts()
if $USE_RAID || $FORCE_RAID
then
cat <<-EOF
-file /sbin/mdadm /sbin/mdadm.static 0755 0 0
+file /bin/mdadm /sbin/mdadm.static 0755 0 0
file /etc/mdadm.conf /etc/mdadm.conf 0644 0 0
EOF
fi
@@ -549,7 +550,7 @@ function lvm_parts()
cat <<-EOF
dir /etc/lvm 0755 0 0
file /etc/lvm/lvm.conf /etc/lvm/lvm.conf 0644 0 0
-file /sbin/lvm /usr/sbin/lvm.static 0755 0 0
+file /bin/lvm /usr/sbin/lvm.static 0755 0 0
EOF
local link
for link in lvs pvs vgs vgck lvconvert lvdisplay pvchange pvcreate \
@@ -560,9 +561,9 @@ EOF
vgremove vgconvert vgcfgbackup lvreduce lvrename lvremove \
lvresize vgdisplay
do
- echo "slink /sbin/$link lvm 0755 0 0"
+ echo "link /bin/$link /bin/lvm 0755 0 0"
done
- echo "file /sbin/dmsetup /sbin/dmsetup.static 0755 0 0"
+ echo "file /bin/dmsetup /sbin/dmsetup.static 0755 0 0"
fi
}

@@ -635,6 +636,41 @@ function fill_modules()
fill_root_filesystem
}

+function gen_cpio_root()
+{
+ local line args
+ while read line
+ do
+ args=($line)
+ case ${args[0]} in
+ link)
+ ln ${CPIO_TMP_ROOT}/${args[2]}
${CPIO_TMP_ROOT}/${args[1]}
+ ;;
+ file)
+ cat ${args[2]} > ${CPIO_TMP_ROOT}/${args[1]}
+ chmod ${args[3]} ${CPIO_TMP_ROOT}/${args[1]}
+ ;;
+ dir)
+ mkdir ${CPIO_TMP_ROOT}/${args[1]}
+ chmod ${args[2]} ${CPIO_TMP_ROOT}/${args[1]}
+ ;;
+ nod)
+ mknod ${CPIO_TMP_ROOT}/${args[1]} ${args[5]}
${args[6]} ${args[7]}
+ chmod ${args[2]} ${CPIO_TMP_ROOT}/${args[1]}
+
+ ;;
+ esac
+ done
+}
+
+function gen_cpio_image()
+{
+ pushd $CPIO_TMP_ROOT > /dev/null 2>&1
+ find . | cpio --quiet -H newc -o | gzip -c > $INITRD_FILE
+ popd > /dev/null 2>&1
+ rm -rf $CPIO_TMP_ROOT
+}
+
function check_raid()
{
if [[ -f /etc/mdadm.conf && -x /sbin/mdadm.static ]]
@@ -663,6 +699,10 @@ do
usage
exit 0
;;
+ -h|--help)
+ usage
+ exit 0
+ ;;
--enable-raid)
FORCE_RAID=true
;;
@@ -707,6 +747,13 @@ check_raid
check_lvm
fill_modules
(
+ linuxrc_pre
+ linuxrc_raid
+ linuxrc_lvm
+ linuxrc_pre_kinit
+ linuxrc_post
+) > /tmp/linuxrc
+(
default_parts
dev_parts
dir_parts
@@ -715,27 +762,14 @@ fill_modules
raid_parts
lvm_parts
user_parts
-) > /tmp/initrd.lst
-(
- linuxrc_pre
- linuxrc_raid
- linuxrc_lvm
- linuxrc_pre_kinit
- linuxrc_post
-) > /tmp/linuxrc
-if ! [[ -x /lib/modules/$KVERSION/build/usr/gen_init_cpio ]]
-then
- echo "Bah!!! can't find the gen_init_cpio file is your kernel built?"
- usage
- exit -1
-fi &&
+) | gen_cpio_root
if [[ -f $INITRD_FILE && ! $REMOVE_OLD_INITRD ]]
then
echo "Refusing to blow away original initrd"
usage
exit -1
-fi &&
-/lib/modules/$KVERSION/build/usr/gen_init_cpio /tmp/initrd.lst | gzip -c >
$INITRD_FILE
+fi &&
+gen_cpio_image

#---------------------------------------------------------------------
##=back
diff --git a/smgl/quill/DETAILS b/smgl/quill/DETAILS
index 916ad37..b4899d0 100755
--- a/smgl/quill/DETAILS
+++ b/smgl/quill/DETAILS
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=0.2.7
+ VERSION=0.2.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.sourcemage.org/projects/quill/$SOURCE
diff --git a/smgl/quill/HISTORY b/smgl/quill/HISTORY
index 8804b70..ecd6283 100644
--- a/smgl/quill/HISTORY
+++ b/smgl/quill/HISTORY
@@ -1,3 +1,6 @@
+2007-09-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.8
+
2007-07-12 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.2.7

diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 3ad42cd..d5593dc 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,7 @@
+2007-09-14 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added selinux patch for loading policies
+ * simpleinit-selinux.patch: added
+
2007-02-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, simpleinit-output-on-shutdown.patch:
patch to fix bug 13114, simpleinit now displaying script output
diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index 42b42fa..2a22375 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -6,6 +6,7 @@ patch -p1 < $SCRIPT_DIRECTORY/simpleinit-msb-crypt.diff &&
patch -p0 < $SPELL_DIRECTORY/simpleinit.nonls.diff &&
patch -p0 < $SPELL_DIRECTORY/shutdown.nonls.diff &&
patch -p0 < $SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch &&
+patch -p1 < $SPELL_DIRECTORY/simpleinit-selinux.patch &&
if [[ $SIMPLEINIT_STATIC == y ]]; then
sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o#shutdown:
shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@
$^#' login-utils/Makefile &&
sedit 's:$(CC) $(LDFLAGS):$(CC) -static $(LDFLAGS):g' login-utils/Makefile
diff --git a/smgl/simpleinit-msb/simpleinit-selinux.patch
b/smgl/simpleinit-msb/simpleinit-selinux.patch
new file mode 100644
index 0000000..09f5194
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit-selinux.patch
@@ -0,0 +1,109 @@
+--- a/login-utils/simpleinit.c 2007-09-14 23:44:34.726342737 +0000
++++ b/login-utils/simpleinit.c 2007-09-14 23:44:18.000000000 +0000
+@@ -218,6 +218,8 @@
+ #include <sys/ioctl.h>
+ #include <dirent.h>
+ #include <termios.h>
++#include <sys/mount.h>
++#include <sys/mman.h>
+ #include <utmp.h>
+ #include <sched.h>
+ #include <time.h>
+@@ -271,6 +273,7 @@
+ struct initline inittab[NUMCMD];
+ int numcmd;
+ int stopped = 0; /* are we stopped */
++int no_selinux = 1; /* disabled by default */
+ static char boot_prog[PATH_SIZE] = _PATH_RC;
+ static char init_root[PATH_SIZE] = "\0";
+ static char script_prefix[PATH_SIZE] = "\0";
+@@ -332,6 +335,8 @@
+ pid_t mywait (int *status);
+ int run_command (const char *file, const char *name, pid_t pid,struct
script_struct* waiting_script);
+ void ystrncat(char* dest,const char* src,ssize_t n);
++int security_load_policy(void *data, size_t len);
++int load_policy(void);
+
+ /* like strcat, but dest will never contain more than n characters after
+ the call (i.e. a 0-terminator will be found among the first n characters,
+@@ -441,7 +446,14 @@
+ }
+
+ open_initctl_fifo();
+-
++
++ if (!no_selinux) {
++ if (load_policy() != 0) {
++ err( _("Failed to load SELinux policy.\n"));
++ exit(1);
++ }
++ }
++
+ if (userspace){
+ pid_t mypid=getpid();
+ int fd;
+@@ -538,6 +550,64 @@
+
+ #define MAXTRIES 3 /* number of tries allowed when giving the password */
+
++int security_load_policy(void *data, size_t len) {
++ int fd, ret;
++ fd = open("/selinux/load", O_RDWR);
++ if (fd < 0)
++ return -1;
++ ret = write(fd, data, len);
++ close(fd);
++ if (ret < 0)
++ return -1;
++ return 0;
++}
++
++int load_policy(void) {
++ int ret;
++ int fd;
++ void *map;
++ struct stat sb;
++ ret = mount("none", "/selinux", "selinuxfs", 0, 0);
++ if (ret < 0) {
++ char txt[256];
++ sprintf(txt, "SELinux: failed to mount /selinux
(errno=%d)\n", errno);
++ err( _(txt));
++ return ret;
++ }
++
++ fd = open("/etc/selinux/policy.bin", O_RDONLY);
++ if (fd < 0) {
++ char txt[256];
++ sprintf(txt, "SELinux: couldn't find /etc/selinux/policy.bin
(errno=%d)\n", errno);
++ err( _(txt));
++ return -1;
++ }
++
++ ret = fstat(fd, &sb);
++ if (ret < 0) {
++ char txt[256];
++ sprintf(txt, "Can't stat /etc/selinux/policy.bin
(errno=%d)\n", errno);
++ err( _(txt));
++ close(fd);
++ return ret;
++ }
++ map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
++ if (map == MAP_FAILED) {
++ char txt[256];
++ sprintf(txt, "Can't map /etc/selinux/policy.bin (errno=%d\n",
errno);
++ err( _(txt));
++ close(fd);
++ return -1;
++ }
++ ret = security_load_policy(map, sb.st_size);
++ if (ret < 0) {
++ err( _("security_load_policy failed\n"));
++ }
++ close(fd);
++ return ret;
++}
++
++
+ /*
+ * run boot script(s). The environment is passed to the script(s), so the RC
+ * environment variable can be used to decide what to do.
diff --git a/smgl/smgl-ledger/DETAILS b/smgl/smgl-ledger/DETAILS
index 4e0b511..7c23b85 100755
--- a/smgl/smgl-ledger/DETAILS
+++ b/smgl/smgl-ledger/DETAILS
@@ -1,5 +1,5 @@
SPELL=smgl-ledger
- VERSION=0.06
+ VERSION=0.07
ENTERED=20050818
KEYWORDS="smgl"
SHORT="Source Mage Ledger Client"
diff --git a/smgl/smgl-ledger/HISTORY b/smgl/smgl-ledger/HISTORY
index c7e95a8..e8256ae 100644
--- a/smgl/smgl-ledger/HISTORY
+++ b/smgl/smgl-ledger/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, smgl-ledger: 0.07, IP address has been changed
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/smgl/smgl-ledger/smgl-ledger b/smgl/smgl-ledger/smgl-ledger
index d39d1c9..663e867 100644
--- a/smgl/smgl-ledger/smgl-ledger
+++ b/smgl/smgl-ledger/smgl-ledger
@@ -1,9 +1,10 @@
#!/bin/bash
# Source Mage Ledger Client (smgl-ledger)

-CLIENT_VERSION=0.06
+CLIENT_VERSION=0.07
#LEDGER_SERVER="http://83.240.17.229/~babca/";
-LEDGER_SERVER="http://83.240.18.143/~babca/";
+#LEDGER_SERVER="http://83.240.18.143/~babca/";
+LEDGER_SERVER="http://83.240.12.49/~babca/";

LANG=C

diff --git a/spelling/stardict/DETAILS b/spelling/stardict/DETAILS
index f79ef70..44a49ec 100755
--- a/spelling/stardict/DETAILS
+++ b/spelling/stardict/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://$SPELL.sourceforge.net
ENTERED=20060421
- PATCHLEVEL=1
+ PATCHLEVEL=2
SHORT="StarDict - A Cross-Platform and international dictionary"
cat << EOF
StarDict - A Cross-Platform and international dictionary written in Gtk2.
diff --git a/spelling/stardict/HISTORY b/spelling/stardict/HISTORY
index 4c9c0af..03f6074 100644
--- a/spelling/stardict/HISTORY
+++ b/spelling/stardict/HISTORY
@@ -1,3 +1,11 @@
+2007-08-25 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, tooltips.patch: added patch for building
+ with latest GTK+ 2
+
+2007-08-25 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: fixed building with espeak
+
2007-08-16 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCHLEVEL++

diff --git a/spelling/stardict/PRE_BUILD b/spelling/stardict/PRE_BUILD
index 34024ac..987d9f0 100755
--- a/spelling/stardict/PRE_BUILD
+++ b/spelling/stardict/PRE_BUILD
@@ -3,6 +3,13 @@ cd ${SOURCE_DIRECTORY} &&

patch -p0 < ${SCRIPT_DIRECTORY}/configure.patch &&
patch -p0 < ${SCRIPT_DIRECTORY}/prefsdlg.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/tooltips.patch &&
+source ${GRIMOIRE}/is_depends_enabled.function &&
+if is_depends_enabled ${SPELL} espeak
+then
+ sedit "s:espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0,
NULL);:espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, NULL, 0);:" \
+ stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
+fi &&
intltoolize --force --copy &&
echo n | libtoolize --copy --force &&
aclocal -I m4 &&
diff --git a/spelling/stardict/tooltips.patch
b/spelling/stardict/tooltips.patch
new file mode 100644
index 0000000..096084d
--- /dev/null
+++ b/spelling/stardict/tooltips.patch
@@ -0,0 +1,497 @@
+diff -Nuar stardict-3.0.0.orig/src/class_factory.cpp
stardict-3.0.0/src/class_factory.cpp
+--- stardict-3.0.0.orig/src/class_factory.cpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/class_factory.cpp 2007-09-11 17:45:05.000000000
+0500
+@@ -61,12 +61,11 @@
+ }
+
+ TrayBase *PlatformFactory::create_tray_icon(GtkWidget *win, bool scan,
+- GtkTooltips *tooltips,
+ const AppSkin& skin)
+ {
+ #ifdef _WIN32
+ return new DockLet(win, scan);
+ #else
+- return new DockLet(win, scan, tooltips, skin);
++ return new DockLet(win, scan, skin);
+ #endif
+ }
+diff -Nuar stardict-3.0.0.orig/src/class_factory.hpp
stardict-3.0.0/src/class_factory.hpp
+--- stardict-3.0.0.orig/src/class_factory.hpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/class_factory.hpp 2007-09-11 17:46:13.000000000
+0500
+@@ -10,7 +10,7 @@
+ class PlatformFactory {
+ public:
+ static void *create_class_by_name(const std::string& name, void
*param=NULL);
+- static TrayBase *create_tray_icon(GtkWidget *, bool, GtkTooltips *,
const AppSkin&);
++ static TrayBase *create_tray_icon(GtkWidget *, bool, const AppSkin&);
+ };
+
+ #endif//!_CLASS_FACTORY_HPP_
+diff -Nuar stardict-3.0.0.orig/src/dictmanagedlg.cpp
stardict-3.0.0/src/dictmanagedlg.cpp
+--- stardict-3.0.0.orig/src/dictmanagedlg.cpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/dictmanagedlg.cpp 2007-09-11 17:24:18.000000000
+0500
+@@ -1735,21 +1735,21 @@
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Add"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Add"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_add_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_DELETE,
GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Delete"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Delete"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_delete_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO,
GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Information"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Information"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_info_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+@@ -1758,28 +1758,28 @@
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_GOTO_TOP,
GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Move to
top"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Move to top"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_move_top_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_GO_UP,
GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Move up"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Move up"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_move_up_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN,
GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Move down"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Move down"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_move_down_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_GOTO_BOTTOM,
GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image(GTK_BUTTON(button), image);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Move to
bottom"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Move to bottom"));
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_dictmanage_move_bottom_button_clicked), this);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+diff -Nuar stardict-3.0.0.orig/src/docklet.cpp stardict-3.0.0/src/docklet.cpp
+--- stardict-3.0.0.orig/src/docklet.cpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/docklet.cpp 2007-09-11 17:31:15.000000000 +0500
+@@ -8,13 +8,12 @@
+
+ #include "docklet.h"
+
+-DockLet::DockLet(GtkWidget *mainwin, bool is_scan_on, GtkTooltips *tooltips,
++DockLet::DockLet(GtkWidget *mainwin, bool is_scan_on,
+ const AppSkin& skin) : TrayBase(mainwin, is_scan_on)
+ {
+ menu_ = NULL;
+ image_ = NULL;
+ embedded_ = false;
+- tooltips_ = tooltips;
+
+ normal_icon_ = get_impl(skin.docklet_normal_icon);
+ scan_icon_ = get_impl(skin.docklet_scan_icon);
+@@ -28,13 +28,13 @@
+ docklet_ = egg_tray_icon_new("StarDict");
+ box_ = gtk_event_box_new();
+ if (is_hide_state()) {
+- gtk_tooltips_set_tip(tooltips_, box_, _("StarDict"),NULL);
++ gtk_widget_set_tooltip_text(box_, _("StarDict"));
+ image_ = gtk_image_new_from_pixbuf(normal_icon_);
+ } else if (is_scan_on()) {
+- gtk_tooltips_set_tip(tooltips_, box_, _("StarDict -
Scanning"),NULL);
++ gtk_widget_set_tooltip_text(box_, _("StarDict - Scanning"));
+ image_ = gtk_image_new_from_pixbuf(scan_icon_);
+ } else {
+- gtk_tooltips_set_tip(tooltips_, box_, _("StarDict -
Stopped"),NULL);
++ gtk_widget_set_tooltip_text(box_, _("StarDict - Stopped"));
+ image_ = gtk_image_new_from_pixbuf(stop_icon_);
+ }
+
+@@ -180,15 +180,13 @@
+
+ void DockLet::scan_on()
+ {
+- gtk_tooltips_set_tip(tooltips_, box_, _("StarDict - Scanning"),
+- NULL);
++ gtk_widget_set_tooltip_text(box_, _("StarDict - Scanning"));
+ gtk_image_set_from_pixbuf(GTK_IMAGE(image_), scan_icon_);
+ }
+
+ void DockLet::scan_off()
+ {
+- gtk_tooltips_set_tip(tooltips_, box_, _("StarDict - Stopped"),
+- NULL);
++ gtk_widget_set_tooltip_text(box_, _("StarDict - Stopped"));
+ gtk_image_set_from_pixbuf(GTK_IMAGE(image_), stop_icon_);
+ }
+
+@@ -196,7 +194,7 @@
+ {
+ if (!image_)
+ return;
+- gtk_tooltips_set_tip(tooltips_, box_, _("StarDict"), NULL);
++ gtk_widget_set_tooltip_text(box_, _("StarDict"));
+ gtk_image_set_from_pixbuf(GTK_IMAGE(image_), normal_icon_);
+ }
+
+diff -Nuar stardict-3.0.0.orig/src/docklet.h stardict-3.0.0/src/docklet.h
+--- stardict-3.0.0.orig/src/docklet.h 2007-09-11 16:42:50.000000000 +0500
++++ stardict-3.0.0/src/docklet.h 2007-09-11 16:47:56.000000000 +0500
+@@ -10,7 +10,7 @@
+
+ class DockLet : public TrayBase {
+ public:
+- DockLet(GtkWidget *, bool, GtkTooltips *, const AppSkin&);
++ DockLet(GtkWidget *, bool, const AppSkin&);
+ ~DockLet();
+ void minimize_to_tray();
+ void set_scan_mode(bool);
+@@ -23,7 +23,6 @@
+ GtkWidget *scan_menuitem_;
+ bool embedded_;
+ GdkPixbuf *normal_icon_, *stop_icon_, *scan_icon_;
+- GtkTooltips *tooltips_;
+
+ static void on_embedded(GtkWidget *widget, gpointer data);
+ static void on_destroyed(GtkWidget *widget, DockLet *oDockLet);
+diff -Nuar stardict-3.0.0.orig/src/floatwin.cpp
stardict-3.0.0/src/floatwin.cpp
+--- stardict-3.0.0.orig/src/floatwin.cpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/floatwin.cpp 2007-09-11 17:50:47.000000000 +0500
+@@ -119,7 +119,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_query_click), this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(button_hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Query in the main
window"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Query in the main window"));
+
+ button= gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_SAVE,GTK_ICON_SIZE_MENU));
+@@ -128,7 +128,7 @@
+ G_CALLBACK(on_save_click), this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(button_hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Save to
file"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Save to file"));
+
+ PronounceWordButton= gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(PronounceWordButton),gtk_image_new_from_stock(GTK_STOCK_EXECUTE,GTK_ICON_SIZE_MENU));
+@@ -136,7 +136,7 @@
+ g_signal_connect(G_OBJECT(PronounceWordButton),"clicked",
G_CALLBACK(on_play_click), this);
+ g_signal_connect(G_OBJECT(PronounceWordButton),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+
gtk_box_pack_start(GTK_BOX(button_hbox),PronounceWordButton,false,false,0);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,PronounceWordButton,_("Pronounce
the word"),NULL);
++ gtk_widget_set_tooltip_text(PronounceWordButton, _("Pronounce the
word"));
+
+ gtk_widget_set_sensitive(PronounceWordButton, false);
+
+@@ -146,7 +146,7 @@
+ g_signal_connect(G_OBJECT(StopButton),"clicked",
G_CALLBACK(on_stop_click), this);
+ g_signal_connect(G_OBJECT(StopButton),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(button_hbox),StopButton,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips, StopButton, _("Stop
selection-scanning"),NULL);
++ gtk_widget_set_tooltip_text(StopButton, _("Stop selection-scanning"));
+
+ gtk_widget_set_sensitive(gpAppFrame->oFloatWin.StopButton,
+
conf->get_bool_at("dictionary/scan_selection"));
+@@ -158,7 +158,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_help_click), this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(button_hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Help"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Help"));
+
+ button= gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_QUIT,GTK_ICON_SIZE_MENU));
+@@ -166,7 +166,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(on_quit_click), this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(button_hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Quit"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Quit"));
+ #endif
+
+ button = gtk_button_new();
+@@ -180,7 +180,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(vLockCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(button_hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Lock floating
window"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Lock floating window"));
+ view.reset(new ArticleView(GTK_BOX(vbox), true));
+
+ gtk_widget_show_all(frame);
+diff -Nuar stardict-3.0.0.orig/src/mainwin.cpp stardict-3.0.0/src/mainwin.cpp
+--- stardict-3.0.0.orig/src/mainwin.cpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/mainwin.cpp 2007-09-11 17:42:00.000000000 +0500
+@@ -87,7 +87,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(ClearCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,3);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Clear the search
box"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Clear the search box"));
+ #endif
+
+ GtkListStore* list_store = gtk_list_store_new(1, G_TYPE_STRING);
+@@ -114,7 +114,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(GoCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Fuzzy
Query"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Fuzzy Query"));
+ #endif
+
+ button=gtk_button_new();
+@@ -126,7 +126,7 @@
+ g_signal_connect(G_OBJECT(button),"button_press_event",
G_CALLBACK(on_back_button_press),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Go Back - Right
button: history (Alt+Left)"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Go Back - Right button:
history (Alt+Left)"));
+
+ GtkWidget *label;
+ label = gtk_label_new("\t");
+@@ -141,7 +141,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(MenuCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Show the main
menu (Alt+M)"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Show the main menu (Alt+M)"));
+ }
+
+ void TopWin::Destroy(void)
+@@ -1245,7 +1245,7 @@
+ GtkWidget *image =
gtk_image_new_from_pixbuf(get_impl(gpAppFrame->oAppSkin.index_wazard));
+ gtk_container_add (GTK_CONTAINER (wazard_button), image);
+ gtk_widget_show_all(wazard_button);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,wazard_button,_("List"),NULL);
++ gtk_widget_set_tooltip_text(wazard_button, _("List"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wazard_button), true);
+ g_signal_connect(G_OBJECT(wazard_button),"toggled",
G_CALLBACK(on_wazard_button_toggled), this);
+
+@@ -1256,7 +1256,7 @@
+ image =
gtk_image_new_from_pixbuf(get_impl(gpAppFrame->oAppSkin.index_dictlist));
+ gtk_container_add (GTK_CONTAINER (result_button), image);
+ gtk_widget_show_all(result_button);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,result_button,_("Result"),NULL);
++ gtk_widget_set_tooltip_text(result_button, _("Result"));
+ g_signal_connect(G_OBJECT(result_button),"toggled",
G_CALLBACK(on_result_button_toggled), this);
+
+ GtkWidget *translate_button =
gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(result_button));
+@@ -1266,7 +1266,7 @@
+ image =
gtk_image_new_from_pixbuf(get_impl(gpAppFrame->oAppSkin.index_translate));
+ gtk_container_add (GTK_CONTAINER (translate_button), image);
+ gtk_widget_show_all(translate_button);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,translate_button,_("Full-Text
Translation"),NULL);
++ gtk_widget_set_tooltip_text(translate_button, _("Full-Text
Translation"));
+ g_signal_connect(G_OBJECT(translate_button),"toggled",
G_CALLBACK(on_translate_button_toggled), this);
+
+ if (has_treedict) {
+@@ -1277,7 +1277,7 @@
+ image =
gtk_image_new_from_pixbuf(get_impl(gpAppFrame->oAppSkin.index_appendix));
+ gtk_container_add (GTK_CONTAINER (appendix_button), image);
+ gtk_widget_show_all(appendix_button);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,appendix_button,_("Tree"),NULL);
++ gtk_widget_set_tooltip_text(appendix_button, _("Tree"));
+ g_signal_connect(G_OBJECT(appendix_button),"toggled",
G_CALLBACK(on_appendix_button_toggled), this);
+ }
+
+@@ -1288,7 +1288,7 @@
+ GTK_WIDGET_UNSET_FLAGS (choosegroup_button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(choosegroup_button),"clicked",
G_CALLBACK(on_choose_group_button_clicked),this);
+ gtk_box_pack_start(GTK_BOX(vbox),choosegroup_button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips, choosegroup_button,
_("Choose dict group"),NULL);
++ gtk_widget_set_tooltip_text(choosegroup_button, _("Choose dict
group"));
+ choosegroup_menu = NULL;
+ UpdateChooseGroup();
+
+@@ -1301,7 +1301,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(NextCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(vbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Next word
(Alt+Down)"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Next word (Alt+Down)"));
+
+ button=gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_GO_UP,GTK_ICON_SIZE_BUTTON));
+@@ -1311,7 +1311,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(PreviousCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(vbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Previous word
(Alt+Up)"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Previous word (Alt+Up)"));
+ }
+
+ void LeftWin::on_wazard_button_toggled(GtkToggleButton *button, LeftWin
*oLeftWin)
+@@ -1500,7 +1500,7 @@
+ #else
+ gtk_box_pack_start(GTK_BOX(hbox),ShowListButton,false,false,5);
+ #endif
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,ShowListButton,_("Show the
word list"),NULL);
++ gtk_widget_set_tooltip_text(ShowListButton, _("Show the word list"));
+
+ HideListButton=gtk_button_new();
+ image =
gtk_image_new_from_stock(GTK_STOCK_GOTO_FIRST,GTK_ICON_SIZE_SMALL_TOOLBAR);
+@@ -1515,7 +1515,7 @@
+ #else
+ gtk_box_pack_start(GTK_BOX(hbox),HideListButton,false,false,5);
+ #endif
+- gtk_tooltips_set_tip(gpAppFrame->tooltips, HideListButton,_("Hide the
word list"),NULL);
++ gtk_widget_set_tooltip_text(HideListButton, _("Hide the word list"));
+
+
+ if (conf->get_bool_at("main_window/hide_list"))
+@@ -1533,7 +1533,7 @@
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(CopyCallback),this);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,5);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Copy"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Copy"));
+ #endif
+
+ PronounceWordMenuButton =
gtk_menu_tool_button_new_from_stock(GTK_STOCK_EXECUTE);
+@@ -1547,7 +1547,7 @@
+ #else
+
gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(PronounceWordMenuButton),false,false,5);
+ #endif
+- gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(PronounceWordMenuButton),
gpAppFrame->tooltips, _("Pronounce the word"),NULL);
++
gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(PronounceWordMenuButton),
_("Pronounce the word"));
+ gtk_widget_set_sensitive(GTK_WIDGET(PronounceWordMenuButton), false);
+
+ button=gtk_button_new();
+@@ -1561,7 +1561,7 @@
+ #else
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,5);
+ #endif
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Save to
file(Alt+E)"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Save to file(Alt+E)"));
+
+ #ifndef CONFIG_GPE
+ button=gtk_button_new();
+@@ -1571,7 +1571,7 @@
+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(PrintCallback),this);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,5);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Print"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Print"));
+ gtk_widget_set_sensitive(button, false);
+ #endif
+
+@@ -1586,7 +1586,7 @@
+ #else
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,5);
+ #endif
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Search in the
definition (Ctrl+F)"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Search in the definition
(Ctrl+F)"));
+ }
+
+ void ToolWin::ShowListCallback(GtkWidget *widget, gpointer data)
+@@ -2707,7 +2707,7 @@
+ g_signal_connect(G_OBJECT(ScanSelectionCheckButton), "toggled",
+
G_CALLBACK(ScanCallback), NULL);
+
gtk_box_pack_start(GTK_BOX(hbox),ScanSelectionCheckButton,false,false,0);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,ScanSelectionCheckButton,_("Scan
the selection"),NULL);
++ gtk_widget_set_tooltip_text(ScanSelectionCheckButton, _("Scan the
selection"));
+
+ GtkWidget *button = gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO,GTK_ICON_SIZE_SMALL_TOOLBAR));
+@@ -2721,7 +2721,7 @@
+ #else
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,8);
+ #endif
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Show info"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Show info"));
+
+ button=gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_QUIT,GTK_ICON_SIZE_SMALL_TOOLBAR));
+@@ -2731,7 +2731,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(QuitCallback), NULL);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Quit"), NULL);
++ gtk_widget_set_tooltip_text(button, _("Quit"));
+
+ GtkWidget *event_box = gtk_event_box_new();
+ g_signal_connect (G_OBJECT (event_box), "enter_notify_event",
G_CALLBACK (vEnterNotifyCallback), this);
+@@ -2753,7 +2753,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(PreferenceCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(hbox),button,false,false,0);
+-
gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Preferences"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Preferences"));
+
+ button=gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_PROPERTIES,GTK_ICON_SIZE_SMALL_TOOLBAR));
+@@ -2763,7 +2763,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(DictManageCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Manage
dictionaries"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Manage dictionaries"));
+
+ button=gtk_button_new();
+
gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_INDEX,GTK_ICON_SIZE_SMALL_TOOLBAR));
+@@ -2773,7 +2773,7 @@
+ g_signal_connect(G_OBJECT(button),"clicked",
G_CALLBACK(NewVersionCallback),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Go to the
StarDict website"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Go to the StarDict website"));
+ #endif
+
+ button=gtk_button_new();
+@@ -2785,7 +2785,7 @@
+ g_signal_connect(G_OBJECT(button),"button_press_event",
G_CALLBACK(on_internetsearch_button_press),this);
+ g_signal_connect(G_OBJECT(button),"enter_notify_event",
G_CALLBACK(stardict_on_enter_notify), NULL);
+ gtk_box_pack_end(GTK_BOX(hbox),button,false,false,0);
+- gtk_tooltips_set_tip(gpAppFrame->tooltips,button,_("Search an
Internet dictionary - Right button: website list"),NULL);
++ gtk_widget_set_tooltip_text(button, _("Search an Internet dictionary
- Right button: website list"));
+ }
+
+ gboolean BottomWin::vEnterNotifyCallback (GtkWidget *widget,
GdkEventCrossing *event, BottomWin *oBottomWin)
+diff -Nuar stardict-3.0.0.orig/src/stardict.cpp
stardict-3.0.0/src/stardict.cpp
+--- stardict-3.0.0.orig/src/stardict.cpp 2007-09-11 16:42:50.000000000
+0500
++++ stardict-3.0.0/src/stardict.cpp 2007-09-11 17:57:31.000000000 +0500
+@@ -305,7 +305,6 @@
+ g_signal_connect (G_OBJECT (window), "key_press_event", G_CALLBACK
(vKeyPressReleaseCallback), this);
+ g_signal_connect (G_OBJECT (window), "key_release_event", G_CALLBACK
(vKeyPressReleaseCallback), this);
+
+- tooltips = gtk_tooltips_new ();
+
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(vbox);
+@@ -318,7 +318,7 @@
+
unlock_keys->set_comb(combnum2str(conf->get_int_at("dictionary/scan_modifier_key")));
+ oFloatWin.Create();
+ bool scan=conf->get_bool_at("dictionary/scan_selection");
+- oDockLet.reset(PlatformFactory::create_tray_icon(window, scan,
tooltips,
++ oDockLet.reset(PlatformFactory::create_tray_icon(window, scan,
+ oAppSkin));
+ oDockLet->on_quit_.connect(sigc::mem_fun(this, &AppCore::Quit));
+ oDockLet->on_change_scan_.connect(
+diff -Nuar stardict-3.0.0.orig/src/stardict.h stardict-3.0.0/src/stardict.h
+--- stardict-3.0.0.orig/src/stardict.h 2007-09-11 16:42:50.000000000 +0500
++++ stardict-3.0.0/src/stardict.h 2007-09-11 16:48:43.000000000 +0500
+@@ -80,7 +80,6 @@
+ unsigned int waiting_mainwin_lookupcmd_seq;
+ unsigned int waiting_floatwin_lookupcmd_seq;
+ GtkWidget *window;
+- GtkTooltips *tooltips;
+
+ TopWin oTopWin;
+ MidWin oMidWin;
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index 21f9cae..c268a44 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -48,6 +48,11 @@ optional_depends "libpri"
\
"--without-pri" \
"to use your ISDN card with asterisk" &&

+optional_depends "zaptel" \
+ "--with-zaptel" \
+ "--without-zaptel" \
+ "to build drivers for various telephone cards" &&
+
optional_depends "iksemel" \
"--with-iksemel" \
"--without-iksemel" \
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index 4adfe5d..e9eb996 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,5 +1,5 @@
SPELL=asterisk
- VERSION=1.4.10
+ VERSION=1.4.11
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
DOCS="$DOCS UPGRADE.txt BUGS CREDITS"
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
LICENSE[0]=GPL2
KEYWORDS="telephony"
SHORT="Asterisk PBX"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index d7de29f..672ce3b 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,11 @@
+2007-08-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.11
+ SECURITY_PATCH++, Bug #13959
+ * patches/1.4r80750_app_voicemail.c: added patch file to fix a
+ possible crash in IMAP voicemail
+ * PRE_BUILD: apply the patch mentioned above
+ * DEPENDS: added zaptel as optional_depends
+
2007-08-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DEPENDS: added iksemel as optional dependency

diff --git a/telephony/asterisk/PRE_BUILD b/telephony/asterisk/PRE_BUILD
index 785fa29..b1b6d27 100755
--- a/telephony/asterisk/PRE_BUILD
+++ b/telephony/asterisk/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+# This patch will be included in 1.4.12 when it is released:
+patch -p2 < $SCRIPT_DIRECTORY/patches/1.4r80750_app_voicemail.c &&
sed -i -e "s|/usr/bin/awk|/bin/awk|" main/editline/makelist &&
sed -i -e "s/OVERWRITE=y/OVERWRITE=n/" Makefile

diff --git a/telephony/asterisk/patches/1.4r80750_app_voicemail.c
b/telephony/asterisk/patches/1.4r80750_app_voicemail.c
new file mode 100644
index 0000000..25c0efb
--- /dev/null
+++ b/telephony/asterisk/patches/1.4r80750_app_voicemail.c
@@ -0,0 +1,11 @@
+--- branches/1.4/apps/app_voicemail.c 2007/08/24 15:49:37 80749
++++ branches/1.4/apps/app_voicemail.c 2007/08/24 15:51:03 80750
+@@ -4421,7 +4421,7 @@
+ mail_fetchstructure
(vms->mailstream,vms->msgArray[vms->curmsg],&body);
+
+ /* We have the body, now we extract the file name of the first
attachment. */
+- if (body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
++ if (body->nested.part && body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
+ attachedfilefmt =
ast_strdupa(body->nested.part->next->body.parameter->value);
+ } else {
+ ast_log(LOG_ERROR, "There is no file attached to this IMAP
message.\n");
diff --git a/telephony/libtelepathy/DETAILS b/telephony/libtelepathy/DETAILS
index 1c11fcc..1132682 100755
--- a/telephony/libtelepathy/DETAILS
+++ b/telephony/libtelepathy/DETAILS
@@ -1,14 +1,13 @@
SPELL=libtelepathy
- VERSION=0.0.55
-
SOURCE_HASH=sha512:300ecbbf43921214cb6280c6dcb82184a7a984c674d14dcb45d0b276354dbb3912618c0c305dc2f467f6fa18a3b88f5c562b0d150f5fcb4fdc3f89e430052977
+ VERSION=0.0.57
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE2=$SOURCE.asc
+ SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
-# SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-# SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
-# SOURCE2_IGNORE=signature
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LICENSE[0]=LGPL
ENTERED=20070424
KEYWORDS="irc im voip"
diff --git a/telephony/libtelepathy/HISTORY b/telephony/libtelepathy/HISTORY
index baa3c80..a25d370 100644
--- a/telephony/libtelepathy/HISTORY
+++ b/telephony/libtelepathy/HISTORY
@@ -1,3 +1,7 @@
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.0.57
+ new upstream key
+
2007-08-16 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: more delinting

diff --git a/telephony/telepathy-glib/DETAILS
b/telephony/telepathy-glib/DETAILS
index 9643a30..cfb9794 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,14 +1,13 @@
SPELL=telepathy-glib
- VERSION=0.5.13
-
SOURCE_HASH=sha512:8e55d8aecd2287f171c06ce2bc4748b4988ca8a011da005635ecabb9552755f92def22fa158ec9e45d7ec237e1213ff71c5f79404003fe9b9acd1cfec02ad101
+ VERSION=0.5.14
SOURCE=$SPELL-$VERSION.tar.gz
-# SOURCE2=$SOURCE.asc
+ SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
-# SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-# SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
-# SOURCE2_IGNORE=signature
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LICENSE[0]=GPL
ENTERED=20070303
KEYWORDS="telepathy"
diff --git a/telephony/telepathy-glib/HISTORY
b/telephony/telepathy-glib/HISTORY
index 2f9720a..bb61650 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,6 @@
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.14
+
2007-06-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.13

diff --git a/telephony/telepathy-mission-control/DETAILS
b/telephony/telepathy-mission-control/DETAILS
index eb86493..718f66a 100755
--- a/telephony/telepathy-mission-control/DETAILS
+++ b/telephony/telepathy-mission-control/DETAILS
@@ -1,6 +1,6 @@
SPELL=telepathy-mission-control
- VERSION=4.33
-
SOURCE_HASH=sha512:134d307ba57995c71d883a6a0a00ff563190c9db6a118d7f22c05bbe8d82604a202fe1c34802cae75a37af651994cf7f812de46d2d529cea3973aedda298e39a
+ VERSION=4.37
+
SOURCE_HASH=sha512:626c91eec7410328f8082a61092316085cba649af847433a54b59f376bae644e8e458f54a1e681b0cfdcfe82ca55cfe45dcdfed033d383d2295d238d3c23c216
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/mission-control/$SOURCE
diff --git a/telephony/telepathy-mission-control/HISTORY
b/telephony/telepathy-mission-control/HISTORY
index 58f69f0..4e8fedc 100644
--- a/telephony/telepathy-mission-control/HISTORY
+++ b/telephony/telepathy-mission-control/HISTORY
@@ -1,3 +1,6 @@
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.37
+
2007-08-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.33

diff --git a/telephony/telepathy-sofiasip/DETAILS
b/telephony/telepathy-sofiasip/DETAILS
index 29ebcc6..a160dc8 100755
--- a/telephony/telepathy-sofiasip/DETAILS
+++ b/telephony/telepathy-sofiasip/DETAILS
@@ -1,6 +1,6 @@
SPELL=telepathy-sofiasip
- VERSION=0.3.26.1
-
SOURCE_HASH=sha512:00691dde671fd3aa3261dd5d634dfcda680f4175a725c3d75ef0359adc0cfee8f5706170adb6e034501489f853f7f9b7ab84386a11fb49d8b556710845b72e8f
+ VERSION=0.3.29
+
SOURCE_HASH=sha512:d8d9ff6a69eac51f3f215b5714bcdfca82906dcdc5c19e64d72e0401d0a6176b2ba14c8f61394e3875d086997e104d28da9ada5eaa3915bee8f52509a5a03217
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://sourceforge.net/projects/tp-sofiasip
diff --git a/telephony/telepathy-sofiasip/HISTORY
b/telephony/telepathy-sofiasip/HISTORY
index 9ec57bb..587c70a 100644
--- a/telephony/telepathy-sofiasip/HISTORY
+++ b/telephony/telepathy-sofiasip/HISTORY
@@ -1,3 +1,6 @@
+2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.29
+
2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.26.1

diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index cee2853..e62603f 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/telephony/zaptel/BUILD b/telephony/zaptel/BUILD
index 5ce3e93..1d37397 100755
--- a/telephony/zaptel/BUILD
+++ b/telephony/zaptel/BUILD
@@ -1,7 +1,12 @@
-default_build &&
+OPTS="$OPTS --build=${BUILD}"

-local EXE &&
-local BINS="torisatool makefw ztmonitor ztspeed zttool zttest fxotune" &&
-for EXE in $BINS; do
- make $EXE
-done
+[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ $OPTS &&
+
+make KVERS=$(get_kernel_version)
diff --git a/telephony/zaptel/DEPENDS b/telephony/zaptel/DEPENDS
index 5699a66..6b57a77 100755
--- a/telephony/zaptel/DEPENDS
+++ b/telephony/zaptel/DEPENDS
@@ -1,6 +1,11 @@
depends newt &&
depends libpri &&

+optional_depends "libusb" \
+ "--with-usb" \
+ "--without-usb" \
+ "if you have USB telephony hardware" &&
+
# check that the required CRC-CCITT builtin/module is there
# should be redone with config subdepends once linux has them #13716
. $GRIMOIRE/FUNCTIONS &&
diff --git a/telephony/zaptel/DETAILS b/telephony/zaptel/DETAILS
index a454d2a..d4baee1 100755
--- a/telephony/zaptel/DETAILS
+++ b/telephony/zaptel/DETAILS
@@ -1,24 +1,56 @@
SPELL=zaptel
- VERSION=1.4.2.1
+ VERSION=1.4.5.1
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://ftp.digium.com/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:5bf426ba1e5411b557b69d6a2d68b8581b20cd736e3db616fde76daea3e34fe66d9aa598f49d73e5b03f5ec40bb0b584c1f73b22edfda42f07bf243435afbe78
+ SOURCE_URL[0]=http://downloads.digium.com/pub/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_URL[1]=http://ftp2.digium.com/pub/$SPELL/$SOURCE
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
LICENSE[0]=GPL
SHORT="Telephony Interface Driver"
cat << EOF
-supported cards :-
-T400P - Quad Span T1 Card
-E400P - Quad Span E1 Card
-TE405P - Quad Span T1/E1 Card (5v version)
-TE410P - Quad Span T1/E1 Card (3.3v version)
-T100P - Single Span T1 Card
-E100P - Single Span E1 Card
-TE110P - Single Span T1/E1 Card
-X100P - Single port FXO interface
-X101P - Single port FXO interface
-TDM400P - Modular FXS/FXO interface (1-4 ports)
-S100U - Single port FXS USB Interface
+Zaptel is a short for ZAPata TELephony. It provides drivers for
+telephony cards.
+
+The following hardware is supported:
+
+Digital Cards:
+
+- wct4xxp:
+ - Digium newer quad-span T1/E1/J1 cards: Wildcard TE420P/TE410P/TE405P
+ - Digium newer dual-span T1/E1/J1 cards: Wildcard TE220P/TE210P/TE205P
+- wcte12xp: Digium Wildcard TE120P and the TE122P single-span T1/E1/J1
+ card
+- wcte11xp: Digium Wildcard TE110P T1/E1/J1
+- wct1xxp:
+ - Wildcard T100P (old single-span T1)
+ - Wildcard E100P (old single-span E1)
+- tor2: Tormenta quad-span T1/E1 card from the Zapata Telephony project
+- torisa: The old dual-span ISA T1 card from Zapata Telephony
+
+
+Analog Cards:
+
+- wctdm24xxp:
+ - Digium TDM2400P card: up to 24 analog ports
+ - Digium TDM800P card: up to 8 analog ports
+- wctdm: Digium TDM400P card: up to 4 analog ports
+- xpp: Xorcom Astribank: a USB connected unit of up to 32 ports
+ (also BRI)
+- wcfxo: X100P, similar and clones. A simple single-port FXO card
+- wcusb: Digium S100U: A simple single-port USB FXS unit
+
+
+Other Drivers:
+
+- pciradio: Zapata Telephony PCI Quad Radio Interface
+- wctc4xxp: Digium hardware transcoder cards (also need zttranscode)
+- ztd-eth: TDM over Ethernet (TDMoE) driver. Requires ztdynamic
+- ztd-loc: Mirror a local span. Requires ztdynamic
+- ztdummy: A dummy driver that only provides a zaptel timing source.
EOF
diff --git a/telephony/zaptel/HISTORY b/telephony/zaptel/HISTORY
index fde4cd7..aafddb6 100644
--- a/telephony/zaptel/HISTORY
+++ b/telephony/zaptel/HISTORY
@@ -1,3 +1,12 @@
+2007-08-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.5.1
+ converted to upstream signature checking
+ fixed SOURCE_URL and added a mirror
+ Updated long description
+ * DEPENDS: added libusb as optional_depends
+ * BUILD, INSTALL: removed extra treatment of binaries as it
+ is already handled in the Makefile
+
2007-06-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 1.4.2.1
* BUILD: use default_build
diff --git a/telephony/zaptel/INSTALL b/telephony/zaptel/INSTALL
index f5a0a54..3619879 100755
--- a/telephony/zaptel/INSTALL
+++ b/telephony/zaptel/INSTALL
@@ -1,8 +1,5 @@
-default_install
&&
-install -m 644 zaptel.sysconfig $INSTALL_ROOT/etc/sysconfig/zaptel
&&
+make_single
&&
+make KVERS=$(get_kernel_version) install
&&
+make_normal
&&

-local EXE &&
-local BINS="torisatool makefw ztmonitor ztspeed zttest fxotune" &&
-for EXE in $BINS; do
- install -m 544 $EXE $INSTALL_ROOT/sbin
-done
+install -m 644 zaptel.sysconfig $INSTALL_ROOT/etc/sysconfig/zaptel
diff --git a/utils/915resolution/BUILD b/utils/915resolution/BUILD
index ed8e93f..da67bb5 100755
--- a/utils/915resolution/BUILD
+++ b/utils/915resolution/BUILD
@@ -1,3 +1,3 @@
-rm 915resolution &&
+rm 915resolution 915resolution.o &&
make

diff --git a/utils/915resolution/HISTORY b/utils/915resolution/HISTORY
index 6aa35ef..3fb68e7 100644
--- a/utils/915resolution/HISTORY
+++ b/utils/915resolution/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Need to clear out the 386 version of 915resolution.o as well
+
2006-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0..5.2
spell created
diff --git a/utils/beagle/DETAILS b/utils/beagle/DETAILS
index 0d115f8..9139fe8 100755
--- a/utils/beagle/DETAILS
+++ b/utils/beagle/DETAILS
@@ -1,9 +1,9 @@
SPELL=beagle
- VERSION=0.2.17
+ VERSION=0.2.18
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/beagle/0.2/${SOURCE}
-
SOURCE_HASH=sha512:20102bdfad45a566d5eed748f7af0e55c5b682c441093f7182966f8c971107151c334cba7d3cd3008122af99bf6b55a0fe4762f14854d5ff2380779c0839ba94
+
SOURCE_HASH=sha512:f607d119be90394f4300ea347b1826af884a5f43d06f762649b8e55c56ab2550cb19ea8dbfb9e0a75621ca4be5a49e3ac384141326bb7d83a9d90d1e73205812
LICENSE[0]=GPL
WEB_SITE=http://www.gnome.org/projects/beagle/
ENTERED=20050821
diff --git a/utils/beagle/HISTORY b/utils/beagle/HISTORY
index e3f53c2..72dc8ef 100644
--- a/utils/beagle/HISTORY
+++ b/utils/beagle/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.2.18
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: changed gnumeric2 to gnumeric

diff --git a/utils/bochs/BUILD b/utils/bochs/BUILD
index 4b9c4e0..1740c95 100755
--- a/utils/bochs/BUILD
+++ b/utils/bochs/BUILD
@@ -1,10 +1,27 @@
-OPTS="$OPTS --enable-all-optimizations \
- --enable-fpu \
- --with-x11 \
- --enable-ne2000 \
- --enable-cdrom=yes \
- --enable-icache \
- --enable-repeat-speedups \
- $RFB $SB16 $TERM $APIC $SMP $IPS" &&
+OPTS="--with-x11 \
+ --enable-cdrom=yes \
+ --enable-vbe \
+ --enable-pci \
+ --enable-usb \
+ --enable-cpu-level=6 \
+ --enable-x86-64 \
+ --enable-vme \
+ --enable-fpu \
+ --enable-mmx \
+ --enable-3dnow \
+ --enable-sse=4 \
+ --enable-disasm \
+ --enable-idle-hack \
+ --enable-all-optimizations \
+ --enable-repeat-speedups \
+ --enable-icache \
+ --enable-plugins \
+ --enable-save-restore \
+ --enable-compressed-hd \
+ --enable-pnic \
+ --enable-ne2000 \
+ --disable-docbook \
+ $RFB $SB16 $TERM $APIC $SMP $IPS \
+ $OPTS" &&

-default_build
+CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" default_build
diff --git a/utils/bochs/DEPENDS b/utils/bochs/DEPENDS
index 1fa3ded..3b364d3 100755
--- a/utils/bochs/DEPENDS
+++ b/utils/bochs/DEPENDS
@@ -1,3 +1,4 @@
+depends dev86 &&
optional_depends wxgtk-no-unicode \
"--with-wx" \
"--without-wx" \
diff --git a/utils/bochs/DETAILS b/utils/bochs/DETAILS
index bdafc62..686ca99 100755
--- a/utils/bochs/DETAILS
+++ b/utils/bochs/DETAILS
@@ -1,16 +1,16 @@
SPELL=bochs
- VERSION=2.2.6
+ VERSION=2.3.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:86f3a629d7a7ca0ef1a1788a1033b098a710fa8498c5d31256352e634f5dcd8e6dff1e282762561efd6cd8559c7df71765aa0775fb3a162be973c388c333fdf1
- WEB_SITE=http://bochs.sourceforge.net
- ENTERED=20020531
- UPDATED=20020731
+#
SOURCE_HASH=sha512:9b3ec6568ad9789a470d197a65dcaec0871f53791cb3a3e182d3192d34edc9b6670e2d35627e72d2ef506ab233059f70af1369041ffc6618d156b9c5cc78550a
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
- DOCS="docs-html/"
+ WEB_SITE=http://bochs.sourceforge.net
KEYWORDS="emulator utils"
+ ENTERED=20020531
SHORT="i386 hardware emulator"
+ DOCS="docs-html/"
cat << EOF
Bochs is a portable x86 PC emulation software package that emulates
enough of the x86 CPU, related AT hardware, and BIOS to run DOS, Windows
diff --git a/utils/bochs/HISTORY b/utils/bochs/HISTORY
index 63ca87f..c7cb871 100644
--- a/utils/bochs/HISTORY
+++ b/utils/bochs/HISTORY
@@ -1,3 +1,16 @@
+2007-09-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.3.5
+ Removed UPDATED
+ * BUILD: Old PIT has been removed, --enable-new-pit is deprecated
+ Remove TABs
+ Pass OPTS last so user may override our options
+
+2007-08-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 2.3
+ * BUILD: added some configuration switches to enable hardware
+ components
+ * DEPENDS: added a dependency on dev86
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/bochs/bochs-2.3.5.tar.gz.sig
b/utils/bochs/bochs-2.3.5.tar.gz.sig
new file mode 100644
index 0000000..ae77e38
Binary files /dev/null and b/utils/bochs/bochs-2.3.5.tar.gz.sig differ
diff --git a/utils/coreutils/BUILD b/utils/coreutils/BUILD
index 67dc13e..e52a5df 100755
--- a/utils/coreutils/BUILD
+++ b/utils/coreutils/BUILD
@@ -4,6 +4,7 @@
--prefix=${TRACK_ROOT}/usr \
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
+ $SELINUX \
$OPTS &&

make_single &&
diff --git a/utils/coreutils/CONFIGURE b/utils/coreutils/CONFIGURE
new file mode 100755
index 0000000..db4798e
--- /dev/null
+++ b/utils/coreutils/CONFIGURE
@@ -0,0 +1 @@
+config_query_option SELINUX "Enable SELinux patches?" n '--enable-selinux' ''
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 212cdd2..d7ba31a 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,19 @@
+2007-09-14 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: forgot to change the patch check to --enable-selinux
+ * CONFIGURE: should be --enable not --with
+
+2007-09-13 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added glibc 2.6.1 patch for futimens function
+ * coreutils-futimens.patch: added patch to internalize the futimens
+ function
+
+2007-09-13 David Brown <dmlb2000 AT gmail.com>
+ * CONFIGURE: added selinux query option and the default is n
+ * coreutils-selinux.patch: got patch from redhat guys and fixed
+ for hostname patch, and remove kill as well... *sigh*
+ * PRE_BUILD: applied patch if requested and fixed the name
+ * BUILD: added selinux option to build commands
+
2007-04-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* hostname.diff: updated for the new version
* DETAILS: updated spell to 6.9, added key qualifier to SOURCE_GPG
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index 4526171..c035bae 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -6,7 +6,17 @@ cd $SOURCE_DIRECTORY &&
# Don't install coreutils' hostname (Bug #7089)
#
patch -p1 < $SCRIPT_DIRECTORY/hostname.diff &&
-
+if [[ $SELINUX == '--enable-selinux' ]]
+then
+ patch -p1 < ${SCRIPT_DIRECTORY}/coreutils-selinux.patch
+fi &&
+case "$(installed_version glibc)" in
+ 2.6*)
+ patch -p1 < ${SCRIPT_DIRECTORY}/coreutils-futimens.patch
+ ;;
+ *)
+ ;;
+esac &&
#
# patch for pam support in su
#
diff --git a/utils/coreutils/coreutils-futimens.patch
b/utils/coreutils/coreutils-futimens.patch
new file mode 100644
index 0000000..bbc4b71
--- /dev/null
+++ b/utils/coreutils/coreutils-futimens.patch
@@ -0,0 +1,60 @@
+diff -Nur coreutils-6.9.orig/lib/utimens.c
coreutils-6.9.futimens/lib/utimens.c
+--- coreutils-6.9.orig/lib/utimens.c 2007-01-18 10:33:34.000000000 +0200
++++ coreutils-6.9.futimens/lib/utimens.c 2007-05-18 15:18:06.000000000
+0300
+@@ -75,7 +75,7 @@
+ Return 0 on success, -1 (setting errno) on failure. */
+
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
++cu_futimens (int fd ATTRIBUTE_UNUSED,
+ char const *file, struct timespec const timespec[2])
+ {
+ /* Some Linux-based NFS clients are buggy, and mishandle time stamps
+@@ -185,5 +185,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+- return futimens (-1, file, timespec);
++ return cu_futimens (-1, file, timespec);
+ }
+diff -Nur coreutils-6.9.orig/lib/utimens.h
coreutils-6.9.futimens/lib/utimens.h
+--- coreutils-6.9.orig/lib/utimens.h 2007-02-23 20:25:21.000000000 +0200
++++ coreutils-6.9.futimens/lib/utimens.h 2007-05-18 15:18:06.000000000
+0300
+@@ -1,3 +1,3 @@
+ #include &lt;time.h&gt;
+-int futimens (int, char const *, struct timespec const [2]);
++int cu_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
+diff -Nur coreutils-6.9.orig/src/copy.c coreutils-6.9.futimens/src/copy.c
+--- coreutils-6.9.orig/src/copy.c 2007-03-18 23:36:43.000000000 +0200
++++ coreutils-6.9.futimens/src/copy.c 2007-05-18 15:18:06.000000000 +0300
+@@ -518,7 +518,7 @@
+ timespec[0] = get_stat_atime (src_sb);
+ timespec[1] = get_stat_mtime (src_sb);
+
+- if (futimens (dest_desc, dst_name, timespec) != 0)
++ if (cu_futimens (dest_desc, dst_name, timespec) != 0)
+ {
+ error (0, errno, _(&quot;preserving times for %s&quot;), quote
(dst_name));
+ if (x-&gt;require_preserve)
+diff -Nur coreutils-6.9.orig/src/touch.c coreutils-6.9.futimens/src/touch.c
+--- coreutils-6.9.orig/src/touch.c 2007-03-18 23:36:43.000000000 +0200
++++ coreutils-6.9.futimens/src/touch.c 2007-05-18 15:18:06.000000000 +0300
+@@ -167,7 +167,7 @@
+
+ if (amtime_now)
+ {
+- /* Pass NULL to futimens so it will not fail if we have
++ /* Pass NULL to cu_futimens so it will not fail if we have
+ write access to the file, but don't own it. */
+ t = NULL;
+ }
+@@ -182,7 +182,7 @@
+ t = timespec;
+ }
+
+- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
++ ok = (cu_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+
+ if (fd == STDIN_FILENO)
+ {
diff --git a/utils/coreutils/coreutils-selinux.patch
b/utils/coreutils/coreutils-selinux.patch
new file mode 100644
index 0000000..580c951
--- /dev/null
+++ b/utils/coreutils/coreutils-selinux.patch
@@ -0,0 +1,2598 @@
+--- coreutils-6.9/tests/help-version.selinux 2007-03-23 11:59:21.000000000
+0000
++++ coreutils-6.9/tests/help-version 2007-03-23 11:59:21.000000000 +0000
+@@ -72,6 +72,8 @@
+
+ # Skip `test'; it doesn't accept --help or --version.
+ test $i = test && continue;
++ test $i = chcon && continue;
++ test $i = runcon && continue;
+
+ # false fails even when invoked with --help or --version.
+ if test $i = false; then
+@@ -198,7 +200,7 @@
+
+ for i in $all_programs; do
+ # Skip these.
+- case $i in chroot|stty|tty|false) continue;; esac
++ case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac
+
+ rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
+ echo > $tmp_in
+--- coreutils-6.9/src/ls.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/ls.c 2007-03-23 11:59:21.000000000 +0000
+@@ -111,6 +111,18 @@
+
+ #define AUTHORS "Richard Stallman", "David MacKenzie"
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++
++static int print_scontext = 0;
++
++
++
++
++
++
++#endif
++
+ #define obstack_chunk_alloc malloc
+ #define obstack_chunk_free free
+
+@@ -133,7 +145,8 @@
+ symbolic_link,
+ sock,
+ whiteout,
+- arg_directory
++ arg_directory,
++ command_line
+ };
+
+ /* Display letters and indicators for each filetype.
+@@ -177,6 +190,10 @@
+ /* For long listings, true if the file has an access control list. */
+ bool have_acl;
+ #endif
++
++#ifdef WITH_SELINUX
++ security_context_t scontext;
++#endif
+ };
+
+ #if USE_ACL
+@@ -247,6 +264,9 @@
+ static void sort_files (void);
+ static void parse_ls_color (void);
+ void usage (int status);
++#ifdef WITH_SELINUX
++static void print_scontext_format (const struct fileinfo *f);
++#endif
+
+ /* The name this program was run with. */
+ char *program_name;
+@@ -360,7 +380,11 @@
+ one_per_line, /* -1 */
+ many_per_line, /* -C */
+ horizontal, /* -x */
+- with_commas /* -m */
++ with_commas, /* -m */
++#ifdef WITH_SELINUX
++ security_format, /* -Z */
++#endif
++ invalid_format
+ };
+
+ static enum format format;
+@@ -741,6 +765,11 @@
+ SHOW_CONTROL_CHARS_OPTION,
+ SI_OPTION,
+ SORT_OPTION,
++#ifdef WITH_SELINUX
++ CONTEXT_OPTION,
++ LCONTEXT_OPTION,
++ SCONTEXT_OPTION,
++#endif
+ TIME_OPTION,
+ TIME_STYLE_OPTION
+ };
+@@ -787,6 +816,11 @@
+ {"time-style", required_argument, NULL, TIME_STYLE_OPTION},
+ {"color", optional_argument, NULL, COLOR_OPTION},
+ {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
++#ifdef WITH_SELINUX
++ {"context", no_argument, 0, CONTEXT_OPTION},
++ {"lcontext", no_argument, 0, LCONTEXT_OPTION},
++ {"scontext", no_argument, 0, SCONTEXT_OPTION},
++#endif
+ {"author", no_argument, NULL, AUTHOR_OPTION},
+ {GETOPT_HELP_OPTION_DECL},
+ {GETOPT_VERSION_OPTION_DECL},
+@@ -796,12 +830,19 @@
+ static char const *const format_args[] =
+ {
+ "verbose", "long", "commas", "horizontal", "across",
+- "vertical", "single-column", NULL
++ "vertical", "single-column",
++#ifdef WITH_SELINUX
++ "context",
++#endif
++ NULL
+ };
+ static enum format const format_types[] =
+ {
+ long_format, long_format, with_commas, horizontal, horizontal,
+ many_per_line, one_per_line
++#ifdef WITH_SELINUX
++ , security_format
++#endif
+ };
+ ARGMATCH_VERIFY (format_args, format_types);
+
+@@ -1246,6 +1287,9 @@
+
+ format_needs_stat = sort_type == sort_time || sort_type == sort_size
+ || format == long_format
++#ifdef WITH_SELINUX
++ || format == security_format || print_scontext
++#endif
+ || print_block_size;
+ format_needs_type = (! format_needs_stat
+ && (recursive
+@@ -1276,7 +1320,7 @@
+ }
+ else
+ do
+- gobble_file (argv[i++], unknown, NOT_AN_INODE_NUMBER, true, "");
++ gobble_file (argv[i++], command_line, NOT_AN_INODE_NUMBER, true, "");
+ while (i < argc);
+
+ if (cwd_n_used)
+@@ -1439,6 +1483,9 @@
+ ignore_mode = IGNORE_DEFAULT;
+ ignore_patterns = NULL;
+ hide_patterns = NULL;
++#ifdef WITH_SELINUX
++ print_scontext = 0;
++#endif
+
+ /* FIXME: put this in a function. */
+ {
+@@ -1514,7 +1561,7 @@
+ }
+
+ while ((c = getopt_long (argc, argv,
+- "abcdfghiklmnopqrstuvw:xABCDFGHI:LNQRST:UX1",
++ "abcdfghiklmnopqrstuvw:xABCDFGHI:LNQRST:UX1Z",
+ long_options, NULL)) != -1)
+ {
+ switch (c)
+@@ -1637,6 +1684,13 @@
+ format = horizontal;
+ break;
+
++#ifdef WITH_SELINUX
++ case 'Z':
++
++ print_scontext = 1;
++ format = security_format;
++ break;
++#endif
+ case 'A':
+ if (ignore_mode == IGNORE_DEFAULT)
+ ignore_mode = IGNORE_DOT_AND_DOTDOT;
+@@ -1817,6 +1871,25 @@
+
+ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+
++#ifdef WITH_SELINUX
++
++ case CONTEXT_OPTION: /* new security format */
++
++ print_scontext = 1;
++ format = security_format;
++ break;
++ case LCONTEXT_OPTION: /* long format plus security context */
++
++ print_scontext = 1;
++ format = long_format;
++ break;
++ case SCONTEXT_OPTION: /* short form of new security format */
++
++ print_scontext = 0;
++ format = security_format;
++ break;
++#endif
++
+ default:
+ usage (LS_FAILURE);
+ }
+@@ -2514,6 +2587,13 @@
+ for (i = 0; i < cwd_n_used; i++)
+ {
+ struct fileinfo *f = sorted_file[i];
++#ifdef WITH_SELINUX
++ if (f->scontext)
++ {
++ freecon (f->scontext);
++ f->scontext = NULL;
++ }
++#endif /* SELINUX */
+ free (f->name);
+ free (f->linkname);
+ }
+@@ -2558,6 +2638,9 @@
+ memset (f, '\0', sizeof *f);
+ f->stat.st_ino = inode;
+ f->filetype = type;
++#ifdef WITH_SELINUX
++ f->scontext = NULL;
++#endif
+
+ if (command_line_arg
+ || format_needs_stat
+@@ -2606,6 +2689,11 @@
+ {
+ case DEREF_ALWAYS:
+ err = stat (absolute_name, &f->stat);
++#ifdef WITH_SELINUX
++ if (err>=0)
++ if (format == security_format || print_scontext)
++ getfilecon(absolute_name, &f->scontext);
++#endif
+ break;
+
+ case DEREF_COMMAND_LINE_ARGUMENTS:
+@@ -2614,6 +2702,11 @@
+ {
+ bool need_lstat;
+ err = stat (absolute_name, &f->stat);
++#ifdef WITH_SELINUX
++ if (err>=0)
++ if (format == security_format || print_scontext)
++ getfilecon(absolute_name, &f->scontext);
++#endif
+
+ if (dereference == DEREF_COMMAND_LINE_ARGUMENTS)
+ break;
+@@ -2632,6 +2725,11 @@
+
+ default: /* DEREF_NEVER */
+ err = lstat (absolute_name, &f->stat);
++#ifdef WITH_SELINUX
++ if (err == 0)
++ if (format == security_format || print_scontext)
++ lgetfilecon(absolute_name, &f->scontext);
++#endif
+ break;
+ }
+
+@@ -2654,7 +2752,11 @@
+ f->stat_ok = true;
+
+ #if USE_ACL
+- if (format == long_format)
++ if (format == long_format
++#ifdef WITH_SELINUX
++ || format == security_format
++#endif
++ )
+ {
+ int n = file_has_acl (absolute_name, &f->stat);
+ f->have_acl = (0 < n);
+@@ -3207,6 +3309,16 @@
+ DIRED_PUTCHAR ('\n');
+ }
+ break;
++
++#ifdef WITH_SELINUX
++ case security_format:
++ for (i = 0; i < cwd_n_used; i++)
++ {
++ print_scontext_format (sorted_file[i]);
++ DIRED_PUTCHAR ('\n');
++ }
++ break;
++#endif
+ }
+ }
+
+@@ -3461,6 +3573,15 @@
+ The latter is wrong when nlink_width is zero. */
+ p += strlen (p);
+
++#ifdef WITH_SELINUX
++
++ if (print_scontext)
++ {
++ sprintf (p, "%-32s ", f->scontext ? f->scontext : "");
++ p += strlen (p);
++ }
++#endif
++
+ DIRED_INDENT ();
+
+ if (print_owner | print_group | print_author)
+@@ -4405,6 +4526,16 @@
+ -X sort alphabetically by entry extension\n\
+ -1 list one file per line\n\
+ "), stdout);
++#ifdef WITH_SELINUX
++printf(_("\nSELINUX options:\n\n\
++ --lcontext Display security context. Enable -l. Lines\n\
++ will probably be too wide for most
displays.\n\
++ -Z, --context Display security context so it fits on most\n\
++ displays. Displays only mode, user,
group,\n\
++ security context and file name.\n\
++ --scontext Display only security context and file name.\n\
++\n\n"));
++#endif
+ fputs (HELP_OPTION_DESCRIPTION, stdout);
+ fputs (VERSION_OPTION_DESCRIPTION, stdout);
+ fputs (_("\n\
+@@ -4428,3 +4559,70 @@
+ }
+ exit (status);
+ }
++
++#ifdef WITH_SELINUX
++
++static void
++print_scontext_format (const struct fileinfo *f)
++{
++ char modebuf[12];
++
++ /* 7 fields that may require LONGEST_HUMAN_READABLE bytes,
++ 1 10-byte mode string,
++ 9 spaces, one following each of these fields, and
++ 1 trailing NUL byte. */
++
++ char init_bigbuf[7 * LONGEST_HUMAN_READABLE + 10 + 9 + 1];
++ char *buf = init_bigbuf;
++ size_t bufsize = sizeof (init_bigbuf);
++ size_t s;
++ char *p;
++ const char *fmt;
++ char *user_name;
++ char *group_name;
++ int rv;
++ char *scontext;
++
++ p = buf;
++
++ if ( print_scontext ) { /* zero means terse listing */
++ filemodestring (&f->stat, modebuf);
++ modebuf[10] = (FILE_HAS_ACL (f) ? '+' : ' ');
++ modebuf[11] = '\0';
++
++ /* print mode */
++
++ (void) sprintf (p, "%s ", modebuf);
++ p += strlen (p);
++
++ /* print standard user and group */
++
++ DIRED_FPUTS (buf, stdout, p - buf);
++ format_user (f->stat.st_uid, owner_width, f->stat_ok);
++ format_group (f->stat.st_gid, group_width, f->stat_ok);
++ p = buf;
++ }
++
++ (void) sprintf (p, "%-32s ", f->scontext ?: "");
++ p += strlen (p);
++
++ DIRED_INDENT ();
++ DIRED_FPUTS (buf, stdout, p - buf);
++ print_name_with_quoting (f->name, f->stat.st_mode, f->linkok,
++ f->stat_ok, f->filetype, &dired_obstack);
++
++ if (f->filetype == symbolic_link) {
++ if (f->linkname) {
++ DIRED_FPUTS_LITERAL (" -> ", stdout);
++ print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1,
++ f->stat_ok, f->filetype, NULL);
++ if (indicator_style != none)
++ print_type_indicator (f->stat_ok, f->linkmode, f->filetype);
++ }
++ }
++ else {
++ if (indicator_style != none)
++ print_type_indicator (f->stat_ok, f->stat.st_mode, f->filetype);
++ }
++}
++#endif
+--- coreutils-6.9/src/cp.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/cp.c 2007-03-23 11:59:21.000000000 +0000
+@@ -51,6 +51,11 @@
+
+ #define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h> /* for is_selinux_enabled() */
++int selinux_enabled=0;
++#endif
++
+ /* Used by do_copy, make_dir_parents_private, and re_protect
+ to keep a list of leading directories whose protections
+ need to be fixed after copying. */
+@@ -141,6 +146,9 @@
+ {"target-directory", required_argument, NULL, 't'},
+ {"update", no_argument, NULL, 'u'},
+ {"verbose", no_argument, NULL, 'v'},
++#ifdef WITH_SELINUX
++ {"context", required_argument, NULL, 'Z'},
++#endif
+ {GETOPT_HELP_OPTION_DECL},
+ {GETOPT_VERSION_OPTION_DECL},
+ {NULL, 0, NULL, 0}
+@@ -194,6 +202,9 @@
+ additional attributes: links, all\n\
+ "), stdout);
+ fputs (_("\
++ -c same as --preserve=context\n\
++"), stdout);
++ fputs (_("\
+ --no-preserve=ATTR_LIST don't preserve the specified attributes\n\
+ --parents use full source file name under DIRECTORY\n\
+ "), stdout);
+@@ -219,6 +230,7 @@
+ destination file is missing\n\
+ -v, --verbose explain what is being done\n\
+ -x, --one-file-system stay on this file system\n\
++ -Z, --context=CONTEXT set security context of copy to CONTEXT\n\
+ "), stdout);
+ fputs (HELP_OPTION_DESCRIPTION, stdout);
+ fputs (VERSION_OPTION_DESCRIPTION, stdout);
+@@ -750,6 +762,11 @@
+ x->preserve_mode = false;
+ x->preserve_timestamps = false;
+
++#ifdef WITH_SELINUX
++ x->preserve_security_context = false;
++ x->set_security_context = false;
++#endif
++
+ x->require_preserve = false;
+ x->recursive = false;
+ x->sparse_mode = SPARSE_AUTO;
+@@ -777,18 +794,19 @@
+ PRESERVE_TIMESTAMPS,
+ PRESERVE_OWNERSHIP,
+ PRESERVE_LINK,
++ PRESERVE_CONTEXT,
+ PRESERVE_ALL
+ };
+ static enum File_attribute const preserve_vals[] =
+ {
+ PRESERVE_MODE, PRESERVE_TIMESTAMPS,
+- PRESERVE_OWNERSHIP, PRESERVE_LINK, PRESERVE_ALL
++ PRESERVE_OWNERSHIP, PRESERVE_LINK, PRESERVE_CONTEXT, PRESERVE_ALL
+ };
+ /* Valid arguments to the `--preserve' option. */
+ static char const* const preserve_args[] =
+ {
+ "mode", "timestamps",
+- "ownership", "links", "all", NULL
++ "ownership", "links", "context", "all", NULL
+ };
+ ARGMATCH_VERIFY (preserve_args, preserve_vals);
+
+@@ -824,11 +842,16 @@
+ x->preserve_links = on_off;
+ break;
+
++ case PRESERVE_CONTEXT:
++ x->preserve_security_context = on_off;
++ break;
++
+ case PRESERVE_ALL:
+ x->preserve_mode = on_off;
+ x->preserve_timestamps = on_off;
+ x->preserve_ownership = on_off;
+ x->preserve_links = on_off;
++ x->preserve_security_context = on_off;
+ break;
+
+ default:
+@@ -853,6 +876,9 @@
+ bool copy_contents = false;
+ char *target_directory = NULL;
+ bool no_target_directory = false;
++#ifdef WITH_SELINUX
++ selinux_enabled= (is_selinux_enabled()>0);
++#endif
+
+ initialize_main (&argc, &argv);
+ program_name = argv[0];
+@@ -868,7 +894,11 @@
+ we'll actually use backup_suffix_string. */
+ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
+
++#ifdef WITH_SELINUX
++ while ((c = getopt_long (argc, argv, "abcdfHilLprst:uvxPRS:TZ:",
++#else
+ while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T",
++#endif
+ long_opts, NULL))
+ != -1)
+ {
+@@ -879,12 +909,13 @@
+ sparse_type_string, sparse_type);
+ break;
+
+- case 'a': /* Like -dpPR. */
++ case 'a': /* Like -dpPRc. */
+ x.dereference = DEREF_NEVER;
+ x.preserve_links = true;
+ x.preserve_ownership = true;
+ x.preserve_mode = true;
+ x.preserve_timestamps = true;
++ x.preserve_security_context = true;
+ x.require_preserve = true;
+ x.recursive = true;
+ break;
+@@ -959,6 +990,36 @@
+ case 'R':
+ x.recursive = true;
+ break;
++#ifdef WITH_SELINUX
++ case 'c':
++ if ( x.set_security_context ) {
++ (void) fprintf(stderr, "%s: cannot force target context and
preserve it\n", argv[0]);
++ exit( 1 );
++ }
++ else if (selinux_enabled)
++ x.preserve_security_context = true;
++ break;
++
++ case 'Z':
++ /* politely decline if we're not on a selinux-enabled kernel. */
++ if( !selinux_enabled ) {
++ fprintf( stderr, "Warning: ignoring --context (-Z). "
++ "It requires a SELinux enabled kernel.\n" );
++ break;
++ }
++ if ( x.preserve_security_context ) {
++ (void) fprintf(stderr, "%s: cannot force target context to '%s'
and preserve it\n", argv[0], optarg);
++ exit( 1 );
++ }
++ x.set_security_context = true;
++ /* if there's a security_context given set new path
++ components to that context, too */
++ if ( setfscreatecon(optarg) < 0 ) {
++ (void) fprintf(stderr, _("cannot set default security context
%s\n"), optarg);
++ exit( 1 );
++ }
++ break;
++#endif
+
+ case REPLY_OPTION: /* Deprecated */
+ x.interactive = XARGMATCH ("--reply", optarg,
+--- coreutils-6.9/src/Makefile.am.selinux 2007-03-23 11:59:21.000000000
+0000
++++ coreutils-6.9/src/Makefile.am 2007-03-23 11:59:21.000000000 +0000
+@@ -19,14 +19,14 @@
+ EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime
users who
+
+ bin_SCRIPTS = groups
+-bin_PROGRAMS = [ chgrp chown chmod cp dd dircolors du \
++bin_PROGRAMS = [ chcon chgrp chown chmod cp dd dircolors du \
+ ginstall link ln dir vdir ls mkdir \
+ mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
+ cat cksum comm csplit cut expand fmt fold head join md5sum \
+ nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+ shuf sort split sum tac tail tr tsort unexpand uniq wc \
+ basename date dirname echo env expr factor false \
+- id logname pathchk printenv printf pwd seq sleep tee \
++ id logname pathchk printenv printf pwd runcon seq sleep tee \
+ test true tty whoami yes \
+ base64 \
+ $(OPTIONAL_BIN_PROGS) $(DF_PROG)
+@@ -60,9 +60,9 @@
+ LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
+
+ # for eaccess in lib/euidaccess.c.
+-cp_LDADD = $(LDADD) $(LIB_EACCESS)
+-ginstall_LDADD = $(LDADD) $(LIB_EACCESS)
+-mv_LDADD = $(LDADD) $(LIB_EACCESS)
++cp_LDADD = $(LDADD) $(LIB_EACCESS) @LIB_SELINUX@
++ginstall_LDADD = $(LDADD) $(LIB_EACCESS) @LIB_SELINUX@
++mv_LDADD = $(LDADD) $(LIB_EACCESS) @LIB_SELINUX@
+ pathchk_LDADD = $(LDADD) $(LIB_EACCESS)
+ rm_LDADD = $(LDADD) $(LIB_EACCESS)
+ test_LDADD = $(LDADD) $(LIB_EACCESS)
+@@ -71,12 +71,19 @@
+
+ # for clock_gettime and fdatasync
+ dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
+-dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+-ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
++dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIB_SELINUX@
++ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIB_SELINUX@
+ pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+ shred_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
+ shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME)
+-vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
++vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIB_SELINUX@
++chcon_LDADD = $(LDADD) @LIB_SELINUX@
++id_LDADD = $(LDADD) @LIB_SELINUX@
++mkdir_LDADD = $(LDADD) @LIB_SELINUX@
++mkfifo_LDADD = $(LDADD) @LIB_SELINUX@
++mknod_LDADD = $(LDADD) @LIB_SELINUX@
++stat_LDADD = $(LDADD) @LIB_SELINUX@
++runcon_LDADD = $(LDADD) @LIB_SELINUX@
+
+ ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
+ sort_LDADD = $(LDADD) $(POW_LIB) $(LIB_GETHRXTIME)
+--- coreutils-6.9/src/copy.h.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/copy.h 2007-03-23 11:59:21.000000000 +0000
+@@ -127,6 +127,10 @@
+ bool preserve_ownership;
+ bool preserve_mode;
+ bool preserve_timestamps;
++#ifdef WITH_SELINUX
++ bool preserve_security_context;
++ bool set_security_context;
++#endif
+
+ /* Enabled for mv, and for cp by the --preserve=links option.
+ If true, attempt to preserve in the destination files any
+--- /dev/null 2007-03-23 08:54:03.819414923 +0000
++++ coreutils-6.9/src/chcon.c 2007-03-23 11:59:21.000000000 +0000
+@@ -0,0 +1,421 @@
++/* chcontext -- change security context of a pathname */
++
++#include <config.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <grp.h>
++#include <getopt.h>
++#include <selinux/selinux.h>
++#include <selinux/context.h>
++
++#include "system.h"
++#include "error.h"
++#include "savedir.h"
++#include "group-member.h"
++
++enum Change_status
++{
++ CH_SUCCEEDED,
++ CH_FAILED,
++ CH_NO_CHANGE_REQUESTED
++};
++
++enum Verbosity
++{
++ /* Print a message for each file that is processed. */
++ V_high,
++
++ /* Print a message for each file whose attributes we change. */
++ V_changes_only,
++
++ /* Do not be verbose. This is the default. */
++ V_off
++};
++
++static int change_dir_context (const char *dir, const struct stat *statp);
++
++/* The name the program was run with. */
++char *program_name;
++
++/* If nonzero, and the systems has support for it, change the context
++ of symbolic links rather than any files they point to. */
++static int change_symlinks;
++
++/* If nonzero, change the context of directories recursively. */
++static int recurse;
++
++/* If nonzero, force silence (no error messages). */
++static int force_silent;
++
++/* Level of verbosity. */
++static enum Verbosity verbosity = V_off;
++
++/* The name of the context file is being given. */
++static const char *specified_context;
++
++/* Specific components of the context */
++static const char *specified_user;
++static const char *specified_role;
++static const char *specified_range;
++static const char *specified_type;
++
++/* The argument to the --reference option. Use the context of this file.
++ This file must exist. */
++static char *reference_file;
++
++/* If nonzero, display usage information and exit. */
++static int show_help;
++
++/* If nonzero, print the version on standard output and exit. */
++static int show_version;
++
++static struct option const long_options[] =
++{
++ {"recursive", no_argument, 0, 'R'},
++ {"changes", no_argument, 0, 'c'},
++ {"no-dereference", no_argument, 0, 'h'},
++ {"silent", no_argument, 0, 'f'},
++ {"quiet", no_argument, 0, 'f'},
++ {"reference", required_argument, 0, CHAR_MAX + 1},
++ {"context", required_argument, 0, CHAR_MAX + 2},
++ {"user", required_argument, 0, 'u'},
++ {"role", required_argument, 0, 'r'},
++ {"type", required_argument, 0, 't'},
++ {"range", required_argument, 0, 'l'},
++ {"verbose", no_argument, 0, 'v'},
++ {"help", no_argument, &show_help, 1},
++ {"version", no_argument, &show_version, 1},
++ {0, 0, 0, 0}
++};
++
++/* Tell the user how/if the context of FILE has been changed.
++ CHANGED describes what (if anything) has happened. */
++
++static void
++describe_change (const char *file, security_context_t newcontext, enum
Change_status changed)
++{
++ const char *fmt;
++ switch (changed)
++ {
++ case CH_SUCCEEDED:
++ fmt = _("context of %s changed to %s\n");
++ break;
++ case CH_FAILED:
++ fmt = _("failed to change context of %s to %s\n");
++ break;
++ case CH_NO_CHANGE_REQUESTED:
++ fmt = _("context of %s retained as %s\n");
++ break;
++ default:
++ abort ();
++ }
++ printf (fmt, file, newcontext);
++}
++
++static int
++compute_context_from_mask (security_context_t context, context_t *ret)
++{
++ context_t newcontext = context_new (context);
++ if (!newcontext)
++ return 1;
++#define SETCOMPONENT(comp) \
++ do { \
++ if (specified_ ## comp) \
++ if (context_ ## comp ## _set (newcontext, specified_ ## comp)) \
++ goto lose; \
++ } while (0)
++
++ SETCOMPONENT(user);
++ SETCOMPONENT(range);
++ SETCOMPONENT(role);
++ SETCOMPONENT(type);
++#undef SETCOMPONENT
++
++ *ret = newcontext;
++ return 0;
++ lose:
++ context_free (newcontext);
++ return 1;
++}
++
++/* Change the context of FILE, using specified components.
++ If it is a directory and -R is given, recurse.
++ Return 0 if successful, 1 if errors occurred. */
++
++static int
++change_file_context (const char *file)
++{
++ struct stat file_stats;
++ security_context_t file_context=NULL;
++ context_t context;
++ security_context_t context_string;
++ int errors = 0;
++ int status = 0;
++
++ if (change_symlinks)
++ status = lgetfilecon(file, &file_context);
++ else
++ status = getfilecon(file, &file_context);
++
++ if ((status < 0) && (errno != ENODATA))
++ {
++ if (force_silent == 0)
++ error (0, errno, "%s", file);
++ return 1;
++ }
++
++ /* If the file doesn't have a context, and we're not setting all of
++ the context components, there isn't really an obvious default.
++ Thus, we just give up. */
++ if (file_context == NULL && specified_context == NULL)
++ {
++ error (0, 0, _("can't apply partial context to unlabeled file %s"),
file);
++ return 1;
++ }
++
++ if (specified_context == NULL)
++ {
++ if (compute_context_from_mask (file_context, &context))
++ {
++ error (0, 0, _("couldn't compute security context from %s"),
file_context);
++ return 1;
++ }
++ }
++ else
++ {
++ context = context_new (specified_context);
++ if (!context)
++ error (1, 0,_("invalid context: %s"),specified_context);
++ }
++
++ context_string = context_str (context);
++
++ if (file_context == NULL || strcmp(context_string,file_context)!=0)
++ {
++ int fail;
++
++ if (change_symlinks)
++ fail = lsetfilecon (file, context_string);
++ else
++ fail = setfilecon (file, context_string);
++
++ if (verbosity == V_high || (verbosity == V_changes_only && !fail))
++ describe_change (file, context_string, (fail ? CH_FAILED :
CH_SUCCEEDED));
++
++ if (fail)
++ {
++ errors = 1;
++ if (force_silent == 0)
++ {
++ error (0, errno, _("failed to change context of %s to %s"),
file, context_string);
++ }
++ }
++ }
++ else if (verbosity == V_high)
++ {
++ describe_change (file, context_string, CH_NO_CHANGE_REQUESTED);
++ }
++
++ context_free(context);
++ freecon(file_context);
++
++ if (recurse) {
++ if (lstat(file, &file_stats)==0)
++ if (S_ISDIR (file_stats.st_mode))
++ errors |= change_dir_context (file, &file_stats);
++ }
++ return errors;
++}
++
++/* Recursively change context of the files in directory DIR
++ using specified context components.
++ STATP points to the results of lstat on DIR.
++ Return 0 if successful, 1 if errors occurred. */
++
++static int
++change_dir_context (const char *dir, const struct stat *statp)
++{
++ char *name_space, *namep;
++ char *path; /* Full path of each entry to process. */
++ unsigned dirlength; /* Length of `dir' and '\0'. */
++ unsigned filelength; /* Length of each pathname to
process. */
++ unsigned pathlength; /* Bytes allocated for `path'. */
++ int errors = 0;
++
++ errno = 0;
++ name_space = savedir (dir);
++ if (name_space == NULL)
++ {
++ if (errno)
++ {
++ if (force_silent == 0)
++ error (0, errno, "%s", dir);
++ return 1;
++ }
++ else
++ error (1, 0, _("virtual memory exhausted"));
++ }
++
++ dirlength = strlen (dir) + 1; /* + 1 is for the trailing '/'. */
++ pathlength = dirlength + 1;
++ /* Give `path' a dummy value; it will be reallocated before first use. */
++ path = xmalloc (pathlength);
++ strcpy (path, dir);
++ path[dirlength - 1] = '/';
++
++ for (namep = name_space; *namep; namep += filelength - dirlength)
++ {
++ filelength = dirlength + strlen (namep) + 1;
++ if (filelength > pathlength)
++ {
++ pathlength = filelength * 2;
++ path = xrealloc (path, pathlength);
++ }
++ strcpy (path + dirlength, namep);
++ errors |= change_file_context (path);
++ }
++ free (path);
++ free (name_space);
++ return errors;
++}
++
++static void
++usage (int status)
++{
++ if (status != 0)
++ fprintf (stderr, _("Try `%s --help' for more information.\n"),
++ program_name);
++ else
++ {
++ printf (_("\
++Usage: %s [OPTION]... CONTEXT FILE...\n\
++ or: %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n\
++ or: %s [OPTION]... --reference=RFILE FILE...\n\
++"),
++ program_name, program_name, program_name);
++ printf (_("\
++Change the security context of each FILE to CONTEXT.\n\
++\n\
++ -c, --changes like verbose but report only when a change is
made\n\
++ -h, --no-dereference affect symbolic links instead of any referenced
file\n\
++ (available only on systems with lchown system
call)\n\
++ -f, --silent, --quiet suppress most error messages\n\
++ --reference=RFILE use RFILE's group instead of using a CONTEXT
value\n\
++ -u, --user=USER set user USER in the target security context\n\
++ -r, --role=ROLE set role ROLE in the target security context\n\
++ -t, --type=TYPE set type TYPE in the target security context\n\
++ -l, --range=RANGE set range RANGE in the target security context\n\
++ -R, --recursive change files and directories recursively\n\
++ -v, --verbose output a diagnostic for every file processed\n\
++ --help display this help and exit\n\
++ --version output version information and exit\n\
++"));
++ close_stdout ();
++ }
++ exit (status);
++}
++
++int
++main (int argc, char **argv)
++{
++ security_context_t ref_context = NULL;
++ int errors = 0;
++ int optc;
++ int component_specified = 0;
++
++ program_name = argv[0];
++ setlocale (LC_ALL, "");
++ bindtextdomain (PACKAGE, LOCALEDIR);
++ textdomain (PACKAGE);
++
++ recurse = force_silent = 0;
++
++ while ((optc = getopt_long (argc, argv, "Rcfhvu:r:t:l:", long_options,
NULL)) != -1)
++ {
++ switch (optc)
++ {
++ case 0:
++ break;
++ case 'u':
++ specified_user = optarg;
++ component_specified = 1;
++ break;
++ case 'r':
++ specified_role = optarg;
++ component_specified = 1;
++ break;
++ case 't':
++ specified_type = optarg;
++ component_specified = 1;
++ break;
++ case 'l':
++ specified_range = optarg;
++ component_specified = 1;
++ break;
++ case CHAR_MAX + 1:
++ reference_file = optarg;
++ break;
++ case 'R':
++ recurse = 1;
++ break;
++ case 'c':
++ verbosity = V_changes_only;
++ break;
++ case 'f':
++ force_silent = 1;
++ break;
++ case 'h':
++ change_symlinks = 1;
++ break;
++ case 'v':
++ verbosity = V_high;
++ break;
++ default:
++ usage (1);
++ }
++ }
++
++ if (show_version)
++ {
++ printf ("chcon (%s) %s\n", GNU_PACKAGE, VERSION);
++ close_stdout ();
++ exit (0);
++ }
++
++ if (show_help)
++ usage (0);
++
++
++ if (reference_file && component_specified)
++ {
++ error (0, 0, _("conflicting security context specifiers given"));
++ usage (1);
++ }
++
++ if (!(((reference_file || component_specified)
++ && (argc - optind > 0))
++ || (argc - optind > 1)))
++ {
++ error (0, 0, _("too few arguments"));
++ usage (1);
++ }
++
++ if (reference_file)
++ {
++ if (getfilecon (reference_file, &ref_context)<0)
++ error (1, errno, "%s", reference_file);
++
++ specified_context = ref_context;
++ }
++ else if (!component_specified) {
++ specified_context = argv[optind++];
++ }
++ for (; optind < argc; ++optind)
++ errors |= change_file_context (argv[optind]);
++
++ if (verbosity != V_off)
++ close_stdout ();
++ if (ref_context != NULL)
++ freecon(ref_context);
++ exit (errors);
++}
+--- coreutils-6.9/src/mkdir.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/mkdir.c 2007-03-23 11:59:21.000000000 +0000
+@@ -35,11 +35,18 @@
+
+ #define AUTHORS "David MacKenzie"
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h> /* for is_selinux_enabled() */
++#endif
++
+ /* The name this program was run with. */
+ char *program_name;
+
+ static struct option const longopts[] =
+ {
++#ifdef WITH_SELINUX
++ {"context", required_argument, NULL, 'Z'},
++#endif
+ {"mode", required_argument, NULL, 'm'},
+ {"parents", no_argument, NULL, 'p'},
+ {"verbose", no_argument, NULL, 'v'},
+@@ -61,6 +68,11 @@
+ Create the DIRECTORY(ies), if they do not already exist.\n\
+ \n\
+ "), stdout);
++#ifdef WITH_SELINUX
++ printf (_("\
++ -Z, --context=CONTEXT (SELinux) set security context to CONTEXT\n\
++"));
++#endif
+ fputs (_("\
+ Mandatory arguments to long options are mandatory for short options too.\n\
+ "), stdout);
+@@ -154,7 +166,11 @@
+
+ atexit (close_stdout);
+
++#ifdef WITH_SELINUX
++ while ((optc = getopt_long (argc, argv, "pm:vZ:", longopts, NULL)) != -1)
++#else
+ while ((optc = getopt_long (argc, argv, "pm:v", longopts, NULL)) != -1)
++#endif
+ {
+ switch (optc)
+ {
+@@ -167,6 +183,20 @@
+ case 'v': /* --verbose */
+ options.created_directory_format = _("created directory %s");
+ break;
++#ifdef WITH_SELINUX
++ case 'Z':
++ /* politely decline if we're not on a selinux-enabled kernel. */
++ if( !(is_selinux_enabled()>0)) {
++ fprintf( stderr, "Sorry, --context (-Z) can be used only on "
++ "a selinux-enabled kernel.\n" );
++ exit( 1 );
++ }
++ if (setfscreatecon(optarg)) {
++ fprintf( stderr, "Sorry, cannot set default context to %s.\n",
optarg);
++ exit( 1 );
++ }
++ break;
++#endif
+ case_GETOPT_HELP_CHAR;
+ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+ default:
+--- coreutils-6.9/src/stat.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/stat.c 2007-03-23 11:59:21.000000000 +0000
+@@ -55,6 +55,13 @@
+ # include <fs_info.h>
+ #endif
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#define SECURITY_ID_T security_context_t
++#else
++#define SECURITY_ID_T char *
++#endif
++
+ #include "system.h"
+
+ #include "error.h"
+@@ -158,6 +165,7 @@
+ };
+
+ static struct option const long_options[] = {
++ {"context", no_argument, 0, 'Z'},
+ {"dereference", no_argument, NULL, 'L'},
+ {"file-system", no_argument, NULL, 'f'},
+ {"filesystem", no_argument, NULL, 'f'}, /* obsolete and undocumented
alias */
+@@ -397,7 +405,7 @@
+ /* print statfs info */
+ static void
+ print_statfs (char *pformat, size_t prefix_len, char m, char const
*filename,
+- void const *data)
++ void const *data, SECURITY_ID_T scontext)
+ {
+ STRUCT_STATVFS const *statfsbuf = data;
+
+@@ -472,7 +480,10 @@
+ case 'd':
+ out_int (pformat, prefix_len, statfsbuf->f_ffree);
+ break;
+-
++ case 'C':
++ strcat (pformat, "s");
++ printf(scontext);
++ break;
+ default:
+ fputc ('?', stdout);
+ break;
+@@ -482,7 +493,7 @@
+ /* print stat info */
+ static void
+ print_stat (char *pformat, size_t prefix_len, char m,
+- char const *filename, void const *data)
++ char const *filename, void const *data, SECURITY_ID_T scontext)
+ {
+ struct stat *statbuf = (struct stat *) data;
+ struct passwd *pw_ent;
+@@ -595,6 +606,10 @@
+ else
+ out_uint (pformat, prefix_len, statbuf->st_ctime);
+ break;
++ case 'C':
++ strcat (pformat, "s");
++ printf(pformat,scontext);
++ break;
+ default:
+ fputc ('?', stdout);
+ break;
+@@ -641,8 +656,9 @@
+
+ static void
+ print_it (char const *format, char const *filename,
+- void (*print_func) (char *, size_t, char, char const *, void const
*),
+- void const *data)
++ void (*print_func) (char *, size_t, char, char const *, void const
*,
++ SECURITY_ID_T ),
++ void const *data, SECURITY_ID_T scontext)
+ {
+ /* Add 2 to accommodate our conversion of the stat `%s' format string
+ to the longer printf `%llu' one. */
+@@ -683,7 +699,7 @@
+ putchar ('%');
+ break;
+ default:
+- print_func (dest, len + 1, *fmt_char, filename, data);
++ print_func (dest, len + 1, *fmt_char, filename, data,
scontext);
+ break;
+ }
+ break;
+@@ -746,9 +762,21 @@
+
+ /* Stat the file system and print what we find. */
+ static bool
+-do_statfs (char const *filename, bool terse, char const *format)
++do_statfs (char const *filename, bool terse, bool secure, char const
*format)
+ {
+ STRUCT_STATVFS statfsbuf;
++ SECURITY_ID_T scontext = NULL;
++#ifdef WITH_SELINUX
++ if(is_selinux_enabled()) {
++ if (getfilecon(filename,&scontext)<0) {
++ if (secure) {
++ perror (filename);
++ return false;
++ }
++ scontext = NULL;
++ }
++ }
++#endif
+
+ if (STATFS (filename, &statfsbuf) != 0)
+ {
+@@ -759,25 +787,46 @@
+
+ if (format == NULL)
+ {
+- format = (terse
+- ? "%n %i %l %t %s %S %b %f %a %c %d\n"
+- : " File: \"%n\"\n"
+- " ID: %-8i Namelen: %-7l Type: %T\n"
+- "Block size: %-10s Fundamental block size: %S\n"
+- "Blocks: Total: %-10b Free: %-10f Available: %a\n"
+- "Inodes: Total: %-10c Free: %d\n");
++ if (terse)
++ {
++ if (secure)
++ format = "%n %i %l %t %s %S %b %f %a %c %d %C\n";
++ else
++ format = "%n %i %l %t %s %S %b %f %a %c %d\n";
++ }
++ else
++ {
++ if (secure)
++ format = " File: \"%n\"\n"
++ " ID: %-8i Namelen: %-7l Type: %T\n"
++ "Block size: %-10s Fundamental block size: %S\n"
++ "Blocks: Total: %-10b Free: %-10f Available: %a\n"
++ "Inodes: Total: %-10c Free: %d\n"
++ " S_Context: %C\n";
++ else
++ format = " File: \"%n\"\n"
++ " ID: %-8i Namelen: %-7l Type: %T\n"
++ "Block size: %-10s Fundamental block size: %S\n"
++ "Blocks: Total: %-10b Free: %-10f Available: %a\n"
++ "Inodes: Total: %-10c Free: %d\n";
++ }
+ }
+
+- print_it (format, filename, print_statfs, &statfsbuf);
++ print_it (format, filename, print_statfs, &statfsbuf, scontext);
++#ifdef WITH_SELINUX
++ if (scontext != NULL)
++ freecon(scontext);
++#endif
+ return true;
+ }
+
+ /* stat the file and print what we find */
+ static bool
+-do_stat (char const *filename, bool follow_links, bool terse,
++do_stat (char const *filename, bool follow_links, bool terse, bool secure,
+ char const *format)
+ {
+ struct stat statbuf;
++ SECURITY_ID_T scontext = NULL;
+
+ if ((follow_links ? stat : lstat) (filename, &statbuf) != 0)
+ {
+@@ -785,11 +834,29 @@
+ return false;
+ }
+
++#ifdef WITH_SELINUX
++ if(is_selinux_enabled()) {
++ int i;
++ if (!follow_links)
++ i=lgetfilecon(filename, &scontext);
++ else
++ i=getfilecon(filename, &scontext);
++ if (i == -1 && secure)
++ {
++ perror (filename);
++ return false;
++ }
++ }
++#endif
++
+ if (format == NULL)
+ {
+ if (terse)
+ {
+- format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
++ if (secure)
++ format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n";
++ else
++ format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
+ }
+ else
+ {
+@@ -807,16 +874,30 @@
+ }
+ else
+ {
+- format =
+- " File: %N\n"
+- " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+- "Device: %Dh/%dd\tInode: %-10i Links: %h\n"
+- "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
+- "Access: %x\n" "Modify: %y\n" "Change: %z\n";
++ if (secure)
++ format =
++ " File: %N\n"
++ " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
++ "Device: %Dh/%dd\tInode: %-10i Links: %-5h"
++ " Device type: %t,%T\n"
++ "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
++ " S_Context: %C\n"
++ "Access: %x\n" "Modify: %y\n" "Change: %z\n";
++ else
++ format =
++ " File: %N\n"
++ " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
++ "Device: %Dh/%dd\tInode: %-10i Links: %h\n"
++ "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
++ "Access: %x\n" "Modify: %y\n" "Change: %z\n";
+ }
+ }
+ }
+- print_it (format, filename, print_stat, &statbuf);
++ print_it (format, filename, print_stat, &statbuf, scontext);
++#ifdef WITH_SELINUX
++ if (scontext)
++ freecon(scontext);
++#endif
+ return true;
+ }
+
+@@ -833,6 +914,7 @@
+ Display file or file system status.\n\
+ \n\
+ -L, --dereference follow links\n\
++ -Z, --context print the security context \n\
+ -f, --file-system display file system status instead of file status\n\
+ "), stdout);
+ fputs (_("\
+@@ -892,6 +974,7 @@
+ %c Total file nodes in file system\n\
+ %d Free file nodes in file system\n\
+ %f Free blocks in file system\n\
++ %C - Security context in SELinux\n\
+ "), stdout);
+ fputs (_("\
+ %i File System ID in hex\n\
+@@ -916,6 +999,7 @@
+ bool follow_links = false;
+ bool fs = false;
+ bool terse = false;
++ bool secure = false;
+ char *format = NULL;
+ bool ok = true;
+
+@@ -927,7 +1011,7 @@
+
+ atexit (close_stdout);
+
+- while ((c = getopt_long (argc, argv, "c:fLt", long_options, NULL)) != -1)
++ while ((c = getopt_long (argc, argv, "c:fLtZ", long_options, NULL)) != -1)
+ {
+ switch (c)
+ {
+@@ -954,6 +1038,14 @@
+ case 't':
+ terse = true;
+ break;
++ case 'Z':
++ if((is_selinux_enabled()>0))
++ secure = 1;
++ else {
++ error (0, 0, _("Kernel is not SELinux enabled"));
++ usage (EXIT_FAILURE);
++ }
++ break;
+
+ case_GETOPT_HELP_CHAR;
+
+@@ -972,8 +1064,8 @@
+
+ for (i = optind; i < argc; i++)
+ ok &= (fs
+- ? do_statfs (argv[i], terse, format)
+- : do_stat (argv[i], follow_links, terse, format));
++ ? do_statfs (argv[i], terse, secure, format)
++ : do_stat (argv[i], follow_links, terse, secure, format));
+
+ exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ }
+--- coreutils-6.9/src/mkfifo.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/mkfifo.c 2007-03-23 11:59:21.000000000 +0000
+@@ -32,11 +32,18 @@
+
+ #define AUTHORS "David MacKenzie"
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h> /* for is_selinux_enabled() */
++#endif
++
+ /* The name this program was run with. */
+ char *program_name;
+
+ static struct option const longopts[] =
+ {
++#ifdef WITH_SELINUX
++ {"context", required_argument, NULL, 'Z'},
++#endif
+ {"mode", required_argument, NULL, 'm'},
+ {GETOPT_HELP_OPTION_DECL},
+ {GETOPT_VERSION_OPTION_DECL},
+@@ -56,6 +63,11 @@
+ Create named pipes (FIFOs) with the given NAMEs.\n\
+ \n\
+ "), stdout);
++#ifdef WITH_SELINUX
++ fputs (_("\
++ -Z, --context=CONTEXT set security context (quoted string)\n\
++"), stdout);
++#endif
+ fputs (_("\
+ Mandatory arguments to long options are mandatory for short options too.\n\
+ "), stdout);
+@@ -85,13 +97,32 @@
+
+ atexit (close_stdout);
+
+- while ((optc = getopt_long (argc, argv, "m:", longopts, NULL)) != -1)
++ while ((optc = getopt_long (argc, argv, "m:"
++#ifdef WITH_SELINUX
++ "Z:"
++#endif
++ , longopts, NULL)) != -1)
+ {
+ switch (optc)
+ {
+ case 'm':
+ specified_mode = optarg;
+ break;
++#ifdef WITH_SELINUX
++ case 'Z':
++ if (!(is_selinux_enabled()>0))
++ {
++ fprintf( stderr, "Sorry, --context (-Z) can be used only on "
++ "a selinux-enabled kernel.\n" );
++ exit (1);
++ }
++ if (setfscreatecon(optarg))
++ {
++ fprintf( stderr, "Sorry, cannot set default context to %s.\n",
optarg);
++ exit (1);
++ }
++ break;
++#endif
+ case_GETOPT_HELP_CHAR;
+ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+ default:
+--- coreutils-6.9/src/mknod.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/mknod.c 2007-03-23 11:59:21.000000000 +0000
+@@ -36,8 +36,15 @@
+ /* The name this program was run with. */
+ char *program_name;
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#endif
++
+ static struct option const longopts[] =
+ {
++#ifdef WITH_SELINUX
++ {"context", required_argument, NULL, 'Z'},
++#endif
+ {"mode", required_argument, NULL, 'm'},
+ {GETOPT_HELP_OPTION_DECL},
+ {GETOPT_VERSION_OPTION_DECL},
+@@ -58,6 +65,11 @@
+ Create the special file NAME of the given TYPE.\n\
+ \n\
+ "), stdout);
++#ifdef WITH_SELINUX
++ fputs(_("\
++ -Z, --context=CONTEXT set security context (quoted string)\n\
++"), stdout);
++#endif
+ fputs (_("\
+ Mandatory arguments to long options are mandatory for short options too.\n\
+ "), stdout);
+@@ -101,13 +113,31 @@
+
+ atexit (close_stdout);
+
++#ifdef WITH_SELINUX
++ while ((optc = getopt_long (argc, argv, "m:Z:", longopts, NULL)) != -1)
++#else
+ while ((optc = getopt_long (argc, argv, "m:", longopts, NULL)) != -1)
++#endif
+ {
+ switch (optc)
+ {
+ case 'm':
+ specified_mode = optarg;
+ break;
++#ifdef WITH_SELINUX
++ case 'Z':
++ /* politely decline if we're not on a selinux-enabled kernel. */
++ if( !(is_selinux_enabled()>0)) {
++ fprintf( stderr, "Sorry, --context (-Z) can be used only on "
++ "a selinux-enabled kernel.\n" );
++ exit( 1 );
++ }
++ if (setfscreatecon(optarg)) {
++ fprintf( stderr, "Sorry, cannot set default context to %s.\n",
optarg);
++ exit( 1 );
++ }
++ break;
++#endif
+ case_GETOPT_HELP_CHAR;
+ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+ default:
+--- coreutils-6.9/src/id.c.selinux 2007-03-23 11:59:21.000000000 +0000
++++ coreutils-6.9/src/id.c 2007-03-23 11:59:21.000000000 +0000
+@@ -37,6 +37,20 @@
+
+ int getugroups ();
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++static void print_context (char* context);
++/* Print the SELinux context */
++static void
++print_context(char *context)
++{
++ printf ("%s", context);
++}
++
++/* If nonzero, output only the SELinux context. -Z */
++static int just_context = 0;
++
++#endif
+ static void print_user (uid_t uid);
+ static void print_group (gid_t gid);
+ static void print_group_list (const char *username);
+@@ -55,8 +69,14 @@
+ /* True unless errors have been encountered. */
+ static bool ok = true;
+
++/* The SELinux context */
++/* Set `context' to a known invalid value so print_full_info() will *
++ * know when `context' has not been set to a meaningful value. */
++static security_context_t context=NULL;
++
+ static struct option const longopts[] =
+ {
++ {"context", no_argument, NULL, 'Z'},
+ {"group", no_argument, NULL, 'g'},
+ {"groups", no_argument, NULL, 'G'},
+ {"name", no_argument, NULL, 'n'},
+@@ -80,6 +100,7 @@
+ Print information for USERNAME, or the current user.\n\
+ \n\
+ -a ignore, for compatibility with other versions\n\
++ -Z, --context print only the context of the current process\n\
+ -g, --group print only the effective group ID\n\
+ -G, --groups print all group IDs\n\
+ -n, --name print a name instead of a number, for -ugG\n\
+@@ -101,6 +122,7 @@
+ main (int argc, char **argv)
+ {
+ int optc;
++ int selinux_enabled=(is_selinux_enabled()>0);
+
+ /* If true, output the list of all group IDs. -G */
+ bool just_group_list = false;
+@@ -119,13 +141,24 @@
+
+ atexit (close_stdout);
+
+- while ((optc = getopt_long (argc, argv, "agnruG", longopts, NULL)) != -1)
++ while ((optc = getopt_long (argc, argv, "agnruGZ", longopts, NULL)) != -1)
+ {
+ switch (optc)
+ {
+ case 'a':
+ /* Ignore -a, for compatibility with SVR4. */
+ break;
++#ifdef WITH_SELINUX
++ case 'Z':
++ /* politely decline if we're not on a selinux-enabled kernel. */
++ if( !selinux_enabled ) {
++ fprintf( stderr, "Sorry, --context (-Z) can be used only on "
++ "a selinux-enabled kernel.\n" );
++ exit( 1 );
++ }
++ just_context = 1;
++ break;
++#endif
+ case 'g':
+ just_group = true;
+ break;
+@@ -148,8 +181,28 @@
+ }
+ }
+
+- if (just_user + just_group + just_group_list > 1)
+- error (EXIT_FAILURE, 0, _("cannot print only user and only group"));
++#ifdef WITH_SELINUX
++ if (argc - optind == 1)
++ if (just_context) error (1, 0, _("\
++cannot print security context when user specified"));
++
++ if( just_context && !selinux_enabled)
++ error (1, 0, _("\
++cannot display context when selinux not enabled"));
++
++ /* If we are on a selinux-enabled kernel, get our context. *
++ * Otherwise, leave the context variable alone - it has *
++ * been initialized known invalid value; if we see this invalid *
++ * value later, we will know we are on a non-selinux kernel. */
++ if( selinux_enabled )
++ {
++ if (getcon(&context) && just_context)
++ error (1, 0, "can't get process context");
++ }
++#endif
++
++ if (just_user + just_group + just_group_list + just_context > 1)
++ error (EXIT_FAILURE, 0, _("cannot print \"only\" of more than one
choice"));
+
+ if (just_user + just_group + just_group_list == 0 && (use_real |
use_name))
+ error (EXIT_FAILURE, 0,
+@@ -183,6 +236,10 @@
+ print_group (use_real ? rgid : egid);
+ else if (just_group_list)
+ print_group_list (argv[optind]);
++#ifdef WITH_SELINUX
++ else if (just_context)
++ print_context (context);
++#endif
+ else
+ print_full_info (argv[optind]);
+ putchar ('\n');
+@@ -407,4 +464,9 @@
+ free (groups);
+ }
+ #endif /* HAVE_GETGROUPS */
++#ifdef WITH_SELINUX
++ if ( context != NULL ) {
++ printf(" context=%s",context);
++ }
++#endif
+ }
+--- coreutils-6.9/src/mv.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/mv.c 2007-03-23 11:59:21.000000000 +0000
+@@ -33,6 +33,11 @@
+ #include "quote.h"
+ #include "remove.h"
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h> /* for is_selinux_enabled() */
++int selinux_enabled=0;
++#endif
++
+ /* The official name of this program (e.g., no `g' prefix). */
+ #define PROGRAM_NAME "mv"
+
+@@ -126,6 +131,10 @@
+ x->preserve_links = true;
+ x->preserve_mode = true;
+ x->preserve_timestamps = true;
++#ifdef WITH_SELINUX
++ x->preserve_security_context = true;
++ x->set_security_context = false;
++#endif
+ x->require_preserve = false; /* FIXME: maybe make this an option */
+ x->recursive = true;
+ x->sparse_mode = SPARSE_AUTO; /* FIXME: maybe make this an option */
+@@ -357,6 +366,10 @@
+
+ cp_option_init (&x);
+
++#ifdef WITH_SELINUX
++ selinux_enabled= (is_selinux_enabled()>0);
++#endif
++
+ /* FIXME: consider not calling getenv for SIMPLE_BACKUP_SUFFIX unless
+ we'll actually use backup_suffix_string. */
+ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
+--- /dev/null 2007-03-23 08:54:03.819414923 +0000
++++ coreutils-6.9/src/runcon.c 2007-03-23 11:59:21.000000000 +0000
+@@ -0,0 +1,253 @@
++/*
++ * runcon [ context |
++ * ( [ -c ] [ -r role ] [-t type] [ -u user ] [ -l levelrange ] )
++ * command [arg1 [arg2 ...] ]
++ *
++ * attempt to run the specified command with the specified context.
++ *
++ * -r role : use the current context with the specified role
++ * -t type : use the current context with the specified type
++ * -u user : use the current context with the specified user
++ * -l level : use the current context with the specified level range
++ * -c : compute process transition context before modifying
++ *
++ * Contexts are interpreted as follows:
++ *
++ * Number of MLS
++ * components system?
++ *
++ * 1 - type
++ * 2 - role:type
++ * 3 Y role:type:range
++ * 3 N user:role:type
++ * 4 Y user:role:type:range
++ * 4 N error
++ */
++
++#include <config.h>
++#include <unistd.h>
++#include <stdio.h>
++#include <getopt.h>
++#include <selinux/context.h>
++#include <selinux/selinux.h>
++#include <selinux/flask.h>
++#include <errno.h>
++#include "system.h"
++extern int errno;
++
++/* The name the program was run with. */
++char *program_name;
++
++/* If nonzero, display usage information and exit. */
++static int show_help;
++
++/* If nonzero, print the version on standard output and exit. */
++static int show_version;
++
++void
++usage(int status)
++{
++ printf(_("Usage: %s CONTEXT COMMAND [args]\n"
++ " or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND
[args]\n"
++ "Run a program in a different security context.\n\n"
++ " CONTEXT Complete security context\n"
++ " -c, --compute compute process transition context before
modifying\n"
++ " -t, --type=TYPE type (for same role as parent)\n"
++ " -u, --user=USER user identity\n"
++ " -r, --role=ROLE role\n"
++ " -l, --range=RANGE levelrange\n"
++ " --help display this help and exit\n"
++ " --version output version information and exit\n"),
++ program_name, program_name);
++ exit(status);
++}
++
++int
++main(int argc,char **argv,char **envp )
++{
++ char *role = 0;
++ char *range = 0;
++ char *user = 0;
++ char *type = 0;
++ char *context = NULL;
++ security_context_t cur_context = NULL;
++ security_context_t file_context = NULL;
++ security_context_t new_context = NULL;
++ int compute_trans = 0;
++
++ context_t con;
++
++ program_name = argv[0];
++ setlocale (LC_ALL, "");
++ bindtextdomain (PACKAGE, LOCALEDIR);
++ textdomain (PACKAGE);
++
++ while (1) {
++ int c;
++ int this_option_optind = optind ? optind : 1;
++ int option_index = 0;
++ static struct option long_options[] = {
++ { "role", 1, 0, 'r' },
++ { "type", 1, 0, 't' },
++ { "user", 1, 0, 'u' },
++ { "range", 1, 0, 'l' },
++ { "compute", 0, 0, 'c' },
++ { "help", 0, &show_help, 1 },
++ { "version", 0, &show_version, 1 },
++ { 0, 0, 0, 0 }
++ };
++ c = getopt_long(argc, argv, "r:t:u:l:c", long_options, &option_index);
++ if ( c == -1 ) {
++ break;
++ }
++ switch ( c ) {
++ case 0:
++ break;
++ case 'r':
++ if ( role ) {
++ fprintf(stderr,_("multiple roles\n"));
++ exit(1);
++ }
++ role = optarg;
++ break;
++ case 't':
++ if ( type ) {
++ fprintf(stderr,_("multiple types\n"));
++ exit(1);
++ }
++ type = optarg;
++ break;
++ case 'u':
++ if ( user ) {
++ fprintf(stderr,_("multiple users\n"));
++ exit(1);
++ }
++ user = optarg;
++ break;
++ case 'l':
++ if ( range ) {
++ fprintf(stderr,_("multiple levelranges\n"));
++ exit(1);
++ }
++ range = optarg;
++ break;
++ case 'c':
++ compute_trans = 1;
++ break;
++ default:
++ usage(1);
++ break;
++ }
++ }
++
++ if (show_version) {
++ printf("runcon (%s) %s\n", GNU_PACKAGE, VERSION);
++ exit(0);
++ }
++
++ if (show_help)
++ usage(0);
++
++ if ( !(user || role || type || range || compute_trans)) {
++ if ( optind >= argc ) {
++ fprintf(stderr,_("must specify -c, -t, -u, -l, -r, or context\n"));
++ usage(1);
++ }
++ context = argv[optind++];
++ }
++
++ if ( optind >= argc ) {
++ fprintf(stderr,_("no command found\n"));
++ usage(1);
++ }
++
++ if( is_selinux_enabled() != 1 ) {
++ fprintf( stderr,
++ _("runcon may be used only on a SELinux kernel.\n") );
++ exit(-1);
++ }
++
++ if ( context ) {
++ con = context_new(context);
++ if (!con) {
++ fprintf(stderr,_("%s is not a valid context\n"), context);
++ exit(1);
++ }
++ }
++ else {
++ if (getcon(&cur_context) < 0) {
++ fprintf(stderr,_("Couldn't get current context.\n"));
++ exit(1);
++ }
++
++ /* We will generate context based on process transition */
++ if ( compute_trans ) {
++ /* Get context of file to be executed */
++ if (getfilecon(argv[optind], &file_context) == -1) {
++ fprintf(stderr,_("unable to retrieve attributes of %s\n"),
++ argv[optind]);
++ exit(1);
++ }
++ /* compute result of process transition */
++ if (security_compute_create(cur_context, file_context,
++ SECCLASS_PROCESS, &new_context) != 0) {
++ fprintf(stderr,_("unable to compute a new context\n"));
++ exit(1);
++ }
++ /* free contexts */
++ freecon(file_context);
++ freecon(cur_context);
++
++ /* set cur_context equal to new_context */
++ cur_context = new_context;
++ }
++
++ con = context_new(cur_context);
++ if (!con) {
++ fprintf(stderr,_("%s is not a valid context\n"), cur_context);
++ exit(1);
++ }
++ if ( user ) {
++ if ( context_user_set(con,user)) {
++ fprintf(stderr,_("failed to set new user %s\n"),user);
++ exit(1);
++ }
++ }
++ if ( type ) {
++ if ( context_type_set(con,type)) {
++ fprintf(stderr,_("failed to set new type %s\n"),type);
++ exit(1);
++ }
++ }
++ if ( range ) {
++ if ( context_range_set(con,range)) {
++ fprintf(stderr,_("failed to set new range %s\n"),range);
++ exit(1);
++ }
++ }
++ if ( role ) {
++ if (context_role_set(con,role)) {
++ fprintf(stderr,_("failed to set new role %s\n"),role);
++ exit(1);
++ }
++ }
++ }
++
++ if (security_check_context(context_str(con)) < 0) {
++ fprintf(stderr, _("%s is not a valid context\n"), context_str(con));
++ exit(1);
++ }
++
++ if (setexeccon(context_str(con))!=0) {
++ fprintf(stderr,_("unable to setup security context %s\n"),
context_str(con));
++ exit(1);
++ }
++ if (cur_context!=NULL)
++ freecon(cur_context);
++
++ if ( execvp(argv[optind],argv+optind) ) {
++ perror("execvp");
++ exit(1);
++ }
++ return 1; /* can't reach this statement.... */
++}
+--- coreutils-6.9/src/copy.c.selinux 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/src/copy.c 2007-03-23 12:00:30.000000000 +0000
+@@ -54,6 +54,11 @@
+ #include "xreadlink.h"
+ #include "yesno.h"
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h> /* for is_selinux_enabled() */
++extern int selinux_enabled;
++#endif
++
+ #ifndef HAVE_FCHOWN
+ # define HAVE_FCHOWN false
+ # define fchown(fd, uid, gid) (-1)
+@@ -302,6 +307,30 @@
+ {
+ dest_desc = open (dst_name, O_WRONLY | O_TRUNC | O_BINARY);
+
++#ifdef WITH_SELINUX
++ if (dest_desc >= 0 && selinux_enabled &&
++ (x->preserve_security_context || x->set_security_context))
++ {
++ security_context_t con;
++ if(getfscreatecon(&con) == -1)
++ {
++ return_val = false;
++ goto close_src_desc;
++ }
++
++ if (con)
++ {
++ if(fsetfilecon(dest_desc, con) == -1)
++ {
++ return_val = false;
++ freecon(con);
++ goto close_src_desc;
++ }
++ freecon(con);
++ }
++ }
++#endif
++
+ if (dest_desc < 0 && x->unlink_dest_after_failed_open)
+ {
+ if (unlink (dst_name) != 0)
+@@ -1539,6 +1568,32 @@
+ In such cases, set this variable to zero. */
+ preserve_metadata = true;
+
++#ifdef WITH_SELINUX
++ if (x->preserve_security_context && selinux_enabled)
++ {
++ security_context_t con;
++
++ if (lgetfilecon (src_name, &con) >= 0)
++ {
++ if (setfscreatecon(con) < 0)
++ {
++ error (0, errno, _("cannot set setfscreatecon %s"), quote
(con));
++ if (x->require_preserve) {
++ freecon(con);
++ return 1;
++ }
++ }
++ freecon(con);
++ }
++ else {
++ if (( errno != ENOTSUP ) && ( errno != ENODATA )) {
++ error (0, errno, _("cannot lgetfilecon %s"), quote (src_name));
++ return 1;
++ }
++ }
++ }
++#endif
++
+ if (S_ISDIR (src_mode))
+ {
+ struct dir_list *dir;
+@@ -1614,6 +1669,10 @@
+ {
+ /* Here, we are crossing a file system boundary and cp's -x option
+ is in effect: so don't copy the contents of this directory. */
++#ifdef WITH_SELINUX
++ if (x->preserve_security_context && selinux_enabled)
++ setfscreatecon(NULL);
++#endif
+ }
+ else
+ {
+@@ -1762,6 +1821,11 @@
+ }
+ }
+
++#ifdef WITH_SELINUX
++ if (x->preserve_security_context && selinux_enabled)
++ setfscreatecon(NULL);
++#endif
++
+ /* There's no need to preserve timestamps or permissions. */
+ preserve_metadata = false;
+
+@@ -1895,6 +1959,11 @@
+
+ un_backup:
+
++#ifdef WITH_SELINUX
++ if (x->preserve_security_context && selinux_enabled)
++ setfscreatecon(NULL);
++#endif
++
+ /* We have failed to create the destination file.
+ If we've just added a dev/ino entry via the remember_copied
+ call above (i.e., unless we've just failed to create a hard link),
+--- coreutils-6.9/src/install.c.selinux 2007-03-18 21:36:43.000000000
+0000
++++ coreutils-6.9/src/install.c 2007-03-23 11:59:21.000000000 +0000
+@@ -49,6 +49,43 @@
+ # include <sys/wait.h>
+ #endif
+
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h> /* for is_selinux_enabled() */
++int selinux_enabled=0;
++static int use_default_selinux_context = 1;
++/* Modify file context to match the specified policy,
++ If an error occurs the file will remain with the default directory
++ context.*/
++static void setdefaultfilecon(const char *path) {
++ struct stat st;
++ security_context_t scontext=NULL;
++ if (selinux_enabled != 1) {
++ /* Indicate no context found. */
++ return;
++ }
++ if (lstat(path, &st) != 0)
++ return;
++
++ /* If there's an error determining the context, or it has none,
++ return to allow default context */
++ if ((matchpathcon(path, st.st_mode, &scontext) != 0) ||
++ (strcmp(scontext, "<<none>>") == 0)) {
++ if (scontext != NULL) {
++ freecon(scontext);
++ }
++ return;
++ }
++ if (lsetfilecon(path, scontext) < 0) {
++ if (errno != ENOTSUP) {
++ error (0, errno,
++ _("warning: failed to change context of %s to
%s"), path, scontext);
++ }
++ }
++ freecon(scontext);
++ return;
++}
++#endif
++
+ #if ! HAVE_ENDGRENT
+ # define endgrent() ((void) 0)
+ #endif
+@@ -124,12 +161,18 @@
+ static struct option const long_options[] =
+ {
+ {"backup", optional_argument, NULL, 'b'},
++#ifdef WITH_SELINUX
++ {"context", required_argument, NULL, 'Z'},
++#endif
+ {"directory", no_argument, NULL, 'd'},
+ {"group", required_argument, NULL, 'g'},
+ {"mode", required_argument, NULL, 'm'},
+ {"no-target-directory", no_argument, NULL, 'T'},
+ {"owner", required_argument, NULL, 'o'},
+ {"preserve-timestamps", no_argument, NULL, 'p'},
++#ifdef WITH_SELINUX
++ {"preserve_context", no_argument, NULL, 'P'},
++#endif
+ {"strip", no_argument, NULL, 's'},
+ {"suffix", required_argument, NULL, 'S'},
+ {"target-directory", required_argument, NULL, 't'},
+@@ -169,6 +212,10 @@
+ x->stdin_tty = false;
+
+ x->update = false;
++#ifdef WITH_SELINUX
++ x->preserve_security_context = false;
++ x->set_security_context = false;
++#endif
+ x->verbose = false;
+ x->dest_info = NULL;
+ x->src_info = NULL;
+@@ -222,6 +269,10 @@
+ bool no_target_directory = false;
+ int n_files;
+ char **file;
++#ifdef WITH_SELINUX
++ /* set iff kernel has extra selinux system calls */
++ selinux_enabled = (is_selinux_enabled()>0);
++#endif
+
+ initialize_main (&argc, &argv);
+ program_name = argv[0];
+@@ -243,7 +294,11 @@
+ we'll actually use backup_suffix_string. */
+ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
+
++#ifdef WITH_SELINUX
++ while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pPt:TvS:Z:",
long_options,
++#else
+ while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pt:TvS:",
long_options,
++#endif
+ NULL)) != -1)
+ {
+ switch (optc)
+@@ -305,6 +360,41 @@
+ case 'T':
+ no_target_directory = true;
+ break;
++#ifdef WITH_SELINUX
++ case 'P':
++ /* politely decline if we're not on a selinux-enabled kernel. */
++ if( !selinux_enabled ) {
++ fprintf( stderr, "Warning: ignoring --preserve_context (-P) "
++ "because the kernel is not selinux-enabled.\n" );
++ break;
++ }
++ if ( x.set_security_context ) {
++ (void) fprintf(stderr, "%s: cannot force target context and
preserve it\n", argv[0]);
++ exit( 1 );
++ }
++ x.preserve_security_context = true;
++ use_default_selinux_context = 0;
++ break ;
++ case 'Z':
++ /* politely decline if we're not on a selinux-enabled kernel. */
++ if( !selinux_enabled) {
++ fprintf( stderr, "Warning: ignoring --context (-Z) "
++ "because the kernel is not selinux-enabled.\n" );
++ break;
++ }
++ if ( x.preserve_security_context ) {
++
++ (void) fprintf(stderr, "%s: cannot force target context
== '%s' and preserve it\n", argv[0], optarg);
++ exit( 1 );
++ }
++ use_default_selinux_context = 0;
++ x.set_security_context = true;
++ if (setfscreatecon(optarg)) {
++ (void) fprintf(stderr, "%s: cannot setup default context ==
'%s'\n", argv[0], optarg);
++ exit(1);
++ }
++ break;
++#endif
+ case_GETOPT_HELP_CHAR;
+ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+ default:
+@@ -523,6 +613,10 @@
+ else
+ return true;
+
++#ifdef WITH_SELINUX
++ if (use_default_selinux_context)
++ setdefaultfilecon(name);
++#endif
+ return false;
+ }
+
+@@ -687,6 +781,11 @@
+ -T, --no-target-directory treat DEST as a normal file\n\
+ -v, --verbose print the name of each directory as it is created\n\
+ "), stdout);
++ fputs (_("\
++ -P, --preserve_context (SELinux) Preserve security context\n\
++ -Z, --context=CONTEXT (SELinux) Set security context of files and
directories\n\
++"), stdout);
++
+ fputs (HELP_OPTION_DESCRIPTION, stdout);
+ fputs (VERSION_OPTION_DESCRIPTION, stdout);
+ fputs (_("\
+--- coreutils-6.9/configure.ac.selinux 2007-03-23 11:59:21.000000000 +0000
++++ coreutils-6.9/configure.ac 2007-03-23 11:59:21.000000000 +0000
+@@ -48,6 +48,13 @@
+ LIB_PAM="-ldl -lpam -lpam_misc"
+ AC_SUBST(LIB_PAM)])
+
++dnl Give the chance to enable SELINUX
++AC_ARG_ENABLE(selinux, dnl
++[ --enable-selinux Enable use of the SELINUX libraries],
++[AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
++LIB_SELINUX="-lselinux"
++AC_SUBST(LIB_SELINUX)])
++
+ AC_CHECK_FUNCS(uname,
+ OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uname\$(EXEEXT)"
+ MAN="$MAN uname.1")
+--- coreutils-6.9/man/stat.1.selinux 2007-03-22 21:21:53.000000000 +0000
++++ coreutils-6.9/man/stat.1 2007-03-23 11:59:21.000000000 +0000
+@@ -28,6 +28,9 @@
+ \fB\-t\fR, \fB\-\-terse\fR
+ print the information in terse form
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR
++print security context information for SELinux if available.
++.TP
+ \fB\-\-help\fR
+ display this help and exit
+ .TP
+@@ -51,6 +54,9 @@
+ %d
+ Device number in decimal
+ .TP
++%C
++SELinux security context
++.TP
+ %D
+ Device number in hex
+ .TP
+--- /dev/null 2007-03-23 08:54:03.819414923 +0000
++++ coreutils-6.9/man/chcon.x 2007-03-23 11:59:21.000000000 +0000
+@@ -0,0 +1,4 @@
++[NAME]
++chcon \- change file security context
++[DESCRIPTION]
++.\" Add any additional description here
+--- /dev/null 2007-03-23 08:54:03.819414923 +0000
++++ coreutils-6.9/man/chcon.1 2007-03-23 11:59:21.000000000 +0000
+@@ -0,0 +1,64 @@
++.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
++.SH NAME
++chcon \- change SELinux security context
++.SH SYNOPSIS
++.B chcon
++[\fIOPTION\fR]...\fI CONTEXT FILE\fR...
++.br
++.B chcon
++[\fIOPTION\fR]...\fI --reference=RFILE FILE\fR...
++.SH DESCRIPTION
++.PP
++." Add any additional description here
++.PP
++Change the security context of each FILE to CONTEXT.
++.TP
++\fB\-c\fR, \fB\-\-changes\fR
++like verbose but report only when a change is made
++.TP
++\fB\-h\fR, \fB\-\-no\-dereference\fR
++affect symbolic links instead of any referenced file (available only on
systems with lchown system call)
++.TP
++\fB\-f\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR
++suppress most error messages
++.TP
++\fB\-l\fR, \fB\-\-range\fR
++set range RANGE in the target security context
++.TP
++\fB\-\-reference\fR=\fIRFILE\fR
++use RFILE's context instead of using a CONTEXT value
++.TP
++\fB\-R\fR, \fB\-\-recursive\fR
++change files and directories recursively
++.TP
++\fB\-r\fR, \fB\-\-role\fR
++set role ROLE in the target security context
++.TP
++\fB\-t\fR, \fB\-\-type\fR
++set type TYPE in the target security context
++.TP
++\fB\-u\fR, \fB\-\-user\fR
++set user USER in the target security context
++.TP
++\fB\-v\fR, \fB\-\-verbose\fR
++output a diagnostic for every file processed
++.TP
++\fB\-\-help\fR
++display this help and exit
++.TP
++\fB\-\-version\fR
++output version information and exit
++.SH "REPORTING BUGS"
++Report bugs to <https://bugzilla.redhat.com/bugzilla>.
++.SH "SEE ALSO"
++The full documentation for
++.B chcon
++is maintained as a Texinfo manual. If the
++.B info
++and
++.B chcon
++programs are properly installed at your site, the command
++.IP
++.B info chcon
++.PP
++should give you access to the complete manual.
+--- coreutils-6.9/man/dir.1.selinux 2007-03-22 21:21:48.000000000 +0000
++++ coreutils-6.9/man/dir.1 2007-03-23 11:59:21.000000000 +0000
+@@ -205,6 +205,20 @@
+ .TP
+ \fB\-1\fR
+ list one file per line
++.PP
++SELINUX options:
++.TP
++\fB\-\-lcontext\fR
++Display security context. Enable \fB\-l\fR. Lines
++will probably be too wide for most displays.
++.TP
++\fB\-\-context\fR
++Display security context so it fits on most
++displays. Displays only mode, user, group,
++security context and file name.
++.TP
++\fB\-\-scontext\fR
++Display only security context and file name.
+ .TP
+ \fB\-\-help\fR
+ display this help and exit
+--- coreutils-6.9/man/mkfifo.1.selinux 2007-03-22 21:21:51.000000000 +0000
++++ coreutils-6.9/man/mkfifo.1 2007-03-23 11:59:21.000000000 +0000
+@@ -12,6 +12,9 @@
+ .PP
+ Mandatory arguments to long options are mandatory for short options too.
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR
++set security context (quoted string)
++.TP
+ \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
+ set file permission bits to MODE, not a=rw \- umask
+ .TP
+--- coreutils-6.9/man/Makefile.am.selinux 2007-03-23 11:59:21.000000000
+0000
++++ coreutils-6.9/man/Makefile.am 2007-03-23 11:59:21.000000000 +0000
+@@ -29,7 +29,7 @@
+ shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 \
+ su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
+ tty.1 unexpand.1 uniq.1 unlink.1 vdir.1 wc.1 \
+- whoami.1 yes.1 $(MAN)
++ whoami.1 yes.1 chcon.1 runcon.1 $(MAN)
+ optional_mans = \
+ chroot.1 hostid.1 nice.1 pinky.1 stty.1 uname.1 uptime.1 users.1 who.1
+
+@@ -141,6 +141,8 @@
+ who.1: $(common_dep) $(srcdir)/who.x ../src/who.c
+ whoami.1: $(common_dep) $(srcdir)/whoami.x ../src/whoami.c
+ yes.1: $(common_dep) $(srcdir)/yes.x ../src/yes.c
++chcon.1: $(common_dep) $(srcdir)/chcon.x ../src/chcon.c
++runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c
+
+ SUFFIXES = .x .1
+
+--- coreutils-6.9/man/cp.1.selinux 2007-03-22 21:21:47.000000000 +0000
++++ coreutils-6.9/man/cp.1 2007-03-23 11:59:21.000000000 +0000
+@@ -57,7 +57,7 @@
+ .TP
+ \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
+ preserve the specified attributes (default:
+-mode,ownership,timestamps), if possible
++mode,ownership,timestamps) and security contexts, if possible
+ additional attributes: links, all
+ .TP
+ \fB\-\-no\-preserve\fR=\fIATTR_LIST\fR
+@@ -106,6 +106,9 @@
+ \fB\-\-help\fR
+ display this help and exit
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR
++set security context of copy to CONTEXT
++.TP
+ \fB\-\-version\fR
+ output version information and exit
+ .PP
+--- coreutils-6.9/man/id.1.selinux 2007-03-22 21:21:50.000000000 +0000
++++ coreutils-6.9/man/id.1 2007-03-23 11:59:21.000000000 +0000
+@@ -13,6 +13,9 @@
+ \fB\-a\fR
+ ignore, for compatibility with other versions
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR
++print only the security context of the current process
++.TP
+ \fB\-g\fR, \fB\-\-group\fR
+ print only the effective group ID
+ .TP
+--- /dev/null 2007-03-23 08:54:03.819414923 +0000
++++ coreutils-6.9/man/runcon.x 2007-03-23 11:59:21.000000000 +0000
+@@ -0,0 +1,14 @@
++[NAME]
++runcon \- run command with specified security context
++[DESCRIPTION]
++Run COMMAND with completely-specified CONTEXT, or with current or
++transitioned security context modified by one or more of LEVEL,
++ROLE, TYPE, and USER.
++.PP
++If none of \fI-c\fR, \fI-t\fR, \fI-u\fR, \fI-r\fR, or \fI-l\fR, is
specified,
++the first argument is used as the complete context. Any additional
++arguments after \fICOMMAND\fR are interpreted as arguments to the
++command.
++.PP
++Note that only carefully-chosen contexts are likely to successfully
++run.
+--- /dev/null 2007-03-23 08:54:03.819414923 +0000
++++ coreutils-6.9/man/runcon.1 2007-03-23 11:59:21.000000000 +0000
+@@ -0,0 +1,45 @@
++.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
++.SH NAME
++runcon \- run command with specified SELinux security context
++.SH SYNOPSIS
++.B runcon
++[\fI-c\fR] [\fI-t TYPE\fR] [\fI-l LEVEL\fR] [\fI-u USER\fR] [\fI-r ROLE\fR]
\fICOMMAND\fR [\fIARGS...\fR]
++.PP
++or
++.PP
++.B runcon
++\fICONTEXT\fR \fICOMMAND\fR [\fIargs...\fR]
++.PP
++.br
++.SH DESCRIPTION
++.PP
++.\" Add any additional description here
++.PP
++Run COMMAND with completely-specified CONTEXT, or with current or
++transitioned security context modified by one or more of LEVEL,
++ROLE, TYPE, and USER.
++.TP
++\fB\-c\fR
++compute process transition before modifying context
++.TP
++\fB\-t\fR
++change current type to the specified type
++.TP
++\fB\-l\fR
++change current level range to the specified range
++.TP
++\fB\-r\fR
++change current role to the specified role
++.TP
++\fB\-u\fR
++change current user to the specified user
++.TP
++\fB\-\-\fR
++The \fB\-\-\fR flag indicates that \fBruncon\fR should stop processing
command
++line arguments. Further arguments will be passed to COMMAND.
++.PP
++If none of \fI-c\fR, \fI-t\fR, \fI-u\fR, \fI-r\fR, or \fI-l\fR, is
specified,
++the first argument is used as the complete context.
++.PP
++Note that only carefully-chosen contexts are likely to successfully
++run.
+--- coreutils-6.9/man/mknod.1.selinux 2007-03-22 21:21:51.000000000 +0000
++++ coreutils-6.9/man/mknod.1 2007-03-23 11:59:21.000000000 +0000
+@@ -12,6 +12,9 @@
+ .PP
+ Mandatory arguments to long options are mandatory for short options too.
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR
++set security context (quoted string)
++.TP
+ \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
+ set file permission bits to MODE, not a=rw \- umask
+ .TP
+--- coreutils-6.9/man/ls.1.selinux 2007-03-22 21:21:51.000000000 +0000
++++ coreutils-6.9/man/ls.1 2007-03-23 11:59:21.000000000 +0000
+@@ -205,6 +205,20 @@
+ .TP
+ \fB\-1\fR
+ list one file per line
++.PP
++SELinux options:
++.TP
++\fB\-\-lcontext\fR
++Display security context. Enable \fB\-l\fR. Lines
++will probably be too wide for most displays.
++.TP
++\fB\-Z\fR, \fB\-\-context\fR
++Display security context so it fits on most
++displays. Displays only mode, user, group,
++security context and file name.
++.TP
++\fB\-\-scontext\fR
++Display only security context and file name.
+ .TP
+ \fB\-\-help\fR
+ display this help and exit
+--- coreutils-6.9/man/mkdir.1.selinux 2007-03-22 21:21:51.000000000 +0000
++++ coreutils-6.9/man/mkdir.1 2007-03-23 11:59:21.000000000 +0000
+@@ -12,6 +12,8 @@
+ .PP
+ Mandatory arguments to long options are mandatory for short options too.
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR (SELinux) set security context
to CONTEXT
++.TP
+ \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
+ set file mode (as in chmod), not a=rwx \- umask
+ .TP
+--- coreutils-6.9/man/vdir.1.selinux 2007-03-22 21:21:55.000000000 +0000
++++ coreutils-6.9/man/vdir.1 2007-03-23 11:59:21.000000000 +0000
+@@ -205,6 +205,20 @@
+ .TP
+ \fB\-1\fR
+ list one file per line
++.PP
++SELINUX options:
++.TP
++\fB\-\-lcontext\fR
++Display security context. Enable \fB\-l\fR. Lines
++will probably be too wide for most displays.
++.TP
++\fB\-\-context\fR
++Display security context so it fits on most
++displays. Displays only mode, user, group,
++security context and file name.
++.TP
++\fB\-\-scontext\fR
++Display only security context and file name.
+ .TP
+ \fB\-\-help\fR
+ display this help and exit
+--- coreutils-6.9/man/install.1.selinux 2007-03-22 21:21:50.000000000
+0000
++++ coreutils-6.9/man/install.1 2007-03-23 11:59:21.000000000 +0000
+@@ -67,6 +67,11 @@
+ .TP
+ \fB\-v\fR, \fB\-\-verbose\fR
+ print the name of each directory as it is created
++.HP
++\fB\-P\fR, \fB\-\-preserve_context\fR (SELinux) Preserve security context
++.TP
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR
++(SELinux) Set security context of files and directories
+ .TP
+ \fB\-\-help\fR
+ display this help and exit
diff --git a/utils/counter-linux/BUILD b/utils/counter-linux/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/utils/counter-linux/BUILD
@@ -0,0 +1 @@
+true
diff --git a/utils/counter-linux/DEPENDS b/utils/counter-linux/DEPENDS
new file mode 100755
index 0000000..7f2cdb1
--- /dev/null
+++ b/utils/counter-linux/DEPENDS
@@ -0,0 +1,2 @@
+depends MAIL-TRANSPORT-AGENT &&
+depends perl
diff --git a/utils/counter-linux/DETAILS b/utils/counter-linux/DETAILS
new file mode 100755
index 0000000..97ffdbe
--- /dev/null
+++ b/utils/counter-linux/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=counter-linux
+ VERSION=0.30
+ SOURCE=machine-update
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ FORCE_DOWNLOAD="on"
+ SOURCE_URL[0]=http://counter.li.org/scripts/$SOURCE
+ SOURCE_IGNORE=volatile
+ LICENSE[0]=GPL
+ KEYWORDS="utils counter"
+ WEB_SITE=http://counter.li.org/scripts/
+ ENTERED=20070823
+ SHORT='Counter Linux.org machine update script'
+cat << EOF
+This script registers or updates a machine's info in the counter. The info
+registered will show up in the list of machines on your homepage.
+
+Instructions for use:
+ * Save machine-update to a file named "machine-update" in any convenient
+ place
+ * From a terminal window, change directory to that place.
+ * Change it to be executable (chmod +x machine-update)
+ * Run "./machine-update -i" to enter information
+ * Run "./machine-update -m" to send mail
+ * Run "./machine-update -c" to add it to your crontab file
+EOF
diff --git a/utils/counter-linux/HISTORY b/utils/counter-linux/HISTORY
new file mode 100644
index 0000000..73fa333
--- /dev/null
+++ b/utils/counter-linux/HISTORY
@@ -0,0 +1,3 @@
+2007-08-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created
+
diff --git a/utils/counter-linux/INSTALL b/utils/counter-linux/INSTALL
new file mode 100755
index 0000000..752ebe4
--- /dev/null
+++ b/utils/counter-linux/INSTALL
@@ -0,0 +1,2 @@
+install -m 0755 -o root -g root $SOURCE_CACHE/$SOURCE \
+ $INSTALL_ROOT/usr/bin/$SOURCE
diff --git a/utils/counter-linux/PRE_BUILD b/utils/counter-linux/PRE_BUILD
new file mode 100755
index 0000000..b3f3f78
--- /dev/null
+++ b/utils/counter-linux/PRE_BUILD
@@ -0,0 +1 @@
+verify_file ''
diff --git a/utils/dialog/DETAILS b/utils/dialog/DETAILS
index 7c67ed4..23b2ee0 100755
--- a/utils/dialog/DETAILS
+++ b/utils/dialog/DETAILS
@@ -1,5 +1,5 @@
SPELL=dialog
- VERSION=1.1-20070528
+ VERSION=1.1-20070704
SOURCE=$SPELL-$VERSION.tgz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dialog/HISTORY b/utils/dialog/HISTORY
index 6e5e0bb..026eaf5 100644
--- a/utils/dialog/HISTORY
+++ b/utils/dialog/HISTORY
@@ -1,3 +1,6 @@
+2007-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1-20070724
+
2007-06-01 Remko van der Vossen <wich AT stack.nl>
* DETAILS: Version bumped to 1.1-20070528
Converted to upstream GPG source checking
diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index f139554..9d7ca3d 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,4 +1,10 @@
if [[ $GNUPLOT_SCM == "y" ]]; then
./prepare
fi &&
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ LIBS="-llua $LIBS"
+ cd $SOURCE_DIRECTORY/gnuplot_lua_terminal &&
+ lua gnuplot.lua style &&
+ cd $SOURCE_DIRECTORY
+fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 1cdd743..cc4f4bc 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -19,11 +19,16 @@ optional_depends svgalib \
"--with-linux-vga" \
"--without-linux-vga" \
"Linux SVGA console driver?" &&
-
-optional_depends tetex \
+if [[ $GNUPLOT_LUA == "n" ]]; then
+ optional_depends tetex \
"--with-tutorial" \
"--without-tutorial" \
- "build LaTeX tutorial?" &&
+ "build LaTeX tutorial?"
+else
+ depends tetex &&
+ depends lua &&
+ depends pgf
+fi &&

. $GRIMOIRE/is_depends_enabled.function &&
if is_depends_enabled $SPELL wxgtk; then
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 2918f0b..a09bed5 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -17,6 +17,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:37656d4aa08782e36c4505e5e815e0801ddc08db7625ee6938012652f098881729a487fd4f9fca11663e4c398675a56f73a52d06d3b91b909ceb238749d61882
fi
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ SOURCE2=${SPELL}_lua_terminal.tgz
+ SOURCE2_URL[0]=http://peter.affenbande.org/$SPELL/$SOURCE2
+ SOURCE2_IGNORE=unversioned
+fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
LICENSE[0]=PD
diff --git a/utils/gnuplot/FINAL b/utils/gnuplot/FINAL
new file mode 100755
index 0000000..ab6596a
--- /dev/null
+++ b/utils/gnuplot/FINAL
@@ -0,0 +1,3 @@
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ texhash
+fi
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index e8fb7cb..b9c89fe 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,10 @@
+2007-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: copy missing lua script, add copying to optional part
+
+2007-08-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, FINAL, INSTALL, POST_REMOVE, PREPARE,
+ PRE_BUILD: added optional support for a lua terminal
+
2007-03-17 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: removed alpha build fix, it's upstream now

diff --git a/utils/gnuplot/INSTALL b/utils/gnuplot/INSTALL
index 0f158d7..93b8063 100755
--- a/utils/gnuplot/INSTALL
+++ b/utils/gnuplot/INSTALL
@@ -1,2 +1,8 @@
-make install-strip
-
+make install-strip &&
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
+ cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/*.sty \
+ $INSTALL_ROOT/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
+ cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/gnuplot.lua \
+ $INSTALL_ROOT/usr/libexec/gnuplot/4.2/gnuplot.lua
+fi
diff --git a/utils/gnuplot/POST_REMOVE b/utils/gnuplot/POST_REMOVE
new file mode 100755
index 0000000..ab6596a
--- /dev/null
+++ b/utils/gnuplot/POST_REMOVE
@@ -0,0 +1,3 @@
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ texhash
+fi
diff --git a/utils/gnuplot/PREPARE b/utils/gnuplot/PREPARE
index 8f59be9..6528253 100755
--- a/utils/gnuplot/PREPARE
+++ b/utils/gnuplot/PREPARE
@@ -3,5 +3,7 @@ config_query GNUPLOT_SCM "Do you want to use the development
version from CVS?"
if [[ $GNUPLOT_SCM == "y" ]]; then
config_query GNUPLOT_AUTOUPDATE \
"Automatically update on every system update?" n
-fi
+fi &&
+
+config_query GNUPLOT_LUA "Do you want to enable the lua terminal (3rd party
addon)?" n

diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
new file mode 100755
index 0000000..6c01f68
--- /dev/null
+++ b/utils/gnuplot/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ unpack_file 2 &&
+ cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/lua.trm \
+ $SOURCE_DIRECTORY/term &&
+ echo '#include "lua.trm"' >> $SOURCE_DIRECTORY/src/term.h &&
+ sedit 's/^LIBS = /LIBS = -llua /' $SOURCE_DIRECTORY/src/Makefile.in
+fi
diff --git a/utils/grep/BUILD b/utils/grep/BUILD
index 8cb1536..2c217a5 100755
--- a/utils/grep/BUILD
+++ b/utils/grep/BUILD
@@ -7,5 +7,9 @@
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
- make DESTDIR=$INSTALL_ROOT
+if ! is_depends_enabled texinfo; then
+ message "texinfo is DISabled"
+ sedit 's/lib\ doc\ src/lib\ src/' Makefile
+fi &&

+make DESTDIR=$INSTALL_ROOT
diff --git a/utils/grep/DEPENDS b/utils/grep/DEPENDS
index 43e650b..af989fb 100755
--- a/utils/grep/DEPENDS
+++ b/utils/grep/DEPENDS
@@ -4,4 +4,9 @@ depends smgl-fhs &&
optional_depends pcre \
'--enable-perl-regexp' \
'--disable-perl-regexp' \
- 'for Perl-style regex support'
+ 'for Perl-style regex support' &&
+
+optional_depends texinfo \
+ '' \
+ '' \
+ 'to install the documentation'
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index 65f9721..c65ce63 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -13,6 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/grep/
ENTERED=20010922
LICENSE[0]=GPL
+ PATCHLEVEL=1
KEYWORDS="utils"
SHORT="grep finds lines that match specified patterns"
cat << EOF
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index 750b512..fc6b0ed 100755
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,8 @@
+2007-08-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: patchlevel++
+ * DEPENDS: made texinfo optional
+ * INSTALL: only try to install the docs when texinfo is installed
+
2007-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5.3
change GPG from gnu-verified to gnu
diff --git a/utils/grep/INSTALL b/utils/grep/INSTALL
index 28598d4..77171d9 100755
--- a/utils/grep/INSTALL
+++ b/utils/grep/INSTALL
@@ -1,3 +1,5 @@
make install DESTDIR=$INSTALL_ROOT &&
-install-info --info-dir="${INSTALL_ROOT}/usr/share/info"\
- ${INSTALL_ROOT}/usr/share/info/grep.info
+if is_depends_enabled texinfo; then
+ install-info --info-dir="${INSTALL_ROOT}/usr/share/info"\
+ ${INSTALL_ROOT}/usr/share/info/grep.info
+fi
diff --git a/utils/helpdeco/BUILD b/utils/helpdeco/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/utils/helpdeco/BUILD
@@ -0,0 +1 @@
+make
diff --git a/utils/helpdeco/DETAILS b/utils/helpdeco/DETAILS
new file mode 100755
index 0000000..62c28c2
--- /dev/null
+++ b/utils/helpdeco/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=helpdeco
+ VERSION=2.1.3
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:6ef5dd1a4a397589e5bcdd308820f4d38cbf53e413971231505a998bc1c8003de3b291483743027280ff3113338fc0ed9553066435ee5ffb597da33a487e2638
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.geocities.com/mwinterhoff/helpdeco.htm";
+ LICENSE[0]=GPL
+ ENTERED=20070827
+ SHORT="a decompiler for Windows HLP files"
+cat << EOF
+helpdeco dissects HLP help files of Windows 3.0, 3.1, 3.11, and '95 and many
+MVB multi media viewer titles into all files required for a rebuild using
+the appropriate help compiler HC30, HC31, HCP, HCW, HCRTF, WMVC, MMVC or MVC:
+
+* HPJ - help project file, use as parameter when calling help compiler *
+MVP - multi media project file, parameter for multi media help compiler *
+RTF - text file containing whole content of help file and all footnotes *
+PH - phrases file (same as produced by help compiler) * ICO - icon of help
+file if embedded * BMP/WMF/SHG/MRB - embedded pictures in appropriate format
*
+Baggage - all baggage files contained in help file
+EOF
diff --git a/utils/helpdeco/HISTORY b/utils/helpdeco/HISTORY
new file mode 100644
index 0000000..5c2c91a
--- /dev/null
+++ b/utils/helpdeco/HISTORY
@@ -0,0 +1,2 @@
+2007-08-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, HISTORY, BUILD, PRE_BUILD: created spell
diff --git a/utils/helpdeco/PRE_BUILD b/utils/helpdeco/PRE_BUILD
new file mode 100755
index 0000000..66841f1
--- /dev/null
+++ b/utils/helpdeco/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sedit 's:/usr/local:/usr:' $SOURCE_DIRECTORY/Makefile
diff --git a/utils/heyu2/DETAILS b/utils/heyu2/DETAILS
index 12d9ee9..7db04ed 100755
--- a/utils/heyu2/DETAILS
+++ b/utils/heyu2/DETAILS
@@ -1,6 +1,6 @@
SPELL=heyu2
- VERSION=2.0.1
-
SOURCE_HASH=sha512:3b7c038cc9206f98a9a2a9c94b5ed59d9ddba6ae936a33749f5cbe5efc806b9c52abff05f05ab4efa161768272b5897569011b5dfe0fd665b96cd70081ae4486
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:dabecd97023e0bd245b78b2e90b87dd08fa497ff8084dac5f737a1042efa8b0d3c6572a1af2817483e7aaf2d1a80817ca64bb93a6fad2a104f164944b3d605f1
SOURCE=${SPELL//2}-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-$VERSION
SOURCE_URL[0]=http://www.heyu.org/download/$SOURCE
@@ -10,8 +10,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-$VERSION
KEYWORDS="utils"
SHORT='HEYU software for CM11A Home Automation'
cat << EOF
-The CM11A is a device built by the X10 company for controlling devices by
-sending signals through the power lines. It's a small box that plugs into
-an AC outlet and connects to a serial port. The CM11A is shipped with a
-Windows application called "Activehome".
-EOF
+HEYU provides a command line interface to communicate with the CM11A
+hardware module from X10. The CM11A will send remote control signals over
+the power lines to remote modules within your house. HEYU can be run from
+cron to automate lights, sprinklers, etc., or can store macros and timers in
+the CM11A memory for standalone operation. Auxiliary input from several X10
RF
+receiver devices is supported. Arbitrary commands and scripts can be
launched
+based on X10 signals and the state of the system.
+ EOF
diff --git a/utils/heyu2/HISTORY b/utils/heyu2/HISTORY
index 8b137f3..c9ab6d1 100755
--- a/utils/heyu2/HISTORY
+++ b/utils/heyu2/HISTORY
@@ -1,3 +1,7 @@
+2007-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.0
+ expanded description
+
2007-07-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.1

diff --git a/utils/iso-codes/DETAILS b/utils/iso-codes/DETAILS
index 2ddf481..4158f5d 100755
--- a/utils/iso-codes/DETAILS
+++ b/utils/iso-codes/DETAILS
@@ -1,5 +1,5 @@
SPELL=iso-codes
- VERSION=1.3
+ VERSION=1.4
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/iso-codes/HISTORY b/utils/iso-codes/HISTORY
index d6a4944..10840e9 100644
--- a/utils/iso-codes/HISTORY
+++ b/utils/iso-codes/HISTORY
@@ -1,3 +1,6 @@
+2007-08-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4
+
2007-08-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3

diff --git a/utils/ntp/DETAILS b/utils/ntp/DETAILS
index 1429371..9234897 100755
--- a/utils/ntp/DETAILS
+++ b/utils/ntp/DETAILS
@@ -1,10 +1,10 @@
SPELL=ntp
- VERSION=4.2.4p3
-
SOURCE_HASH=sha512:0b8fc1a02159e15d3ae9211fb4a3f129c54e599d416668116d191ef4d09ea554c0f5c354f18d384dbcd7ef0f3e0cb94a0b63663f96bbadad8ae014fb524f3191
+ VERSION=4.2.4p4
+
SOURCE_HASH=sha512:c4ca7271a4abf4b8ccf8433510683722dd00115441bb1cbbf0c62f770a4fa973a49184e4a4802eaff79345544a7f2ef1588ebf0ced70d02bca8bd5440ae24239
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/$SOURCE
-
SOURCE_URL[1]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE
+# SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/$SOURCE
+
SOURCE_URL[0]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE
WEB_SITE=http://www.ntp.org/
ENTERED=20011004
LICENSE[0]=PD
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 029c6fc..e6514b9 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,7 @@
+2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.2.4p4
+ disable ftp url, it seems to be blocked
+
2007-08-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.2.4p3

diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index f12724e..fd001e5 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -22,6 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
LICENSE[0]=LGPL
ENTERED=20070309
+ PATCHLEVEL=1
KEYWORDS="search engine"
SHORT="desktop search engine"
cat << EOF
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index e74f186..7a0a0ae 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,10 @@
+2007-09-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PPREPARE: ask the autoupdate query only if svn was chosen
+
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL, strigi.sh: added, to set XDG_DATA_DIRS
+ * DETAILS: PATCHLEVEL++
+
2007-08-07 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional exiv2

diff --git a/utils/strigi/INSTALL b/utils/strigi/INSTALL
new file mode 100755
index 0000000..45986c0
--- /dev/null
+++ b/utils/strigi/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+cd $SOURCE_DIRECTORY &&
+DEST=${INSTALL_ROOT}/etc/profile.d &&
+mkdir -p ${DEST} &&
+install -m 0644 $SCRIPT_DIRECTORY/strigi.sh ${DEST}
diff --git a/utils/strigi/PREPARE b/utils/strigi/PREPARE
index d4a5478..febee33 100755
--- a/utils/strigi/PREPARE
+++ b/utils/strigi/PREPARE
@@ -1,2 +1,4 @@
-config_query STRIGI_SVN 'DO you wnat the SVN version?' n
-config_query STRIGI_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
+config_query STRIGI_SVN 'DO you wnat the SVN version?' n &&
+if [[ $STRIGI_SVN == y ]]; then
+ config_query STRIGI_SVN_AUTOUPDATE "Update to the latest SVN on every
cast?" ${DEFAULT:-n}
+fi
diff --git a/utils/strigi/strigi.sh b/utils/strigi/strigi.sh
new file mode 100755
index 0000000..6e3c824
--- /dev/null
+++ b/utils/strigi/strigi.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+#set environment for using strigi
+export XDG_DATA_DIRS=/usr/share
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 6f0710e..de26f0b 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.6.9p3
+ VERSION=1.6.9p4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index cd7a920..c50bb8e 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2007-08-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.6.9p4
+
2007-08-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 1.6.9p3

diff --git a/utils/sudo/sudo-1.6.9p3.tar.gz.sig
b/utils/sudo/sudo-1.6.9p3.tar.gz.sig
deleted file mode 100644
index c73d6a7..0000000
Binary files a/utils/sudo/sudo-1.6.9p3.tar.gz.sig and /dev/null differ
diff --git a/utils/sudo/sudo-1.6.9p4.tar.gz.sig
b/utils/sudo/sudo-1.6.9p4.tar.gz.sig
new file mode 100644
index 0000000..5d511df
Binary files /dev/null and b/utils/sudo/sudo-1.6.9p4.tar.gz.sig differ
diff --git a/utils/sysstat/BUILD b/utils/sysstat/BUILD
deleted file mode 100755
index f7de73a..0000000
--- a/utils/sysstat/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-sedit 's:/usr/local:/usr:' build/CONFIG &&
-sedit 's:${PREFIX}/man:${PREFIX}/share/man:' build/CONFIG &&
-
-make
diff --git a/utils/sysstat/DETAILS b/utils/sysstat/DETAILS
index 8703db4..ad93d80 100755
--- a/utils/sysstat/DETAILS
+++ b/utils/sysstat/DETAILS
@@ -1,9 +1,9 @@
SPELL=sysstat
- VERSION=7.0.4
+ VERSION=8.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://perso.wanadoo.fr/sebastien.godard/$SOURCE
-
SOURCE_HASH=sha512:0ccefee0affa7eaaf3be70089dbf2204c59f37d4fee1363c5f01170086e94c5d425e84abbe9ace8d7bac817966c84d45fe691fea7e33ab35b1ef27a61c933608
+
SOURCE_HASH=sha512:ee1fc5b26e0a493c0e2b40f74c2e534ace427ac2de81a78121b31f99091f38d61da52563388ea73961983a38b687360292d6ecfb98a3faac5568a1f610696864
WEB_SITE=http://perso.wanadoo.fr/sebastien.godard/
ENTERED=20050506
LICENSE[0]="GPL"
diff --git a/utils/sysstat/HISTORY b/utils/sysstat/HISTORY
index 7933e5e..f7c5f99 100644
--- a/utils/sysstat/HISTORY
+++ b/utils/sysstat/HISTORY
@@ -1,3 +1,7 @@
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 8.0.0
+ * BUILD: removed
+
2007-02-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.0.4
* INSTALL: removed
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index b3e1a0f..56e636a 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,7 +1,7 @@
SPELL=util-linux
if [[ $UTIL_LINUX_NG == y ]]
then
- VERSION=2.13-rc3
+ VERSION=2.13
SOURCE=$SPELL-ng-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index f0815e5..e8c73c4 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+2007-09-13 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added patch for nls and selinux enabled
+ * util-linux-ng-nls.patch: fix for a little thing with LC_ALL
undefined
+
+2007-08-28 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated version to 2.13
+
2007-08-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_INSTALL: fix #13926 for good

diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index f737d99..4a47774 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -30,4 +30,10 @@ if [ "$SELINUX" == "y" ]; then
message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}"
fi

+else
+ patch -p1 < ${SCRIPT_DIRECTORY}/util-linux-ng-nls.patch
+
+ if [ "$SELINUX" == "y" ] ; then
+ OPTS="--with-selinux"
+ fi
fi
diff --git a/utils/util-linux/util-linux-ng-nls.patch
b/utils/util-linux/util-linux-ng-nls.patch
new file mode 100644
index 0000000..7908060
--- /dev/null
+++ b/utils/util-linux/util-linux-ng-nls.patch
@@ -0,0 +1,12 @@
+--- a/include/nls.h 2007-09-14 04:13:55.000000000 +0000
++++ b/include/nls.h 2007-09-14 04:14:19.000000000 +0000
+@@ -9,6 +9,9 @@
+
+ #ifdef ENABLE_NLS
+ # include <libintl.h>
++# ifndef LC_ALL
++# include <locale.h>
++# endif
+ # define _(Text) gettext (Text)
+ # ifdef gettext_noop
+ # define N_(String) gettext_noop (String)
diff --git a/utils/virtualbox-module/DETAILS b/utils/virtualbox-module/DETAILS
index 2b066da..9c4b0ea 100755
--- a/utils/virtualbox-module/DETAILS
+++ b/utils/virtualbox-module/DETAILS
@@ -1,9 +1,9 @@
SPELL=virtualbox-module
- VERSION=1.4.0
+ VERSION=1.5.0
SOURCE=vbox-kernel-module-src-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:d49b7898d5bafbd498167c5c542c294634fea984dbd2884ebb40cbf26e965fde082942c606f33e2402bf280e617e638d311bd85fad355e26a867455f064219da
+
SOURCE_HASH=sha512:57c441b359ecce5ac9b506118c163c06c4762a8b035386465a02f54c5dc5af289f4703d363599c24747d83e6c1101635366c30bbed3d1fdb18df0ff8aba929cd
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
ENTERED=20070613
diff --git a/utils/virtualbox-module/HISTORY b/utils/virtualbox-module/HISTORY
index 5e92225..8f2086c 100644
--- a/utils/virtualbox-module/HISTORY
+++ b/utils/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.0
+
2007-06-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD: created this spell, version 1.4.0

diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index 0d8a68c..73ac4d8 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -1,5 +1,5 @@
depends virtualbox-module &&
depends qt-x11 &&
-depends dev86 &&
+depends LD86 &&
depends iasl &&
depends xalan-c
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 179ec08..47e4f57 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=virtualbox
- VERSION=1.4.0
- SOURCE=VirtualBox-OSE-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-OSE-$VERSION
+ VERSION=1.5.0
+ SOURCE=VirtualBox-${VERSION}_OSE.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION}_OSE
SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:72ccd4a936bf5be5f7679d33beda22f9d9aaf04cfde3f2147e9abb299bce140306e031a9055486f1b16a3446a14efe831feab17f32788daad4e07db5fde0e5cd
+
SOURCE_HASH=sha512:1d5b0eb9cdc005619f87bd506ca49351650793d3a5ec3676fc9f3563852c558985b3d144f6a388d75364b96c1ae109421c3a4afaf1b476dc1bc43b05e3089130
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 24b3438..e43dc9f 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,10 @@
+2007-09-16 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DEPENDS: Changed dev86 to LD86
+
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.0, updated SOURCE and SOURCE_DIRECTORY
+ * PRE_BUILD: updated
+
2007-06-13 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: added virtualbox-module
* INSTALL, virtualbox: added
diff --git a/utils/virtualbox/PRE_BUILD b/utils/virtualbox/PRE_BUILD
index ad283db..2d5be09 100755
--- a/utils/virtualbox/PRE_BUILD
+++ b/utils/virtualbox/PRE_BUILD
@@ -7,4 +7,4 @@ ln -s $TRACK_ROOT/usr/include/qt
$SOURCE_DIRECTORY/FAKEQTDIR/include &&
ln -s $TRACK_ROOT/usr/bin $SOURCE_DIRECTORY/FAKEQTDIR/bin &&
ln -s $TRACK_ROOT/usr/lib $SOURCE_DIRECTORY/FAKEQTDIR/lib &&

-sedit "s:QTDIR=\"/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3
/usr/lib64/qt-3.3\":QTDIR=\"$SOURCE_DIRECTORY/FAKEQTDIR\":" configure
+sedit "s:QTDIR=\"/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3
/usr/lib64/qt-3.3 /usr/X11R6\":QTDIR=\"$SOURCE_DIRECTORY/FAKEQTDIR\":"
configure
diff --git a/video-libs/gst-plugins-good/DEPENDS
b/video-libs/gst-plugins-good/DEPENDS
index c37420c..12e2255 100755
--- a/video-libs/gst-plugins-good/DEPENDS
+++ b/video-libs/gst-plugins-good/DEPENDS
@@ -5,7 +5,7 @@ depends liboil &&
optional_depends aalib \
"--enable-aalib" \
"--disable-aalib" \
- "for ascii art output" &&
+ "for ASCII art output" &&
optional_depends X11-LIBS \
"--enable-x --enable-xshm" \
"--disable-x --disable-xshm" \
diff --git a/video-libs/gst-plugins-good/HISTORY
b/video-libs/gst-plugins-good/HISTORY
index 5cd02bf..76ccc29 100644
--- a/video-libs/gst-plugins-good/HISTORY
+++ b/video-libs/gst-plugins-good/HISTORY
@@ -1,3 +1,8 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: ascii -> ASCII in text description
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow e-emotion to depend on
gst-plugins-good
+ built with libcdio support
+
2007-07-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: added wavpack, it got moved from -bad to here
* DETAILS: PATCHLEVEL++
diff --git a/video-libs/gst-plugins-good/PRE_SUB_DEPENDS
b/video-libs/gst-plugins-good/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..51e751c
--- /dev/null
+++ b/video-libs/gst-plugins-good/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LIBCDIO) is_depends_enabled $SPELL libcdio && return 0
+ ;;
+esac
+return 1
diff --git a/video-libs/gst-plugins-good/SUB_DEPENDS
b/video-libs/gst-plugins-good/SUB_DEPENDS
new file mode 100755
index 0000000..9143764
--- /dev/null
+++ b/video-libs/gst-plugins-good/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ LIBCDIO) depends libcdio '--enable-cdio'
+ ;;
+ *) echo "Unknown sub-depends!" ;
+ return 1
+ ;;
+esac
diff --git a/video-libs/gst-plugins/DEPENDS b/video-libs/gst-plugins/DEPENDS
index 154e64a..e48174a 100755
--- a/video-libs/gst-plugins/DEPENDS
+++ b/video-libs/gst-plugins/DEPENDS
@@ -148,6 +148,9 @@ optional_depends "dirac" \
optional_depends "swfdec" \
"" "--disable-swfdec" \
"for flash support" &&
+optional_depends "x264" \
+ "" "--disable-x264" \
+ "for H264/AVC support" &&

# stuff
optional_depends "libmusicbrainz" \
diff --git a/video-libs/gst-plugins/HISTORY b/video-libs/gst-plugins/HISTORY
index f3b208c..2b3585b 100644
--- a/video-libs/gst-plugins/HISTORY
+++ b/video-libs/gst-plugins/HISTORY
@@ -1,3 +1,6 @@
+2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Added optional dependency on x264
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Changed jack to JACK-DRIVER.

diff --git a/video-libs/libdvdnav/DETAILS b/video-libs/libdvdnav/DETAILS
index 30bc410..c42ab5a 100755
--- a/video-libs/libdvdnav/DETAILS
+++ b/video-libs/libdvdnav/DETAILS
@@ -1,12 +1,11 @@
SPELL=libdvdnav
- VERSION=0.1.9
+ VERSION=0.1.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/dvd/$SOURCE
WEB_SITE=http://dvd.sourceforge.net/
ENTERED=20020428
- UPDATED=20020627
-
SOURCE_HASH=sha512:521616dced4015ca170113e5e265a4a13a72f667c9ad5decc6f361037fb554d244c45ccfe371b322af83be49c405190b15e2ea8a6be8872299583582db830907
+
SOURCE_HASH=sha512:be9f7cecfe50290977479bee978091555567160f4a09f2ca1fc24c80c50858929465150ad8383a52f70e6bc63d231d636ddad3417bb0658b66086e885fadd039
LICENSE[0]=GPL
DOCS="COPYING NEWS README"
KEYWORDS="video libs"
diff --git a/video-libs/libdvdnav/HISTORY b/video-libs/libdvdnav/HISTORY
index cb6431c..f949d1f 100644
--- a/video-libs/libdvdnav/HISTORY
+++ b/video-libs/libdvdnav/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.1.10, removed UPDATED
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video-libs/libdvdread/DETAILS b/video-libs/libdvdread/DETAILS
index 0ba5c65..95930c2 100755
--- a/video-libs/libdvdread/DETAILS
+++ b/video-libs/libdvdread/DETAILS
@@ -1,11 +1,10 @@
SPELL=libdvdread
- VERSION=0.9.6
+ VERSION=0.9.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.dtek.chalmers.se/groups/dvd/dist/$SOURCE
WEB_SITE=http://www.dtek.chalmers.se/groups/dvd/downloads.shtml
ENTERED=20010927
- PATCHLEVEL=1
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=GPL
KEYWORDS="dvd video libs"
diff --git a/video-libs/libdvdread/HISTORY b/video-libs/libdvdread/HISTORY
index 186efa0..66c6e3a 100644
--- a/video-libs/libdvdread/HISTORY
+++ b/video-libs/libdvdread/HISTORY
@@ -1,3 +1,7 @@
+2007-09-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.9.7
+ * libdvdread-0.9.6-udfsymbols.patch: minor fix
+
2006-11-09 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added configure.in mkdir -p patch probably automake
problem
* configure.in-mkdir-p.patch: added
diff --git a/video-libs/libdvdread/libdvdread-0.9.6-udfsymbols.patch
b/video-libs/libdvdread/libdvdread-0.9.6-udfsymbols.patch
index 2fbd3a7..98ca6d8 100644
--- a/video-libs/libdvdread/libdvdread-0.9.6-udfsymbols.patch
+++ b/video-libs/libdvdread/libdvdread-0.9.6-udfsymbols.patch
@@ -11,8 +11,8 @@ Index: libdvdread-0.9.5/dvdread/Makefile.am
dvdread_internal.h cmd_print.c \
md5.c md5.h
libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@
--libdvdread_la_LDFLAGS = -version-info 5:0:2 -export-symbols-regex
"(DVD.*|ifo.*|nav.*|cmd.*)"
-+libdvdread_la_LDFLAGS = -version-info 5:0:2 -export-symbols-regex
"(DVD.*|UDF.*|ifo.*|nav.*|cmd.*)"
+-libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex
"(DVD.*|ifo.*|nav.*|cmd.*)"
++libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex
"(DVD.*|UDF.*|ifo.*|nav.*|cmd.*)"

pkgincludedir = $(includedir)/dvdread

diff --git a/video-libs/libdvdread/libdvdread-0.9.6.tar.gz.sig
b/video-libs/libdvdread/libdvdread-0.9.6.tar.gz.sig
deleted file mode 100644
index 64a688e..0000000
Binary files a/video-libs/libdvdread/libdvdread-0.9.6.tar.gz.sig and
/dev/null differ
diff --git a/video-libs/libdvdread/libdvdread-0.9.7.tar.gz.sig
b/video-libs/libdvdread/libdvdread-0.9.7.tar.gz.sig
new file mode 100644
index 0000000..154e89a
Binary files /dev/null and
b/video-libs/libdvdread/libdvdread-0.9.7.tar.gz.sig differ
diff --git a/video-libs/swfdec-mozilla/BUILD b/video-libs/swfdec-mozilla/BUILD
index b856226..4cf571e 100755
--- a/video-libs/swfdec-mozilla/BUILD
+++ b/video-libs/swfdec-mozilla/BUILD
@@ -1,12 +1,2 @@
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
- OPTS="$OPTS --with-mozilla=firefox"
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- OPTS="$OPTS --with-mozilla=seamonkey"
-elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
- OPTS="$OPTS --with-mozilla=mozilla"
-elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS --with-mozilla=xulrunner"
-else
- OPTS="$OPTS --without-mozilla"
-fi &&
+OPTS="$OPTS --with-plugin-dir=$INSTALL_ROOT/usr/lib/$(get_spell_provider
$SPELL GECKO)/plugins" &&
default_build
diff --git a/video-libs/swfdec-mozilla/DEPENDS
b/video-libs/swfdec-mozilla/DEPENDS
index 6706b05..92eb8fb 100755
--- a/video-libs/swfdec-mozilla/DEPENDS
+++ b/video-libs/swfdec-mozilla/DEPENDS
@@ -1,3 +1,2 @@
depends GECKO &&
-depends gst-plugins-base &&
depends swfdec
diff --git a/video-libs/swfdec-mozilla/DETAILS
b/video-libs/swfdec-mozilla/DETAILS
index d2c5f81..e15fef5 100755
--- a/video-libs/swfdec-mozilla/DETAILS
+++ b/video-libs/swfdec-mozilla/DETAILS
@@ -1,5 +1,5 @@
SPELL=swfdec-mozilla
- VERSION=0.4.3
+ VERSION=0.5.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://swfdec.freedesktop.org/download/swfdec-mozilla/${VERSION:0:3}/$SOURCE
diff --git a/video-libs/swfdec-mozilla/HISTORY
b/video-libs/swfdec-mozilla/HISTORY
index 7cb1916..d88184b 100644
--- a/video-libs/swfdec-mozilla/HISTORY
+++ b/video-libs/swfdec-mozilla/HISTORY
@@ -1,3 +1,9 @@
+2007-08-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.2
+ * PRE_BUILD, POST_REMOVE, browser-plugin.patch: removed
+ * DEPENDS: removed gst-plugins-base
+ * BUILD: replaced --with-mozilla flags by --with-plugin-dir
+
2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
* Copied from swfdec and modified to install the mozilla plugin
* CONFIGURE: Removed
diff --git a/video-libs/swfdec-mozilla/POST_REMOVE
b/video-libs/swfdec-mozilla/POST_REMOVE
deleted file mode 100755
index cbc86ac..0000000
--- a/video-libs/swfdec-mozilla/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf-query-loaders > $INSTALL_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders
diff --git a/video-libs/swfdec-mozilla/PRE_BUILD
b/video-libs/swfdec-mozilla/PRE_BUILD
deleted file mode 100755
index 6be05c6..0000000
--- a/video-libs/swfdec-mozilla/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/browser-plugin.patch &&
-autoreconf
diff --git a/video-libs/swfdec-mozilla/browser-plugin.patch
b/video-libs/swfdec-mozilla/browser-plugin.patch
deleted file mode 100644
index 47b2d72..0000000
--- a/video-libs/swfdec-mozilla/browser-plugin.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur swfdec-mozilla-0.4.3.orig/configure.ac
swfdec-mozilla-0.4.3/configure.ac
---- swfdec-mozilla-0.4.3.orig/configure.ac 2007-04-02 14:15:48.286730883
-0700
-+++ swfdec-mozilla-0.4.3/configure.ac 2007-04-02 14:49:09.712400849 -0700
-@@ -112,23 +112,50 @@
- AC_MSG_ERROR([cannot find cairo, which is required for build])
- fi
-
--PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
--MOZILLA_DIR=mozilla
--if test "$HAVE_MOZILLA" = no ; then
-- PKG_CHECK_MODULES(MOZILLA, firefox-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
-- MOZILLA_DIR=mozilla-firefox
--fi
--if test "$HAVE_MOZILLA" = no ; then
-- PKG_CHECK_MODULES(MOZILLA, iceape-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
-- MOZILLA_DIR=iceape
--fi
--AC_SUBST(MOZILLA_CFLAGS)
--AC_SUBST(MOZILLA_LIBS)
--AC_SUBST(MOZILLA_DIR)
--AM_CONDITIONAL(HAVE_MOZILLA, [test $HAVE_MOZILLA = yes])
--if test "x$HAVE_MOZILLA" = "xno"; then
-- AC_MSG_ERROR([Mozilla not found. Mozilla/Netscape plugin will not be
built.])
-+dnl ******************
-+dnl Mozilla name check
-+dnl ******************
-+AC_MSG_CHECKING([which mozilla to use])
-+MOZILLA=
-+AC_ARG_WITH([mozilla],
-+
AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
-+ [Which mozilla to use for plugin (default:
autodetect)]),
-+ [MOZILLA="$withval"])
-+if test "x$MOZILLA" = "x"; then
-+ if $PKG_CONFIG --exists mozilla-plugin; then
-+ MOZILLA=mozilla
-+ elif $PKG_CONFIG --exists firefox-plugin; then
-+ MOZILLA=firefox
-+ elif $PKG_CONFIG --exists seamonkey-plugin; then
-+ MOZILLA=seamonkey
-+ elif $PKG_CONFIG --exists xulrunner-plugin; then
-+ MOZILLA=xulrunner
-+ else
-+ AC_MSG_WARN([no mozilla installation found. Mozilla plugin will not be
built])
-+ HAVE_MOZILLA=no
-+ fi
-+elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox"
-a "x$with_mozilla" != "xseamonkey" -a "x$with_mozilla" != "xxulrunner" -a
"x$with_mozilla" != "xno"; then
-+ AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
-+ fi
-+
-+AC_SUBST(MOZILLA)
-+AC_MSG_RESULT([$MOZILLA])
-+
-+if test "x$with_mozilla" != "xno"; then
-+ PKG_CHECK_MODULES(MOZILLA, $MOZILLA-plugin, HAVE_MOZILLA="yes",
HAVE_MOZILLA="no")
-+ AC_SUBST(MOZILLA_CFLAGS)
-+ AC_SUBST(MOZILLA_LIBS)
-+ if test "x$HAVE_MOZILLA" = "xyes"; then
-+ MOZILLA_PLUGIN_DIR=`pkg-config --variable=libdir
$MOZILLA-plugin`/plugins
-+ else
-+ MOZILLA_PLUGIN_DIR=
-+ fi
-+else
-+ MOZILLA_PLUGIN_DIR=
-+ HAVE_MOZILLA=no
- fi
-+AC_SUBST(MOZILLA_PLUGIN_DIR)
-+AM_CONDITIONAL(HAVE_MOZILLA,[test "$HAVE_MOZILLA" = "yes"])
-
- dnl define standard mozilla defines
- dnl this needs updates if we want to compile on Windows or OS X
-diff -Naur swfdec-mozilla-0.4.3.orig/src/Makefile.am
swfdec-mozilla-0.4.3/src/Makefile.am
---- swfdec-mozilla-0.4.3.orig/src/Makefile.am 2007-04-02 14:15:48.279731951
-0700
-+++ swfdec-mozilla-0.4.3/src/Makefile.am 2007-04-02 14:33:03.215845958
-0700
-@@ -8,7 +8,7 @@
- BUILT_SOURCES = swfdec_playback.c
- CLEANFILES = swfdec_playback.c
-
--plugindir = $(libdir)/$(MOZILLA_DIR)/plugins
-+plugindir = @MOZILLA_PLUGIN_DIR@
- plugin_LTLIBRARIES = libswfdecmozilla.la
-
- libswfdecmozilla_la_CFLAGS = $(GLOBAL_CFLAGS) $(MOZILLA_CFLAGS)
$(SWFDEC_CFLAGS) \
diff --git a/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig
deleted file mode 100644
index 41dd200..0000000
Binary files a/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig and
/dev/null differ
diff --git a/video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig
new file mode 100644
index 0000000..8c93dee
Binary files /dev/null and
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig differ
diff --git a/video-libs/swfdec/BUILD b/video-libs/swfdec/BUILD
deleted file mode 100755
index feceeab..0000000
--- a/video-libs/swfdec/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-make_single &&
-default_build &&
-make_normal
diff --git a/video-libs/swfdec/DEPENDS b/video-libs/swfdec/DEPENDS
index 5365c87..e1527bf 100755
--- a/video-libs/swfdec/DEPENDS
+++ b/video-libs/swfdec/DEPENDS
@@ -1,37 +1,42 @@
-depends automake &&
depends cairo &&
depends liboil &&
depends libtool &&
depends glib2 &&
-depends gtk+2 &&
depends pango &&
depends pkgconfig &&

-if test "$SWFDEC_MOZPLUGIN" = "y"; then
- depends GECKO &&
- depends gst-plugins-base
-fi &&
-
-optional_depends gimp \
- '' \
- '' \
- 'for gimp plugin' &&
-
-optional_depends alsa-lib \
- '--with-audio=alsa' \
- '--with-audio=auto' \
- 'for ALSA audio backend' &&
-
optional_depends libmad \
'--enable-mad' \
'--disable-mad' \
'for high-quality MPEG audio decoder' &&

-optional_depends ffmpeg \
+optional_depends gstreamer \
+ '--enable-gstreamer' \
+ '--disable-gstreamer' \
+ 'for gstreamer audio/video support' &&
+
+optional_depends LIBAVCODEC \
'--enable-ffmpeg' \
'--disable-ffmpeg' \
'for Internet audio and video' &&

+optional_depends gtk+2 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'for gtk integration lib' &&
+
+if is_depends_enabled $SPELL gtk+2; then
+optional_depends alsa-lib \
+ '--with-audio=alsa' \
+ '--with-audio=auto' \
+ 'for ALSA support in gtk integration' &&
+
+optional_depends libsoup \
+ '--enable-soup' \
+ '--disable-soup' \
+ 'for HTTP support in gtk integration'
+fi &&
+
optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc' \
diff --git a/video-libs/swfdec/DETAILS b/video-libs/swfdec/DETAILS
index 388862c..79989b4 100755
--- a/video-libs/swfdec/DETAILS
+++ b/video-libs/swfdec/DETAILS
@@ -1,5 +1,5 @@
SPELL=swfdec
- VERSION=0.4.3
+ VERSION=0.5.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://swfdec.freedesktop.org/download/swfdec/${VERSION:0:3}/$SOURCE
diff --git a/video-libs/swfdec/HISTORY b/video-libs/swfdec/HISTORY
index 6973f57..49b71ed 100644
--- a/video-libs/swfdec/HISTORY
+++ b/video-libs/swfdec/HISTORY
@@ -1,3 +1,12 @@
+2007-08-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.2
+ * DEPENDS: removed automake, gimp and the mozilla plugin stuff,
+ gtk+2 is optional, changed ffmpeg to LIBAVCODEC, added optional
+ depends on gstreamer, alsa and libsoup are optional if gtk+2 is
+ used
+ * BUILD: removed, works fine with multiple make jobs
+ * POST_REMOVE: removed, there's no gdkpixbuf support anymore
+
2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.4.3 (plays YouTube)
Now hosted at http://swfdec.freedesktop.org/
diff --git a/video-libs/swfdec/POST_REMOVE b/video-libs/swfdec/POST_REMOVE
deleted file mode 100755
index cbc86ac..0000000
--- a/video-libs/swfdec/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf-query-loaders > $INSTALL_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders
diff --git a/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
b/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
deleted file mode 100644
index e671f4d..0000000
Binary files a/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig and /dev/null differ
diff --git a/video-libs/swfdec/swfdec-0.5.2.tar.gz.sig
b/video-libs/swfdec/swfdec-0.5.2.tar.gz.sig
new file mode 100644
index 0000000..ed5e7aa
Binary files /dev/null and b/video-libs/swfdec/swfdec-0.5.2.tar.gz.sig differ
diff --git a/video-libs/x264/DETAILS b/video-libs/x264/DETAILS
index 83db892..1acc3c8 100755
--- a/video-libs/x264/DETAILS
+++ b/video-libs/x264/DETAILS
@@ -1,6 +1,6 @@
SPELL=x264
- VERSION=20070407-2245
-
SOURCE_HASH=sha512:a4285a998aee13ff4e4cfb51100ed52c2b21b77fe0ea609f746eb2728ffadca581289664d7139f04b23201c61be2c8e720f5954ceb06cba0cc25a968bb2a5514
+ VERSION=20070821-2245
+
SOURCE_HASH=sha512:0a8526050950cef58b873d1ebb1d7967b9f231f0fc0d0ff7bbd1ac5bc14d6c66714ea32f9cd880883db51a7ca28784c6eb707749580a1039c065c20c87c63a14
SOURCE=$SPELL-snapshot-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-snapshot-$VERSION
SOURCE_URL[0]=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$SOURCE
diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY
index 64897e3..f85bc26 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2007-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20070821-2245
+
2007-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20070407-2245

diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index 79a8a1f..0f6bf51 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,6 +1,6 @@
SPELL=xine-lib
- VERSION=1.1.7
-
SOURCE_HASH=sha512:dcbfe304cc0e7965bbedb43d2464473d3c8e387ee351dd6d6409d4a1699eb7d63f964fd6ab9b452ebfddd1d2adf5dfa61e4e637843e1f3f6e743fb04189feea5
+ VERSION=1.1.8
+
SOURCE_HASH=sha512:7942bf42cd564a3d36f5aa95e59c02b939d24b1be4369d9ebcf791873bf0094666ac504417b53f30ba38d8d0b7d6c7dbfe0c55a742499b91bf93e6a20cca8e80
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 784ba76..c70d9e9 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,6 @@
+2007-08-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.8
+
2007-06-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.7

diff --git a/video/dvgrab/DETAILS b/video/dvgrab/DETAILS
index c94f5dc..3ff1cb9 100755
--- a/video/dvgrab/DETAILS
+++ b/video/dvgrab/DETAILS
@@ -1,6 +1,6 @@
SPELL=dvgrab
- VERSION=2.1
-
SOURCE_HASH=sha512:d07a383ed3d5e26c8246e14d35b56d5e3797eb020e709aca62a2c3c450191525a1594b073799c3f1b6cb6ddb51c033b563aed459a547712bc5ef5bcf2a9d27e1
+ VERSION=3.0
+
SOURCE_HASH=sha512:b69754c62ccb690468263190aa5cbfe8f6b909eeaf315d8160076dcf75ad0d0540f9327ecd406d600c673aa820eee66381752027bc7a6d70e4788d01b8e2babf
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/kino/$SOURCE
diff --git a/video/dvgrab/HISTORY b/video/dvgrab/HISTORY
index 104bacc..29c3b13 100644
--- a/video/dvgrab/HISTORY
+++ b/video/dvgrab/HISTORY
@@ -1,3 +1,6 @@
+2007-09-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated VERSION to 3.0
+
2006-12-31 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional LIBQUICKTIME

diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index ccdb929..5c66786 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -1,4 +1,4 @@
-depends subversion &&
+depends subversion &&
optional_depends "nasm" \
"" \
"--disable-mmx" \
@@ -23,11 +23,32 @@ optional_depends "freetype2" \
"" \
"" \
"for a text render plugin" &&
-optional_depends "xvid" \
+#optional_depends "libdts" \
+# "--enable-libdts" \
+# "" \
+# "for DTS audio decoding" &&
+optional_depends "xvid" \
"--enable-libxvid" \
- "" \
+ "" \
"for xvid support" &&
optional_depends sdl \
"" \
"--disable-ffplay" \
- "for ffplay video player"
+ "for ffplay video player" &&
+optional_depends a52dec \
+ "--enable-liba52" \
+ "" \
+ "for a52dec support" &&
+optional_depends faac \
+ "--enable-libfaac" \
+ "" \
+ "support for faac" &&
+optional_depends libtheora \
+ "--enable-libtheora" \
+ "" \
+ "theora codec" &&
+optional_depends x264 \
+ "--enable-libx264" \
+ "" \
+ "h.264"
+
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 7d90e05..e4de220 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: sync options with normal ffmpeg spell
+ forgot to recheck some stuff
+
2007-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DOWNLOAD: added to support stable sorcery, bug #13693
* DEPENDS: enable-xvid option renamed to enable-libxvid
diff --git a/video/freevo/DETAILS b/video/freevo/DETAILS
index c4023bc..0824035 100755
--- a/video/freevo/DETAILS
+++ b/video/freevo/DETAILS
@@ -1,6 +1,6 @@
SPELL=freevo
- VERSION=1.7.2
-
SOURCE_HASH=sha512:89acfdb83aecff39e83a8763c379e0310c4ea08e51967d802f7869c7a3026c32078a2019416ce0023ba3cb658241c17aa0b3d16d66a1e682fcc66763912162c1
+ VERSION=1.7.3
+
SOURCE_HASH=sha512:80327c47753f9c2b03eb7145b898309f6c8c361c1450946f7fb44fab4ad896f3d4ce6e7e6650d554dd856a06ea7125db18f1f6ce9fcb652844fbee8421027fbd
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/$SOURCE
diff --git a/video/freevo/HISTORY b/video/freevo/HISTORY
index b60790e..672f071 100644
--- a/video/freevo/HISTORY
+++ b/video/freevo/HISTORY
@@ -1,3 +1,8 @@
+2007-08-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.3
+ * volatiles, configs: added
+ * PRE_BUILD: remove elementtree from sedit
+
2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.2
* DEPENDS: remove elementtree and pil
diff --git a/video/freevo/PRE_BUILD b/video/freevo/PRE_BUILD
index ed31953..08774db 100755
--- a/video/freevo/PRE_BUILD
+++ b/video/freevo/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i "/Image/D;/elementtree/D" setup.py
+sed -i "/Image/D" setup.py
diff --git a/video/freevo/config b/video/freevo/config
new file mode 100644
index 0000000..57d2fa7
--- /dev/null
+++ b/video/freevo/config
@@ -0,0 +1 @@
+/etc/freevo/local_conf.py
diff --git a/video/freevo/volatiles b/video/freevo/volatiles
new file mode 100644
index 0000000..57d2fa7
--- /dev/null
+++ b/video/freevo/volatiles
@@ -0,0 +1 @@
+/etc/freevo/local_conf.py
diff --git a/video/gpac/DEPENDS b/video/gpac/DEPENDS
new file mode 100755
index 0000000..a761a21
--- /dev/null
+++ b/video/gpac/DEPENDS
@@ -0,0 +1,50 @@
+depends zlib &&
+optional_depends "OPENGL" \
+ "" \
+ "--disable-opengl" \
+ "build with opengl?" &&
+optional_depends "openssl" \
+ "" \
+ "--disable-ssl" \
+ "build with ssl?" &&
+optional_depends "wxgtk" \
+ "" \
+ "--disable-wx" \
+ "to build Osmo4 player" &&
+optional_depends "librsvg2" \
+ "" \
+ "--disable-svg" \
+ "enable svg?" &&
+optional_depends "freetype2" \
+ "" \
+ "--use-ft=no" \
+ "enable freetype?" &&
+optional_depends "jpeg" \
+ "" \
+ "--use-jpeg=no" \
+ "enable jpeg?" &&
+optional_depends "libpng" \
+ "" \
+ "--use-png=no" \
+ "enable png?" &&
+optional_depends "libmad" \
+ "" \
+ "--use-mad=no" \
+ "enable libmad?" &&
+optional_depends "faad2" \
+ "" \
+ "--use-faad=no" \
+ "enable faad?" &&
+optional_depends "xvid" \
+ "" \
+ "--use-xvid=no" \
+ "enable xvid?" &&
+optional_depends "ffmpeg" \
+ "" \
+ "--use-ffmpeg=no" \
+ "enable ffmpeg?" &&
+optional_depends "openjpeg" \
+ "" \
+ "--use-openjpeg=no" \
+ "enable openjpeg?"
+
diff --git a/video/gpac/DETAILS b/video/gpac/DETAILS
new file mode 100755
index 0000000..b1d3843
--- /dev/null
+++ b/video/gpac/DETAILS
@@ -0,0 +1,44 @@
+ SPELL=gpac
+ VERSION=0.4.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ WEB_SITE=http://gpac.sourceforge.net/
+ ENTERED=20070820
+ UPDATED=20070820
+ LICENSE[0]=LGPL
+ BUILD_API=2
+
SOURCE_HASH=sha512:5374130e7bda61fa895f70a2836bd8dc207b7b5da0a71d1584e55467c2c3c2367fbba66a6055a73364d8510becedf37b7653ebb6b5fd2cb7ff58de4ac1ea5cf8
+ KEYWORDS="video"
+ SHORT=' GPAC is an Open Source multimedia framework for
+research and academic purposes in different aspects of multimedia, with
+a focus on presentation technologies (graphics, animation and
+interactivity).'
+cat << EOF
+GPAC features encoders and multiplexers, publishing and content
+distribution tools for MP4 and 3GPP(2) files and many tools for scene
+descriptions (BIFS/VRML/X3D converters, SWF/BIFS, SVG/BIFS, etc...).
+MP4Box provides all these tools in a single command-line application. An
+exhaustive list of packaging features is available here but a good
+summary of what MP4Box can do for you is the following:
+
+* MP4/3GP Conversion from MP3, AVI, MEPG-2 TS, MPEG-PS, AAC, H263,
+* H264, AMR, and many others,
+* File layout: fragmentation or interleaving, and cleaning,
+* File hinting for RTP/RTSP and QTSS/DSS servers (MPEG-4 / ISMA /
+* 3GP / 3GP2 files),
+* File splitting by size or time, extraction from file and file
+* concatenation,
+* XML information dumping for MP4 and RTP hint tracks,
+* Media Track extractions,
+* ISMA E&A encryption and decryption,
+* 3GPP timed text tools (SUB/SRT/TTXT/TeXML), VobSub import/export,
+* BIFS codec and scene conversion between MP4, BT and XMT-A,
+* LASeR codec and scene conversion between MP4, SAF, SVG and XSR
+* (XML LASeR),
+* XML scene statistics for BIFS scene (BT, XMT-A and MP4),
+* Conversion to and from BT, XMT-A, WRL, X3D and X3DV with support
+* for gzip.
+
+GPAC also provides a multimedia player and streamer: MP4Client.
+EOF
diff --git a/video/gpac/HISTORY b/video/gpac/HISTORY
new file mode 100644
index 0000000..a83c824
--- /dev/null
+++ b/video/gpac/HISTORY
@@ -0,0 +1,3 @@
+2007-08-21 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS, DEPENDS, HISTORY, PRE_BUILD: spell created
+
diff --git a/video/gpac/PRE_BUILD b/video/gpac/PRE_BUILD
new file mode 100755
index 0000000..3e21fe1
--- /dev/null
+++ b/video/gpac/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+chmod u+x configure
diff --git a/video/kino/DETAILS b/video/kino/DETAILS
index 155ac42..af5578c 100755
--- a/video/kino/DETAILS
+++ b/video/kino/DETAILS
@@ -1,6 +1,6 @@
SPELL=kino
- VERSION=1.1.0
-
SOURCE_HASH=sha512:b76f48414bbcd600d017f0e7cff1f83e1a639132a9cbda0a2a0266d59fa572bf40704269926ff9d95ce2350b807938eee98e5876bdf2b2b3a909ed466406d108
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:304d608f710de07b16dd91a871c3795ed846994c5e0522e64eed25093b421a4268a24b856a789ddbde02c70b805f8ee5d6c99d736daa3ea864888ff687ea6f77
SOURCE=${SPELL}-${VERSION}.tar.gz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index 7314874..5b50238 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,3 +1,6 @@
+2007-08-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1
+
2007-07-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.0
new website
diff --git a/video/kmplayer/DEPENDS b/video/kmplayer/DEPENDS
index fc8b708..750f90c 100755
--- a/video/kmplayer/DEPENDS
+++ b/video/kmplayer/DEPENDS
@@ -1,4 +1,5 @@
depends kdelibs &&
+depends pkgconfig &&

if list_find "$BACKENDS" "mplayer"; then
depends mplayer
@@ -7,9 +8,19 @@ if list_find "$BACKENDS" "xine"; then
depends xine-lib
fi &&
if list_find "$BACKENDS" "gstreamer"; then
- depends gst-plugins
+ depends gst-plugins-base
fi &&

+optional_depends cairo \
+ '--enable-cairo' \
+ '--disable-cairo' \
+ "SMIL support" &&
+
+optional_depends expat \
+ '--enable-expat' \
+ '--disable-expat' \
+ "expat XML parsing" &&
+
optional_depends arts "" "--without-arts" "for arts support" &&

optional_depends LIBAVCODEC \
diff --git a/video/kmplayer/HISTORY b/video/kmplayer/HISTORY
index 78e3c54..917d248 100644
--- a/video/kmplayer/HISTORY
+++ b/video/kmplayer/HISTORY
@@ -1,3 +1,7 @@
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add pkgconfig, cairo, expat
+ replace gst-plugins (obsolete) by gst-plugins-base
+
2007-04-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 0.9.4a

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index b8f2e62..48747ae 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -13,6 +13,10 @@ if [ "$MPLAYER_SVN" == "y" ]; then
optional_depends libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio"
optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
else
+ optional_depends libdvdnav \
+ "" \
+ "--disable-dvdnav" \
+ "support for DVD navigation" &&
optional_depends libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio" &&
optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
fi &&
@@ -75,10 +79,6 @@ optional_depends libdvdread \
"" \
"--disable-dvdread" \
"support for reading scrambled (CSS) DVDs" &&
-optional_depends libdvdnav \
- "" \
- "--disable-dvdnav" \
- "support for DVD navigation" &&
optional_depends fribidi \
"--enable-fribidi" \
"" \
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index cb9dda8..ba5414e 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: moved dvdnav option to non-svn version, svn requires the
+ libdvdnav fork hosted on mplayerhq.hu that we don't support yet
+
2007-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DOWNLOAD: actually check SOURCE_URL[0] in the url_get_prefix call
so it works with stable sorcery
diff --git a/video/mplayerplug-in/DETAILS b/video/mplayerplug-in/DETAILS
index 0f4dc32..bc39456 100755
--- a/video/mplayerplug-in/DETAILS
+++ b/video/mplayerplug-in/DETAILS
@@ -1,13 +1,13 @@
SPELL=mplayerplug-in
- VERSION=3.40
+ VERSION=3.45
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:12644cac5a13c433700ce10e68411d504a2c8576cec6ec223ae18a8aa6ce2676c913f3ffd9a46391d5ce027538818f6e9dd8252b1aa8072426a2f044052ea136
+
SOURCE_HASH=sha512:542de8d16c81068523edec35f9369a972b723c36798ec9a02b291c838ecadb56b43033273a20e4f5651858f4132fedbb1f6a54dd23ba9b04953a91eb43d508a6
WEB_SITE=http://mplayerplug-in.sourceforge.net/
ENTERED=20030202
KEYWORDS="web player video"
SHORT="MPlayer web browser plugin"
cat << EOF
-mplayerplug-in is a browser plugin that uses mplayer to play videos from
websites. A current version of mplayer (0.90rc4) is required. This plugin
gives Netscape, Mozilla and Konqueror the ability to play videos off the net.
+mplayerplug-in is a browser plugin that uses mplayer to play videos from
websites. A current version of mplayer (1.0pre5) is required. This plugin
gives Netscape, Mozilla and Konqueror the ability to play videos off the net.
EOF
diff --git a/video/mplayerplug-in/HISTORY b/video/mplayerplug-in/HISTORY
index 7f8ea0d..2ec55a1 100644
--- a/video/mplayerplug-in/HISTORY
+++ b/video/mplayerplug-in/HISTORY
@@ -1,3 +1,6 @@
+2007-09-19 Lalo Martis <lalo AT sourcemage.org>
+ * DETAILS: Updated to version 3.45
+
2007-03-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 3.40
* PRE_BUILD: Removed, not needed.
diff --git a/video/mythmusic/DETAILS b/video/mythmusic/DETAILS
index dd70de6..2bf4cb3 100755
--- a/video/mythmusic/DETAILS
+++ b/video/mythmusic/DETAILS
@@ -1,5 +1,5 @@
SPELL=mythmusic
- VERSION=0.20a
+ VERSION=0.20.2
SOURCE=mythplugins-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mythplugins-$VERSION
SOURCE_URL[0]=http://www.mythtv.org/mc/$SOURCE
diff --git a/video/mythmusic/HISTORY b/video/mythmusic/HISTORY
index bcb6a16..69b855f 100644
--- a/video/mythmusic/HISTORY
+++ b/video/mythmusic/HISTORY
@@ -1,3 +1,6 @@
+2007-09-07 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DETAILS: updated to 0.20.2
+
2007-03-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.20a

diff --git a/video/mythmusic/mythplugins-0.20.2.tar.bz2.sig
b/video/mythmusic/mythplugins-0.20.2.tar.bz2.sig
new file mode 100644
index 0000000..3fde13a
Binary files /dev/null and b/video/mythmusic/mythplugins-0.20.2.tar.bz2.sig
differ
diff --git a/video/mythmusic/mythplugins-0.20a.tar.bz2.sig
b/video/mythmusic/mythplugins-0.20a.tar.bz2.sig
deleted file mode 100644
index d787587..0000000
Binary files a/video/mythmusic/mythplugins-0.20a.tar.bz2.sig and /dev/null
differ
diff --git a/video/myththemes/BUILD b/video/myththemes/BUILD
new file mode 100755
index 0000000..9f3570b
--- /dev/null
+++ b/video/myththemes/BUILD
@@ -0,0 +1,4 @@
+QTDIR=${QTDIR:-$INSTALL_ROOT/usr} &&
+./configure --prefix=/usr &&
+qmake myththemes.pro
+
diff --git a/video/myththemes/DEPENDS b/video/myththemes/DEPENDS
new file mode 100755
index 0000000..e75c993
--- /dev/null
+++ b/video/myththemes/DEPENDS
@@ -0,0 +1 @@
+depends mythtv
diff --git a/video/myththemes/DETAILS b/video/myththemes/DETAILS
new file mode 100755
index 0000000..6ea7bac
--- /dev/null
+++ b/video/myththemes/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=myththemes
+ VERSION=0.20.2
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://www.mythtv.org/mc/${SOURCE}
+
SOURCE_HASH=sha512:d2f7812da8d7f68e60daadc01aeda6574e0675a2402f86fafbe94c2e808081b5f024c6a5d4342fe70cedf220f1e4302b4ceb3a8a9449cf7c83bb8236829016fd
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="www.mythtv.org"
+ LICENSE[0]=GPL
+ ENTERED=20070914
+ SHORT="More official themes for MythTV systems"
+cat << EOF
+More up-to-date themes to make your MythTV system look great.
+EOF
diff --git a/video/myththemes/HISTORY b/video/myththemes/HISTORY
new file mode 100644
index 0000000..366acd9
--- /dev/null
+++ b/video/myththemes/HISTORY
@@ -0,0 +1,3 @@
+2007-09-14 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * BUILD, BUILD~, DEPENDS, DETAILS, HISTORY: spell created
+
diff --git a/video/mythtv/BUILD b/video/mythtv/BUILD
index 0122390..eabf8d1 100755
--- a/video/mythtv/BUILD
+++ b/video/mythtv/BUILD
@@ -1,4 +1,6 @@
QTDIR=${QTDIR:-$INSTALL_ROOT/usr} &&
+OPTS="$ENABLE_DVB \
+ $OPTS" &&
./configure --prefix=/usr --disable-distcc $OPTS &&
qmake mythtv.pro &&
make
diff --git a/video/mythtv/CONFIGURE b/video/mythtv/CONFIGURE
new file mode 100755
index 0000000..0ef74ce
--- /dev/null
+++ b/video/mythtv/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option ENABLE_DVB "Enable DVB capture card functionality" y
"--enable-dvb --dvb-path=/usr/include/linux/dvb" ""
+
diff --git a/video/mythtv/DETAILS b/video/mythtv/DETAILS
index 155c575..63eae12 100755
--- a/video/mythtv/DETAILS
+++ b/video/mythtv/DETAILS
@@ -1,9 +1,9 @@
SPELL=mythtv
- VERSION=0.20
+ VERSION=0.20.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.mythtv.org/mc/$SOURCE
-
SOURCE_HASH=sha512:665f30de53b3a080786129470f1f126f41ab5f3f1a465aca718388021a55cfe33253647ad2aa551161bc2efd9b89fa42195413c2817360ce565a4686d828b535
+
SOURCE_HASH=sha512:55de59d74a1ea3688210e9045f9c3405533e4b955267febaf578ce42fd2a3f2f1da875eddd87de67554cc2a1c35fc4ac2a16cf12dd0eb66791722f6ed6221767
WEB_SITE=http://www.mythtv.org
ENTERED=20040727
UPDATED=20050430
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index a79208b..b431972 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,10 @@
+2007-09-07 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ *DETAIS: Updated to version 0.20.2
+
+2007-08-11 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ *CONFIGURE: new file, added option to compile DVB functionality
+ *BUILD: added option variable for DVB functionality
+
2006-12-16 David Kowis <dkowis AT shlrm.org>
* DEPENDS: Fixed lirc dependency. Also moved xmltv to optional
* DETAILS: version bumped to 0.20 using sha512sum now, becuase I'm
not in the gurus.gpg
diff --git a/video/mythweb/DETAILS b/video/mythweb/DETAILS
index 5369cb8..c66bee8 100755
--- a/video/mythweb/DETAILS
+++ b/video/mythweb/DETAILS
@@ -1,5 +1,5 @@
SPELL=mythweb
- VERSION=0.20a
+ VERSION=0.20.2
SOURCE=mythplugins-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mythplugins-$VERSION
SOURCE_URL[0]=http://www.mythtv.org/mc/$SOURCE
diff --git a/video/mythweb/HISTORY b/video/mythweb/HISTORY
index 506a094..2138c30 100644
--- a/video/mythweb/HISTORY
+++ b/video/mythweb/HISTORY
@@ -1,3 +1,6 @@
+2007-09-07 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DETAILS: Updated to 0.20.2
+
2007-03-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.20a

diff --git a/video/mythweb/mythplugins-0.20.2.tar.bz2.sig
b/video/mythweb/mythplugins-0.20.2.tar.bz2.sig
new file mode 100644
index 0000000..3fde13a
Binary files /dev/null and b/video/mythweb/mythplugins-0.20.2.tar.bz2.sig
differ
diff --git a/video/mythweb/mythplugins-0.20a.tar.bz2.sig
b/video/mythweb/mythplugins-0.20a.tar.bz2.sig
deleted file mode 100644
index a899605..0000000
Binary files a/video/mythweb/mythplugins-0.20a.tar.bz2.sig and /dev/null
differ
diff --git a/video/totem/DETAILS b/video/totem/DETAILS
index 2e0ee9b..01b059a 100755
--- a/video/totem/DETAILS
+++ b/video/totem/DETAILS
@@ -1,5 +1,5 @@
SPELL=totem
- VERSION=2.18.2
+ VERSION=2.20.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index 63f20e5..63c3cfa 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,9 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0
+
+2007-09-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.19.90
+
2007-05-24 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/video/totem/totem-2.18.2.tar.bz2.sig
b/video/totem/totem-2.18.2.tar.bz2.sig
deleted file mode 100644
index aa54021..0000000
Binary files a/video/totem/totem-2.18.2.tar.bz2.sig and /dev/null differ
diff --git a/video/totem/totem-2.20.0.tar.bz2.sig
b/video/totem/totem-2.20.0.tar.bz2.sig
new file mode 100644
index 0000000..a10c979
Binary files /dev/null and b/video/totem/totem-2.20.0.tar.bz2.sig differ
diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index 76539d2..f9af725 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -26,11 +26,6 @@ optional_depends sdl \
"--disable-sdl" \
"for SDL preview plugin" &&

-optional_depends gtk+ \
- "--enable-gtk" \
- "--disable-gtk" \
- "for GTK preview plugin" &&
-
optional_depends libdv \
"--enable-libdv" \
"--disable-libdv" \
diff --git a/video/transcode/DETAILS b/video/transcode/DETAILS
index 58ef1d7..e80917b 100755
--- a/video/transcode/DETAILS
+++ b/video/transcode/DETAILS
@@ -1,5 +1,5 @@
SPELL=transcode
- VERSION=1.0.3
+ VERSION=1.0.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_HASH
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 72dd03d..dbbac57 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,9 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0.4
+ * DEPENDS: removed gtk+ optional_depends
+ * PRE_BUILD, avcodec.patch, transcode-1.0.2-libmpeg3-1.7.patch:
+ removed patches
+
2007-07-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, avcodec.patch: patch to work with current ffmpeg-svn,
bug #13866
diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index 3f3e556..bb38c05 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,5 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/transcode-1.0.2-libmpeg3-1.7.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/avcodec.patch &&
sedit 's/-llzo/-llzo2/' configure
diff --git a/video/transcode/avcodec.patch b/video/transcode/avcodec.patch
deleted file mode 100644
index bc79bf3..0000000
--- a/video/transcode/avcodec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- export/aud_aux.c-org 2007-07-07 13:34:28.000000000 +0200
-+++ export/aud_aux.c 2007-07-07 13:34:56.000000000 +0200
-@@ -361,8 +361,7 @@
-
- pthread_mutex_lock(&init_avcodec_lock);
- avcodec_init();
-- register_avcodec(&ac3_encoder);
-- register_avcodec(&mp2_encoder);
-+ avcodec_register_all();
- pthread_mutex_unlock(&init_avcodec_lock);
-
- switch (o_codec) {
diff --git a/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
b/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
deleted file mode 100644
index 8a058af..0000000
--- a/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- transcode-1.0.2/import/import_mpeg3.c.orig 2006-09-09 23:39:08.598897708
+0200
-+++ transcode-1.0.2/import/import_mpeg3.c 2006-09-09 23:40:36.455540042
+0200
-@@ -68,7 +68,7 @@
- MOD_open
- {
-
-- int i;
-+ int i,return_value;
-
- param->fd = NULL;
-
-@@ -79,14 +79,14 @@
- if (param->flag == TC_VIDEO) {
- if (!file) {
- if (!file_a) {
-- if((file = mpeg3_open(vob->video_in_file))==NULL) {
-+ if((file = mpeg3_open(vob->video_in_file,
&return_value))==NULL) {
- fprintf(stderr, "open file failed\n");
- return(TC_IMPORT_ERROR);
- }
- if (verbose & TC_DEBUG)
- printf("[%s] Opened video NO copy\n", MOD_NAME);
- } else if (file_a) {
-- if((file = mpeg3_open_copy(vob->video_in_file, file_a))==NULL) {
-+ if((file = mpeg3_open_copy(vob->video_in_file, file_a,
&return_value))==NULL) {
- fprintf(stderr, "open file failed\n");
- return(TC_IMPORT_ERROR);
- }
-@@ -98,14 +98,14 @@
- if (param->flag == TC_AUDIO) {
- if (!file_a) {
- if (!file) {
-- if((file_a = mpeg3_open(vob->audio_in_file))==NULL) {
-+ if((file_a = mpeg3_open(vob->audio_in_file,
&return_value))==NULL) {
- fprintf(stderr, "open audio file failed\n");
- return(TC_IMPORT_ERROR);
- }
- if (verbose & TC_DEBUG)
- printf("[%s] Opened audio NO copy\n", MOD_NAME);
- } else if (file) {
-- if((file_a = mpeg3_open_copy(vob->audio_in_file, file))==NULL) {
-+ if((file_a = mpeg3_open_copy(vob->audio_in_file, file,
&return_value))==NULL) {
- fprintf(stderr, "open_copy audio file failed\n");
- return(TC_IMPORT_ERROR);
- }
diff --git a/video/transcode/transcode-1.0.3.tar.bz2.sig
b/video/transcode/transcode-1.0.3.tar.bz2.sig
deleted file mode 100644
index 198f3e2..0000000
Binary files a/video/transcode/transcode-1.0.3.tar.bz2.sig and /dev/null
differ
diff --git a/video/transcode/transcode-1.0.4.tar.bz2.sig
b/video/transcode/transcode-1.0.4.tar.bz2.sig
new file mode 100644
index 0000000..8d523da
Binary files /dev/null and b/video/transcode/transcode-1.0.4.tar.bz2.sig
differ
diff --git a/volatiles b/volatiles
index 9469a83..f0d7ca5 100644
--- a/volatiles
+++ b/volatiles
@@ -3,3 +3,4 @@
^/usr/share/pear/\.filemap$
^/etc/gconf/gconf\.xml\.defaults/.*
^/usr/lib/X11/xinit/xinitrc
+^/usr/lib/ghc.*/package\.conf.*$
diff --git a/windowmanagers/afterstep/AfterStep-2.2.6.tar.bz2.sig
b/windowmanagers/afterstep/AfterStep-2.2.6.tar.bz2.sig
deleted file mode 100644
index 96fb691..0000000
Binary files a/windowmanagers/afterstep/AfterStep-2.2.6.tar.bz2.sig and
/dev/null differ
diff --git a/windowmanagers/afterstep/AfterStep-2.2.7.tar.bz2.sig
b/windowmanagers/afterstep/AfterStep-2.2.7.tar.bz2.sig
new file mode 100644
index 0000000..b6295ae
Binary files /dev/null and
b/windowmanagers/afterstep/AfterStep-2.2.7.tar.bz2.sig differ
diff --git a/windowmanagers/afterstep/DETAILS
b/windowmanagers/afterstep/DETAILS
index 834a31d..d8bff82 100755
--- a/windowmanagers/afterstep/DETAILS
+++ b/windowmanagers/afterstep/DETAILS
@@ -1,5 +1,5 @@
SPELL=afterstep
- VERSION=2.2.6
+ VERSION=2.2.7
SOURCE=AfterStep-$VERSION.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/AfterStep-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/windowmanagers/afterstep/HISTORY
b/windowmanagers/afterstep/HISTORY
index f9c33fc..ae1f8bf 100644
--- a/windowmanagers/afterstep/HISTORY
+++ b/windowmanagers/afterstep/HISTORY
@@ -1,3 +1,6 @@
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.2.7
+
2007-05-26 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 2.2.6

diff --git a/windowmanagers/icewm/DETAILS b/windowmanagers/icewm/DETAILS
index 48f55d7..4d04940 100755
--- a/windowmanagers/icewm/DETAILS
+++ b/windowmanagers/icewm/DETAILS
@@ -1,5 +1,5 @@
SPELL=icewm
- VERSION=1.2.30
+ VERSION=1.2.32
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
diff --git a/windowmanagers/icewm/HISTORY b/windowmanagers/icewm/HISTORY
index 9c91618..92a8f5f 100644
--- a/windowmanagers/icewm/HISTORY
+++ b/windowmanagers/icewm/HISTORY
@@ -1,3 +1,7 @@
+2007-08-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 1.2.31
+ updated spell to 1.2.32
+
2007-05-02 Arjan Bouter <abouter AT sourcemage.org>
* configs,volatiles: added

diff --git a/windowmanagers/icewm/icewm-1.2.30.tar.gz.sig
b/windowmanagers/icewm/icewm-1.2.30.tar.gz.sig
deleted file mode 100644
index 6e88c9b..0000000
Binary files a/windowmanagers/icewm/icewm-1.2.30.tar.gz.sig and /dev/null
differ
diff --git a/windowmanagers/icewm/icewm-1.2.32.tar.gz.sig
b/windowmanagers/icewm/icewm-1.2.32.tar.gz.sig
new file mode 100644
index 0000000..fa9ec53
Binary files /dev/null and b/windowmanagers/icewm/icewm-1.2.32.tar.gz.sig
differ
diff --git a/windowmanagers/jwm/HISTORY b/windowmanagers/jwm/HISTORY
index b932774..034f10a 100644
--- a/windowmanagers/jwm/HISTORY
+++ b/windowmanagers/jwm/HISTORY
@@ -1,3 +1,8 @@
+2007-08-25 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: separated the rootmenu
+ * startjwm,jwm.desktop: added
+ * INSTALL: added session files
+
2007-08-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added xorg-mdular support
* DETAILS: cleaned up
diff --git a/windowmanagers/jwm/INSTALL b/windowmanagers/jwm/INSTALL
new file mode 100755
index 0000000..8dc0b80
--- /dev/null
+++ b/windowmanagers/jwm/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+install_wmfiles &&
+install -m 0644 jwmrc-menu /etc/
diff --git a/windowmanagers/jwm/PRE_BUILD b/windowmanagers/jwm/PRE_BUILD
new file mode 100755
index 0000000..7cd2a16
--- /dev/null
+++ b/windowmanagers/jwm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/separate-rootmenu.patch
diff --git a/windowmanagers/jwm/configs b/windowmanagers/jwm/configs
new file mode 100755
index 0000000..d659d96
--- /dev/null
+++ b/windowmanagers/jwm/configs
@@ -0,0 +1,2 @@
+^/etc/system.jwmrc$
+^/etc/jwmrc-menu$
diff --git a/windowmanagers/jwm/jwm.desktop b/windowmanagers/jwm/jwm.desktop
new file mode 100644
index 0000000..8f0f93a
--- /dev/null
+++ b/windowmanagers/jwm/jwm.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=jwm
+Comment=This session logs you into jwm
+Exec=startjwm
+TryExec=startjwm
+Icon=
+Type=Application
diff --git a/windowmanagers/jwm/separate-rootmenu.patch
b/windowmanagers/jwm/separate-rootmenu.patch
new file mode 100644
index 0000000..b06c7de
--- /dev/null
+++ b/windowmanagers/jwm/separate-rootmenu.patch
@@ -0,0 +1,77 @@
+diff -Naur ./jwm-2.0.1/example.jwmrc jwm-2.0.1-fixed/example.jwmrc
+--- ./jwm-2.0.1/example.jwmrc 2007-07-05 03:56:41.000000000 +0200
++++ jwm-2.0.1-fixed/example.jwmrc 2007-08-25 23:26:07.000000000 +0200
+@@ -1,36 +1,8 @@
+ <?xml version="1.0"?>
+
+ <JWM>
+-
+- <!-- The root menu, if this is undefined you will not get a menu. -->
+- <!-- Additional RootMenu attributes: onroot, labeled, label -->
+- <RootMenu height="32" onroot="123">
+- <Program icon="rxvt.png" label="Terminal">rxvt</Program>
+-
+- <Menu icon="folder.png" label="Applications">
+- <Program icon="audacious.png" label="Audacious">audacious</Program>
+- <Program icon="dia.png" label="Dia">dia</Program>
+- <Program icon="firefox.png" label="Firefox">firefox</Program>
+- <Program icon="pidgin.png" label="Pidgin">pidgin</Program>
+- <Program icon="gimp.png" label="Gimp">gimp</Program>
+- <Program icon="gtk-gnutella.png" label="gtk-gnutella">
+- gtk-gnutella
+- </Program>
+- <Program icon="gxine.png" label="gxine">gxine</Program>
+- <Program icon="ooffice.png" label="Open Office">ooffice</Program>
+- </Menu>
+- <Menu icon="folder.png" label="Utilities">
+- <Program icon="xcalc.png">xcalc</Program>
+- <Program icon="xfontsel.png">xfontsel</Program>
+- <Program icon="xmag.png">xmag</Program>
+- <Program icon="xprop.png" label="xprop">
+- xprop | xmessage -file -
+- </Program>
+- </Menu>
+- <Separator/>
+- <Restart label="Restart" icon="restart.png"/>
+- <Exit label="Exit" confirm="true" icon="exit.png"/>
+- </RootMenu>
++ # include the Rootmenu
++ <Include>/etc/jwmrc-menu</Include>
+
+ <Group>
+ <Class>Pidgin</Class>
+diff -Naur ./jwm-2.0.1/jwmrc-menu jwm-2.0.1-fixed/jwmrc-menu
+--- ./jwm-2.0.1/jwmrc-menu 1970-01-01 01:00:00.000000000 +0100
++++ jwm-2.0.1-fixed/jwmrc-menu 2007-08-25 23:26:27.000000000 +0200
+@@ -0,0 +1,31 @@
++<JWM>
++
++<!-- The root menu, if this is undefined you will not get a menu. -->
++<!-- Additional RootMenu attributes: onroot, labeled, label -->
++<RootMenu height="32" onroot="123">
++ <Program icon="rxvt.png" label="Terminal">rxvt</Program>
++ <Menu icon="folder.png" label="Applications">
++ <Program icon="audacious.png" label="Audacious">audacious</Program>
++ <Program icon="dia.png" label="Dia">dia</Program>
++ <Program icon="firefox.png" label="Firefox">firefox</Program>
++ <Program icon="pidgin.png" label="Pidgin">pidgin</Program>
++ <Program icon="gimp.png" label="Gimp">gimp</Program>
++ <Program icon="gtk-gnutella.png" label="gtk-gnutella">
++ gtk-gnutella
++ </Program>
++ <Program icon="gxine.png" label="gxine">gxine</Program>
++ <Program icon="ooffice.png" label="Open Office">ooffice</Program>
++ </Menu>
++ <Menu icon="folder.png" label="Utilities">
++ <Program icon="xcalc.png">xcalc</Program>
++ <Program icon="xfontsel.png">xfontsel</Program>
++ <Program icon="xmag.png">xmag</Program>
++ <Program icon="xprop.png" label="xprop">
++ xprop | xmessage -file -
++ </Program>
++ </Menu>
++ <Separator/>
++ <Restart label="Restart" icon="restart.png"/>
++ <Exit label="Exit" confirm="true" icon="exit.png"/>
++</RootMenu>
++</JWM>
diff --git a/windowmanagers/jwm/startjwm b/windowmanagers/jwm/startjwm
new file mode 100644
index 0000000..e15df33
--- /dev/null
+++ b/windowmanagers/jwm/startjwm
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# startjwm
+#
+# Copyright (C) 2007 Arjan Bouter <abouter AT sourcemage.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+exec jwm
diff --git a/windowmanagers/jwm/volatiles b/windowmanagers/jwm/volatiles
new file mode 100755
index 0000000..d659d96
--- /dev/null
+++ b/windowmanagers/jwm/volatiles
@@ -0,0 +1,2 @@
+^/etc/system.jwmrc$
+^/etc/jwmrc-menu$
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index 015cfbd..79bd329 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmonad
- VERSION=0.2
+ VERSION=0.3
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ea2b9907160d93bd01b30d5397c2d0c780148646381898a3b1a7875b512348b660ebd7b71d1c5095d3cacb5ad1505c806fff0872d15deebe2b6a90c82d1848a8
+
SOURCE_HASH=sha512:fc8087d7bdca09a98d87396338b01258e353aca994e7bc75ca103e4a22d028d2da0620e2271289c6d97081e5b810dd3c491bb213888570c9aadda0e1b0452156
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xmonad.org";
LICENSE[0]=BSD3
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 7af8550..f34c408 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,6 @@
+2007-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.3
+
2007-08-12 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS, DEPENDS, CONFIGURE, PRE_BUILD, BUILD, INSTALL, HISTORY:
created spell
diff --git a/wm-addons/bubblemon-dockapp/DETAILS
b/wm-addons/bubblemon-dockapp/DETAILS
index ca5d4d4..6bf0dbf 100755
--- a/wm-addons/bubblemon-dockapp/DETAILS
+++ b/wm-addons/bubblemon-dockapp/DETAILS
@@ -10,15 +10,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="gnome wm-addons"
SHORT="This is a system monitoring dockapp, visually based on the
GNOME BubbleMon applet."
cat << EOF
-This is a system monitoring dockapp, visually based on the GNOME "BubbleMon"
applet (here).
-Basically, it displays CPU and memory load as bubbles in a jar of water. But
that's where similarity
-ends. New bubblemon-dockapp features translucent CPU load meter (for
accurate CPU load measurement),
-yellow duck swimming back and forth on the water surface (just for fun), and
fading load average and
-memory usage screens. Either of the info screens can be locked to stay on
top of water/duck/cpu
-screen, so that you can see both statistics at once. Pretty nifty toy for
your desktop. Supports
-Linux, FreeBSD, OpenBSD, and Solaris 2.6, 7 and 8. Code has been thoroughly
optimized since version
-1.0, and even with all the features compiled in, BubbleMon still uses very
little CPU time. Load
-Average screen locked at about 20% looks particularly sexy (pictured at
right). All the extra
-"bloated" features can be compiled out or disabled on command-line, if you
prefer original "BubbleMon"
-look.
+This is a system monitoring dockapp, visually based on the GNOME
+"BubbleMon" applet (here). Basically, it displays CPU and memory load as
+bubbles in a jar of water. But that's where similarity ends. New
+bubblemon-dockapp features translucent CPU load meter (for accurate CPU
+load measurement), yellow duck swimming back and forth on the water surface
+(just for fun), and fading load average and memory usage screens. Either of
+the info screens can be locked to stay on top of water/duck/cpu screen, so
+that you can see both statistics at once. Pretty nifty toy for your
+desktop. Supports Linux, FreeBSD, OpenBSD, and Solaris 2.6, 7 and 8. Code
+has been thoroughly optimized since version 1.0, and even with all the
+features compiled in, BubbleMon still uses very little CPU time. Load
+Average screen locked at about 20% looks particularly sexy. All the extra
+"bloated" features can be compiled out or disabled on command-line, if you
+prefer original "BubbleMon" look.
EOF
diff --git a/wm-addons/bubblemon-dockapp/HISTORY
b/wm-addons/bubblemon-dockapp/HISTORY
index 1f89e40..1ba65f3 100644
--- a/wm-addons/bubblemon-dockapp/HISTORY
+++ b/wm-addons/bubblemon-dockapp/HISTORY
@@ -1,3 +1,6 @@
+2007-08-16 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: delint (80-col)
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/wm-addons/dzen2/DETAILS b/wm-addons/dzen2/DETAILS
index 13933d4..5895ade 100755
--- a/wm-addons/dzen2/DETAILS
+++ b/wm-addons/dzen2/DETAILS
@@ -1,9 +1,23 @@
SPELL=dzen2
- VERSION=0.8.0
+if [[ "$DZEN_SCM" == "y" ]]; then
+if [[ "$DZEN_SCM_AUTO" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=scm
+fi
+ SOURCE=$SPELL-scm.tar.bz2
+ SOURCE_HINTS=old_svn_compat
+ FORCE_DOWNLOAD=on
+ SOURCE_URL[0]=svn://dzen.googlecode.com/svn/trunk/:dzen2-scm
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+else
+ VERSION=0.8.5
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://gotmor.googlepages.com/${SOURCE}
-
SOURCE_HASH=sha512:85d6c04d0bfa212c06ab298ee74936991587c94e45630ba78fdcf492163a115f0ad1481d5c42c413bebc65cae4ea2637ee525faa157a28c6b05f7be9ffbada70
+
SOURCE_HASH=sha512:04b808ebb7a3a0135a9bab9e79ae0c16cb5d777458d34d5ab39a5279228fb7fa771b5fee8e4a14b325433359ef751dafa95cb1f4f75db7683404e0fe12beb273
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
WEB_SITE="http://gotmor.googlepages.com/dzen";
LICENSE[0]=MIT
ENTERED=20070309
diff --git a/wm-addons/dzen2/HISTORY b/wm-addons/dzen2/HISTORY
index 8d8dc43..9b3b3c0 100644
--- a/wm-addons/dzen2/HISTORY
+++ b/wm-addons/dzen2/HISTORY
@@ -1,3 +1,8 @@
+2007-08-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.8.5
+ added svn version support
+ * PREPARE: added svn version support
+
2007-08-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.8.0

diff --git a/wm-addons/dzen2/PREPARE b/wm-addons/dzen2/PREPARE
new file mode 100755
index 0000000..6cdf278
--- /dev/null
+++ b/wm-addons/dzen2/PREPARE
@@ -0,0 +1,7 @@
+config_query DZEN_SCM "Do you want SCM version" "n" &&
+if [[ "${DZEN_SCM}" == "y" ]]
+then
+config_query DZEN_SCM_AUTO \
+ "Automaticaly update the spell on sorcery queue/system-update?" \
+ "n"
+fi
diff --git a/wm-addons/wmgtemp/HISTORY b/wm-addons/wmgtemp/HISTORY
index 69847ae..65d04e3 100644
--- a/wm-addons/wmgtemp/HISTORY
+++ b/wm-addons/wmgtemp/HISTORY
@@ -1,5 +1,6 @@
-2007-08-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS, PRE_BUILD, INSTALL, BUILD: updated to 0.8
+2007-08-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, INSTALL, BUILD,
+ wmgtemp.c.patch: updated to 0.8

2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/wm-addons/xtrlock/BUILD b/wm-addons/xtrlock/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/wm-addons/xtrlock/BUILD
@@ -0,0 +1 @@
+make
diff --git a/wm-addons/xtrlock/DEPENDS b/wm-addons/xtrlock/DEPENDS
new file mode 100755
index 0000000..1dde63f
--- /dev/null
+++ b/wm-addons/xtrlock/DEPENDS
@@ -0,0 +1 @@
+depends X11-LIBS
diff --git a/wm-addons/xtrlock/DETAILS b/wm-addons/xtrlock/DETAILS
new file mode 100755
index 0000000..d87d3a0
--- /dev/null
+++ b/wm-addons/xtrlock/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=xtrlock
+ VERSION=2.0-12
+ SOURCE="${SPELL}_${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/x/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:4e059e6fd323021b99f146d56928d2d3f05cbdc396a620d7536153e8b70f6016c2528ab67f80600a8edeb9c2e7b7f4fddbcebfb5099c98bad366d878aa1e3e4d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION/-*}"
+ WEB_SITE="http://packages.debian.org/stable/x11/xtrlock";
+ LICENSE[0]=GPL
+ ENTERED=20070826
+ SHORT="Minimal X display lock program"
+cat << EOF
+xtrlock is a very minimal X display lock program, which uses nothing except
the
+Xlib library. It doesn't obscure the screen, it is completely idle while the
+display is locked and you don't type at it, and it doesn't do funny things
+to the X access control lists.
+EOF
diff --git a/wm-addons/xtrlock/HISTORY b/wm-addons/xtrlock/HISTORY
new file mode 100644
index 0000000..d63790b
--- /dev/null
+++ b/wm-addons/xtrlock/HISTORY
@@ -0,0 +1,2 @@
+2007-08-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, HISTORY: created spell
diff --git a/wm-addons/xtrlock/PRE_BUILD b/wm-addons/xtrlock/PRE_BUILD
new file mode 100755
index 0000000..5b3bd67
--- /dev/null
+++ b/wm-addons/xtrlock/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+cp Makefile.noimake Makefile &&
+sedit "s:/usr/man:${INSTALL_ROOT}/usr/share/man:" Makefile &&
+sedit "s:/usr/bin/X11:${INSTALL_ROOT}/usr/bin:" Makefile &&
+sedit "s:-c -m 755 xtrlock:-c -m 4755 xtrlock:" Makefile &&
+sedit "s:^CFLAGS=.*:CFLAGS=-DSHADOW_PWD ${CFLAGS}:" Makefile &&
+sedit "s:^LDLIBS=.*:LDLIBS=-L/usr/X11/libs -lX11 -lcrypt $LDFLAGS:" \
+ Makefile
diff --git a/x11-libs/cairomm/DETAILS b/x11-libs/cairomm/DETAILS
index b0cf681..18781cc 100755
--- a/x11-libs/cairomm/DETAILS
+++ b/x11-libs/cairomm/DETAILS
@@ -1,9 +1,10 @@
SPELL=cairomm
- VERSION=1.4.2
+ VERSION=1.4.4
+
SOURCE_HASH=sha512:9dfde3e02cb03bd301314ac57ec46d4a5cd5be5115e19689cc60c5535c96b2c02c2c19cabbd63bcbc879c81eda795089aa8cc651ce22a491aca9e8aaace70181
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=MIT
KEYWORDS="x11 libs"
WEB_SITE=http://cairographics.org
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index e116bdf..322f98f 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,6 @@
+2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.4
+
2007-07-16 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.4.2

diff --git a/x11-libs/cairomm/cairomm-1.4.2.tar.gz.sig
b/x11-libs/cairomm/cairomm-1.4.2.tar.gz.sig
deleted file mode 100644
index 987395e..0000000
Binary files a/x11-libs/cairomm/cairomm-1.4.2.tar.gz.sig and /dev/null differ
diff --git a/x11-libs/icon-naming-utils/DETAILS
b/x11-libs/icon-naming-utils/DETAILS
index a109c88..eeaf335 100755
--- a/x11-libs/icon-naming-utils/DETAILS
+++ b/x11-libs/icon-naming-utils/DETAILS
@@ -1,5 +1,5 @@
SPELL=icon-naming-utils
- VERSION=0.8.2
+ VERSION=0.8.6
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://tango-project.org/releases/${SOURCE}
diff --git a/x11-libs/icon-naming-utils/HISTORY
b/x11-libs/icon-naming-utils/HISTORY
index 2de0d27..9c1756d 100644
--- a/x11-libs/icon-naming-utils/HISTORY
+++ b/x11-libs/icon-naming-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.6
+
2007-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: updated spell to 0.8.2
* DEPENDS: Depends on pkgconfig
diff --git a/x11-libs/icon-naming-utils/icon-naming-utils-0.8.2.tar.gz.sig
b/x11-libs/icon-naming-utils/icon-naming-utils-0.8.2.tar.gz.sig
deleted file mode 100644
index e0f945d..0000000
Binary files a/x11-libs/icon-naming-utils/icon-naming-utils-0.8.2.tar.gz.sig
and /dev/null differ
diff --git a/x11-libs/icon-naming-utils/icon-naming-utils-0.8.6.tar.gz.sig
b/x11-libs/icon-naming-utils/icon-naming-utils-0.8.6.tar.gz.sig
new file mode 100644
index 0000000..dbfb52b
Binary files /dev/null and
b/x11-libs/icon-naming-utils/icon-naming-utils-0.8.6.tar.gz.sig differ
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 74a6059..96e384e 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -11,7 +11,7 @@ if [[ $WINE_VCS == y ]]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=1
else
- VERSION=0.9.43
+ VERSION=0.9.45
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index c3799e6..f267364 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.45
+
+2007-08-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.44
+
2007-08-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.43

diff --git a/x11-libs/xfree86/DETAILS b/x11-libs/xfree86/DETAILS
index b293868..02bf294 100755
--- a/x11-libs/xfree86/DETAILS
+++ b/x11-libs/xfree86/DETAILS
@@ -1,5 +1,5 @@
SPELL=xfree86
- VERSION=4.6.0
+ VERSION=4.7.0
SOURCE=XFree86-$VERSION-src-1.tgz
SOURCE2=XFree86-$VERSION-src-2.tgz
SOURCE3=XFree86-$VERSION-src-3.tgz
@@ -15,13 +15,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
SOURCE5_URL[0]=$XFREE86_URL/$VERSION/source/$SOURCE5
SOURCE6_URL[0]=$XFREE86_URL/$VERSION/source/$SOURCE6
SOURCE7_URL[0]=$XFREE86_URL/$VERSION/source/$SOURCE7
-
SOURCE_HASH=sha512:59a41c8bfbb72950c5af42d8f2ac9bfe609d87f94e78b494c14d95fef963550a22fc30bdaff51841a358508f9f745bc75e3b8e9b3ae03c985677914c436ef03d
-
SOURCE2_HASH=sha512:a09eb878b7da2be34d98fc1610e5a9174a02027f4de9471f2e78ac0e6671b98ab583b1fadb70fd919551b331baee75a8467a05214c60bed8bdf6f58f62d5a7c5
-
SOURCE3_HASH=sha512:13010a6eb95b9397d6bc899acb8b077130d30695ef8bc742f8637f50ee2feff3faa88e5c78922de38a8cda571c8fa4bfc64a835c96d09885780c99977ea1398b
-
SOURCE4_HASH=sha512:18a4b999c75945f640110ef66ee27bef46de841a48682c566c6796d0416e7abf0319f2673dabd19ddc7584960e2333a350b3efdcf27b45399b47efccddb048dd
-
SOURCE5_HASH=sha512:64c78eb8866203d6005bf6b91a765b19c8d6087497a41dfcbab514f958b47b0d6b368e8d35a5f031208f9c09d6a597b6ab41d30e70b5217ece0e388db46d9e79
-
SOURCE6_HASH=sha512:496f1fc95c9f24137e2dad6f57b5ced289b90cd58f638d12fa6cb036a6e07d21daee60d71dbc656583e33dadc7da43dba0c70a73d217b9a6cc0bb66e7a6d3b0f
-
SOURCE7_HASH=sha512:8d1f69832c24f602045901ed1f1b55b0df1bb8b9fcd16c41e298f6d9bf6638b659697a6eae6eb58a9db25d2b47daae8f49c15ee5d55fb0093d87f03b453adbe6
+
SOURCE_HASH=sha512:1cfeebf3b952264a6fa7b1acc3c8d286faf6a0d5356b21971525e699af3969ee25fe32b1df37f53c22576739efef3e10bd65f3984332e730cee7b5ccea1ac5b2
+
SOURCE2_HASH=sha512:881338194c0515c8edb90d6462bf12aa61cfa15ea69a42202feeafcd92fc246da8f284498e4257b5ef20c815ccacc080395115db86c91f47296cbc37641ed80f
+
SOURCE3_HASH=sha512:bee265e98271dd621d0134d4b8f9fe976a8b6aabde979d0ea0515cb3a3d69d3fdac8464322838bf506f9404508af72e27e92b4886a5c10978167bbb74434db2a
+
SOURCE4_HASH=sha512:302002f408025160694682770ce18a7f22db62ecc24c02a01c66e36fd19b91443ede18d9c2f3c3d0d6acc4e335738e5441b5ec171356dc57275502b9e4849386
+
SOURCE5_HASH=sha512:f4acbde528f7a60f2392bec2d8b8d4b2c2b6caeb20fccae1177cdd28b5dd3e4b9c3a4bfd13e21b9df85aeb8c168ba61d2df78703ff609cb190aa4c83c01484e5
+
SOURCE6_HASH=sha512:5e3fcf4c76144695a442a2fa58ac2fc4c294d9013c9a800159b90be09b1db86a018e23f0141a4d78fff110a531a49ef030c47733d26d49a0c1068f2707d146a2
+
SOURCE7_HASH=sha512:246d23768422a5270bccff433c4d5613c5fa45a39a31a1f2cb7d7d522a56e6d1645142bb779289d1d163ac479b18f47f70cc6a26d573b4afedda486e1495d6e4
WEB_SITE=http://www.xfree86.org/
ENTERED=20010922
LICENSE[0]=XCL
diff --git a/x11-libs/xfree86/HISTORY b/x11-libs/xfree86/HISTORY
index bb3ea28..ef43a83 100644
--- a/x11-libs/xfree86/HISTORY
+++ b/x11-libs/xfree86/HISTORY
@@ -1,3 +1,9 @@
+2007-08-16 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.7.0
+ * PRE_BUILD: Removed patches for freetype2 2.2.1
+ * ftfuncs.patch, ftfuncs.h.patch, ftsystem.patch,
+ util.c.patch: Removed. Incorporated upstream.
+
2006-11-18 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 4.6.0. Removed Updated.
* PRE_BUILD: Added patches for freetype2 2.2.1. Removed not
diff --git a/x11-libs/xfree86/PRE_BUILD b/x11-libs/xfree86/PRE_BUILD
index 3fedc10..2d5b589 100755
--- a/x11-libs/xfree86/PRE_BUILD
+++ b/x11-libs/xfree86/PRE_BUILD
@@ -7,9 +7,5 @@ unpack_file 5 &&
unpack_file 6 &&
unpack_file 7 &&

-mk_source_dir $SOURCE_DIRECTORY.bld &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ftfuncs.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/ftfuncs.h.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/ftsystem.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/util.c.patch
+mk_source_dir $SOURCE_DIRECTORY.bld
+
diff --git a/x11-libs/xfree86/ftfuncs.h.patch
b/x11-libs/xfree86/ftfuncs.h.patch
deleted file mode 100644
index cd0fa05..0000000
--- a/x11-libs/xfree86/ftfuncs.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/font/FreeType/ftfuncs.h.orig 2006-11-16 19:24:26.000000000 +0400
-+++ lib/font/FreeType/ftfuncs.h 2006-11-16 19:25:10.000000000 +0400
-@@ -46,6 +46,7 @@
- typedef struct _FTFace {
- char *filename;
- FT_Face face;
-+ FT_UInt num_hmetrics;
- int bitmap;
- struct _FTInstance *instances;
- struct _FTInstance *active_instance;
diff --git a/x11-libs/xfree86/ftfuncs.patch b/x11-libs/xfree86/ftfuncs.patch
deleted file mode 100644
index 0025d1e..0000000
--- a/x11-libs/xfree86/ftfuncs.patch
+++ /dev/null
@@ -1,241 +0,0 @@
---- lib/font/FreeType/ftfuncs.c.orig 2006-11-14 22:06:39.000000000 +0400
-+++ lib/font/FreeType/ftfuncs.c 2006-11-15 06:39:43.000000000 +0400
-@@ -50,10 +50,7 @@
- #include FT_TYPE1_TABLES_H
- #include FT_XFREE86_H
- #include FT_BBOX_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
- #include FT_TRUETYPE_TAGS_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_STREAM_H
- /*
- * If you want to use FT_Outline_Get_CBox instead of
- * FT_Outline_Get_BBox, define here.
-@@ -118,6 +115,45 @@
- "CHARSET_ENCODING",
- };
-
-+/* read 2-byte value from a SFNT table */
-+static FT_UShort
-+sfnt_get_ushort( FT_Face face,
-+ FT_ULong table_tag,
-+ FT_ULong table_offset )
-+{
-+ FT_Byte buff[2];
-+ FT_ULong len = sizeof(buff);
-+ FT_UShort result = 0;
-+
-+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
-+ result = (FT_UShort)( (buff[0] << 8) | buff[1] );
-+
-+ return result;
-+}
-+
-+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
-+
-+
-+#if 0
-+static FT_ULong
-+sfnt_get_ulong( FT_Face face,
-+ FT_ULong table_tag,
-+ FT_ULong table_offset )
-+{
-+ FT_Byte buff[4];
-+ FT_ULong len = sizeof(buff);
-+ FT_UShort result = 0;
-+
-+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
-+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
-+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3];
-+
-+ return result;
-+}
-+#endif
-+
-+
-+
-
- static int ftypeInitP = 0; /* is the engine initialised? */
- static FT_Library ftypeLibrary;
-@@ -207,6 +243,10 @@
- if(maxp && maxp->maxContours == 0)
- face->bitmap = 1;
- }
-+
-+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
-+ TTAG_hhea, 34 );
-+
- /* Insert face in hashtable and return it */
- face->next = faceTable[bucket];
- faceTable[bucket] = face;
-@@ -458,6 +498,29 @@
- }
-
- if( FT_IS_SFNT( face->face ) ) {
-+#if 1
-+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-+ FT_UInt nn;
-+
-+ instance->strike_index=0xFFFFU;
-+
-+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5);
-+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
-+
-+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) &
-64;
-+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) &
-64;
-+
-+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
-+ {
-+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn];
-+
-+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
-+ {
-+ instance->strike_index = nn;
-+ break;
-+ }
-+ }
-+#else
- /* See Set_Char_Sizes() in ttdriver.c */
- FT_Error err;
- TT_Face tt_face;
-@@ -482,6 +545,7 @@
- sfnt = (SFNT_Service)tt_face->sfnt;
- err =
sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
- if ( err ) instance->strike_index=0xFFFFU;
-+#endif
- }
-
- /* maintain a linked list of instances */
-@@ -799,31 +863,35 @@
- * parse the htmx field in TrueType font.
- */
-
--/* from src/truetype/ttgload.c */
- static void
--tt_get_metrics( TT_HoriHeader* header,
-+tt_get_metrics( FT_Face face,
- FT_UInt idx,
-+ FT_UInt num_hmetrics,
- FT_Short* bearing,
- FT_UShort* advance )
--/* Copyright 1996-2001, 2002 by */
--/* David Turner, Robert Wilhelm, and Werner Lemberg. */
- {
-- TT_LongMetrics longs_m;
-- FT_UShort k = header->number_Of_HMetrics;
-+ /* read the metrics directly from the horizontal header, we
-+ * parse the SFNT table directly through the standard FreeType API.
-+ * this works with any version of the library and doesn't need to
-+ * peek at its internals. Maybe a bit less
-+ */
-+ FT_UInt count = num_hmetrics;
-
-- if ( k == 0 ) {
-- *bearing = *advance = 0;
-- return;
-+ if ( count == 0 )
-+ {
-+ *advance = 0;
-+ *bearing = 0;
- }
--
-- if ( idx < (FT_UInt)k ) {
-- longs_m = (TT_LongMetrics )header->long_metrics + idx;
-- *bearing = longs_m->bearing;
-- *advance = longs_m->advance;
-+ else if ( idx < count )
-+ {
-+ FT_ULong offset = idx*4;
-+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
-+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
- }
-- else {
-- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
-- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
-+ else
-+ {
-+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
-+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
- }
- }
-
-@@ -831,6 +899,7 @@
- ft_get_very_lazy_bbox( FT_UInt index,
- FT_Face face,
- FT_Size size,
-+ FT_UInt num_hmetrics,
- double slant,
- FT_Matrix *matrix,
- FT_BBox *bbox,
-@@ -838,14 +907,13 @@
- FT_Long *vertAdvance)
- {
- if ( FT_IS_SFNT( face ) ) {
-- TT_Face ttface = (TT_Face)face;
- FT_Size_Metrics *smetrics = &size->metrics;
- FT_Short leftBearing = 0;
- FT_UShort advance = 0;
- FT_Vector p0, p1, p2, p3;
-
- /* horizontal */
-- tt_get_metrics(&ttface->horizontal, index,
-+ tt_get_metrics( face, num_hmetrics, index,
- &leftBearing, &advance);
-
- #if 0
-@@ -905,6 +973,27 @@
- FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index,
- FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return )
- {
-+#if 1
-+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
-+ {
-+ FT_Error error;
-+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index];
-+
-+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
-+ if ( !error )
-+ {
-+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
-+ if ( !error )
-+ {
-+ if ( metrics_return != NULL )
-+ *metrics_return = ft_face->glyph->metrics;
-+
-+ return 0;
-+ }
-+ }
-+ }
-+ return -1;
-+#elif (FREETYPE_VERSION >= 2001008)
- SFNT_Service sfnt;
- TT_Face face;
- FT_Error error;
-@@ -968,6 +1057,7 @@
-
- Exit:
- return error;
-+#endif
- }
-
- int
-@@ -1022,7 +1112,8 @@
- }
- if( bitmap_metrics == NULL ) {
- if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) {
-- if( ft_get_very_lazy_bbox( idx, face->face,
instance->size,
-+ if( ft_get_very_lazy_bbox( idx, face->face,
instance->size,
-+ face->num_hmetrics,
- instance->ttcap.vl_slant,
-
&instance->transformation.matrix,
- &bbox, &outline_hori_advance,
-@@ -1196,7 +1287,8 @@
- if( (instance->ttcap.flags & TTCAP_MONO_CENTER) && hasMetrics ) {
- if( is_outline == 1 ){
- if( correct ){
-- if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
-+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
-+ face->num_hmetrics,
- instance->ttcap.vl_slant,
- &instance->transformation.matrix,
- &bbox, &outline_hori_advance,
diff --git a/x11-libs/xfree86/ftsystem.patch b/x11-libs/xfree86/ftsystem.patch
deleted file mode 100644
index f5b625e..0000000
--- a/x11-libs/xfree86/ftsystem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/font/FreeType/ftsystem.c.orig 2006-11-16 19:17:34.000000000 +0400
-+++ lib/font/FreeType/ftsystem.c 2006-11-16 19:20:53.000000000 +0400
-@@ -32,7 +32,9 @@
-
- #include <ft2build.h>
- #include FT_CONFIG_CONFIG_H
--#include FT_INTERNAL_DEBUG_H
-+#define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */
-+#define FT_TRACE1( varformat ) FT_TRACE( 1, varformat )
-+#define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */
- #include FT_SYSTEM_H
- #include FT_ERRORS_H
- #include FT_TYPES_H
diff --git a/x11-libs/xfree86/util.c.patch b/x11-libs/xfree86/util.c.patch
deleted file mode 100644
index d33cc97..0000000
--- a/x11-libs/xfree86/util.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/fonttosfnt/util.c.orig 2006-11-15 07:23:20.000000000 +0400
-+++ programs/fonttosfnt/util.c 2006-11-15 07:23:37.000000000 +0400
-@@ -34,7 +34,6 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include FT_INTERNAL_OBJECTS_H
- #include FT_BDF_H
- #include "X11/Xos.h"
- #include "fonttosfnt.h"
diff --git a/x11-toolkits/fox/DEPENDS b/x11-toolkits/fox/DEPENDS
index b292e35..d3d5bd0 100755
--- a/x11-toolkits/fox/DEPENDS
+++ b/x11-toolkits/fox/DEPENDS
@@ -7,4 +7,14 @@ optional_depends "X11-LIBS" "--with-opengl=opengl"
"--disable-opengl" "for g
optional_depends "CUPS" "" ""
"for printing support" &&
optional_depends "jpeg" "--enable-jpeg=yes" "--disable-jpeg"
"for JPEG image support" &&
optional_depends "tiff" "--enable-tiff=yes" "--disable-tiff"
"for TIFF image support" &&
-optional_depends "libpng" "--enable-png=yes" "--disable-png"
"for PNG image support"
+optional_depends "libpng" "--enable-png=yes" "--disable-png"
"for PNG image support" &&
+
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs; then
+ optional_depends "libxft" \
+ "--with-xft=yes" \
+ "--without-xft" \
+ "for XFT anti-aliased font support"
+fi
diff --git a/x11-toolkits/fox/HISTORY b/x11-toolkits/fox/HISTORY
index 77185ba..15e0f34 100644
--- a/x11-toolkits/fox/HISTORY
+++ b/x11-toolkits/fox/HISTORY
@@ -1,3 +1,9 @@
+2007-08-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: optional_depends libxft only if xorg-modular
+
+2007-08-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: added optional_depends libxft
+
2007-07-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 1.6.28

diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index ce7625c..15ef97b 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk+2
- VERSION=2.10.14
+ VERSION=2.12.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gtk+-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk+-$VERSION
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 89e6fda..2519e02 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,12 @@
+2007-09-15 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.12.0
+
+2007-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.11.6
+
+2007-08-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: fix compile with cups 1.3
+
2007-07-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.14

diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
new file mode 100755
index 0000000..833562f
--- /dev/null
+++ b/x11-toolkits/gtk+2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/CUPS_VERSION_MINOR > 1/\0 \&\& CUPS_VERSION_MINOR < 3/'
modules/printbackends/cups/gtkcupsutils.c
diff --git a/x11-toolkits/gtk+2/gtk+-2.10.14.tar.bz2.sig
b/x11-toolkits/gtk+2/gtk+-2.10.14.tar.bz2.sig
deleted file mode 100644
index b6813d4..0000000
Binary files a/x11-toolkits/gtk+2/gtk+-2.10.14.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig
b/x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig
new file mode 100644
index 0000000..d122617
Binary files /dev/null and b/x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig differ
diff --git a/x11-toolkits/gtk-sharp-2/DETAILS
b/x11-toolkits/gtk-sharp-2/DETAILS
index 8256cba..b31ff9c 100755
--- a/x11-toolkits/gtk-sharp-2/DETAILS
+++ b/x11-toolkits/gtk-sharp-2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk-sharp-2
- VERSION=2.10.0
+ VERSION=2.10.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtk-sharp-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/gtk-sharp-${VERSION}
diff --git a/x11-toolkits/gtk-sharp-2/HISTORY
b/x11-toolkits/gtk-sharp-2/HISTORY
index 3c4b675..cdfaf58 100644
--- a/x11-toolkits/gtk-sharp-2/HISTORY
+++ b/x11-toolkits/gtk-sharp-2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.10.2
+
2007-08-15 George Sherwood <george AT beernabeer.com>
* DETAILS: Commented out SOURCE_URL[1] due to missing bz2 file.
Downgraded to 2.10.0. http://go-mono.com called this stable.
diff --git a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.0.tar.bz2.sig
b/x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.0.tar.bz2.sig
deleted file mode 100644
index 2db280d..0000000
Binary files a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.0.tar.bz2.sig and
/dev/null differ
diff --git a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.2.tar.bz2.sig
b/x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.2.tar.bz2.sig
new file mode 100644
index 0000000..8dc7a09
Binary files /dev/null and
b/x11-toolkits/gtk-sharp-2/gtk-sharp-2.10.2.tar.bz2.sig differ
diff --git a/x11-toolkits/gtkmm2/DETAILS b/x11-toolkits/gtkmm2/DETAILS
index 369ad79..b7e64c9 100755
--- a/x11-toolkits/gtkmm2/DETAILS
+++ b/x11-toolkits/gtkmm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkmm2
- VERSION=2.10.11
+ VERSION=2.12.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtkmm-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkmm-$VERSION
diff --git a/x11-toolkits/gtkmm2/HISTORY b/x11-toolkits/gtkmm2/HISTORY
index 2592795..3d8ab62 100644
--- a/x11-toolkits/gtkmm2/HISTORY
+++ b/x11-toolkits/gtkmm2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.0
+
+2007-09-08 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated VERSION to 2.11.8
+
2007-08-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.11

diff --git a/x11-toolkits/gtkmm2/gtkmm-2.10.11.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.10.11.tar.bz2.sig
deleted file mode 100644
index 2fcbea8..0000000
Binary files a/x11-toolkits/gtkmm2/gtkmm-2.10.11.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig
new file mode 100644
index 0000000..87d9256
Binary files /dev/null and b/x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig
differ
diff --git a/x11-toolkits/kiwi/DETAILS b/x11-toolkits/kiwi/DETAILS
index 52b09a7..718ecf4 100755
--- a/x11-toolkits/kiwi/DETAILS
+++ b/x11-toolkits/kiwi/DETAILS
@@ -1,9 +1,9 @@
SPELL=kiwi
- VERSION=1.9.14
+ VERSION=1.9.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:5205ad17aa8d68e311db5442472cd2846152baabb91d824dc50b88765ec23de58011b0fba5d621105d9e1fa3cf79d9e5dc0fa32c27f132517737ca425dfe205e
+
SOURCE_HASH=sha512:70dec9a0a2de1486667b331485b853e0d1f031cfc3a72d9bed13ba58824cac598c086b78510a793a2a90b4208902c9a94b5d9059a8b7391905347f7d2d533a64
WEB_SITE=http://www.async.com.br/projects/kiwi/
ENTERED=20070113
LICENSE[0]=LGPL
diff --git a/x11-toolkits/kiwi/HISTORY b/x11-toolkits/kiwi/HISTORY
index 8e76650..561f1cf 100644
--- a/x11-toolkits/kiwi/HISTORY
+++ b/x11-toolkits/kiwi/HISTORY
@@ -1,3 +1,6 @@
+2007-09-08 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 1.9.16
+
2007-04-21 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: Updated to 1.9.14

diff --git a/x11-toolkits/pygtk2/DETAILS b/x11-toolkits/pygtk2/DETAILS
index 33165c7..5bb828e 100755
--- a/x11-toolkits/pygtk2/DETAILS
+++ b/x11-toolkits/pygtk2/DETAILS
@@ -1,5 +1,5 @@
SPELL=pygtk2
- VERSION=2.10.6
+ VERSION=2.12.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=pygtk-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pygtk-$VERSION
diff --git a/x11-toolkits/pygtk2/HISTORY b/x11-toolkits/pygtk2/HISTORY
index d1d1594..4a8bf19 100644
--- a/x11-toolkits/pygtk2/HISTORY
+++ b/x11-toolkits/pygtk2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.0
+
2007-07-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.6

diff --git a/x11-toolkits/pygtk2/pygtk-2.10.6.tar.bz2.sig
b/x11-toolkits/pygtk2/pygtk-2.10.6.tar.bz2.sig
deleted file mode 100644
index 92f9372..0000000
Binary files a/x11-toolkits/pygtk2/pygtk-2.10.6.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig
b/x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig
new file mode 100644
index 0000000..41724f2
Binary files /dev/null and b/x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig
differ
diff --git a/x11-toolkits/qt-x11/175791_3.diff
b/x11-toolkits/qt-x11/175791_3.diff
new file mode 100644
index 0000000..06ae9e5
--- /dev/null
+++ b/x11-toolkits/qt-x11/175791_3.diff
@@ -0,0 +1,11 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -165,7 +165,7 @@ public:
+ QString toUnicode(const char* chars, int len)
+ {
+ QString result;
+- result.setLength( len ); // worst case
++ result.setLength( len + 1 ); // worst case
+ QChar *qch = (QChar *)result.unicode();
+ uchar ch;
+ int error = -1;
diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index 565e387..4ae31ae 100755
--- a/x11-toolkits/qt-x11/DETAILS
+++ b/x11-toolkits/qt-x11/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-free-$VERSION
WEB_SITE=http://www.trolltech.com/qt/x11.html
KEYWORDS="qt x11 libs"
ENTERED=20020410
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
DOCS="FAQ README README-QT.TXT"
SHORT="Qt simplifies writing and maintaining GUI applications"
cat << EOF
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 6c05737..3647de2 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * 175791_3.diff: added
+ fixes bug #13987
+
2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD:apply patch
diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
index 6ccb4a4..efd567d 100755
--- a/x11-toolkits/qt-x11/PRE_BUILD
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -3,6 +3,7 @@ cd $SOURCE_DIRECTORY &&
# apply patches
patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.diff &&
patch -p4 < $SPELL_DIRECTORY/170529.diff &&
+patch -p0 < $SPELL_DIRECTORY/175791_3.diff &&
# fix detecction of firebird
sedit "s/-lgds//" configure &&
sedit "/gds/D;/\t}/D" plugins/src/sqldrivers/ibase/ibase.pro &&
diff --git a/x11-toolkits/qt4/175791_4.diff b/x11-toolkits/qt4/175791_4.diff
new file mode 100644
index 0000000..645daa6
--- /dev/null
+++ b/x11-toolkits/qt4/175791_4.diff
@@ -0,0 +1,11 @@
+--- src/corelib/codecs/qutfcodec.cpp
++++ src/corelib/codecs/qutfcodec.cpp
+@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const
char *chars, int len, C
+
+ int originalLength = target->length();
+ QString &result = *target;
+- result.resize(originalLength + len); // worst case
++ result.resize(originalLength + len + 1); // worst case
+ QChar *qch = result.data() + originalLength;
+ uchar ch;
+ int invalid = 0;
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 86ebcbf..120ed42 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -12,14 +12,14 @@ case $QT_VER in

SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
;;
*) #stable
VERSION=4.3.1

SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
esac
SOURCE_URL[0]=ftp://ftp.trolltech.com/$URI
SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 2dddd09..4344d91 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * 175791_4.diff: added
+ fix bug #13987
+
2007-08-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update snapshot to 4.3.2

diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 6ee57a9..fcc3f38 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# apply patches
+if [[ $QT_VER != snapshot ]]; then
+ patch -p0 < $SPELL_DIRECTORY/175791_4.diff
+fi &&
+
# add better optimisation flags
# -O2 gives segmentation fault in moc when building tools
sed -i "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf \
diff --git a/x11-toolkits/wxgtk/BUILD b/x11-toolkits/wxgtk/BUILD
index c412f33..9ef7477 100755
--- a/x11-toolkits/wxgtk/BUILD
+++ b/x11-toolkits/wxgtk/BUILD
@@ -3,14 +3,17 @@ OPTS="$OPTS
--disable-debug
--disable-monolithic
--enable-shared
- --with-opengl
--with-libiconv-prefix=$INSTALL_ROOT/usr
--enable-geometry
- --enable-xrc
--enable-unicode
--with-gtk=2
" &&
+if list_find "$WX_CONTRIB" "xrc"
+then
+ OPTS="--enable-xrc $OPTS"
+fi &&
default_build &&
for COMPONENT in $WX_CONTRIB; do
+ if [[ "$COMPONENT" == "xrc" ]]; then continue; fi &&
make -C contrib/src/$COMPONENT
done
diff --git a/x11-toolkits/wxgtk/CONFIGURE b/x11-toolkits/wxgtk/CONFIGURE
index 8e68c67..d9f5262 100755
--- a/x11-toolkits/wxgtk/CONFIGURE
+++ b/x11-toolkits/wxgtk/CONFIGURE
@@ -3,9 +3,9 @@ message "previous defaults were: animate gizmos ogl stc" &&
source $GRIMOIRE/FUNCTIONS &&
if [[ "$WX_DEV" == "y" ]];then
config_query_multi WX_CONTRIB "which add-ons to build?" animate applet
canvas foldbar \
- fl gizmos mmedia net ogl stc
+ fl gizmos mmedia net ogl stc xrc

else
config_query_multi WX_CONTRIB "which add-ons to build?" applet foldbar \
- fl gizmos mmedia net ogl stc
+ fl gizmos mmedia net ogl stc xrc
fi
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 52cd1e5..25e0d06 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -4,7 +4,7 @@ depends gtk+2 &&

depends X11-LIBS '--with-x --with-libxpm' &&

-depends OPENGL &&
+depends OPENGL "--with-opengl" &&
# all of the "depends" below strictly speaking are not required, e.g. we can
# use included library by specifying --with-*=builtin, but we want to use the
# system libraries, so we're saying --with-*[=sys] here.
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index 8b847ff..4e6e64e 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,11 +1,12 @@
SPELL=wxgtk
SPELLX=wxGTK
if [[ "$WX_DEV" == "y" ]];then
- VERSION=2.8.4
-
SOURCE_HASH=sha512:655678285e50d672df58672455f17cf607905ef5a2c7940e0ffbd700c08a48bf0aa07067a8c2f3519e80d62807cfd12f0347727a1561d13b4702e5a99157fccb
+ VERSION=2.8.5
+
SOURCE_HASH=sha512:472ce32e2f2138c48e749d502c6e2a7c332a8427b95238554564d745bd8ac16b115114e3477cf932beb19803f21773bcadcd7e86d7f7963f7fd42478025976d4
else
VERSION=2.6.4

SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
+ PATCHLEVEL=2
fi
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index a6045a9..4698421 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,29 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, debdiff.patch: patch to fix an issue triggered by glibc
+ 2.6, see
+ https://bugs.launchpad.net/mandriva/+source/vlc/+bug/120278, thanks
+ to the ubuntu guys for backporting the upstream fix
+ * DETAILS: updated 2.8 version to 2.8.5, fixes the same issue, moved
+ PATCHLEVEL to 2.6 version and incremented
+
+2007-09-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCLEVEL++
+ * BUILD, INSTALL: fixed if statements in xrc skipping,
+ removed WXGTK_OPTS usage
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: switched to WX_CONTRIB,
+ added DEV sub_dependency
+
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, PRE_SUB_DEPENDS: fixed bad list_find usage
+
+2007-09-05 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: moved opengl flag to DEPENDS, changed options handling,
+ made xrc optional
+ * CONFIGURE: added xrc to WX_CONTRIB
+ * DEPENDS: added flag to OPENGL
+ * INSTALL: fixed xrc handling an added $WXGTK_OPTS to loop
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added for sub_depending ;)
+
2007-07-09 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: At least for stable, animate is an empty directory

diff --git a/x11-toolkits/wxgtk/INSTALL b/x11-toolkits/wxgtk/INSTALL
index c58df9c..23ee151 100755
--- a/x11-toolkits/wxgtk/INSTALL
+++ b/x11-toolkits/wxgtk/INSTALL
@@ -1,4 +1,5 @@
default_install &&
for COMPONENT in $WX_CONTRIB; do
+ if [[ "$COMPONENT" == "xrc" ]]; then continue; fi &&
make -C contrib/src/$COMPONENT install
done
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
new file mode 100755
index 0000000..3b1d034
--- /dev/null
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ $WX_DEV != y ]]; then
+ patch -p1 < $SPELL_DIRECTORY/debdiff.patch
+fi
diff --git a/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
b/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ada7e7f
--- /dev/null
+++ b/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
@@ -0,0 +1,17 @@
+case $THIS_SUB_DEPENDS in
+ ANIMATE) list_find "$WXGTK_CONTRIB" "animate" ;;
+ APPLET) list_find "$WXGTK_CONTRIB" "applet" ;;
+ CANVAS) list_find "$WXGTK_CONTRIB" "canvas" ;;
+ DEV) if [[ "$WX_DEV" == "y" ]]; then
+ return 0; fi ;;
+ FOLDBAR) list_find "$WXGTK_CONTRIB" "foldbar" ;;
+ FL) list_find "$WXGTK_CONTRIB" "fl" ;;
+ GIZMOS) list_find "$WXGTK_CONTRIB" "gizmos" ;;
+ MMEDIA) list_find "$WXGTK_CONTRIB" "mmedia" ;;
+ NET) list_find "$WXGTK_CONTRIB" "net" ;;
+ OGL) list_find "$WXGTK_CONTRIB" "ogl" ;;
+ STC) list_find "$WXGTK_CONTRIB" "stc" ;;
+ XRC) list_find "$WXGTK_CONTRIB" "xrc" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/x11-toolkits/wxgtk/SUB_DEPENDS b/x11-toolkits/wxgtk/SUB_DEPENDS
new file mode 100755
index 0000000..83b31b8
--- /dev/null
+++ b/x11-toolkits/wxgtk/SUB_DEPENDS
@@ -0,0 +1,17 @@
+persistent_remove WXGTK_OPTS
+case $THIS_SUB_DEPENDS in
+ ANIMATE) list_add WXGTK_CONTRIB animate ;;
+ APPLET) list_add WXGTK_CONTRIB applet ;;
+ CANVAS) list_add WXGTK_CONTRIB canvas ;;
+ DEV) WX_DEV="y" ;;
+ FOLDBAR) list_add WXGTK_CONTRIB foldbar ;;
+ FL) list_add WXGTK_CONTRIB fl ;;
+ GIZMOS) list_add WXGTK_CONTRIB gizmos ;;
+ MMEDIA) list_add WXGTK_CONTRIB mmedia ;;
+ NET) list_add WXGTK_CONTRIB net ;;
+ OGL) list_add WXGTK_CONTRIB ogl ;;
+ STC) list_add WXGTK_CONTRIB stc ;;
+ XRC) list_add WXGTK_CONTRIB xrc ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/x11-toolkits/wxgtk/debdiff.patch
b/x11-toolkits/wxgtk/debdiff.patch
new file mode 100644
index 0000000..06c99b4
--- /dev/null
+++ b/x11-toolkits/wxgtk/debdiff.patch
@@ -0,0 +1,24 @@
+diff -pruN wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/button.cpp
wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/button.cpp
+--- wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/button.cpp 2006-05-01
07:38:40.000000000 +0300
++++ wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/button.cpp 2007-06-25
23:40:33.000000000 +0300
+@@ -89,7 +89,7 @@ gtk_button_style_set_callback( GtkWidget
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+- g_free( default_border );
++ gtk_border_free( default_border );
+ }
+ #else
+ left_border = 6;
+diff -pruN wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/window.cpp
wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/window.cpp
+--- wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/window.cpp 2006-05-01
07:38:40.000000000 +0300
++++ wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/window.cpp 2007-06-25
23:47:35.000000000 +0300
+@@ -3276,7 +3276,7 @@ void wxWindowGTK::DoSetSize( int x, int
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+- g_free( default_border );
++ gtk_border_free( default_border );
+ }
+ #else
+ left_border = 6;
diff --git a/x11-toolkits/xaw3d/BUILD b/x11-toolkits/xaw3d/BUILD
index ebc9c06..d3d1c5c 100755
--- a/x11-toolkits/xaw3d/BUILD
+++ b/x11-toolkits/xaw3d/BUILD
@@ -1,3 +1,4 @@
+make_single &&
cd lib/Xaw3d &&
ln -s .. X11 &&
perl -i -pe 's/# (EXTRA_INCLUDES = -I.)/$1/' Imakefile &&
diff --git a/x11-toolkits/xaw3d/HISTORY b/x11-toolkits/xaw3d/HISTORY
index b41f35d..ad75356 100644
--- a/x11-toolkits/xaw3d/HISTORY
+++ b/x11-toolkits/xaw3d/HISTORY
@@ -1,3 +1,6 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fails with multiple make jobs
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/x11/slim/BUILD b/x11/slim/BUILD
index d22c51a..29c828c 100755
--- a/x11/slim/BUILD
+++ b/x11/slim/BUILD
@@ -1 +1 @@
-make DESTDIR=${TRACK_ROOT}/ CC=gcc CXX=g++
+make $OPTS DESTDIR=${TRACK_ROOT}/ CC=gcc CXX=g++
diff --git a/x11/slim/DEPENDS b/x11/slim/DEPENDS
index 330ce3a..d0064df 100755
--- a/x11/slim/DEPENDS
+++ b/x11/slim/DEPENDS
@@ -1,20 +1,24 @@
-depends fontconfig &&
-depends freetype2 &&
-depends jpeg &&
-depends libpng &&
-depends X11-LIBS &&
-depends zlib &&
+depends fontconfig &&
+depends freetype2 &&
+depends jpeg &&
+depends libpng &&
+depends X11-LIBS &&
+depends zlib &&
+optional_depends linux-pam \
+ "USE_PAM=1" \
+ "" \
+ "Enable PAM support" &&

-. $GRIMOIRE/FUNCTIONS &&
+. $GRIMOIRE/FUNCTIONS &&

if check_if_xorg_modular_libs; then
- depends libx11 &&
- depends libxft &&
- depends libxmu &&
- depends libxrender &&
- depends xauth &&
- optional_depends xterm \
- "" \
- "" \
+ depends libx11 &&
+ depends libxft &&
+ depends libxmu &&
+ depends libxrender &&
+ depends xauth &&
+ optional_depends xterm \
+ "" \
+ "" \
"for console login"
fi
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 8c06e1d..6694d9e 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,8 @@
+2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: added pam support
+ * BUILD: added pam support
+ * PRE_BUILD: use our CFLAGS
+
2007-07-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.3.0
fixed long description wrap
diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD
index 014f854..3c884fb 100755
--- a/x11/slim/PRE_BUILD
+++ b/x11/slim/PRE_BUILD
@@ -1,4 +1,10 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i -e "s:^CXXFLAGS=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" \
+ -e "s:^CFLAGS=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
+ -e "s:^MANDIR=.*:MANDIR=${INSTALL_ROOT}/usr/share/man:" \
+ -e "s:/usr/X11R6:${INSTALL_ROOT}/usr:" \
+ Makefile &&
if check_if_xorg_modular_libs; then
sedit 's:X11R6\/::g' $SOURCE_DIRECTORY/slim.conf
fi
diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index 4518803..f9fb363 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -1,2 +1,32 @@
-depends xfce4-panel &&
-depends exo
+depends xfce4-panel &&
+depends exo &&
+
+optional_depends dbus \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for D-Bus support" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&
+
+optional_depends hal \
+ "--with-volume-manager=hal" \
+ "" \
+ "to use HAL as volume manager" &&
+
+optional_depends libexif \
+ "--enable-exif" \
+ "--disable-exif" \
+ "for EXIF support" &&
+
+optional_depends pcre \
+ "--enable-pcre" \
+ "--disable-pcre" \
+ "for regular expressions support" &&
+
+optional_depends startup-notification \
+ "--enable-startup-notification" \
+ "--disable-startup-notification" \
+ "for startup notification library support"
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index 866d986..df0823f 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,7 +1,10 @@
+2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added dbus, gtk-doc, hal, libexif, pcre and
+ startup-notification as optional
+
2007-02-19 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: added for proper docs installation

2007-01-23 George Sherwood <george AT beernabeer.com>
* DEPENDS, DETAILS, HISTORY: created the spell
-
diff --git a/xfce/xfce-utils/DEPENDS b/xfce/xfce-utils/DEPENDS
index 6a95a58..c30afaf 100755
--- a/xfce/xfce-utils/DEPENDS
+++ b/xfce/xfce-utils/DEPENDS
@@ -1,2 +1,7 @@
depends xfce-mcs-manager &&
-depends which
+depends which &&
+
+optional_depends dbus-glib \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for D-Bus support'
diff --git a/xfce/xfce-utils/HISTORY b/xfce/xfce-utils/HISTORY
index 274b521..87df992 100644
--- a/xfce/xfce-utils/HISTORY
+++ b/xfce/xfce-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added dbus-glib as optional
+
2007-07-04 George Sherwood <george AT beernabeer.com>
* DEPENDS: depends which

diff --git a/xfce/xfce4-mixer/BUILD b/xfce/xfce4-mixer/BUILD
new file mode 100755
index 0000000..62767ff
--- /dev/null
+++ b/xfce/xfce4-mixer/BUILD
@@ -0,0 +1,2 @@
+make_single &&
+default_build
diff --git a/xfce/xfce4-mixer/HISTORY b/xfce/xfce4-mixer/HISTORY
index 32e6a40..443b824 100644
--- a/xfce/xfce4-mixer/HISTORY
+++ b/xfce/xfce4-mixer/HISTORY
@@ -1,3 +1,6 @@
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fails to compile with multiple make jobs
+
2007-05-15 Lalo Martins <lalo AT sourcemage.org>
* DEPENDS, DETAILS: option to force use of ALSA. Without that, if
both ALSA and OSS are detected, it will use OSS. Fell free to
diff --git a/xfce/xfce4-session/DEPENDS b/xfce/xfce4-session/DEPENDS
index fa501be..f96bae6 100755
--- a/xfce/xfce4-session/DEPENDS
+++ b/xfce/xfce4-session/DEPENDS
@@ -6,7 +6,12 @@ if check_if_xorg_modular_libs gtk+2; then
depends iceauth
fi &&

+optional_depends dbus \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for D-Bus support' &&
+
optional_depends gconf2 \
- '--enable-gconf' \
- '--disable-gconf' \
+ '--enable-gnome' \
+ '--disable-gnome' \
'for Assistive technologies support'
diff --git a/xfce/xfce4-session/HISTORY b/xfce/xfce4-session/HISTORY
index a746cdb..77c3103 100644
--- a/xfce/xfce4-session/HISTORY
+++ b/xfce/xfce4-session/HISTORY
@@ -1,3 +1,7 @@
+2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added dbus as optional, fixed gconf2 flags
+ * PRE_BUILD, gconf2.patch: removed, fixed by upstream
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfce4-session/PRE_BUILD b/xfce/xfce4-session/PRE_BUILD
deleted file mode 100755
index 2c7e58d..0000000
--- a/xfce/xfce4-session/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-
-if list_find "$OPTS" "--enable-gconf"; then
- cd $SOURCE_DIRECTORY &&
- patch -p1 < $SCRIPT_DIRECTORY/gconf2.patch
-fi
diff --git a/xfce/xfce4-session/gconf2.patch b/xfce/xfce4-session/gconf2.patch
deleted file mode 100644
index a32def7..0000000
--- a/xfce/xfce4-session/gconf2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur xfce4-session-4.2.3.orig/Makefile.in
xfce4-session-4.2.3/Makefile.in
---- xfce4-session-4.2.3.orig/Makefile.in 2006-08-11 08:53:00.103774152
-0700
-+++ xfce4-session-4.2.3/Makefile.in 2006-08-11 09:15:53.403000936 -0700
-@@ -96,7 +96,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I/usr/include/libgnome-2.0
-I/usr/include/bonobo-activation-2 -I/usr/include/libbonobo-2.0
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-diff -Naur xfce4-session-4.2.3.orig/xfce4-session/Makefile.in
xfce4-session-4.2.3/xfce4-session/Makefile.in
---- xfce4-session-4.2.3.orig/xfce4-session/Makefile.in 2006-08-11
08:53:00.118771872 -0700
-+++ xfce4-session-4.2.3/xfce4-session/Makefile.in 2006-08-11
09:14:15.325910920 -0700
-@@ -98,7 +98,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I/usr/include/libgnome-2.0
-I/usr/include/bonobo-activation-2 -I/usr/include/libbonobo-2.0
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@



  • [SM-Commit] GIT changes to devel-openoffice grimoire by Eric Sandall (252d6cf07ee1ae785db34adc93563cf4a7f8e47f), Eric Sandall, 09/23/2007

Archive powered by MHonArc 2.6.24.

Top of Page