Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (f7d453a67e2a7b833cef639eedb0c17bf4c61637)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (f7d453a67e2a7b833cef639eedb0c17bf4c61637)
  • Date: Sat, 23 Jun 2012 02:12:36 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 16
antivirus/clamav/DEPENDS | 1
antivirus/clamav/DETAILS | 4
antivirus/clamav/FINAL | 5
antivirus/clamav/HISTORY | 11
antivirus/clamav/INSTALL | 4
antivirus/clamav/PRE_REMOVE | 3
antivirus/clamav/vendor_clamav.gpg |binary
archive/gzip/DETAILS | 4
archive/gzip/HISTORY | 3
archive/xz-utils/DETAILS | 2
archive/xz-utils/HISTORY | 3
audio-drivers/oss/DETAILS | 4
audio-drivers/oss/HISTORY | 3
audio-libs/rubberband/DETAILS | 6
audio-libs/rubberband/HISTORY | 3
audio-players/mpg123/BUILD | 2
audio-players/mpg123/CONFIGURE | 2
audio-players/mpg123/HISTORY | 3
audio-players/stretchplayer/BUILD | 1
audio-players/stretchplayer/DEPENDS | 2
audio-players/stretchplayer/DETAILS | 17
audio-players/stretchplayer/HISTORY | 2
audio-players/stretchplayer/stretchplayer_0.503.orig.tar.gz.sig |binary
audio-plugins/vamp-plugin-sdk/BUILD | 6
audio-plugins/vamp-plugin-sdk/CONFIGURE | 1
audio-plugins/vamp-plugin-sdk/DETAILS | 6
audio-plugins/vamp-plugin-sdk/HISTORY | 4
audio-plugins/vamp-plugin-sdk/INSTALL | 15
audio-plugins/vamp-plugin-sdk/PRE_BUILD | 12
audio-soft/alsaequal/BUILD | 1
audio-soft/alsaequal/DEPENDS | 2
audio-soft/alsaequal/DETAILS | 22
audio-soft/alsaequal/HISTORY | 3
audio-soft/sox/HISTORY | 4
audio-soft/sox/PRE_BUILD | 3
audio-soft/sox/ffmpeg-0.11-arch.patch | 129 ++
chat-im/licq/DETAILS | 2
chat-im/licq/HISTORY | 3
cluster/atlas/HISTORY | 6
cluster/atlas/INSTALL | 14
cluster/atlas/PRE_BUILD | 6
cluster/atlas/no_fortran.patch | 16
collab/openldap/BUILD | 43
collab/openldap/CONFIGURE | 200 ++-
collab/openldap/DEPENDS | 127 +-
collab/openldap/DETAILS | 11
collab/openldap/HISTORY | 18
collab/openldap/PREPARE | 4
collab/openldap/PRE_BUILD | 2
collab/openldap/PRE_SUB_DEPENDS | 2
collab/openldap/SUB_DEPENDS | 2
collab/openldap/TRIGGERS | 5
collab/openldap/UP_TRIGGERS | 8
collab/openldap/openldap-2.4-ntlm.patch | 203 ---
collab/openldap/openldap-2.4.31-ntlm.patch | 219 ++++
crypto/krb5-appl/DETAILS | 5
crypto/krb5-appl/HISTORY | 6
crypto/krb5-appl/PRE_BUILD | 4
crypto/krb5-appl/system-et.patch.bz2 | 0
crypto/krb5/BUILD | 9
crypto/krb5/CONFIGURE | 1
crypto/krb5/DETAILS | 7
crypto/krb5/HISTORY | 12
crypto/krb5/PRE_BUILD | 2
crypto/krb5/gcc-4.7.patch | 10
crypto/krb5/system-et.patch.bz2 | 0
crypto/mosh/DEPENDS | 10
crypto/mosh/DETAILS | 4
crypto/mosh/FINAL | 3
crypto/mosh/HISTORY | 7
dev/null |binary
devel/ddd/HISTORY | 4
devel/ddd/PRE_BUILD | 4
devel/ddd/gcc-4.4.patch | 10
devel/gdb/DEPENDS | 7
devel/gdb/HISTORY | 4
devel/geany-plugins/DETAILS | 2
devel/geany-plugins/HISTORY | 3
devel/geany/DETAILS | 3
devel/geany/HISTORY | 3
devel/ghc/DETAILS | 8
devel/ghc/HISTORY | 3
devel/git/DETAILS | 8
devel/git/HISTORY | 3
devel/qt-creator/DETAILS | 8
devel/qt-creator/HISTORY | 3
disk/ddrescue/DETAILS | 4
disk/ddrescue/HISTORY | 3
disk/e2fsprogs/DETAILS | 2
disk/e2fsprogs/HISTORY | 3
disk/partclone/DEPENDS | 7
disk/partclone/DETAILS | 4
disk/partclone/HISTORY | 5
disk/partclone/PRE_BUILD | 4
doc/docbook-xsl/DETAILS | 4
doc/docbook-xsl/HISTORY | 3
doc/zathura-pdf-poppler/DETAILS | 4
doc/zathura-pdf-poppler/HISTORY | 3
doc/zathura/DETAILS | 4
doc/zathura/HISTORY | 3
editors/ne/BUILD | 4
editors/ne/CONFIGURE | 21
editors/ne/DEPENDS | 3
editors/ne/DETAILS | 6
editors/ne/HISTORY | 8
editors/ne/INSTALL | 4
editors/ne/PRE_BUILD | 5
education/klavaro/DETAILS | 4
education/klavaro/HISTORY | 3
graphics-libs/freetype2/DETAILS | 2
graphics-libs/freetype2/HISTORY | 3
graphics-libs/poppler/DETAILS | 8
graphics-libs/poppler/HISTORY | 3
graphics/feh/DEPENDS | 1
graphics/feh/HISTORY | 3
graphics/vym/DETAILS | 4
graphics/vym/HISTORY | 3
http/firefox/DETAILS | 6
http/firefox/HISTORY | 3
http/seamonkey/DETAILS | 4
http/seamonkey/HISTORY | 3
i18n/scim-tables/DETAILS | 4
i18n/scim-tables/HISTORY | 3
i18n/scim/DEPENDS | 16
i18n/scim/DETAILS | 4
i18n/scim/HISTORY | 14
i18n/scim/PRE_BUILD | 3
i18n/scim/scim_glibc-2.10.patch | 12
java/icedtea-web/DEPENDS | 6
java/icedtea-web/DETAILS | 2
java/icedtea-web/HISTORY | 4
java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig | 0
java/icedtea-web/icedtea-web-1.2.tar.gz.sig |binary
java/icedtea6/CONFLICTS | 3
java/icedtea6/DETAILS | 4
java/icedtea6/HISTORY | 15
java/icedtea6/PROVIDES | 2
java/icedtea6/icedtea6-1.11.1.tar.gz.sig | 0
java/icedtea6/icedtea6-1.11.3.tar.gz.sig |binary
java/icedtea7/BUILD | 13
java/icedtea7/CONFIGURE | 11
java/icedtea7/CONFLICTS | 7
java/icedtea7/DEPENDS | 56 +
java/icedtea7/DETAILS | 57 +
java/icedtea7/DOWNLOAD | 37
java/icedtea7/FINAL | 5
java/icedtea7/HISTORY | 3
java/icedtea7/INSTALL | 10
java/icedtea7/PRE_BUILD | 28
java/icedtea7/PROVIDES | 6
java/icedtea7/corba.tar.gz.sig |binary
java/icedtea7/hotspot.tar.gz.sig |binary
java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch | 543
++++++++++
java/icedtea7/icedtea-2.2.1.tar.gz.sig |binary
java/icedtea7/icedtea-7.2.2-no_suffix.patch | 26
java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig |binary
java/icedtea7/icedtea.gpg |binary
java/icedtea7/icedtea7-2.1-fixed_paths.patch | 128 ++
java/icedtea7/icedtea7-2.2.1-fixed_paths.patch | 114 ++
java/icedtea7/java.sh | 6
java/icedtea7/jaxp.tar.gz.sig |binary
java/icedtea7/jaxws.tar.gz.sig |binary
java/icedtea7/jdk.tar.gz.sig |binary
java/icedtea7/langtools.tar.gz.sig |binary
java/icedtea7/openjdk.tar.gz.sig |binary
kernels/linux/HISTORY | 14
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4 | 5
kernels/linux/latest.defaults | 2
kernels/virtualbox-module/DETAILS | 2
kernels/virtualbox-module/HISTORY | 3
libs/c-ares/DETAILS | 2
libs/c-ares/HISTORY | 3
libs/gavl/DETAILS | 2
libs/gavl/HISTORY | 3
libs/gavl/gavl-1.2.0.tar.gz.sig | 0
libs/gavl/gavl-1.4.0.tar.gz.sig |binary
libs/girara/DETAILS | 4
libs/girara/HISTORY | 3
libs/libmpc/DEPENDS | 7
libs/libmpc/HISTORY | 8
libs/libmpc/TRIGGERS | 1
libs/libplist/DETAILS | 4
libs/libplist/HISTORY | 3
libs/libplist/libplist-1.3.tar.bz2.sig | 0
libs/libplist/libplist-1.8.tar.bz2.sig |binary
libs/libusb-compat/HISTORY | 4
libs/libusb-compat/PRE_BUILD | 6
libs/libusbx/DETAILS | 4
libs/libusbx/HISTORY | 3
lua-forge/lua/DETAILS | 5
lua-forge/lua/HISTORY | 4
lua-forge/lua/lua.pc | 2
net/dnstop/DEPENDS | 1
net/dnstop/DETAILS | 14
net/dnstop/HISTORY | 3
net/libpcap/DETAILS | 2
net/libpcap/HISTORY | 3
net/minidlna/HISTORY | 3
net/minidlna/PRE_BUILD | 3
net/minidlna/minidlna.patch | 46
net/tcpdump/DETAILS | 2
net/tcpdump/HISTORY | 3
perl-cpan/dbi/DETAILS | 4
perl-cpan/dbi/HISTORY | 3
php-pear/php/DETAILS | 18
php-pear/php/HISTORY | 3
python-pypi/pyasn1/DEPENDS | 1
python-pypi/pyasn1/DETAILS | 5
python-pypi/pyasn1/HISTORY | 4
python-pypi/rsa/DEPENDS | 2
python-pypi/rsa/DETAILS | 8
python-pypi/rsa/HISTORY | 7
python-pypi/six/DEPENDS | 2
python-pypi/six/DETAILS | 16
python-pypi/six/HISTORY | 4
python-pypi/sqlalchemy/DETAILS | 4
python-pypi/sqlalchemy/HISTORY | 3
science-libs/eigen2/DETAILS | 4
science-libs/eigen2/HISTORY | 3
science/stellarium/DETAILS | 4
science/stellarium/HISTORY | 3
security/nmap/DETAILS | 4
security/nmap/HISTORY | 3
security/wireshark/DETAILS | 4
security/wireshark/HISTORY | 3
shell-term-fm/bash-completion/DETAILS | 4
shell-term-fm/bash-completion/HISTORY | 3
shell-term-fm/spacefm/DETAILS | 4
shell-term-fm/spacefm/HISTORY | 3
smgl/smgl-archspecs/DETAILS | 2
smgl/smgl-archspecs/HISTORY | 3
utils/avahi/BUILD | 11
utils/avahi/DEPENDS | 8
utils/avahi/HISTORY | 11
utils/avahi/PRE_BUILD | 1
utils/avahi/qt.patch | 40
utils/dbus/DETAILS | 4
utils/dbus/HISTORY | 3
utils/grep/DETAILS | 2
utils/grep/HISTORY | 8
utils/grep/PRE_BUILD | 5
utils/ipmitool/BUILD | 3
utils/ipmitool/CONFIGURE | 36
utils/ipmitool/DEPENDS | 7
utils/ipmitool/DETAILS | 1
utils/ipmitool/HISTORY | 6
utils/pciutils/DETAILS | 22
utils/pciutils/HISTORY | 5
utils/pciutils/pciutils.gpg |binary
utils/psmisc/DETAILS | 4
utils/psmisc/HISTORY | 3
utils/virtualbox/DETAILS | 4
utils/virtualbox/HISTORY | 3
video-libs/gmerlin-avdecoder/DETAILS | 4
video-libs/gmerlin-avdecoder/HISTORY | 3
video-libs/gmerlin-encoders/DETAILS | 4
video-libs/gmerlin-encoders/HISTORY | 3
video-libs/gmerlin/DETAILS | 4
video-libs/gmerlin/HISTORY | 3
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
265 files changed, 2552 insertions(+), 630 deletions(-)

New commits:
commit 6ee2280e291dc434c448727ebd03cf2a5f146004
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

scim: => 1.4.14
* DEPENDS: added optional_depends qt4 and clutter
* BUILD: removed, compiles fine when gtk+3 is selected as default

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

linux: => 3.0.36 (lts)

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

openldap: refactured the spell

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

wireshark 1.8.0

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

atlas: if fortran is enabled, apply patch to not compile fortran libs
(fixes #161)
* no_fortran.patch: added, patch to not compile fortran libs
* BUILD: Only install fortran libs if optional fortran depends is enabled

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

c-ares 1.9.1

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

linux 3.4.4

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

xz-utils 5.0.4

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

virtualbox-module 4.1.18

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

virtualbox 4.1.18

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

new spell - six - Python 2 and 3 compatibility utilities

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

eigen2: updated sha512 and fixed SOURCE_DIRECTORY

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

scim-tables: => 0.5.10

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

scim: => 1.4.13
* DEPENDS: Changed optional_Depends scim-tables to suggest_depends.
Changed depends gtk+2 to optional_depends.
Added optional_depends gtk+3

* BUILD: added, force gtk+2 UI for now since gtk+3 does not seem to
compile. Check if this is still valid on next update.

* PRE_BUILD, scim_glibc-2.10.patch: removed, no longer needed

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

klavaro: => 1.9.5

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

dbi: => 1.622

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

vym 2.2.0

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

bash-completion: => 2.0

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

docbook-xsl: => 1.77.1

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

partclone: => 0.2.49

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

sox: added patch from arch to fix building against ffmpeg 0.11

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

libplist: version 1.8 and corrected source url

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

minidlna: added a patch to make it build against ffmpeg 0.11

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

net/dnstop: new spell, various tables of DNS traffic

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

gzip 1.5

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

krb5-appl: system-et patch removed, not needed

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

ipmitool: added dependencies and other options

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

mpg123: fix integer quality choice

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

ne: => 2.4

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

geany-plugins: => 0.21.1

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

geany: => 1.22

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

gmerlin-encoders 1.2.0

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

gmerlin-avdecoder 1.2.0

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

gmerlin 1.2.0

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

gavl 1.4.0

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

ddrescue: => 1.16

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

psmisc: => 22.18

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

dbus: => 1.6.0

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

krb5-appl: => 1.0.3

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

krb5: => 1.10.2
fixed SOURCE_URL[0]
BUILD: --with-krb4 no longer valid, removed.
--enable-dns-for-kdc no longer valid, removed.
* CONFIGURE: removed, no longer needed
* PRE_BUILD: Don't apply system-et.patch.
Apply gcc-4.7.patch.
* gcc-4.7.patch: added, fix compilation with gcc 4.7, still compiles with
gcc 4.6
* system-et.patch.bz2: removed, not needed --with-system-et should do this

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

rsa: => 3.1.1

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

linux: => 3.0.35 (lts)

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

ddd: fix compilation on gcc >= 4.4
PRE_BUILD - added to apply patch
gcc-4.4.patch - added, fixes compilation on gcc >= 4.4

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

gdb: removed optional_depends tk as gdbtk is a separate project (insight)
(fixes #249)

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

spacefm 0.7.8

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

wine 1.4.1

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

audio-soft/alsaequal: new - alsa equalizer plugin

This is an alsa plugin to provide a realtime equalizer.

Once installed, follow the directions in its readme file
(/usr/share/doc/alsaequal/README) and add some mappings to your
.asoundrc file. Then you can access the equalizer settings from any
alsa-compatible mixer program (like alsamixer), and play audio through
it by addressing the equalizer device with an alsa-compatible player.

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

stellarium 0.11.3

commit 8e9ecbc165370d9ecc7191369590b4f49b9820c1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

git: update spell to 1.7.11

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

icedtea6: added icedtea7 to CONFLICTS

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

seamonkey: => 2.10.1

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

linux 3.4.3

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

firefox 13.0.1, SECURITY_PATCH=50

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

icedtea-web: updated to 1.2 and changed DEPENDS icedtea6 to ICEDTEA

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

icedtea7: forgot to add ICEDTEA to provides

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

icedtea7: new spell - openjdk7

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

icedtea6: added ICEDTEA to provides so icedtea-web can use either 6 or 7

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

sqlalchemy: => 0.7.8

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

nmap 6.01

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

rsa: => 3.1

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

pyasn1: => 0.1.3

commit 5b43bb4eb4c828933ce7cc1576e08608a080f2cc
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

crypto/mosh: direct depends on gcc with CXX

mosh requires a C++ compiler in order to build. Its dependency on
protobuf means a C++ compiler will be accounted for anyway, since
protobuf also requires a C++ compiler to build, but it should still be
listed as a direct dependency of mosh. I forgot to add it in with my
previous commit, but now it's taken care of.

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

crypto/mosh: update to 1.2.2, fix dependencies

Updated the version to 1.2.2, but also fixed some of the dependencies.
The IO:Pty perl module is provided by spell io-tty, so a runtime_depends
was added for this, obsoleting the message in FINAL. Thus, FINAL was
removed. The dependency on libutempter was also made optional, and I
included a link to a discussion on the merits/issues involved with using
libutempter with mosh.

As of mosh 1.2.0, boost is no longer used, so it was removed as a
dependency.

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

icedtea6: updated to 1.11.3

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

libusbx: => 1.0.12

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

libusb-compat - fix build with latest libusbx

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

lua: => 5.2.1

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

chat-im/licq: version 1.6.1

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

zathura-pdf-poppler 0.2.0

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

zathura 0.2.0

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

girara 0.1.3

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

poppler 0.20.1

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

oss: stable => 4.2-build2006

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

clamav-0.97.5 - SECURITY++

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

libmpc: fixed build failure if automake less than 1.12 is found. this is
required if you need to compile the basic toolchain first (for example after
changing archspecs)

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

php 5.3.14, SECURITY_PATCH=18

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

pciutils: removed forgotten hash sum

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

pciutils: switched to upstream pgp checking

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

Revert "pciutils: renewed hash sum, diff returns nothing between contents
of old and new tarballs"

This reverts commit eefc748eb466b66b124a97fb7e5173854537fea2.

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

freetype2 2.4.10

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

avahi: Do not run autoreconf as it seems to break install
Changed qt.patch to patch configure rather than configure.ac so
autoreconf does not need to be run.

BUILD: Setting variables in DEPENDS isn't persistent, so change check for
no D-BUS.
Explicitly disable pygtk annd gdbm if not enabled
DEPENDS: if glib is disabled, disable gobject as well.
Remove setting AVAHI_NODBUS as it is not persistent.
Set disable gdbm flag in BUILD.

commit fd9ad3e3035164b6e1490a4a58d9567769d08898
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Update: feh - Dependency Added

A missing dependency on 'curl' caused feh to fail casting due to
a fatal error caused by the lack of the dependency.

Installing the missing dependency resolved the problem of the fatal
error. Feh DEPENDS file has been updated accordingly to include
this dependency going forward.

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

Revert "Spell Update: mdadm 3.1.5 -> 3.2.1"

This reverts commit 98045b92359c5d5886fabf77458f7f64bc91d077.

The latest from 3.2 branch is 3.2.5 (May 18, 2012), but we haven't updated
to branch 3.2 as it wasn't stable enough, and 3.2.1 is buggy as hell.

No idea about 3.2.5 though.

commit 98045b92359c5d5886fabf77458f7f64bc91d077
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Update: mdadm 3.1.5 -> 3.2.1

Simple version bump for mdadm.

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

smgl-archspecs: => 0.8.3

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

Revert "grep 2.11"

This reverts commit e9e64a190f6c30ead14a38945f76b290e6f88be9.

Everything above 2.10 doesn't work well enough with our current
stable sorcery while selecting archspec in menu.

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

Revert "grep: => 2.12"

This reverts commit 31424fbd0984fae9e9e2a5e7db3dd46358557222.

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

libmpc: recast on mpfr upgrade/downgrade

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

audio-players/stretchplayer: new spell, audio player with time stretch
and pitch shift

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

rubberband 1.7.0

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

vamp-plugin-sdk 2.2.1

Anybody with previous version installed?
We might want to update CONFIGURE, INSTALL and get them back.

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

pciutils: renewed hash sum, diff returns nothing between contents of old
and new tarballs

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

e2fsprogs 1.42.4

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

tcpdump 4.3.0

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

libpcap 1.3.0, patch is still needed

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

devel/qt-creator: version 2.5.0

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

Revert "avahi: Do not run autoreconf as it seems to break install"

This reverts commit 87ea9be652ffaef69cd63225a2d207bcbe73443e.

Commited to soon. Somehow got it to not find QT4 moc.

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

avahi: Do not run autoreconf as it seems to break install

qt.patch: Removed. QT4_PREFIX and QT3_PREFIX are detected properly on my
boxes at least. If this is an issue consider changing $QT3_PREFIX on line
20673 and $QT4_PREFIX on line 20843 of configure rather than configure.ac

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

devel/ghc: version 7.4.2

diff --git a/ChangeLog b/ChangeLog
index e0bc099..04c0ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-pypi/six: new spell, Python 2 and 3 compatibility utilities
+
+2012-06-20 Ladislav Hagara <hgr AT vabo.cz>
+ * net/dnstop: new spell, displays various tables of DNS traffic
+
+2012-06-18 Justin Boffemmyer <flux AT sourcemage.org>
+ * audio-soft/alsaequal: new spell, alsa equalizer plugin
+
+2012-05-17 Robin Cook <rcook AT wyrms.net>
+ * java/icedtea7: new spell for openjdk7
+
+2012-06-14 Ladislav Hagara <hgr AT vabo.cz>
+ * audio-players/stretchplayer: new spell
+ audio player with time stretch and pitch shift
+
2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* audio-libs/libmusicbrainz5: new spell, new api for musicbrainz

diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index 6e67a02..a7a7b30 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -13,4 +13,5 @@ optional_depends gmp "--enable-dsig" \
"--disable-dsig" \
"for digital signature support" &&

+optional_depends llvm '' '' 'JIT support in engine' &&
optional_depends SYSTEM-LOGGER "" "" "to log activity"
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index b275dbf..cc2a95d 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.97.4
+ VERSION=0.97.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
@@ -9,7 +9,7 @@
SOURCE_GPG=vendor_clamav.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.clamav.net
LICENSE[0]=GPL
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
ENTERED=20030909
KEYWORDS="antivirus"
SHORT="Clam AntiVirus is an anti-virus toolkit for Unix"
diff --git a/antivirus/clamav/FINAL b/antivirus/clamav/FINAL
deleted file mode 100755
index 0a134a2..0000000
--- a/antivirus/clamav/FINAL
+++ /dev/null
@@ -1,5 +0,0 @@
-message "This is a test of the virus scanner:" &&
-clamscan -r -i $SOURCE_DIRECTORY/test
-message "Test complete." &&
-
-ldconfig
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index fdfacd5..143dbec 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,14 @@
+2012-06-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.97.5
+ SECURITY_PATCH++
+ CVE-2012-1457, CVE-2012-1458, and CVE-2012-1459
+ * vendor_clamav.gpg: updated, add 15497F03
+ * DEPENDS: add optional llvm
+ * PRE_REMOVE, FINAL: delete
+ * INSTALL: create /usr/share/clamav directory
+ clamav nolonger includes the virus database
+ this will be downloaded by freshclam
+
2012-03-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.97.4
* DEPENDS: add libtommath
diff --git a/antivirus/clamav/INSTALL b/antivirus/clamav/INSTALL
index 8b6b33e..141c9b5 100755
--- a/antivirus/clamav/INSTALL
+++ b/antivirus/clamav/INSTALL
@@ -1,3 +1,3 @@
default_install &&
-
-install -vm 755 -d -o clamav -g clamav "$INSTALL_ROOT/var/run/clamav"
+install -vm 755 -d -o clamav -g clamav "$INSTALL_ROOT/var/run/clamav" &&
+install -vm 755 -d -o clamav -g clamav "$INSTALL_ROOT/usr/share/clamav"
diff --git a/antivirus/clamav/PRE_REMOVE b/antivirus/clamav/PRE_REMOVE
deleted file mode 100755
index b466017..0000000
--- a/antivirus/clamav/PRE_REMOVE
+++ /dev/null
@@ -1,3 +0,0 @@
-#in case the virus database has been updated by clamfresh since
-#the original installation
-rm -r /usr/share/clamav/*
diff --git a/antivirus/clamav/vendor_clamav.gpg
b/antivirus/clamav/vendor_clamav.gpg
index fd2f844..8579cff 100644
Binary files a/antivirus/clamav/vendor_clamav.gpg and
b/antivirus/clamav/vendor_clamav.gpg differ
diff --git a/archive/gzip/DETAILS b/archive/gzip/DETAILS
index 228c87a..ce2d4d9 100755
--- a/archive/gzip/DETAILS
+++ b/archive/gzip/DETAILS
@@ -1,5 +1,5 @@
SPELL=gzip
- VERSION=1.4
+ VERSION=1.5
SECURITY_PATCH=1
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
WEB_SITE=http://www.gzip.org
ENTERED=20010922
- SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=gnu-verified.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
KEYWORDS="archive"
diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 59cf6e5..12375f3 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,6 @@
+2012-06-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5, gnu.gpg -> gnu-verified.gpg
+
2010-01-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4, SECURITY_PATCH=1, CVE-2010-0001

diff --git a/archive/xz-utils/DETAILS b/archive/xz-utils/DETAILS
index 697b53c..06de212 100755
--- a/archive/xz-utils/DETAILS
+++ b/archive/xz-utils/DETAILS
@@ -1,5 +1,5 @@
SPELL=xz-utils
- VERSION=5.0.3
+ VERSION=5.0.4
SOURCE=xz-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/xz-$VERSION"
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index a1ecd82..5c4114b 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.0.4
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 69184620.gpg: added gpg keyring
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index c771b4f..6ebbbba 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -16,10 +16,10 @@ elif [[ $OSS_BRANCH == test ]]; then

SOURCE_HASH=sha512:44dce6c0176c6e7da61a254f526c5e86c7fc731e0b1311df2f6d9cee08a0151d16e51da7f62c3a63462b408ea7f34c646ce152b1fc3829e3f345dbededdd6936
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
else
- VERSION=v4.2-build2002
+ VERSION=v4.2-build2006
SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2

SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/stable/gpl/$SOURCE
-
SOURCE_HASH=sha512:e899edd30299020b97b4061968217c89867f014e3f555cc2b2315119ecc7d6033d30c105ce81ac5c8934e8c016a0db4247e00694801acf69d2e536c63e6b7b18
+
SOURCE_HASH=sha512:d1834055e446496bd215a520a18af8a86f0109eab19e3fa2a6a67a8cb0958d9ec7fe343a2515bfc84e9a697308fb93dc8d50bdd0dbe73f2aa9717ec0e3d6e4a6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
fi
WEB_SITE="http://www.opensound.com "
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index b3a897b..616beb2 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: stable updated to 4.2-build2006
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DOWNLOAD: source $GRIMOIRE/hg_download.function before using
hg_download

diff --git a/audio-libs/rubberband/DETAILS b/audio-libs/rubberband/DETAILS
index c19e965..6ab1711 100755
--- a/audio-libs/rubberband/DETAILS
+++ b/audio-libs/rubberband/DETAILS
@@ -1,9 +1,9 @@
SPELL=rubberband
- VERSION=1.3
+ VERSION=1.7.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL=http://www.breakfastquay.com/rubberband/files/$SOURCE
-
SOURCE_HASH=sha512:12efb373cf94315d0f85f1f8ba753cfe74f027d3bf072903e309eaa56910101633b6cd4666be546bc560bfb8caf976ad09d4bc171ec23c03559182166f10270c
+
SOURCE_URL=http://code.breakfastquay.com/attachments/download/23/$SOURCE
+
SOURCE_HASH=sha512:47d45ff6355e8f31f3ef0c0c5f14f27cc952f98597271b6b35b5047293b8dfa5e6576dc2e3ede102c0209507c77d666cf7c049fc65da18f09de84ea90fb2f87d
WEB_SITE=http://www.breakfastquay.com/rubberband/
ENTERED=20080322
LICENSE[0]=GPL
diff --git a/audio-libs/rubberband/HISTORY b/audio-libs/rubberband/HISTORY
index 8f85d71..2c2f50c 100644
--- a/audio-libs/rubberband/HISTORY
+++ b/audio-libs/rubberband/HISTORY
@@ -1,3 +1,6 @@
+2012-06-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.0, SOURCE_URL updated
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/audio-players/mpg123/BUILD b/audio-players/mpg123/BUILD
index cc18974..471b0ae 100755
--- a/audio-players/mpg123/BUILD
+++ b/audio-players/mpg123/BUILD
@@ -5,5 +5,5 @@ if [[ "$MPG123_SEEKTABLE" != "" ]]; then
OPTS="--with-seektable=$MPG123_SEEKTABLE $OPTS"
fi &&
# Use .so for modules so it is safe to rip out the .la files.
-OPTS="$MPG123_MODULES --with-module-suffix=.so $OPTS" &&
+OPTS="$MPG123_QUALITY $MPG123_MODULES --with-module-suffix=.so $OPTS" &&
default_build
diff --git a/audio-players/mpg123/CONFIGURE b/audio-players/mpg123/CONFIGURE
index 81469d8..7260934 100755
--- a/audio-players/mpg123/CONFIGURE
+++ b/audio-players/mpg123/CONFIGURE
@@ -1,5 +1,5 @@
. $GRIMOIRE/config_query_multi.function &&
-config_query_option MPG123_MODULES "Prefer highest accuracy for 16bit output
(instead of highest speed)?" n \
+config_query_option MPG123_QUALITY "Prefer highest accuracy for 16bit output
(instead of highest speed)?" n \
--enable-int-quality --disable-int-quality &&
message "${MESSAGE_COLOR}Optimization is chosen automatically now, though
you can force your will via custom spell options.$DEFAULT_COLOR" &&
config_query_option MPG123_MODULES "Build output modules?" y \
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 64ae241..96060a5 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2012-06-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, BUILD: fix quality choice
+
2012-06-08 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Update to 1.14.2

diff --git a/audio-players/stretchplayer/BUILD
b/audio-players/stretchplayer/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/audio-players/stretchplayer/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/audio-players/stretchplayer/DEPENDS
b/audio-players/stretchplayer/DEPENDS
new file mode 100755
index 0000000..73be32a
--- /dev/null
+++ b/audio-players/stretchplayer/DEPENDS
@@ -0,0 +1,2 @@
+depends qt4 &&
+depends rubberband
diff --git a/audio-players/stretchplayer/DETAILS
b/audio-players/stretchplayer/DETAILS
new file mode 100755
index 0000000..6cf8aa6
--- /dev/null
+++ b/audio-players/stretchplayer/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=stretchplayer
+ VERSION=0.503
+ SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.teuton.org/~gabriel/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ WEB_SITE=http://www.teuton.org/~gabriel/stretchplayer/
+ ENTERED=20120614
+ LICENSE[0]=GPL
+ SHORT="audio player with time stretch and pitch shift"
+cat << EOF
+StretchPlayer is an audio file player that allows you to change the
+speed of the song without changing the pitch. It will also allow you
+to transpose the song to another key (while also changing the speed).
+This is a very powerful tool for musicians who are learning to play a
+pre-recorded song.
+EOF
diff --git a/audio-players/stretchplayer/HISTORY
b/audio-players/stretchplayer/HISTORY
new file mode 100644
index 0000000..bbe453b
--- /dev/null
+++ b/audio-players/stretchplayer/HISTORY
@@ -0,0 +1,2 @@
+2012-06-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, BUILD: spell created, version 0.503
diff --git a/audio-players/stretchplayer/stretchplayer_0.503.orig.tar.gz.sig
b/audio-players/stretchplayer/stretchplayer_0.503.orig.tar.gz.sig
new file mode 100644
index 0000000..9e56fd4
Binary files /dev/null and
b/audio-players/stretchplayer/stretchplayer_0.503.orig.tar.gz.sig differ
diff --git a/audio-plugins/vamp-plugin-sdk/BUILD
b/audio-plugins/vamp-plugin-sdk/BUILD
deleted file mode 100755
index e3e502c..0000000
--- a/audio-plugins/vamp-plugin-sdk/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-make &&
-
-if is_depends_enabled $SPELL doxygen
-then
- doxygen
-fi
diff --git a/audio-plugins/vamp-plugin-sdk/CONFIGURE
b/audio-plugins/vamp-plugin-sdk/CONFIGURE
deleted file mode 100755
index 1eeacd4..0000000
--- a/audio-plugins/vamp-plugin-sdk/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query VAMP_EXAMPLES "Build example plugins?" y
diff --git a/audio-plugins/vamp-plugin-sdk/DETAILS
b/audio-plugins/vamp-plugin-sdk/DETAILS
index 4d2cd58..86dbb3b 100755
--- a/audio-plugins/vamp-plugin-sdk/DETAILS
+++ b/audio-plugins/vamp-plugin-sdk/DETAILS
@@ -1,9 +1,9 @@
SPELL=vamp-plugin-sdk
- VERSION=1.2
+ VERSION=2.2.1
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:92985aa97231388b9bbb1d31a11e7eaf96ca28da2afaa3f5e23d477035a95a6654c08d0df3a66dcea14da11e63b17e7a840a5b113d032054429401b498bd5dda
+
SOURCE_HASH=sha512:e27c0cc07e36bd30d42a53e6ea535316d768b5b76ba4788722f6e9f2573acbd7f9376ccae95fd7d2fe55b08dffa3764be29711bab70b4946b9d376660312b2bd
SOURCE_URL[0]=$SOURCEFORGE_URL/vamp/$SOURCE
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-v$VERSION"
WEB_SITE=http://www.vamp-plugins.org/
ENTERED=20080218
LICENSE[0]=BSD
diff --git a/audio-plugins/vamp-plugin-sdk/HISTORY
b/audio-plugins/vamp-plugin-sdk/HISTORY
index 117b44f..4e46cdf 100644
--- a/audio-plugins/vamp-plugin-sdk/HISTORY
+++ b/audio-plugins/vamp-plugin-sdk/HISTORY
@@ -1,3 +1,7 @@
+2012-06-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.1, SOURCE_DIRECTORY updated
+ * CONFIGURE, PRE_BUILD, BUILD, INSTALL: removed
+
2008-03-22 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.2.
* CONFIGURE: Added, query about example plugin installation.
diff --git a/audio-plugins/vamp-plugin-sdk/INSTALL
b/audio-plugins/vamp-plugin-sdk/INSTALL
deleted file mode 100755
index 8926308..0000000
--- a/audio-plugins/vamp-plugin-sdk/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-default_install &&
-
-mkdir -p "$INSTALL_ROOT/usr/lib/vamp/" &&
-
-if [[ $VAMP_EXAMPLES == y ]]
-then
- cp "$SOURCE_DIRECTORY/examples/"*.so "$INSTALL_ROOT/usr/lib/vamp/"
-fi &&
-
-if is_depends_enabled $SPELL doxygen
-then
- mkdir -p "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
- cp -r "$SOURCE_DIRECTORY/doc/html/" \
- "$INSTALL_ROOT/usr/share/doc/$SPELL/"
-fi
diff --git a/audio-plugins/vamp-plugin-sdk/PRE_BUILD
b/audio-plugins/vamp-plugin-sdk/PRE_BUILD
deleted file mode 100755
index d20da71..0000000
--- a/audio-plugins/vamp-plugin-sdk/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# Use INSTALL_ROOT
-sed -i "s|/usr|\"$INSTALL_ROOT/usr\"|" Makefile
-
-# Remove 'plugins' and 'test' targets if examples not selected
-if [[ $VAMP_EXAMPLES != y ]]
-then
- sed -i "s|\(^all:.*\)plugins|\1|" Makefile &&
- sed -i "s|\(^all:.*\)test|\1|" Makefile
-fi
diff --git a/audio-soft/alsaequal/BUILD b/audio-soft/alsaequal/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/audio-soft/alsaequal/BUILD
@@ -0,0 +1 @@
+make
diff --git a/audio-soft/alsaequal/DEPENDS b/audio-soft/alsaequal/DEPENDS
new file mode 100755
index 0000000..e516516
--- /dev/null
+++ b/audio-soft/alsaequal/DEPENDS
@@ -0,0 +1,2 @@
+depends alsa-lib &&
+runtime_depends caps-plugins
diff --git a/audio-soft/alsaequal/DETAILS b/audio-soft/alsaequal/DETAILS
new file mode 100755
index 0000000..64b3191
--- /dev/null
+++ b/audio-soft/alsaequal/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=alsaequal
+ VERSION=0.6
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+ SOURCE_URL[0]="http://www.thedigitalmachine.net/tools/$SOURCE";
+
SOURCE_HASH=sha512:53a73469682eb7b641849151d4e91a3ac031daa5f11f7ad328bdd0bcf5251112814c75d27dceb8baf8582c749bf80f055414397259d24b749e7edbc03472bc6a
+ WEB_SITE="http://www.thedigitalmachine.net/${SPELL}.html";
+ LICENSE[0]=GPL
+ ENTERED=20120618
+ KEYWORDS="tools audio"
+ SHORT="alsa realtime equalizer plugin"
+cat << EOF
+Alsaequal is a real-time adjustable equalizer plugin for ALSA. It can be
+adjusted using an ALSA compatible mixer, like alsamixergui or alsamixer.
+
+Alsaequal uses the Eq CAPS LADSPA Plugin as it's default equalizer but you
can
+change it to use almost any LADSPA plugin, like mbeq from the swh-plugin
+package. Though alsaequal is primarily intended to be used as an equalizer
you
+should be able to use it to control any LADSPA plugin. It's similar in
+functionality to the LADSPA plugin provided with ALSA but allows for
real-time
+controls as opposed to static controls defined in the asoundrc file.
+EOF
diff --git a/audio-soft/alsaequal/HISTORY b/audio-soft/alsaequal/HISTORY
new file mode 100644
index 0000000..90da208
--- /dev/null
+++ b/audio-soft/alsaequal/HISTORY
@@ -0,0 +1,3 @@
+2012-06-18 Justin Boffemmyer <flux AT sourcemage.org>:
+ * DETAILS, DEPENDS: spell created
+
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index 2595fd3..f77f9c2 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,7 @@
+2012-06-20 Arjan Bouter <abouter AT sourcemage.org>
+ * ffmpeg-0.11-arch.patch: added patch from arch to fix
+ building against ffmpeg 0.11
+
2012-03-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 14.4.0
* DEPENDS: added a few optional dependencies
diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index 1def27b..af4ad33 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch"
+patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
+patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
diff --git a/audio-soft/sox/ffmpeg-0.11-arch.patch
b/audio-soft/sox/ffmpeg-0.11-arch.patch
new file mode 100644
index 0000000..acefce6
--- /dev/null
+++ b/audio-soft/sox/ffmpeg-0.11-arch.patch
@@ -0,0 +1,129 @@
+diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
+--- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400
++++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400
+@@ -15781,9 +15781,9 @@
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file
in -lavformat" >&5
+-$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
+-if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input
in -lavformat" >&5
++$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
++if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15797,27 +15797,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char av_open_input_file ();
++char avformat_open_input ();
+ int
+ main ()
+ {
+-return av_open_input_file ();
++return avformat_open_input ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_avformat_av_open_input_file=yes
++ ac_cv_lib_avformat_avformat_open_input=yes
+ else
+- ac_cv_lib_avformat_av_open_input_file=no
++ ac_cv_lib_avformat_avformat_open_input=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_avformat_av_open_input_file" >&5
+-$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
+-if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_avformat_avformat_open_input" >&5
++$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
++if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
+ for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
+--- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400
++++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400
+@@ -93,7 +93,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ enc->error_resilience = 1;
+ #else
+- enc->error_recognition = 1;
++ enc->err_recognition = 1;
+ #endif
+
+ if (!codec || avcodec_open(enc, codec) < 0)
+@@ -157,7 +157,7 @@
+ static int startread(sox_format_t * ft)
+ {
+ priv_t * ffmpeg = (priv_t *)ft->priv;
+- AVFormatParameters params;
++ AVDictionary *params;
+ int ret;
+ int i;
+
+@@ -172,7 +172,7 @@
+
+ /* Open file and get format */
+ memset(&params, 0, sizeof(params));
+- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0,
&params)) < 0) {
++ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL,
&params)) < 0) {
+ lsx_fail("ffmpeg cannot open file for reading: %s (code %d)",
ft->filename, ret);
+ return SOX_EOF;
+ }
+@@ -231,7 +231,7 @@
+ /* If input buffer empty, read more data */
+ if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
+ if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
+- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
++ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
+ break;
+ ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg,
ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ ffmpeg->audio_buf_index = 0;
+@@ -373,13 +373,6 @@
+ return SOX_EOF;
+ }
+
+- /* set the output parameters (must be done even if no
+- parameters). */
+- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
+- lsx_fail("ffmpeg invalid output format parameters");
+- return SOX_EOF;
+- }
+-
+ /* Next line for debugging */
+ /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
+
+@@ -391,14 +384,14 @@
+
+ /* open the output file, if needed */
+ if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
++ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
+ lsx_fail("ffmpeg could not open `%s'", ft->filename);
+ return SOX_EOF;
+ }
+ }
+
+ /* write the stream header, if any */
+- av_write_header(ffmpeg->ctxt);
++ avformat_write_header(ffmpeg->ctxt, NULL);
+
+ return SOX_SUCCESS;
+ }
+@@ -478,7 +471,7 @@
+ #if (LIBAVFORMAT_VERSION_INT < 0x340000)
+ url_fclose(&ffmpeg->ctxt->pb);
+ #else
+- url_fclose(ffmpeg->ctxt->pb);
++ avio_close(ffmpeg->ctxt->pb);
+ #endif
+ }
diff --git a/chat-im/licq/DETAILS b/chat-im/licq/DETAILS
index bc25430..dbecb5b 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -10,7 +10,7 @@ if [[ "$LICQ_BRANCH" == "scm" ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git/$SPELL
else
- VERSION=1.6.0
+ VERSION=1.6.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index b469fea..6858b4b 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,6 @@
+2012-06-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.1
+
2011-10-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.0

diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 5495ff6..d1d45ff 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,9 @@
+2012-06-22 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: if optional fortran depends is enabled, apply
+ patch to not compile fortran libs
+ * no_fortran.patch: added, patch to not compile fortran libs
+ * BUILD: Only install fortran libs if optional fortran depends is
enabled
+
2011-05-15 Peng Chang (Charels) <chp AT sourcemage.org>
* BUILD: fat_shared is still not prevailing, added make check and
make time,
these takes only 2 min, but definitely worth keeping record
diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL
index 3fe412b..b18db84 100755
--- a/cluster/atlas/INSTALL
+++ b/cluster/atlas/INSTALL
@@ -1,13 +1,17 @@
make install &&

if [ $PT_LIB == y ]; then
- mv -v lib/libptf77blas.so lib/libf77blas.so &&
mv -v lib/libptcblas.so lib/libcblas.so &&
- mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a
$INSTALL_ROOT/usr/lib/libf77blas.a &&
- mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a
+ mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a
&&
+ if is_depends_enabled $SPELL fortran; then
+ mv -v lib/libptf77blas.so lib/libf77blas.so &&
+ mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a
$INSTALL_ROOT/usr/lib/libf77blas.a
+ fi
else
- rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a &&
- rm -v $INSTALL_ROOT/usr/lib/libptcblas.a
+ rm -v $INSTALL_ROOT/usr/lib/libptcblas.a &&
+ if is_depends_enabled $SPELL fortran; then
+ rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a
+ fi
fi &&

cp -v lib/*.so $INSTALL_ROOT/usr/lib
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
index 9dbaf8f..09f47f3 100755
--- a/cluster/atlas/PRE_BUILD
+++ b/cluster/atlas/PRE_BUILD
@@ -3,4 +3,8 @@ mkdir $SOURCE_DIRECTORY/bld &&

cd $SOURCE_DIRECTORY &&
patch configure $SPELL_DIRECTORY/configure.patch &&
-patch CONFIG/src/backend/archinfo_x86.c $SPELL_DIRECTORY/x86.patch
+patch CONFIG/src/backend/archinfo_x86.c $SPELL_DIRECTORY/x86.patch &&
+
+if ! is_depends_enabled $SPELL fortran; then
+ patch -p1 < $SPELL_DIRECTORY/no_fortran.patch
+fi
diff --git a/cluster/atlas/no_fortran.patch b/cluster/atlas/no_fortran.patch
new file mode 100644
index 0000000..05cf400
--- /dev/null
+++ b/cluster/atlas/no_fortran.patch
@@ -0,0 +1,16 @@
+--- ATLAS.o/makes/Make.lib 2011-05-14 13:33:24.000000000 -0400
++++ ATLAS/makes/Make.lib 2012-06-22 14:40:42.068787951 -0400
+@@ -33,11 +33,11 @@
+
+ ptshared :
+ - rm -f libatlas.so liblapack.so
+- $(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \
++ $(MAKE) libatlas.so liblapack.so \
+ libptcblas.so libcblas.so liblapack.so
+ shared :
+ - rm -f libatlas.so liblapack.so
+- $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so
liblapack.so
++ $(MAKE) libatlas.so liblapack.so libcblas.so liblapack.so
+ cptshared :
+ - rm -f libatlas.so libclapack.so
+ $(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
diff --git a/collab/openldap/BUILD b/collab/openldap/BUILD
index 101e5cd..2f0dc8d 100755
--- a/collab/openldap/BUILD
+++ b/collab/openldap/BUILD
@@ -6,31 +6,34 @@ if is_depends_enabled $SPELL db; then
LDFLAGS="-ldb $LDFLAGS"
fi &&

-# only add slapd options when actually building it
-if echo $OPENLDAP_SLAPD | grep -q enable; then
+if is_depends_enabled $SPELL nss; then
+ CPPFLAGS="-I$INSTALL_ROOT/usr/include/nss \
+ -I$INSTALL_ROOT/usr/include/nspr \
+ $CPPFLAGS"
+fi &&

- if [[ "${SLAPD_OVERLAYS}" == 'none' ]]; then
- message 'skipping overlays'
- elif [[ "${SLAPD_OVERLAYS}" == 'all' ]]; then
- message 'adding all overlays' &&
- OVERLAYS='--enable-overlays=mod'
+if list_find "$OPENLDAP_OPTS" "--disable-slapd"; then
+ OPTS="--disable-backends \
+ --disable-overlays \
+ $OPTS"
+else
+ if list_find "$SLAPD_OVERLAYS" "all"; then
+ OPTS="--enable-overlays=mod $OPTS"
+ elif list_find "$SLAPD_OVERLAYS" "none"; then
+ OPTS="--disable-overlays $OPTS"
else
- for OVERLAY in ${SLAPD_OVERLAYS}; do
- OVERLAYS="${OVERLAYS} --enable-${OVERLAY}=mod"
+ for o in $SLAPD_OVERLAYS; do
+ OPTS="--enable-${o}=mod $OPTS"
done
fi
-
- SLAPD_OPTS="$OPENLDAP_SLAPD $SLAPD_ACL $SLAPD_ACI $SLAPD_DNSSRV
- $SLAPD_MONITOR $SLAPD_CRYPT $SLAPD_CLEAR $SLAPD_REV
- $SLAPD_SOCK $SLAPD_META $SLAPD_RELAY $OVERLAYS"
-else
- SLAPD_OPTS="$OPENLDAP_SLAPD"
fi &&

-OPTS="$OPTS
- $SLAPD_OPTS
- --enable-shared --enable-static
- --enable-dynamic
- --enable-local" &&
+OPTS="--enable-static \
+ --enable-shared \
+ --enable-dynamic \
+ --enable-local \
+ --without-fetch \
+ $OPENLDAP_OPTS \
+ $OPTS" &&

default_build
diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE
index 8ba29f9..8ea1eb8 100755
--- a/collab/openldap/CONFIGURE
+++ b/collab/openldap/CONFIGURE
@@ -1,57 +1,167 @@
source $GRIMOIRE/config_query_multi.function &&

-config_query_option OPENLDAP_SLAPD 'Build SLAPD, the standalone LDAP
daemon?' y \
- '--enable-slapd --enable-modules' '--disable-slapd' &&
-
-if echo $OPENLDAP_SLAPD | grep -q enable; then
- config_query_option SLAPD_DNSSRV 'Enable DNS backend? (LDAP server
locator)' n \
- '--enable-dnssrv=mod' '--disable-dnssrv' &&
- config_query_option SLAPD_META 'Enable metadirectory backend?' n \
- '--enable-meta=mod' '--disable-meta' &&
- config_query_option SLAPD_MONITOR 'Enable LDAP server monitor backend?' y \
- '--enable-monitor=mod' '--disable-monitor' &&
- config_query_option SLAPD_SOCK 'Enable sock backend?' n \
- '--enable-sock=mod' '--disable-sock' &&
- config_query_option SLAPD_RELAY 'Enable relay backend?' n \
- '--enable-relay=mod' '--disable-relay' &&
- config_query_option SLAPD_ACL 'Enable EXPERIMENTAL loadable ACL?' n \
- '--enable-dynacl' '--disable-dynacl' &&
- if echo $SLAPD_ACL|grep -q enable; then
- config_query_option SLAPD_ACI 'Enable per-object access control' n \
- '--enable-aci' '--disable-aci'
- fi &&
- config_query_option SLAPD_CLEAR 'Enable cleartext passwords?' y \
- '--enable-cleartext' '--disable-cleartext' &&
- config_query_option SLAPD_CRYPT 'Enable crypt passwords?' n \
- '--enable-crypt' '--disable-crypt' &&
- config_query_option SLAPD_REV 'Enable reverse lookup of client hostnames?'
n \
- '--enable-rlookups' '--disable-rlookups'
-fi &&
+config_query_option OPENLDAP_OPTS "Enable IPv6 support?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&

-config_query OPENLDAP_NTLM "Enable NTLM API support (needed for Evolution
Exchange plugin)?" n &&
+config_query_option OPENLDAP_OPTS "Enable proctitle support?" y \
+ "--enable-proctitle" \
+ "--disable-proctitle" &&
+
+config_query_option OPENLDAP_OPTS "Enable debugging?" y \
+ "--enable-debug" \
+ "--disable-debug" &&
+
+config_query_option OPENLDAP_OPTS "Enable threads support (not recommended
for shell backend in SLAPD)?" y \
+ "--with-threads" \
+ "--without-threads" &&

-config_query_multi SLAPD_OVERLAYS \
- "which overlays do you want supported?" \
- none all \
- accesslog auditlog collect constraint dds deref dyngroup \
- dynlist memberof ppolicy proxycache refint retcode rwm \
- seqmod sssvlv syncprov translucent unique valsort
-
-if list_find "$SLAPD_OVERLAYS" "all"; then
- SLAPD_OVERLAYS="all"
-elif list_find "$SLAPD_OVERLAYS" "none"; then
- SLAPD_OVERLAYS="none"
+if list_find "$OPENLDAP_OPTS" "--with-threads"; then
+ config_query_option OPENLDAP_OPTS "Enable implicitly yielding select?" y \
+ "--with-yielding-select=auto" \
+ "--without-yielding-select"
fi &&

-if echo $OPENLDAP_SLURPD |grep -q enable ; then
- if list_find "$SLAPD_OVERLAYS" "syncprov"; then
- message 'slurpd has been replaced by the syncprov overlay'
+config_query_list OPENLDAP_TLS "Which backend do you want for TLS/SSL
support?" \
+ none \
+ openssl \
+ gnutls \
+ moznss &&
+
+# backporting legacy options
+for o in OPENLDAP_SLAPD OPENLDAP_SLURPD SLAPD_DNSSRV SLAPD_META
SLAPD_MONITOR \
+ SLAPD_SOCK SLAPD_RELAY SLAPD_ACL SLAPD_ACI SLAPD_CLEAR SLAPD_CRYPT \
+ SLAPD_REV; do
+ if [[ -n ${!o} ]]; then
+ list_add "OPENLDAP_OPTS" "${!o}"
+ persistent_remove ${o}
+ fi
+done &&
+
+config_query_option OPENLDAP_OPTS 'Build SLAPD, the standalone LDAP daemon
(client-only otherwise)?' y \
+ '--enable-slapd --enable-modules' \
+ '--disable-slapd' &&
+
+if list_find "$OPENLDAP_OPTS" "--enable-slapd"; then
+ config_query_option OPENLDAP_OPTS 'Enable DNS backend (LDAP server
locator)?' n \
+ '--enable-dnssrv=mod' \
+ '--disable-dnssrv' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable Memory-Mapped database backend?'
y \
+ '--enable-mdb=mod' \
+ '--disable-mdb' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable LDAP backend?' n \
+ '--enable-ldap=mod' \
+ '--disable-ldap' &&
+
+ if list_find "$OPENLDAP_OPTS" "--enable-ldap=mod"; then
+ config_query_option OPENLDAP_OPTS 'Enable metadirectory backend?' n \
+ '--enable-meta=mod' \
+ '--disable-meta'
+ else
+ list_add "OPENLDAP_OPTS" "--disable-meta"
+ fi &&
+
+ config_query_option OPENLDAP_OPTS 'Enable LDAP server monitor backend?' y \
+ '--enable-monitor=mod' \
+ '--disable-monitor' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable sock backend?' n \
+ '--enable-sock=mod' \
+ '--disable-sock' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable relay backend?' y \
+ '--enable-relay=mod' \
+ '--disable-relay' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable null backend?' n \
+ '--enable-null=mod' \
+ '--disable-null' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable run-time loadable ACL support
(experimental)?' n \
+ '--enable-dynacl' \
+ '--disable-dynacl' &&
+
+ if list_find "$OPENLDAP_OPTS" "--enable-dynacl"; then
+ config_query_option OPENLDAP_OPTS 'Enable per-object access control
(experimental)?' n \
+ '--enable-aci' \
+ '--disable-aci'
+ fi &&
+
+ if [[ $OPENLDAP_TLS != none ]]; then
+ config_query_option OPENLDAP_OPTS 'Enable LAN Manager passwords?' n \
+ '--enable-lmpasswd' \
+ '--disable-lmpasswd'
+ fi &&
+
+ config_query_option OPENLDAP_OPTS 'Enable cleartext passwords?' y \
+ '--enable-cleartext' \
+ '--disable-cleartext' &&
+
+ config_query_option OPENLDAP_OPTS "Enable crypt(3)'ed passwords?" n \
+ "--enable-crypt" \
+ "--disable-crypt" &&
+
+ config_query_option OPENLDAP_OPTS 'Enable reverse lookup of client
hostnames?' n \
+ '--enable-rlookups' \
+ '--disable-rlookups' &&
+
+ config_query_option OPENLDAP_OPTS 'Enable SLAPI support (experimental)?' n
\
+ '--enable-slapi' \
+ '--disable-slapi' &&
+
+ config_query_multi SLAPD_OVERLAYS "Which overlays do you want supported?" \
+ none \
+ all \
+ accesslog \
+ auditlog \
+ collect \
+ constraint \
+ dds \
+ deref \
+ dyngroup \
+ dynlist \
+ memberof \
+ ppolicy \
+ proxycache \
+ refint \
+ retcode \
+ rwm \
+ seqmod \
+ sssvlv \
+ syncprov \
+ translucent \
+ unique \
+ valsort &&
+
+ if list_find "$OPENLDAP_OPTS" "--enable-meta" || list_find
"$SLAPD_OVERLAYS" "rwm"; then
+ list_add "OPENLDAP_OPTS" "--enable-rewrite"
else
- message 'slurpd has been replaced by the syncprov overlay, adding it' &&
- SLAPD_OVERLAYS="${SLAPD_OVERLAYS} syncprov"
+ config_query_option OPENLDAP_OPTS 'Enable DN rewriting?' y \
+ '--enable-rewrite=auto' \
+ '--disable-rewrite'
+ fi &&
+
+ # migrating slurpd to syncprov
+ if list_find "$OPENLDAP_OPTS" "--enable-slurpd"; then
+ if list_find "$SLAPD_OVERLAYS" "syncprov"; then
+ message 'slurpd has been replaced by the syncprov overlay'
+ else
+ message 'slurpd has been replaced by the syncprov overlay, adding it'
&&
+ list_add "SLAPD_OVERLAYS" "syncprov"
+ fi &&
+
+ list_remove "OPENLDAP_OPTS" "--enable-slurpd"
fi &&
- persistent_remove OPENLDAP_SLURPD
+
+ config_query_multi OPENLDAP_MP 'Which method do you want for multiple
precision statistics?' \
+ auto \
+ bignum \
+ gmp
fi &&

+config_query OPENLDAP_NTLM "Enable NTLM API support (needed for Evolution
Exchange plugin)?" n &&
+
message "${MESSAGE_COLOR}If you care about security, check out
http://timof.qipc.org/ldap/libldap.html .$DEFAULT_COLOR" &&
message "${MESSAGE_COLOR}The patch is not in the spell anymore because of
version mismatch...$DEFAULT_COLOR."
diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS
index e3b7aa3..7840dd8 100755
--- a/collab/openldap/DEPENDS
+++ b/collab/openldap/DEPENDS
@@ -6,70 +6,85 @@ optional_depends SYSTEM-LOGGER \
'--disable-syslog' \
'for syslog support' &&

-# TODO add gnutls here if it works, preferably using PROVIDES
-optional_depends openssl \
- '--with-tls' \
- '--without-tls' \
- 'for SSL/TLS support' &&
+case $OPENLDAP_TLS in
+ none) OPTS="--without-tls $OPTS"
+ ;;
+ openssl) depends openssl "--with-tls=openssl"
+ ;;
+ gnutls) depends gnutls "--with-tls=gnutls"
+ ;;
+ moznss) depends nss "--with-tls=moznss" &&
+ depends nspr
+ ;;
+esac &&

-optional_depends cyrus-sasl '--with-cyrus-sasl' '--without-cyrus-sasl' \
- 'for SASL authentication, if SLAPD is a backend authenticator for SASL,
say "no"' &&
+optional_depends LIBSASL \
+ '--with-cyrus-sasl' \
+ '--without-cyrus-sasl' \
+ 'for SASL authentication, if SLAPD is a backend
authenticator for SASL, say "no"' &&

-if echo $OPENLDAP_SLAPD | grep -q enable; then
- optional_depends db '--enable-bdb=mod --enable-hdb=mod' \
- '--disable-bdb --disable-hdb' \
- 'for Berkeley DB backend (recommended)' &&
+if list_find "$OPENLDAP_OPTS" "--enable-slapd"; then
+ case OPENLDAP_MP in
+ auto) OPTS="--with-mp=auto $OPTS"
+ ;;
+ bignum) depends openssl "--with-mp=bignum"
+ ;;
+ gmp) depends gmp "--with-mp=gmp"
+ ;;
+ esac &&

- optional_depends ODBC-MGR \
- '--enable-sql=mod' \
- '--disable-sql' \
- 'for SQL backend (experimental)' &&
- if [[ $(get_spell_provider $SPELL ODBC-MGR) ]]; then
- if is_depends_enabled $SPELL unixodbc; then
- depends unixodbc --with-odbc=unixodbc
- elif is_depends_enabled $SPELL libiodbc; then
- depends libiodbc --with-odbc=iodbc
- else
- message "${PROBLEM_COLOR}unknown ODBC provider selected, please update
spell${DEFAULT_COLOR}"
- fi
- fi &&
+ if is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL); then
+ config_query_option OPENLDAP_OPTS "Enable (Cyrus) SASL password
verification?" n \
+ "--enable-spasswd" \
+ "--disable-spasswd"
+ fi &&

- optional_depends MYSQL '--enable-mdb=mod' '--disable-mdb' \
- 'for MYSQL backend' &&
+ optional_depends openslp \
+ '--enable-slp' \
+ '--disable-slp' \
+ 'for SLPv2 support' &&

- if [[ $(get_spell_provider $SPELL MYSQL) ]]; then
- config_query_option SLAPD_NDB 'Enable MYSQL NDB cluster support?' n \
- '--enable-ndb=mod' '--disable-ndb'
- if echo $SLAPD_NDB |grep -q enable ; then
- if is_depends_enabled $SPELL mariadb; then
- depends -sub NDB mariadb
- elif is_depends_enabled $SPELL mysql; then
- depends -sub NDB mysql
- fi
- fi
- fi
+ optional_depends tcp_wrappers \
+ '--enable-wrappers' \
+ '--disable-wrappers' \
+ 'for TCP wrappers support' &&

- optional_depends perl \
- '--enable-perl=mod' \
- '--disable-perl' \
- 'for perl backend (write your own storage backend)' &&
+ optional_depends db \
+ '--enable-bdb=mod --enable-hdb=mod' \
+ '--disable-bdb --disable-hdb' \
+ 'for Berkeley DB backend (recommended)' &&

- optional_depends bash \
- '--enable-shell=mod' \
- '--disable-shell' \
- 'for shell backend (write your own storage backend)' &&
+ optional_depends ODBC-MGR \
+ '--enable-sql=mod' \
+ '--disable-sql' \
+ 'for SQL backend' &&

- optional_depends shadow \
- '--enable-passwd=mod' \
- '--disable-passwd' \
- 'for passwd backend (demo code, do not use)' &&
+ if is_depends_enabled $SPELL $(get_spell_provider $SPELL ODBC-MGR); then
+ case $(get_spell_provider $SPELL ODBC-MGR) in
+ libiodbc) depends libiodbc "--with-odbc=iodbc"
+ ;;
+ unixodbc) depends unixodbc "--with-odbc=unixodbc"
+ ;;
+ esac
+ fi &&

- optional_depends tcp_wrappers \
- '--enable-wrappers' \
- '--disable-wrappers' \
- 'for TCP wrappers support'
-fi &&
+ optional_depends -sub NDB MYSQL \
+ "--enable-ndb=mod" \
+ "--disable-ndb" \
+ "for MySQL/MariaDB NDB Cluster backend" &&

-if [[ "$OPENLDAP_CONTEXT" == y ]]; then
- depends autoconf
+ optional_depends perl \
+ '--enable-perl=mod' \
+ '--disable-perl' \
+ 'for Perl backend (write your own storage backend)' &&
+
+ optional_depends bash \
+ '--enable-shell=mod' \
+ '--disable-shell' \
+ 'for shell backend (write your own storage backend)' &&
+
+ optional_depends shadow \
+ '--enable-passwd=mod' \
+ '--disable-passwd' \
+ 'for passwd backend'
fi
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 00bdb28..f39f683 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,15 +1,15 @@
SPELL=openldap
if [[ $OPENLDAP_BRANCH == stable ]]; then
- VERSION=2.4.30
- XVERSION=20120311
- SOURCE=$SPELL-stable-$XVERSION.tgz
-
SOURCE_HASH=sha512:89f032b069dc54cfe0c3149b85c5fedaf89b6b706c368da22852fed51c2574cb703823db1f4c52a9422d5274d4e70497f270fd558985675ab274d6025678c6f3
+ VERSION=2.4.31
+ SOURCE=$SPELL-$VERSION.tgz
+
SOURCE_HASH=sha512:c0f58928a339bedf68de4f95ca0e4d82b187d54ffa15834ebd69d8a90722f699cc495fb4f624450bc51b9e1bcb2b96c429b84dd80ba1930ecdd24c1cd77cc24b
else
VERSION=2.4.31
SOURCE=$SPELL-$VERSION.tgz

SOURCE_HASH=sha512:c0f58928a339bedf68de4f95ca0e4d82b187d54ffa15834ebd69d8a90722f699cc495fb4f624450bc51b9e1bcb2b96c429b84dd80ba1930ecdd24c1cd77cc24b
fi
- SOURCE_URI=$SPELL-$OPENLDAP_BRANCH/$SOURCE
+ SECURITY_PATCH=2
+ 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://it.openldap.org/pub/OpenLDAP/$SOURCE_URI
@@ -18,7 +18,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
ENTERED=20010922
LICENSE[0]=http://www.openldap.org/software/release/license.html
KEYWORDS="ldap collab"
- SECURITY_PATCH=2
SHORT="fully featured open source LDAP software suite"
cat << EOF
The OpenLDAP Project is a collaborative effort to provide a robust,
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 0e190e9..212b7f6 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,21 @@
+2012-06-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: 2.4.31 goes stable; updated source uri
+ * BUILD: fixed compilation with nss+nspr for moznss support; switched
to
+ OPENLDAP_OPTS
+ * DEPENDS: added multi-tls support; added missing deps; mdb has
nothing
+ to do with MySQL: it's a memory-mapped database backend; cyrus-sasl
->
+ LIBSASL
+ * CONFIGURE: added missing options; readability++; global safe switch
to
+ OPENLDAP_OPTS
+ * {PRE_,}SUB_DEPENDS: cyrus-sasl -> LIBSASL
+ * PREPARE: aligned branch names
+ * PRE_BUILD: apply new patch
+ * TRIGGERS: do this only if spell depends on `db'
+ * UP_TRIGGERS: corrected triggers to skip further checking if the
spell
+ hadn't been installed yet
+ * openldap-2.4-ntlm.patch: replaced by up-to-date patch
+ * openldap-2.4.31-ntlm.patch: added, for NTLM support
+
2012-05-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.31

diff --git a/collab/openldap/PREPARE b/collab/openldap/PREPARE
index fe60ef1..16b338c 100755
--- a/collab/openldap/PREPARE
+++ b/collab/openldap/PREPARE
@@ -1,3 +1,3 @@
config_query_list OPENLDAP_BRANCH "Select which branch to build:" \
- stable \
- release
+ stable \
+ release
diff --git a/collab/openldap/PRE_BUILD b/collab/openldap/PRE_BUILD
index aee9428..258ed08 100755
--- a/collab/openldap/PRE_BUILD
+++ b/collab/openldap/PRE_BUILD
@@ -2,5 +2,5 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

if [[ $OPENLDAP_NTLM == y ]]; then
- patch -p1 < "$SPELL_DIRECTORY/openldap-2.4-ntlm.patch"
+ patch -p1 < "$SPELL_DIRECTORY/openldap-2.4.31-ntlm.patch"
fi
diff --git a/collab/openldap/PRE_SUB_DEPENDS b/collab/openldap/PRE_SUB_DEPENDS
index 3625961..4328e50 100755
--- a/collab/openldap/PRE_SUB_DEPENDS
+++ b/collab/openldap/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- SASL) is_depends_enabled $SPELL cyrus-sasl;;
+ SASL) is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL);;
NTLM) [[ OPENLDAP_NTLM == "y" ]] && return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
diff --git a/collab/openldap/SUB_DEPENDS b/collab/openldap/SUB_DEPENDS
index 391032f..a92065e 100755
--- a/collab/openldap/SUB_DEPENDS
+++ b/collab/openldap/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
SASL) message "OpenLDAP with SASL support requested, forcing cyrus-sasl
dependency" &&
- depends cyrus-sasl "--with-cyrus-sasl";;
+ depends LIBSASL "--with-cyrus-sasl";;
NTLM) message "OpenLDAP with NTLM support requested, forcing NTLM patch"
&&
OPENLDAP_NTLM=y ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
diff --git a/collab/openldap/TRIGGERS b/collab/openldap/TRIGGERS
index 14b231e..953906a 100755
--- a/collab/openldap/TRIGGERS
+++ b/collab/openldap/TRIGGERS
@@ -1,2 +1,3 @@
-# TODO do this only if spell depends on `db'
-on_cast db check_self
+if is_depends_enabled $SPELL db; then
+ on_cast db check_self
+fi
diff --git a/collab/openldap/UP_TRIGGERS b/collab/openldap/UP_TRIGGERS
index 7c79804..f548991 100755
--- a/collab/openldap/UP_TRIGGERS
+++ b/collab/openldap/UP_TRIGGERS
@@ -1,7 +1,7 @@
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
+
if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
- message "This is a possibly incompatible update of openldap..."
+ message "This is a possibly incompatible update of $SPELL..."
message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL 1); do
if gaze install-spell $each | xargs readelf -d 2> /dev/null |
@@ -9,7 +9,7 @@ if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
up_trigger $each cast_self
fi
done
-fi
+fi &&

if spell_ok curl && is_depends_enabled curl $SPELL; then
up_trigger curl cast_self
diff --git a/collab/openldap/openldap-2.4-ntlm.patch
b/collab/openldap/openldap-2.4-ntlm.patch
deleted file mode 100644
index 1f1e8f2..0000000
--- a/collab/openldap/openldap-2.4-ntlm.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-This is a patch against OpenLDAP 2.2.6. Apply with -p0
-
-This patch was obtained from
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openldap-ntlm.diff and
updated to openldap 2.4.14. Apply with -p1.
-
-diff -Naur openldap-2.4.14.orig/include/ldap.h openldap-2.4.14/include/ldap.h
---- openldap-2.4.14.orig/include/ldap.h 2009-02-18 03:43:05.491974110
-0800
-+++ openldap-2.4.14/include/ldap.h 2009-02-18 03:43:16.327725135 -0800
-@@ -2461,5 +2461,26 @@
- LDAPControl **ctrls,
- LDAPDerefRes **drp ));
-
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-diff -Naur openldap-2.4.14.orig/libraries/libldap/Makefile.in
openldap-2.4.14/libraries/libldap/Makefile.in
---- openldap-2.4.14.orig/libraries/libldap/Makefile.in 2009-02-18
03:43:05.489975043 -0800
-+++ openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-18
03:43:16.327725135 -0800
-@@ -20,7 +20,7 @@
- SRCS = bind.c open.c result.c error.c compare.c search.c \
- controls.c messages.c references.c extended.c cyrus.c \
- modify.c add.c modrdn.c delete.c abandon.c \
-- sasl.c gssapi.c sbind.c unbind.c cancel.c \
-+ sasl.c gssapi.c ntlm.c sbind.c unbind.c cancel.c \
- filter.c free.c sort.c passwd.c whoami.c \
- getdn.c getentry.c getattr.c getvalues.c addentry.c \
- request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
-@@ -33,7 +33,7 @@
- OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
- controls.lo messages.lo references.lo extended.lo cyrus.lo \
- modify.lo add.lo modrdn.lo delete.lo abandon.lo \
-- sasl.lo gssapi.lo sbind.lo unbind.lo cancel.lo \
-+ sasl.lo gssapi.lo ntlm.lo sbind.lo unbind.lo cancel.lo \
- filter.lo free.lo sort.lo passwd.lo whoami.lo \
- getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
- request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
-diff -Naur openldap-2.4.14.orig/libraries/libldap/ntlm.c
openldap-2.4.14/libraries/libldap/ntlm.c
---- openldap-2.4.14.orig/libraries/libldap/ntlm.c 1969-12-31
16:00:00.000000000 -0800
-+++ openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-18 03:43:16.328725611
-0800
-@@ -0,0 +1,137 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04
20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
-+{
-+ BerElement *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+ LDAP_FREE( ld->ld_error );
-+ ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+ LDAP_FREE( ld->ld_matched );
-+ ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+ &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+ ld->ld_errno = LDAP_DECODING_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
diff --git a/collab/openldap/openldap-2.4.31-ntlm.patch
b/collab/openldap/openldap-2.4.31-ntlm.patch
new file mode 100644
index 0000000..ae981eb
--- /dev/null
+++ b/collab/openldap/openldap-2.4.31-ntlm.patch
@@ -0,0 +1,219 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2012-04-06
+Initial Package Version: 2.4.30
+Upstream Status: Unknown
+Origin: Debian
+Description: Patch from evolution-exchange (2.10.3). The
ldap_ntlm_bind function is
+ actually called by evolution-data-server, checked
at version 1.12.2.
+ Without this patch, the Exchange addressbook
integration uses simple binds
+ with cleartext passwords.
+
+--- openldap.orig/include/ldap.h 2012-02-29 18:37:09.000000000 +0100
++++ openldap/include/ldap.h 2012-04-01 00:20:00.059827789 +0200
+@@ -2517,5 +2517,25 @@
+ LDAPControl **ctrls,
+ LDAPDerefRes **drp ));
+
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+--- openldap.orig/libraries/libldap/Makefile.in 2012-04-01
00:18:54.233419658 +0200
++++ openldap/libraries/libldap/Makefile.in 2012-04-01 00:20:00.060827810
+0200
+@@ -27,7 +27,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+
+ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
+--- openldap.orig/libraries/libldap/ntlm.c 1970-01-01 01:00:00.000000000
+0100
++++ openldap/libraries/libldap/ntlm.c 2012-04-01 00:20:00.059827789 +0200
+@@ -0,0 +1,138 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04
20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <ac/socket.h>
++#include <ac/string.h>
++#include <ac/time.h>
++#include <ac/errno.h>
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp )
++{
++ BerElement *ber;
++ int rc;
++ ber_int_t id;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
++
++ if( msgidp == NULL ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ assert( LBER_VALID( ber ) );
++
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++ id, LDAP_REQ_BIND,
++ ld->ld_version, dn, tag,
++ cred );
++
++ /* Put Server Controls */
++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++ ld->ld_errno = LDAP_ENCODING_ERROR;
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++ if(*msgidp < 0)
++ return ld->ld_errno;
++
++ return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
++{
++ ber_int_t errcode;
++ ber_tag_t tag;
++ BerElement *ber;
++ ber_len_t len;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
++
++ if ( ld == NULL || res == NULL ) {
++ return LDAP_PARAM_ERROR;
++ }
++
++ if( res->lm_msgtype != LDAP_RES_BIND ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ if ( ld->ld_error ) {
++ LDAP_FREE( ld->ld_error );
++ ld->ld_error = NULL;
++ }
++ if ( ld->ld_matched ) {
++ LDAP_FREE( ld->ld_matched );
++ ld->ld_matched = NULL;
++ }
++
++ /* parse results */
++
++ ber = ber_dup( res->lm_ber );
++
++ if( ber == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ tag = ber_scanf( ber, "{ioa" /*}*/,
++ &errcode, challenge, &ld->ld_error );
++ ber_free( ber, 0 );
++
++ if( tag == LBER_ERROR ) {
++ ld->ld_errno = LDAP_DECODING_ERROR;
++ return ld->ld_errno;
++ }
++
++ ld->ld_errno = errcode;
++
++ return( ld->ld_errno );
++}
++
+--- openldap.orig/libraries/libldap_r/Makefile.in 2012-04-01
00:18:54.234419703 +0200
++++ openldap/libraries/libldap_r/Makefile.in 2012-04-01 00:20:00.060827810
+0200
+@@ -29,7 +29,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+ SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
+ thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
diff --git a/crypto/krb5-appl/DETAILS b/crypto/krb5-appl/DETAILS
index 8883d65..d9652e6 100755
--- a/crypto/krb5-appl/DETAILS
+++ b/crypto/krb5-appl/DETAILS
@@ -1,14 +1,13 @@
SPELL=krb5-appl
- VERSION=1.0.1
+ VERSION=1.0.3
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/$SOURCE
-
SOURCE_HASH=sha512:f81222de37e1135fd499639c77c9e396ec8a1f07cc3cd2d895e460882be634655a365b04e7673976c490c50ab422fdd39b14bcec96a704338d2c9e6a47cbed7a
+
SOURCE_HASH=sha512:1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
- PATCHLEVEL=0
SECURITY_PATCH=0
SHORT="Kerberos 5 aplications"
cat << EOF
diff --git a/crypto/krb5-appl/HISTORY b/crypto/krb5-appl/HISTORY
index 8a13603..80e191c 100644
--- a/crypto/krb5-appl/HISTORY
+++ b/crypto/krb5-appl/HISTORY
@@ -1,3 +1,9 @@
+2012-06-20 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, system-et.patch.bz2: patch removed, not needed
+
+2012-06-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.3
+
2010-06-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.1

diff --git a/crypto/krb5-appl/PRE_BUILD b/crypto/krb5-appl/PRE_BUILD
index a1d0c86..a5b0c11 100755
--- a/crypto/krb5-appl/PRE_BUILD
+++ b/crypto/krb5-appl/PRE_BUILD
@@ -2,6 +2,4 @@ mk_source_dir &&
cd $SOURCE_DIRECTORY &&

unpack_file &&
-tar xzf ${SOURCE_RAW} &&
-cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
-bzcat $SCRIPT_DIRECTORY/system-et.patch.bz2 | patch -p1
+tar xzf ${SOURCE_RAW}
diff --git a/crypto/krb5-appl/system-et.patch.bz2
b/crypto/krb5-appl/system-et.patch.bz2
deleted file mode 100644
index 8989c12..0000000
Binary files a/crypto/krb5-appl/system-et.patch.bz2 and /dev/null differ
diff --git a/crypto/krb5/BUILD b/crypto/krb5/BUILD
index 14d1206..5555064 100755
--- a/crypto/krb5/BUILD
+++ b/crypto/krb5/BUILD
@@ -1,13 +1,6 @@
-if [ "$KRB4" == "y" ]; then
- OPTS="$OPTS --with-krb4"
-else
- OPTS="$OPTS --without-krb4"
-fi
-
cd $SPELL-$VERSION/src &&

-./configure --enable-dns-for-kdc \
- --enable-dns-for-realm \
+./configure --enable-dns-for-realm \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--enable-shared \
diff --git a/crypto/krb5/CONFIGURE b/crypto/krb5/CONFIGURE
deleted file mode 100755
index 0cbe4f2..0000000
--- a/crypto/krb5/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query KRB4 "Do you want to enable Kerberos V4 backwards compatibility
?" n
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index 4ed85fe..60f631a 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,14 +1,13 @@
SPELL=krb5
- VERSION=1.8.4
+ VERSION=1.10.2
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://web.mit.edu/kerberos/www/dist/krb5/${VERSION::3}/$SOURCE
-
SOURCE_HASH=sha512:cfb61ad17785b440583f50860e87a88da87f9da0868290aafb92b663dd4bda997b1f4126deed9a5ba7a9b7886e419ec6fbae3352e9eb7436fa7a6275ff18223f
+ SOURCE_URL[0]=http://web.mit.edu/kerberos/dist/krb5/${VERSION%.*}/$SOURCE
+
SOURCE_HASH=sha512:989d49e2b5cfa55ccf01fd075a9ebe27eb22e2682a3c59eac1489318c84ad8b950458cf6c7ea9a0bfc81423e91a9545fed164799d73a6f6c46ff8f8b97bb2475
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
- PATCHLEVEL=0
SECURITY_PATCH=9
KEYWORDS="security crypto"
SHORT="Kerberos 5 network security protocol"
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index cc88fe9..c2fce7e 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,15 @@
+2012-06-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 1.10.2
+ Fixed SOURCE_URL[0]
+ * BUILD: --with-krb4 no longer valid, removed.
+ --enable-dns-for-kdc no longer valid, removed.
+ * CONFIGURE: removed, no longer needed
+ * PRE_BUILD: Don't apply system-et.patch.
+ Apply gcc-4.7.patch.
+ * gcc-4.7.patch: added, fix compilation with gcc 4.7
+ * system-et.patch.bz2: removed, not needed --with-system-et
+ should do this
+
2011-11-14 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: --with-tcl needs corresponding --without-tcl

diff --git a/crypto/krb5/PRE_BUILD b/crypto/krb5/PRE_BUILD
index 14960ce..965a071 100755
--- a/crypto/krb5/PRE_BUILD
+++ b/crypto/krb5/PRE_BUILD
@@ -4,4 +4,4 @@ cd $SOURCE_DIRECTORY &&
unpack_file &&
tar xzf ${SOURCE_RAW} &&
cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
-bzcat $SCRIPT_DIRECTORY/system-et.patch.bz2 | patch -p1
+patch -p0 < $SPELL_DIRECTORY/gcc-4.7.patch
diff --git a/crypto/krb5/gcc-4.7.patch b/crypto/krb5/gcc-4.7.patch
new file mode 100644
index 0000000..dbbcac9
--- /dev/null
+++ b/crypto/krb5/gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- src/lib/krb5/krb/deltat.c 2011-09-06 14:34:32.000000000 +0300
++++ src/lib/krb5/krb/deltat.c 2012-04-17 23:15:11.405005256 +0300
+@@ -77,6 +77,7 @@
+ #ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wuninitialized"
++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+
+ #include <ctype.h>
diff --git a/crypto/krb5/system-et.patch.bz2 b/crypto/krb5/system-et.patch.bz2
deleted file mode 100644
index bbf9547..0000000
Binary files a/crypto/krb5/system-et.patch.bz2 and /dev/null differ
diff --git a/crypto/mosh/DEPENDS b/crypto/mosh/DEPENDS
index 16ff9a6..69c079e 100755
--- a/crypto/mosh/DEPENDS
+++ b/crypto/mosh/DEPENDS
@@ -1,5 +1,11 @@
-depends boost &&
+depends -sub CXX gcc &&
depends protobuf &&
depends ncurses &&
depends zlib &&
-depends libutempter
+
+runtime_depends io-tty &&
+
+optional_depends libutempter \
+ "--with-utempter" \
+ "--without-utempter" \
+ "for utmp/wtmp session entries (see
https://github.com/keithw/mosh/issues/201)"
diff --git a/crypto/mosh/DETAILS b/crypto/mosh/DETAILS
index 0d613bd..b3e6356 100755
--- a/crypto/mosh/DETAILS
+++ b/crypto/mosh/DETAILS
@@ -1,8 +1,8 @@
SPELL=mosh
- VERSION=1.1.3
+ VERSION=1.2.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/downloads/keithw/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:8caa27b78e81f10e033bbb9aa0c35ad40ca0cd3cb6ee5f21ea6dba123bc0bd80e5d8a70b4018d4e18d8f6383d41b69685a5df4ded33194a887c935e7fa5f59d9
+
SOURCE_HASH=sha512:90a436f97afd797b29d46eb08f6c69360206e2ebf56c25e4095609f0d8cc3a179b837ee7b26a0c296defb11992ee6a079f3eaec40f394a1048407ed1664888e5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="mosh.mit.edu"
LICENSE[0]=GPL
diff --git a/crypto/mosh/FINAL b/crypto/mosh/FINAL
deleted file mode 100755
index 8eaaf55..0000000
--- a/crypto/mosh/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-message "${MESSAGE_COLOR}NOTICE: You will need to
-insure that the IO::Pty Perl Module is installed
-before you use mosh.${DEFAULT_COLOR}"
diff --git a/crypto/mosh/HISTORY b/crypto/mosh/HISTORY
index a7d85c9..8b4dd03 100644
--- a/crypto/mosh/HISTORY
+++ b/crypto/mosh/HISTORY
@@ -1,3 +1,10 @@
+2012-06-17 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated to 1.2.2
+ * DEPENDS: fixed dependencies (io-tty for IO:Pty perl module was
+ missing, libutempter is optional); removed boost as it's no longer
+ needed/used; added dependency on gcc with CXX
+ * FINAL: removed, IO:Pty is handled via runtime_depends in DEPENDS
+
2012-04-20 David C. Haley <khoralin AT gmail.com>
* FINAL, DEPENDS, DETAILS: spell created

diff --git a/devel/ddd/HISTORY b/devel/ddd/HISTORY
index cb4af32..b4a3763 100644
--- a/devel/ddd/HISTORY
+++ b/devel/ddd/HISTORY
@@ -1,3 +1,7 @@
+2012-06-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply gcc patch
+ * gcc-4.4.patch: added, fix compilation on gcc >= 4.4
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* E5158D1A.gpg: added gpg keyring
diff --git a/devel/ddd/PRE_BUILD b/devel/ddd/PRE_BUILD
new file mode 100755
index 0000000..e038d92
--- /dev/null
+++ b/devel/ddd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/gcc-4.4.patch
diff --git a/devel/ddd/gcc-4.4.patch b/devel/ddd/gcc-4.4.patch
new file mode 100644
index 0000000..d644044
--- /dev/null
+++ b/devel/ddd/gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- ddd/strclass.C 2011-10-04 17:49:36.428744325 -0700
++++ ddd/strclass.C-new 2011-10-04 17:49:29.016546965 -0700
+@@ -39,6 +39,7 @@ extern "C" int malloc_verify();
+ #include <limits.h>
+ #include <new>
+ #include <stdlib.h>
++#include <cstdio>
+
+ void string::error(const char* msg) const
+ {
diff --git a/devel/gdb/DEPENDS b/devel/gdb/DEPENDS
index 0dc6280..744620c 100755
--- a/devel/gdb/DEPENDS
+++ b/devel/gdb/DEPENDS
@@ -40,9 +40,4 @@ optional_depends expat \
optional_depends python \
"--with-python" \
"--without-python" \
- "to include Python support" &&
-
-optional_depends tk \
- "--enable-gdbtk" \
- "--disable-gdbtk" \
- "for graphical user interface"
+ "to include Python support"
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index f306865..8a436e2 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,7 @@
+2012-06-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: removed optional_depends tk as gdbtk is
+ a separate project (insight) (fixes #249)
+
2012-05-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.4.1

diff --git a/devel/geany-plugins/DETAILS b/devel/geany-plugins/DETAILS
index 6dd8767..1fc1f17 100755
--- a/devel/geany-plugins/DETAILS
+++ b/devel/geany-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=geany-plugins
- VERSION=0.21
+ VERSION=0.21.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://plugins.geany.org/$SPELL/$SOURCE
diff --git a/devel/geany-plugins/HISTORY b/devel/geany-plugins/HISTORY
index fd81a94..922cad5 100644
--- a/devel/geany-plugins/HISTORY
+++ b/devel/geany-plugins/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.21.1
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index a53d8ac..b8dc3aa 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,10 +1,11 @@
SPELL=geany
- VERSION=0.21
+ VERSION=1.22
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.geany.org/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE_GPG=geany.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index f3bca11..8a301e0 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.22; added 2nd source url for pgp sig
+
2011-10-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.21; updated to use new gpg keyring
* geany.gpg: added new gpg keyring
diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index 41221a8..c75c579 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -1,16 +1,16 @@
SPELL=ghc
- VERSION=7.4.1
+ VERSION=7.4.2
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:2d92deb2e9373f816b97acafd9239efc35bad1d912dbe57fc2744b35cb0e156b031b2b039d8699ee1554179ace15a94b03b62b1395d0a87703aa524750b818a3
+
SOURCE_HASH=sha512:5a3d06a36702fa7e337b482c9de92ce1f84a68f18d8560bcc11f3617d6d46f93167fee27e786de6483a9ef0eab3b1ac6909a71dd53908d36156df4e465075050
if [[ ! -x /usr/bin/ghc ]] ; then
ARCH="$(uname -m)"
[[ "$ARCH" = i686 ]] && ARCH=i386
SOURCE2=${SPELL}-${VERSION}-${ARCH}-unknown-linux.tar.bz2
SOURCE2_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE2}
-
SOURCE2_HASH=sha512:9a400050803aef949320e4837e487ffadd7a3df9d17d6a6d31d6f404a151f9a796f04925659fca14c383361d2fd419d1ae5b71d0996389ff1d1e361cc8d48538
- [ "$ARCH" = "x86_64" ] &&
SOURCE2_HASH=sha512:157ac38676f3cb3cf41c37dd4d8ce995067936682e0b45d501f5abbc41732b41ad03798279aafd952bc7cd4e1af43e6f6340e398f6383cd5490d02b8bf8f75dc
+
SOURCE2_HASH=sha512:ad2cacf21528bc5a3d1ab9e3e683ce4fcbe8cc3039f15e9ffdec72f3c0f908a808f310244975455aa5d2f64328f787abd50e8b6b2a3456c1e0976ce9edc3f5f2
+ [ "$ARCH" = "x86_64" ] &&
SOURCE2_HASH=sha512:93a9b33ae0b8b1c8e27aba6621624059c628d7e9302b41525985f0aefb9cbc11173aba5a7f9fbccb41e69cbf66f29c01099ae833db8b12a62e23f1db11b28d9b
fi
TMPFS=off

diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index e92e7a1..f30b7b6 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2012-06-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.4.2
+
2012-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: activated parallel build
* PRE_BUILD: create /lib64 symlink on x86_64
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index e417cf5..b9e535f 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.7.10.4
+ VERSION=1.7.11
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-
SOURCE_HASH=sha512:21e1a1b71e2594fc0a1cb7fcd86b2411f06c0c920a8bd24cb22d5bcae2387e12b0b46e03a73f15eaa78df585bafbe41cf015a0fd8819fbd9ddb2a75f8846460f
+
SOURCE_HASH=sha512:39fb1ba8522b0b26537b58707dd61e06179f18f33788ed684c32a82f5b21eb89492041b78066c3430405744cbaa39d1f9518337b5ad0e97658f1cd88a5c429e5
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:b4a4cbd3fccb394d676a4e551537961a3fb4e677a2640ae83eb3ef6650c139ab61c3cf3fcbacde9ea8a2de6b9fd03d151342ebf11abbb3afece89251246662ca
+
SOURCE3_HASH=sha512:e8bd513cc031ac20b5b6e7f30af9f65ce114b85bd4a2728901b03127e1c344b96066dc8d432ad829c69494ae8f074a6472d17f2116e4244de733a73aa9c34d33
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:130570e8db7e5af0d8226551f003e0525c598525631ee85d7893059919a06f2a6166fd42c325d1bb95c1312cf3c8b969d083dcb3b4bfae9224354814f9ae4f7e
+
SOURCE5_HASH=sha512:69dd30e206c32d61134890794f3d62cafbbe5f1edb03b2c69760c2fa45292131bb4f1747422bbd64fded9775b99aac376f9da335bf6fda0030a1030780f479ab
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 6bfe4ca..335ca06 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-06-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.11
+
2012-06-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.10.4

diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 446cebc..6276450 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,10 +1,10 @@
SPELL=qt-creator
if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
- VERSION=2.5.0-rc
-
SOURCE_HASH=sha512:89bc1d3ec1246933c90eb43d30be8f0af35fdec526144f2ad41d483a64cb71dfe322c12e829bd4183b551be81f3d0980d9c5740cc6708adcb5f28a313837c345
+ VERSION=2.5.0
+
SOURCE_HASH=sha512:b97c8a9d6ca36495fe88bf1ea1e80b85dfca0729c205a2fab4509f2888c1c9f927c89e4461b9db06330cfa0bf2b18c0e778a08468e7b2841bf71581860039692
else
- VERSION=2.4.1
-
SOURCE_HASH=sha512:ad49a5b7a25ea87433174f3d4dc46227229880ba09888b3cdfc28944be7d250f10ad142c67e6202f905ec092569fc967209ac721ad1b569a13ea50cb9447a2f1
+ VERSION=2.5.0
+
SOURCE_HASH=sha512:b97c8a9d6ca36495fe88bf1ea1e80b85dfca0729c205a2fab4509f2888c1c9f927c89e4461b9db06330cfa0bf2b18c0e778a08468e7b2841bf71581860039692
fi
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index b5f6d47..2045e39 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2012-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable and devel version 2.5.0
+
2012-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: devel version 2.5.0-rc

diff --git a/disk/ddrescue/DETAILS b/disk/ddrescue/DETAILS
index 89a8652..44f1e4a 100755
--- a/disk/ddrescue/DETAILS
+++ b/disk/ddrescue/DETAILS
@@ -1,6 +1,6 @@
SPELL=ddrescue
- VERSION=1.15
-
SOURCE_HASH=sha512:103a14c3ce0729240844517da0e030115d2bffa59f41a56e4b21f92e35cfe6334282424473f53f17cc5ce85440e5ff5e83891f6e855808ae68f23435cc59604f
+ VERSION=1.16
+
SOURCE_HASH=sha512:c775ac34701b63ab7efd0a56cecf5c8b198874239e48383142db0ccb83c193c7101335374dc89efaa815b466258181f458a3589ea4abb230804b553fb42b345d
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index 33b216d..b3fab8c 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.16
+
2012-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.15

diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index aeaa10d..d441a98 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,5 +1,5 @@
SPELL=e2fsprogs
- VERSION=1.42.3
+ VERSION=1.42.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index bf1e1a2..e5aaac8 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,6 @@
+2012-06-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.42.4
+
2012-05-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.42.3

diff --git a/disk/partclone/DEPENDS b/disk/partclone/DEPENDS
index 0713ef3..425588d 100755
--- a/disk/partclone/DEPENDS
+++ b/disk/partclone/DEPENDS
@@ -1,3 +1,10 @@
+depends util-linux &&
+depends libxslt &&
+depends docbook-xsl &&
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'National Language support' &&
optional_depends e2fsprogs '--enable-extfs' '' 'support ext2/3/4 ' &&
optional_depends ntfs-3g '--enable-ntfs' '' 'support NTFS' &&
optional_depends ncurses '--enable-ncursesw' '' 'enable TEXT User
Interface'
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 34a5b36..044b0f3 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.48
-
SOURCE_HASH=sha512:7b00bfe63e659dfe70e97bdc678581b4209ce44d36555e19c4b287570976283a95e977510110a98a05b9495e4886742b78b3492f6d574ad4c6a574ca0b10dfeb
+ VERSION=0.2.49
+
SOURCE_HASH=sha512:d40ce7aff661592710f8b1de638404e98c7d1166da3ffa6cb941bbc6ec64f013431930d231027abc1bce0ac8b7c7b5580d87294e8504ee0130ebf961aa210eaa
SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 7b57330..2552a0d 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,8 @@
+2012-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.49
+ * DEPENDS: add docbook-xsl, gtettext, util-linux
+ * PRE_BUILD: added, find correct docbook-xsl
+
2012-05-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.48

diff --git a/disk/partclone/PRE_BUILD b/disk/partclone/PRE_BUILD
new file mode 100755
index 0000000..e4cbb8d
--- /dev/null
+++ b/disk/partclone/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# find docbook-xsl
+sed -i '/^MAN_S/s|stylesheet/docbook-xsl|xsl-stylesheets-*/|'
docs/Makefile.in
diff --git a/doc/docbook-xsl/DETAILS b/doc/docbook-xsl/DETAILS
index 5061f97..db6c4fc 100755
--- a/doc/docbook-xsl/DETAILS
+++ b/doc/docbook-xsl/DETAILS
@@ -1,6 +1,6 @@
SPELL=docbook-xsl
- VERSION=1.76.1
-
SOURCE_HASH=sha512:4e63a0fdc29de8f22400966cc0cb59a1c3263c1da39ddb5b3840a7902208a1118ed473d03738587534166d588e6c79ec7ae0e423330f84c4f9f810f0c2ede9c2
+ VERSION=1.77.1
+
SOURCE_HASH=sha512:39c1eb10ce439ad2c99d9aedf13d26b9ff6bbab871d4491c88253c9f88caaaafdb9316dde201627c84b639c4b6c2a110fa0eddc687ff4e199c0407331954c839
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/docbook/$SOURCE
diff --git a/doc/docbook-xsl/HISTORY b/doc/docbook-xsl/HISTORY
index 6b39dd6..a012f5f 100644
--- a/doc/docbook-xsl/HISTORY
+++ b/doc/docbook-xsl/HISTORY
@@ -1,3 +1,6 @@
+2012-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.77.1
+
2011-06-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.76.1

diff --git a/doc/zathura-pdf-poppler/DETAILS b/doc/zathura-pdf-poppler/DETAILS
index e29344d..ad37cad 100755
--- a/doc/zathura-pdf-poppler/DETAILS
+++ b/doc/zathura-pdf-poppler/DETAILS
@@ -1,6 +1,6 @@
SPELL=zathura-pdf-poppler
- VERSION=0.1.1
-
SOURCE_HASH=sha512:8cbdebb3f9dd543c23a2380a499a69252e0072a507c242ddff153e49aa6859db3cb88995ee749b559444eb42cc1d5e38a67e9c73d74e458c29f2ecf1af0b3394
+ VERSION=0.2.0
+
SOURCE_HASH=sha512:afcb1073bbe0008e8fc019600827455ce5ca391cf3c275a9443f9aaa6001dbffd22209c88a92c3d433dd8d8aa996be5d33c1a07d40dbfd2cc0cfbcd01cd85521
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pwmt.org/projects/zathura/plugins/download/$SOURCE
diff --git a/doc/zathura-pdf-poppler/HISTORY b/doc/zathura-pdf-poppler/HISTORY
index 9b46694..6362dd7 100644
--- a/doc/zathura-pdf-poppler/HISTORY
+++ b/doc/zathura-pdf-poppler/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.0
+
2012-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.1.1, SOURCE_URL[0] updated

diff --git a/doc/zathura/DETAILS b/doc/zathura/DETAILS
index c8487f0..32e4288 100755
--- a/doc/zathura/DETAILS
+++ b/doc/zathura/DETAILS
@@ -1,6 +1,6 @@
SPELL=zathura
- VERSION=0.1.2
-
SOURCE_HASH=sha512:a2977d69cb07865b3ff16711b47f9370379ed79f9ef6e2f306d76097d6981644634d31bbf338623ea9ab72bb6294b4da4992b8158775dcf4d952b05643008dd3
+ VERSION=0.2.0
+
SOURCE_HASH=sha512:a804b6a36a1a91cd799f7cf0c2e9ed581783be443175c0c46527e9719ce57eac125d991b8c20f421cbd6c7f49d3ef3f02d1ad56246c7641b47ec7016fb041914
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pwmt.org/projects/zathura/download/$SOURCE
diff --git a/doc/zathura/HISTORY b/doc/zathura/HISTORY
index 9ef48d0..4b7719d 100644
--- a/doc/zathura/HISTORY
+++ b/doc/zathura/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.0
+
2012-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.1.2

diff --git a/editors/ne/BUILD b/editors/ne/BUILD
index 0374137..581af83 100755
--- a/editors/ne/BUILD
+++ b/editors/ne/BUILD
@@ -1 +1,3 @@
-make PREFIX="$INSTALL_ROOT/usr"
+make_single &&
+make PREFIX="$INSTALL_ROOT/usr" $NE_OPTS &&
+make_normal
diff --git a/editors/ne/CONFIGURE b/editors/ne/CONFIGURE
new file mode 100755
index 0000000..857ed92
--- /dev/null
+++ b/editors/ne/CONFIGURE
@@ -0,0 +1,21 @@
+config_query_option NE_OPTS "Use termcap database?" n \
+ "NE_TERMCAP=1" \
+ "NE_TERMCAP=" &&
+
+if list_find "$NE_OPTS" "TERMCAP=1"; then
+ config_query_option NE_OPTS "Use built-in ANSI terminal description by
default?" n \
+ "NE_ANSI=1" \
+ "NE_ANSI="
+fi &&
+
+config_query_option NE_OPTS "Enable debugging?" n \
+ "NE_DEBUG=1" \
+ "NE_DEBUG=" &&
+
+config_query_option NE_OPTS "Build POSIX-compliant version?" n \
+ "NE_POSIX=1" \
+ "NE_POSIX=" &&
+
+config_query_option NE_OPTS "Enable multiple-column support?" y \
+ "NE_NOWCHAR=" \
+ "NE_NOWCHAR=1"
diff --git a/editors/ne/DEPENDS b/editors/ne/DEPENDS
new file mode 100755
index 0000000..559c7dd
--- /dev/null
+++ b/editors/ne/DEPENDS
@@ -0,0 +1,3 @@
+if ! list_find "$NE_OPTS" "NE_TERMCAP=1"; then
+ depends ncurses
+fi
diff --git a/editors/ne/DETAILS b/editors/ne/DETAILS
index 80acb1b..8a71596 100755
--- a/editors/ne/DETAILS
+++ b/editors/ne/DETAILS
@@ -1,6 +1,6 @@
SPELL=ne
- VERSION=2.3
-
SOURCE_HASH=sha512:2a02aa2d800ae01df8a707d59f3f5638422e699d09e1e384274be4a4a90b7019c40b5005e3892684f0ca7e3521ca1449af94bb89f0933c17c64aefc8e2c36240
+ VERSION=2.4
+
SOURCE_HASH=sha512:1cea65abc9ced79fc4eeb4ade42c51a9620b6e78e4f6dfb6a085380906299b56b81159b634d0bfb98c427b8c2e0e1a2d060254dff299a548c7c47987d76f4768
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://ne.dsi.unimi.it/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]='GPL'
ENTERED=20060122
KEYWORDS="editors"
- SHORT="a nice editor"
+ SHORT="nice editor: minimal, modern replacement for vi"
cat << EOF
ne is a free text editor that runs on (hopefully almost) any UN*X machine.
ne is easy to use for the beginner, but powerful and fully configurable for
diff --git a/editors/ne/HISTORY b/editors/ne/HISTORY
index bb4d039..c242c2c 100644
--- a/editors/ne/HISTORY
+++ b/editors/ne/HISTORY
@@ -1,3 +1,11 @@
+2012-06-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4; updated short desc
+ * PRE_BUILD: added, to compile with user-defined cflags
+ * DEPENDS: added, for missing dependency
+ * CONFIGURE: added, for various options
+ * BUILD: multijob build isn't supported; use NE_OPTS
+ * INSTALL: multijob install isn't supported
+
2011-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.3; corrected source url
* BUILD: simplified build process
diff --git a/editors/ne/INSTALL b/editors/ne/INSTALL
index f1b6bc6..67fdcdd 100755
--- a/editors/ne/INSTALL
+++ b/editors/ne/INSTALL
@@ -1 +1,3 @@
-make install PREFIX="$INSTALL_ROOT/usr"
+make_single &&
+make install PREFIX="$INSTALL_ROOT/usr" &&
+make_normal
diff --git a/editors/ne/PRE_BUILD b/editors/ne/PRE_BUILD
new file mode 100755
index 0000000..a347273
--- /dev/null
+++ b/editors/ne/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# apply user-defined cflags
+sedit "s:-O3:${CFLAGS}:" src/makefile
diff --git a/education/klavaro/DETAILS b/education/klavaro/DETAILS
index 70ec686..3986a82 100755
--- a/education/klavaro/DETAILS
+++ b/education/klavaro/DETAILS
@@ -1,9 +1,9 @@
SPELL=klavaro
- VERSION=1.9.3
+ VERSION=1.9.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2534885b9fb741e613d38d9e4887b0e641be4e9aecea89630d30f93078eb574a7a4cd5c0e9cda44a88caa4fb5ad86bb1897ce1f0c8810bb7a13ccf88afbb252f
+
SOURCE_HASH=sha512:76242b8d9e3002ea0f77f7751bc7ba56f51078f70f92350f934cdb80a1f20cd7392907d65837cc31c2a1916809ab9e3cfaefc8018f4b65e05448c991c4e3b786
LICENSE[0]=GPL
WEB_SITE=http://klavaro.sourceforge.net/
ENTERED=20110123
diff --git a/education/klavaro/HISTORY b/education/klavaro/HISTORY
index 5c3d275..944ffb0 100644
--- a/education/klavaro/HISTORY
+++ b/education/klavaro/HISTORY
@@ -1,3 +1,6 @@
+2012-06-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.5
+
2011-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9.3
* DEPENDS: added espeak suggest depends
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index bc2559b..bfaf0a6 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
SPELL=freetype2
- VERSION=2.4.9
+ VERSION=2.4.10
SECURITY_PATCH=7
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 3bbb23e..adce7cb 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.10
+
2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.9, SECURITY_PATCH=7

diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 899acf8..ffe4f4e 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.20.0
-
SOURCE_HASH=sha512:1fa19452ecc08311b215a778d55bed0074a0222101bc92dece1a0fc4b842d8c6e48b75dbe2d05898fb79d3190a679349a62a47afd9c5b87b241f3013607ddac2
+ VERSION=0.20.1
+
SOURCE_HASH=sha512:601a9d15d56d0241ebdfdb4314bd185fac3fcca78ca994d378b124e50400dcd0417bd60c822bd8d7adf245c9ce4ea4f28cf78b05b8275837706d7c436b72e0da
else
- VERSION=0.20.0
-
SOURCE_HASH=sha512:1fa19452ecc08311b215a778d55bed0074a0222101bc92dece1a0fc4b842d8c6e48b75dbe2d05898fb79d3190a679349a62a47afd9c5b87b241f3013607ddac2
+ VERSION=0.20.1
+
SOURCE_HASH=sha512:601a9d15d56d0241ebdfdb4314bd185fac3fcca78ca994d378b124e50400dcd0417bd60c822bd8d7adf245c9ce4ea4f28cf78b05b8275837706d7c436b72e0da
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index fd89b83..b4f6905 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.20.1
+
2012-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.20.0

diff --git a/graphics/feh/DEPENDS b/graphics/feh/DEPENDS
index 765f125..ebc8323 100755
--- a/graphics/feh/DEPENDS
+++ b/graphics/feh/DEPENDS
@@ -1,3 +1,4 @@
+depends curl &&
depends libxinerama &&
depends giblib &&
depends JPEG &&
diff --git a/graphics/feh/HISTORY b/graphics/feh/HISTORY
index d1140f7..281747b 100644
--- a/graphics/feh/HISTORY
+++ b/graphics/feh/HISTORY
@@ -1,3 +1,6 @@
+2012-06-14 David C. Haley <khoralin AT gmail.com>
+ * DEPENDS: changed blabla
+
2012-03-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.5

diff --git a/graphics/vym/DETAILS b/graphics/vym/DETAILS
index 35d2c60..efb8bf2 100755
--- a/graphics/vym/DETAILS
+++ b/graphics/vym/DETAILS
@@ -1,8 +1,8 @@
SPELL=vym
- VERSION=2.0.12
+ VERSION=2.2.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:04092608794e0454cbdc8dc47a63311c497e086155db315f58f9d18462b1557fbdf80a487cb1875c7b546e89bd8b5758bbdb507e1665a86967c11021e5b4e318
+
SOURCE_HASH=sha512:195541297346564104d4bdb8f53a59bbdcc5489abdd7d29fcf6e8fcf7464edf2fb16e02b4b740090dc0cc1309388e15687aea729715328317bb694c97d4166ba
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.insilmaril.de/vym/";
LICENSE[0]=GPL2
diff --git a/graphics/vym/HISTORY b/graphics/vym/HISTORY
index 0216264..9e33676 100644
--- a/graphics/vym/HISTORY
+++ b/graphics/vym/HISTORY
@@ -1,3 +1,6 @@
+2012-06-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.0
+
2012-05-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.12

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 22d6e7d..38b8161 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=13.0
+ VERSION=13.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=13.0
+ VERSION=13.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=49
+ SECURITY_PATCH=50
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index a673d2c..93d567c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 13.0.1, SECURITY_PATCH=50
+
2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 13.0, SECURITY_PATCH=49
* PRE_BUILD, mozconfig5: mozconfig5 -> mozconfig
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3fd454e..e3040a9 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,7 +1,7 @@
SPELL=seamonkey
- VERSION=2.10
+ VERSION=2.10.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:58ee8230174ac34183d68ed29baf3e601898fd5ba692de5856181fc48d0f96a022e17012d569960c75e640c00272e41aaa89ee3b0f34a561211fd22015a697d0
+
SOURCE_HASH=sha512:6d01a2faaeddbbc8b17b640cab0b424a16a091f2de8900c1e62abc5c18e8be8e5573e07074b61ddeb6479714a438685ebadcf34d22d4dea544daf206b89b4fe3
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index ed60146..f65a646 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2012-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.1
+
2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10; SECURITY_PATCH++
* PRE_BUILD: fixed packaging for usage with system libs
diff --git a/i18n/scim-tables/DETAILS b/i18n/scim-tables/DETAILS
index 43bb05d..5c75671 100755
--- a/i18n/scim-tables/DETAILS
+++ b/i18n/scim-tables/DETAILS
@@ -1,10 +1,10 @@
SPELL=scim-tables
- VERSION=0.5.9
+ VERSION=0.5.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.scim-im.org/
SOURCE_URL[0]=$SOURCEFORGE_URL/scim/$SOURCE
-
SOURCE_HASH=sha512:52027ffc3e06a633c06aa6cf33939a0534e195d32ae389a392a6c71b58fb5df1b12a8477d60908804f2b058ac1db75c3866156773feedd20ac63553469484b35
+
SOURCE_HASH=sha512:e58247e2ac2dd08b497ce32648d4f6c173a320cb2d69ef18cc2a24a4be6312e9920b3ac71b82de4412d383f04eaf7e7f667c46e93977638c614a374dc0d0efbb
LICENSE[0]=GPL
ENTERED=20030912
KEYWORDS="i18n"
diff --git a/i18n/scim-tables/HISTORY b/i18n/scim-tables/HISTORY
index 5e4025c..22d583a 100644
--- a/i18n/scim-tables/HISTORY
+++ b/i18n/scim-tables/HISTORY
@@ -1,3 +1,6 @@
+2012-06-21 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: Updated to version 0.5.10
+
2009-02-01 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.5.9

diff --git a/i18n/scim/DEPENDS b/i18n/scim/DEPENDS
index 64548c2..f137098 100755
--- a/i18n/scim/DEPENDS
+++ b/i18n/scim/DEPENDS
@@ -3,11 +3,10 @@ depends cairo &&
depends expat &&
depends fontconfig &&
depends freetype2 &&
-depends -sub CXX gcc &&
+depends -sub CXX gcc &&
depends gcc &&
depends glib2 &&
depends glitz &&
-depends gtk+2 &&
depends libpng &&
depends libx11 &&
depends libxau &&
@@ -22,5 +21,14 @@ depends libxrender &&
depends pango &&
depends zlib &&

-# convert to suggested_depends once available
-optional_depends scim-tables "" "" "for one of the input methods"
+optional_depends gtk+2 "" "--disable-gtk2-immodule" "For GTK2 IMModule" &&
+
+optional_depends gtk+3 "" "--disable-gtk3-immodule" "For GTK3 IMModule" &&
+
+optional_depends qt4 "--with-qt4-moc=/usr/bin/qt4/moc"
"--disable-qt4-immodule" "For QT4 IMModule" &&
+
+optional_depends clutter "" "--disable-clutter-immodule" "For Clutter
IMModule" &&
+
+optional_depends doxygen "" "--without-doxygen" "For API documentation" &&
+
+suggest_depends scim-tables "" "" "for one of the input methods"
diff --git a/i18n/scim/DETAILS b/i18n/scim/DETAILS
index d9243c5..98a9e3c 100755
--- a/i18n/scim/DETAILS
+++ b/i18n/scim/DETAILS
@@ -1,10 +1,10 @@
SPELL=scim
- VERSION=1.4.9
+ VERSION=1.4.14
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.scim-im.org/
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:5b8239e4274dbb896d48d4411012d755ee903f885092edd9943168e535fb78b23c7bc832f22bde1fe6ff715a55a5e2779baea9f1ac9e68257576301541906761
+
SOURCE_HASH=sha512:00fe7a1b40b69aae123c0a1e67eb3744ad1e6b1e66726bb011a7426bd28012c52b346c62f08c7ecf0977ac3e88ee416337c9fa89b39142d5eea338d99641f5df
LICENSE[0]=GPL
ENTERED=20030912
KEYWORDS="i18n"
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index 3d145d0..2d52285 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,17 @@
+2012-06-22 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: Spell updated to 1.4.14
+ * DEPENDS: added optional_depends qt4 and clutter
+ * BUILD: removed, compiles fine when gtk+3 is selected as default
+
+2012-06-21 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: Spell updated to 1.4.13
+ * DEPENDS: Changed optional_Depends scim-tables to suggest_depends.
+ Changed depends gtk+2 to optional_depends.
+ Added optional_depends gtk+3
+ * BUILD: added, force gtk+2 UI for now since gtk+3 does not seem to
+ compile. Check if this is still valid on next update.
+ * PRE_BUILD, scim_glibc-2.10.patch: removed, no longer needed
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/i18n/scim/PRE_BUILD b/i18n/scim/PRE_BUILD
deleted file mode 100755
index d6f80ac..0000000
--- a/i18n/scim/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/scim_glibc-2.10.patch
diff --git a/i18n/scim/scim_glibc-2.10.patch b/i18n/scim/scim_glibc-2.10.patch
deleted file mode 100644
index 52213aa..0000000
--- a/i18n/scim/scim_glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur scim-1.4.9.orig/src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
---- scim-1.4.9.orig/src/ltdl.cpp 2008-11-02 07:42:40.000000000 +0100
-+++ scim-1.4.9/src/ltdl.cpp 2010-08-11 08:46:27.000000000 +0200
-@@ -3361,7 +3361,7 @@
- {
- lt_dlhandle handle = 0;
- char * tmp = 0;
-- char * ext = 0;
-+ const char * ext = 0;
- size_t len;
- int errors = 0;
-
diff --git a/java/icedtea-web/DEPENDS b/java/icedtea-web/DEPENDS
index 827b66f..313c488 100755
--- a/java/icedtea-web/DEPENDS
+++ b/java/icedtea-web/DEPENDS
@@ -1,8 +1,6 @@
-depends gcc "--with-gcj=/usr/bin/gcj --with-ecj-jar=/usr/share/java/ecj.jar"
&&
+depends gcc
depends -sub CXX gcc &&
-depends -sub JAVA gcc &&
-depends -sub JAVAHOME gcc &&
-depends icedtea6 &&
+depends ICEDTEA &&
depends libx11 &&
depends zlib &&
depends firefox &&
diff --git a/java/icedtea-web/DETAILS b/java/icedtea-web/DETAILS
index e81068a..8ec908f 100755
--- a/java/icedtea-web/DETAILS
+++ b/java/icedtea-web/DETAILS
@@ -1,5 +1,5 @@
SPELL=icedtea-web
- VERSION=1.1.4
+ VERSION=1.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
diff --git a/java/icedtea-web/HISTORY b/java/icedtea-web/HISTORY
index 5cfe68c..f7c10ba 100644
--- a/java/icedtea-web/HISTORY
+++ b/java/icedtea-web/HISTORY
@@ -1,2 +1,6 @@
+2012-06-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.2
+ * DEPPENDS: changed icedtea6 to ICEDTEA
+
2011-11-18 Robin Cook <rcook AT wyrms.net>
* NEW SPELL: DETAILS, DEPENDS, CONFIGURE, BUILD, INSTALL
diff --git a/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
b/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
deleted file mode 100644
index 444ad6b..0000000
Binary files a/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig and /dev/null
differ
diff --git a/java/icedtea-web/icedtea-web-1.2.tar.gz.sig
b/java/icedtea-web/icedtea-web-1.2.tar.gz.sig
new file mode 100644
index 0000000..b08f0d3
Binary files /dev/null and b/java/icedtea-web/icedtea-web-1.2.tar.gz.sig
differ
diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS
index 0e66666..4729bad 100755
--- a/java/icedtea6/CONFLICTS
+++ b/java/icedtea6/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk1.5-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts icedtea7
diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
index f365072..c4b38ad 100755
--- a/java/icedtea6/DETAILS
+++ b/java/icedtea6/DETAILS
@@ -1,13 +1,11 @@
SPELL=icedtea6
- VERSION=1.11.1
+ VERSION=1.11.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
SOURCE4=jdk6-jaf-b20.zip
SOURCE5=jaxp144_03.zip
-# SOURCE5=jaxp145_01.zip
SOURCE6=jdk6-jaxws2_1_6-2011_06_13.zip
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
SOURCE2_IGNORE=signature
SOURCE2_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE2
diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
index e612a92..e1a02a1 100644
--- a/java/icedtea6/HISTORY
+++ b/java/icedtea6/HISTORY
@@ -1,3 +1,13 @@
+2012-06-18 Robin Cook <rcook AT wyrms.net>
+ * CONFLICTS: added icedtea7
+
+2012-06-17 Robin Cook <rcook AT wyrms.net>
+ * PROVIDES: added ICEDTEA
+
+2012-06-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 1.11.3
+ removed duplicate SOURCE_DIRECTORY
+
2012-03-09 Robin Cook <rcook AT wyrms.net>
* BUILD: updated to 1.11
* DETAILS: updated to 1.11, removed scm option
@@ -8,5 +18,6 @@
* PREPARE: removed

2011-10-23 Robin Cook <rcook AT wyrms.net>
- * New Spell: BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, INSTALL,
- PRE_BUILD, PREPARE, PROVIDES
+ * New Spell: BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, INSTALL,
+ PRE_BUILD, PREPARE, PROVIDES
+
diff --git a/java/icedtea6/PROVIDES b/java/icedtea6/PROVIDES
index 0f1a7a4..0b7c3ac 100755
--- a/java/icedtea6/PROVIDES
+++ b/java/icedtea6/PROVIDES
@@ -2,4 +2,4 @@ JAVA
JAVA6
JDK5
JDK
-
+ICEDTEA
diff --git a/java/icedtea6/icedtea6-1.11.1.tar.gz.sig
b/java/icedtea6/icedtea6-1.11.1.tar.gz.sig
deleted file mode 100644
index ed09a43..0000000
Binary files a/java/icedtea6/icedtea6-1.11.1.tar.gz.sig and /dev/null differ
diff --git a/java/icedtea6/icedtea6-1.11.3.tar.gz.sig
b/java/icedtea6/icedtea6-1.11.3.tar.gz.sig
new file mode 100644
index 0000000..ec26bd6
Binary files /dev/null and b/java/icedtea6/icedtea6-1.11.3.tar.gz.sig differ
diff --git a/java/icedtea7/BUILD b/java/icedtea7/BUILD
new file mode 100755
index 0000000..94549a0
--- /dev/null
+++ b/java/icedtea7/BUILD
@@ -0,0 +1,13 @@
+export PATH_HOLD="${PATH}" &&
+export JAVA_HOME="$BUILD_DIRECTORY/icedtea-bin-7.2.2.1" &&
+export CLASSPATH=".:/usr/share/java" &&
+export PATH="${PATH}:${JAVA_HOME}/bin" &&
+
+OPTS="$ICEDTEA7_DOCS $ICEDTEA7_OPT $ICEDTEA7_PARA $OPTS"
&&
+OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea-bin-7.2.2.1 $OPTS"
&&
+OPTS="--with-abs-install-dir=${INSTALL_ROOT}/usr/lib/icedtea7-$VERSION
$OPTS" &&
+OPTS="--disable-bootstrap --disable-downloading $OPTS"
&&
+
+unset JAVA_HOME &&
+
+default_build
diff --git a/java/icedtea7/CONFIGURE b/java/icedtea7/CONFIGURE
new file mode 100755
index 0000000..336fd16
--- /dev/null
+++ b/java/icedtea7/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option ICEDTEA7_DOCS "Generate Documentation?" y \
+ "--enable-docs" \
+ "--disable-docs" &&
+
+config_query_option ICEDTEA7_OPT "Enable build optimizations?" y \
+ "--enable-optimizations" \
+ "--disable-optimizations" &&
+
+config_query_option ICEDTEA7_PARA "Use parallel build?" n \
+ "--with-parallel-jobs=$MAKE_NJOBS" \
+ "--without-parallel-jobs"
diff --git a/java/icedtea7/CONFLICTS b/java/icedtea7/CONFLICTS
new file mode 100755
index 0000000..4e23c15
--- /dev/null
+++ b/java/icedtea7/CONFLICTS
@@ -0,0 +1,7 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jre1.5-bin &&
+conflicts jre6-bin &&
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin &&
+conflicts icedtea6
diff --git a/java/icedtea7/DEPENDS b/java/icedtea7/DEPENDS
new file mode 100755
index 0000000..6b1f152
--- /dev/null
+++ b/java/icedtea7/DEPENDS
@@ -0,0 +1,56 @@
+depends gcc &&
+depends -sub CXX gcc &&
+depends lsb-release &&
+depends pkgconfig &&
+depends giflib &&
+depends lcms &&
+depends libpng &&
+depends zlib &&
+depends JPEG &&
+depends zip &&
+depends unzip &&
+depends ca-certificates &&
+depends ant &&
+depends perl &&
+depends libxslt &&
+depends openssl &&
+depends attr &&
+depends cpio &&
+depends alsa-lib &&
+depends cups &&
+depends atk &&
+depends glib2 &&
+depends fontconfig &&
+depends cairo &&
+depends pango &&
+depends gdk-pixbuf2 &&
+depends gtk+2 &&
+depends libx11 &&
+depends libxext &&
+depends libxi &&
+depends libxrender &&
+depends libxtst &&
+depends libxau &&
+depends libxdmcp &&
+depends libxp &&
+depends libxinerama &&
+depends inputproto &&
+depends xextproto &&
+depends xineramaproto &&
+depends xproto &&
+
+optional_depends rhino
\
+ "--with-rhino=/usr/lib/java/other/lib/js.jar"
\
+ "--without-rhino"
\
+ "Add javascript support?"
&&
+
+optional_depends pulseaudio
\
+ "--enable-pulse-java"
\
+ "--disable-pulse-java"
\
+ "Enable pulse-java - an audio mixer spi that uses
PulseAudio?" &&
+
+# note this depends on nss 3.12.5 or greater
+optional_depends nss
\
+ "--enable-nss"
\
+ "--disable-nss"
\
+ "Enable inclusion of NSS security provider?"

diff --git a/java/icedtea7/DETAILS b/java/icedtea7/DETAILS
new file mode 100755
index 0000000..75f10aa
--- /dev/null
+++ b/java/icedtea7/DETAILS
@@ -0,0 +1,57 @@
+ SPELL=icedtea7
+ VERSION=2.2.1
+ SOURCE=icedtea-$VERSION.tar.gz
+ SOURCE2=openjdk.tar.gz
+ SOURCE3=corba.tar.gz
+ SOURCE4=hotspot.tar.gz
+ SOURCE5=jaxp.tar.gz
+ SOURCE6=jaxws.tar.gz
+ SOURCE7=jdk.tar.gz
+ SOURCE8=langtools.tar.gz
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/icedtea-$VERSION
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ ia32|32)
+ SOURCE9=icedtea-bin-core-7.2.2.1-x86.tar.bz2
+ ;;
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
+ SOURCE9=icedtea-bin-core-7.2.2.1-amd64.tar.bz2
+ else
+ SOURCE9=icedtea-bin-core-7.2.2.1-x86.tar.bz2
+ fi
+ ;;
+esac
+ SOURCE_URL[0]=http://icedtea.classpath.org/download/source
+
SOURCE2_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/archive
+
SOURCE3_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba/archive
+
SOURCE4_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot/archive
+
SOURCE5_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp/archive
+
SOURCE6_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws/archive
+
SOURCE7_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk/archive
+
SOURCE8_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools/archive
+ SOURCE9_URL[0]=http://dev.gentoo.org/~caster/distfiles
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
+ SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig"
+ SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig"
+ SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig"
+ SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig"
+ SOURCE7_GPG="gurus.gpg:${SOURCE7}.sig"
+ SOURCE8_GPG="gurus.gpg:${SOURCE8}.sig"
+ SOURCE9_GPG="gurus.gpg:${SOURCE9}.sig"
+ LICENSE[0]=GPL
+ KEYWORDS="JAVA"
+ WEB_SITE=http://icedtea.classpath.org/wiki/Main_Page
+ ENTERED=20120617
+ SHORT='Harness to build OpenJDK with Free Software build tools'
+cat << EOF
+The IcedTea project provides a harness to build the source code from
+http://openjdk.java.net using Free Software build tools and adds a number of
key
+features to the upstream OpenJDK codebase:
+
+A Free 64-bit plugin with LiveConnect and Java Web Start support
+(see IcedTea-Web).
+Support for additional platforms via a pure interpreted mode in HotSpot
(Zero)
+or the alternative CACAO virtual machine. Experimental JIT support for Zero
is
+also available via Shark.
+EOF
diff --git a/java/icedtea7/DOWNLOAD b/java/icedtea7/DOWNLOAD
new file mode 100755
index 0000000..6656d62
--- /dev/null
+++ b/java/icedtea7/DOWNLOAD
@@ -0,0 +1,37 @@
+cd $SOURCE_CACHE &&
+
+if ! test -f $SOURCE ; then
+ wget $SOURCE_URL/$SOURCE 2>&1
+fi &&
+
+if ! test -f $SOURCE2 ; then
+ wget $SOURCE2_URL/0b776ef59474.tar.gz --progress=dot -O $SOURCE2 2>&1
+fi &&
+
+if ! test -f $SOURCE3 ; then
+ wget $SOURCE3_URL/38deb372c569.tar.gz --progress=dot -O $SOURCE3 2>&1
+fi &&
+
+if ! test -f $SOURCE4 ; then
+ wget $SOURCE4_URL/889dffcf4a54.tar.gz --progress=dot -O $SOURCE4 2>&1
+fi &&
+
+if ! test -f $SOURCE5 ; then
+ wget $SOURCE5_URL/335fb0b059b7.tar.gz --progress=dot -O $SOURCE5 2>&1
+fi &&
+
+if ! test -f $SOURCE6 ; then
+ wget $SOURCE6_URL/5471e01ef43b.tar.gz --progress=dot -O $SOURCE6 2>&1
+fi &&
+
+if ! test -f $SOURCE7 ; then
+ wget $SOURCE7_URL/6c3b742b735d.tar.gz --progress=dot -O $SOURCE7 2>&1
+fi &&
+
+if ! test -f $SOURCE8 ; then
+ wget $SOURCE8_URL/beea46c7086b.tar.gz --progress=dot -O $SOURCE8 2>&1
+fi &&
+
+if ! test -f $SOURCE9 ; then
+ wget $SOURCE9_URL/$SOURCE9 2>&1
+fi
diff --git a/java/icedtea7/FINAL b/java/icedtea7/FINAL
new file mode 100755
index 0000000..a6034d9
--- /dev/null
+++ b/java/icedtea7/FINAL
@@ -0,0 +1,5 @@
+default_final &&
+rm -rf $BUILD_DIRECTORY/doc &&
+rm -rf $BUILD_DIRECTORY/icedtea-bin-7.2.2.1 &&
+export PATH="$PATH_HOLD"
+
diff --git a/java/icedtea7/HISTORY b/java/icedtea7/HISTORY
new file mode 100644
index 0000000..c2e495b
--- /dev/null
+++ b/java/icedtea7/HISTORY
@@ -0,0 +1,3 @@
+2012-06-17 Robin Cook <rcook AT wyrms.net>
+ * New Spell: BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, DOWNLOAD,
+ FINAL, HISTORY, INSTALL, PRE_BUILD, PROVIDES
diff --git a/java/icedtea7/INSTALL b/java/icedtea7/INSTALL
new file mode 100755
index 0000000..537a053
--- /dev/null
+++ b/java/icedtea7/INSTALL
@@ -0,0 +1,10 @@
+cp -R openjdk.build/j2sdk-image ${INSTALL_ROOT}/usr/lib/icedtea7-${VERSION}
&&
+chown -R root:root ${INSTALL_ROOT}/usr/lib/icedtea7-${VERSION}
&&
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/
&&
+install -m 0644 $SCRIPT_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/
&&
+cd ${INSTALL_ROOT}/usr/lib
&&
+ln -sfn icedtea7-${VERSION}/ j2sdk
&&
+ln -sfn icedtea7-${VERSION}/ java7
&&
+cd $SOURCE_DIRCETORY
+
+
diff --git a/java/icedtea7/PRE_BUILD b/java/icedtea7/PRE_BUILD
new file mode 100755
index 0000000..bd2dc28
--- /dev/null
+++ b/java/icedtea7/PRE_BUILD
@@ -0,0 +1,28 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+verify_file 2 &&
+cp $SOURCE_CACHE/$SOURCE2 ./ &&
+verify_file 3 &&
+cp $SOURCE_CACHE/$SOURCE3 ./ &&
+verify_file 4 &&
+cp $SOURCE_CACHE/$SOURCE4 ./ &&
+verify_file 5 &&
+cp $SOURCE_CACHE/$SOURCE5 ./ &&
+verify_file 6 &&
+cp $SOURCE_CACHE/$SOURCE6 ./ &&
+verify_file 7 &&
+cp $SOURCE_CACHE/$SOURCE7 ./ &&
+verify_file 8 &&
+cp $SOURCE_CACHE/$SOURCE8 ./ &&
+
+cd $SOURCE_DIRECTORY
+patch -p1 < $SPELL_DIRECTORY/icedtea-2.2.1-add_cacerts-1.patch &&
+patch -p1 < $SPELL_DIRECTORY/icedtea-7.2.2-no_suffix.patch &&
+autoreconf &&
+patch -p1 < $SPELL_DIRECTORY/icedtea7-2.2.1-fixed_paths.patch &&
+
+cd $BUILD_DIRECTORY &&
+verify_file 9 &&
+tar xjf $SOURCE_CACHE/$SOURCE9 &&
+cd $SOURCE_DIRECTORY
+
diff --git a/java/icedtea7/PROVIDES b/java/icedtea7/PROVIDES
new file mode 100755
index 0000000..74d3c36
--- /dev/null
+++ b/java/icedtea7/PROVIDES
@@ -0,0 +1,6 @@
+JAVA
+JAVA6
+JAVA7
+JDK5
+JDK
+ICEDTEA
diff --git a/java/icedtea7/corba.tar.gz.sig b/java/icedtea7/corba.tar.gz.sig
new file mode 100644
index 0000000..99d65a5
Binary files /dev/null and b/java/icedtea7/corba.tar.gz.sig differ
diff --git a/java/icedtea7/hotspot.tar.gz.sig
b/java/icedtea7/hotspot.tar.gz.sig
new file mode 100644
index 0000000..4bb30e4
Binary files /dev/null and b/java/icedtea7/hotspot.tar.gz.sig differ
diff --git a/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
b/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
new file mode 100644
index 0000000..440e32e
--- /dev/null
+++ b/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
@@ -0,0 +1,543 @@
+diff -Nuarp icedtea-2.2-orig/acinclude.m4 icedtea-2.2/acinclude.m4
+--- icedtea-2.2-orig/acinclude.m4 2012-05-30 22:11:30.000000000 -0500
++++ icedtea-2.2/acinclude.m4 2012-05-30 21:53:36.000000000 -0500
+@@ -302,6 +302,178 @@ AC_DEFUN_ONCE([IT_WITH_OPENJDK_SRC_DIR],
+ AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test
"x${openjdk_src_dir_hardlinkable}" = "xyes")
+ ])
+
++AC_DEFUN([IT_WITH_CACERTS],
++[
++ AC_MSG_CHECKING([whether a cacerts file is provided for distribution])
++ AC_ARG_WITH([cacerts],
++ [AS_HELP_STRING(--with-cacerts=FILE,specify the location of a
pre-generated cacerts file for distribution)],
++ [
++ if test -f "${withval}"; then
++ CACERTS_FILE="${withval}"
++ cacerts_file_set=yes
++ else
++ CACERTS_FILE=
++ fi
++ ],
++ [
++ CACERTS_FILE=
++ ])
++ if test x"${CACERTS_FILE}" = "x"; then
++ cacerts_file_set=no
++ CACERTS_FILE="no"
++ fi
++ AC_MSG_RESULT(${CACERTS_FILE})
++ AC_SUBST(CACERTS_FILE)
++ AM_CONDITIONAL([CACERTS_FILE_SET], test x"${cacerts_file_set}" = "xyes")
++])
++
++AC_DEFUN([IT_GENERATE_CACERTS],
++[
++ AC_REQUIRE([IT_WITH_CACERTS])
++ AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
++ AC_ARG_ENABLE([cacerts-generation],
++ [AS_HELP_STRING(--enable-cacerts-generation, generate a
cacerts file for distribution [[default=auto]])],
++ [
++ case "${enableval}" in
++ no)
++ generate_cacerts=no
++ ;;
++ *)
++ generate_cacerts=yes
++ ;;
++ esac
++ ],
++ [
++ if test x"${cacerts_file_set}" = "xno"; then
++ generate_cacerts=forced
++ else
++ if test x"${cacerts_file_set}" = "xyes"; then
++ generate_cacerts=no
++ else
++ generate_cacerts=yes
++ fi
++ fi
++ ])
++ AC_MSG_RESULT([$generate_cacerts])
++ AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes"
-o x"${generate_cacerts}" = "xforced")
++])
++
++AC_DEFUN([IT_GET_LOCAL_CACERTS],
++[
++ AC_MSG_CHECKING([for a local x509 certificate directory])
++ AC_ARG_WITH([ca-dir],
++ [AS_HELP_STRING(--with-ca-dir=DIR, specify a top-level local
x509 certificate directory for cacerts generation)],
++ [
++ if test -d "${withval}"; then
++ CADIR="${withval}"
++ else
++ if test x"${withval}" = "xno"; then
++ CADIR=no
++ else
++ CADIR=
++ fi
++ fi
++ ],
++ [
++ CADIR=
++ ])
++ if test x"${CADIR}" = "x"; then
++ for dir in /etc/pki/tls/certs \
++ /usr/share/ca-certificates \
++ /etc/ssl/certs \
++ /etc/certs ; do
++ if test -d "${dir}"; then
++ CADIR="${dir}"
++ break
++ fi
++ done
++ if test x"${CADIR}" = "x"; then
++ CADIR=no
++ fi
++ fi
++ AC_MSG_RESULT(${CADIR})
++ AC_SUBST(CADIR)
++
++ AC_MSG_CHECKING([for a local x509 certificate file])
++ AC_ARG_WITH([ca-file],
++ [AS_HELP_STRING(--with-ca-file=FILE, specify a local x509
certificate file for cacerts generation)],
++ [
++ if test -f "${withval}"; then
++ CAFILE="${withval}"
++ else
++ if test x"${withval}" = "xno"; then
++ CAFILE=no
++ else
++ CAFILE=
++ fi
++ fi
++ ],
++ [
++ CAFILE=
++ ])
++ if test x"${CAFILE}" = "x"; then
++ for file in /etc/pki/tls/certs/ca-bundle.crt \
++ /etc/ssl/certs/ca-bundle.crt \
++ /etc/ssl/ca-bundle.crt \
++ /etc/ca-bundle.crt ; do
++ if test -e "${file}"; then
++ CAFILE=$file
++ break
++ fi
++ done
++ if test x"${CAFILE}" = "x"; then
++ CAFILE=no
++ fi
++ fi
++ AC_MSG_RESULT(${CAFILE})
++ AC_SUBST(CAFILE)
++ if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
++ AC_MSG_ERROR([You must supply a cacerts file or a list of CA
certificates to generate one.])
++ fi
++])
++
++AC_DEFUN([IT_FIND_OPENSSL],
++[
++ AC_MSG_CHECKING([for openssl])
++ AC_ARG_WITH([openssl],
++ [AS_HELP_STRING(--with-openssl=PATH, specify the path of the
openssl utility)],
++ [
++ if test -x "${withval}" -a -f "${withval}"; then
++ OPENSSL="${withval}"
++ else
++ if test x"${withval}" = "xno"; then
++ OPENSSL="no"
++ else
++ OPENSSL=
++ fi
++ fi
++ ],
++ [
++ OPENSSL=
++ ])
++ if test x"${OPENSSL}" = "x"; then
++
++ OPENSSL=$(
++ IFS=":"
++ for dir in ${withval}:${PATH}; do
++ if test -x "${dir}/openssl" -a -f "${dir}/openssl"; then
++ FOUNDSSL="${dir}/openssl"
++ break
++ fi
++ done
++ echo "${FOUNDSSL}"
++ )
++ if test x"${OPENSSL}" = "x"; then
++ OPENSSL=no
++ fi
++ fi
++ AC_MSG_RESULT(${OPENSSL})
++ AC_SUBST(OPENSSL)
++ if test x"${OPENSSL}" = "xno"; then
++ AC_MSG_ERROR([You must supply a cacerts file or have openssl available
to generate one.])
++ fi
++])
++
+ AC_DEFUN_ONCE([IT_CAN_HARDLINK_TO_SOURCE_TREE],
+ [
+ AC_CACHE_CHECK([if we can hard link rather than copy from
${abs_top_srcdir}], it_cv_hardlink_src, [
+diff -Nuarp icedtea-2.2-orig/configure.ac icedtea-2.2/configure.ac
+--- icedtea-2.2-orig/configure.ac 2012-05-30 22:11:30.000000000 -0500
++++ icedtea-2.2/configure.ac 2012-05-30 21:53:36.000000000 -0500
+@@ -84,6 +84,13 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test
+ AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
+
+ IT_LOCATE_NSS
++IT_GENERATE_CACERTS
++
++if test x"${generate_cacerts}" = "xyes" -o x"${generate_cacerts}" =
"xforced"; then
++ IT_GET_LOCAL_CACERTS
++ IT_FIND_OPENSSL
++fi
++
+ IT_GET_PKGVERSION
+ IT_GET_LSB_DATA
+
+diff -Nuarp icedtea-2.2-orig/Makefile.am icedtea-2.2/Makefile.am
+--- icedtea-2.2-orig/Makefile.am 2012-05-30 22:11:35.000000000 -0500
++++ icedtea-2.2/Makefile.am 2012-05-30 22:10:09.000000000 -0500
+@@ -746,7 +746,8 @@ clean-local: clean-tests clean-pulse-jav
+ clean-bootstrap-directory-symlink-stage1
clean-bootstrap-directory-symlink-stage2 \
+ clean-extract clean-generated clean-native-ecj clean-hgforest
clean-icedtea-stage2 \
+ clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero
clean-add-zero-debug \
+- clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino
clean-rewriter
++ clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino
clean-rewriter \
++ clean-cacerts clean-cacerts-debug
+ if [ -e bootstrap ]; then \
+ rmdir bootstrap ; \
+ fi
+@@ -776,7 +777,7 @@ install:
+ jtregcheck clean-remove-intree-libraries \
+ clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug
\
+ clean-extract-hotspot clean-sanitise-openjdk \
+- clean-tests clean-tapset-report
++ clean-tests clean-tapset-report clean-cacerts clean-cacerts-debug
+
+ env:
+ @echo 'unset JAVA_HOME'
+@@ -1703,6 +1704,13 @@ endif
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ $(ARCH_PREFIX) $(MAKE) add-cacerts
++else
++if CACERTS_FILE_SET
++ $(ARCH_PREFIX) $(MAKE) add-cacerts
++endif
++endif
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+ touch $@
+@@ -1769,6 +1777,13 @@ endif
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ $(ARCH_PREFIX) $(MAKE) add-cacerts-debug
++else
++if CACERTS_FILE_SET
++ $(ARCH_PREFIX) $(MAKE) add-cacerts-debug
++endif
++endif
+ @echo "IcedTea (debug build) is served:" \
+ $(DEBUG_BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+@@ -1857,6 +1872,69 @@ stamps/icedtea-stage1.stamp: stamps/iced
+ clean-icedtea-stage1:
+ rm -f stamps/icedtea-stage1.stamp
+
++# CA Certs
++stamps/generate-cacerts.stamp:
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -s $(OPENSSL) \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -s $(OPENSSL) \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi
++endif
++ touch stamps/generate-cacerts.stamp
++
++stamps/add-cacerts.stamp: stamps/generate-cacerts.stamp
++if CACERTS_FILE_SET
++ cp $(CACERTS_FILE) $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++endif
++ cp $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++ touch stamps/add-cacerts.stamp
++
++clean-cacerts:
++ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++ rm -f stamps/add-cacerts.stamp
++ rm -f stamps/generate-cacerts.stamp
++
++stamps/generate-cacerts-debug.stamp:
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -s $(OPENSSL) \
++ -o $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -s $(OPENSSL) \
++ -o $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi
++endif
++ touch stamps/generate-cacerts-debug.stamp
++
++stamps/add-cacerts-debug.stamp: stamps/generate-cacerts-debug.stamp
++if CACERTS_FILE_SET
++ cp $(CACERTS_FILE)
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++endif
++ cp $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++ touch stamps/add-cacerts-debug.stamp
++
++clean-cacerts-debug:
++ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++ rm -f stamps/add-cacerts-debug.stamp
++ rm -f stamps/generate-cacerts-debug.stamp
++
++# end of CA Certs
++
+ # PulseAudio based mixer
+ # (pulse-java)
+ if ENABLE_PULSE_JAVA
+@@ -2379,6 +2457,10 @@ clean-rt:
+ # Target Aliases
+ # ===============
+
++add-cacerts: stamps/add-cacerts.stamp
++
++add-cacerts-debug: stamps/add-cacerts-debug.stamp
++
+ add-zero: stamps/add-zero.stamp
+
+ add-zero-debug: stamps/add-zero-debug.stamp
+diff -Nuarp icedtea-2.2-orig/scripts/mkcacerts.sh
icedtea-2.2/scripts/mkcacerts.sh
+--- icedtea-2.2-orig/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
++++ icedtea-2.2/scripts/mkcacerts.sh 2012-05-30 21:53:36.000000000 -0500
+@@ -0,0 +1,208 @@
++#!/bin/sh
++# Simple script to extract x509 certificates and create a JRE cacerts file.
++
++function get_args()
++ {
++ if test -z "${1}" ; then
++ showhelp
++ exit 1
++ fi
++
++ while test -n "${1}" ; do
++ case "${1}" in
++ -f | --cafile)
++ check_arg $1 $2
++ CAFILE="${2}"
++ shift 2
++ ;;
++ -d | --cadir)
++ check_arg $1 $2
++ CADIR="${2}"
++ shift 2
++ ;;
++ -o | --outfile)
++ check_arg $1 $2
++ OUTFILE="${2}"
++ shift 2
++ ;;
++ -k | --keytool)
++ check_arg $1 $2
++ KEYTOOL="${2}"
++ shift 2
++ ;;
++ -s | --openssl)
++ check_arg $1 $2
++ OPENSSL="${2}"
++ shift 2
++ ;;
++ -h | --help)
++ showhelp
++ exit 0
++ ;;
++ *)
++ showhelp
++ exit 1
++ ;;
++ esac
++ done
++ }
++
++function check_arg()
++ {
++ echo "${2}" | grep -v "^-" > /dev/null
++ if [ -z "$?" -o ! -n "$2" ]; then
++ echo "Error: $1 requires a valid argument."
++ exit 1
++ fi
++ }
++
++# The date binary is not reliable on 32bit systems for dates after 2038
++function mydate()
++ {
++ local y=$( echo $1 | cut -d" " -f4 )
++ local M=$( echo $1 | cut -d" " -f1 )
++ local d=$( echo $1 | cut -d" " -f2 )
++ local m
++
++ if [ ${d} -lt 10 ]; then d="0${d}"; fi
++
++ case $M in
++ Jan) m="01";;
++ Feb) m="02";;
++ Mar) m="03";;
++ Apr) m="04";;
++ May) m="05";;
++ Jun) m="06";;
++ Jul) m="07";;
++ Aug) m="08";;
++ Sep) m="09";;
++ Oct) m="10";;
++ Nov) m="11";;
++ Dec) m="12";;
++ esac
++
++ certdate="${y}${m}${d}"
++ }
++
++function showhelp()
++ {
++ echo "`basename ${0}` creates a valid cacerts file for use with
IcedTea."
++ echo ""
++ echo " -f --cafile The path to a file containing PEM
formated CA"
++ echo " certificates. May not be used
with -d/--cadir."
++ echo " -d --cadir The path to a diectory of PEM
formatted CA"
++ echo " certificates. May not be used
with -f/--cafile."
++ echo " -o --outfile The path to the output file."
++ echo ""
++ echo " -k --keytool The path to the java keytool
utility."
++ echo ""
++ echo " -s --openssl The path to the openssl utility."
++ echo ""
++ echo " -h --help Show this help message and exit."
++ echo ""
++ echo ""
++ }
++
++# Initialize empty variables so that the shell does not polute the script
++CAFILE=""
++CADIR=""
++OUTFILE=""
++OPENSSL=""
++KEYTOOL=""
++certdate=""
++date=""
++today=$( date +%Y%m%d )
++
++# Process command line arguments
++get_args ${@}
++
++# Handle common errors
++if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
++ echo "ERROR! You must provide an x509 certificate store!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
++ echo "ERROR! You cannot provide two x509 certificate stores!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${KEYTOOL}x" == "x" ; then
++ echo "ERROR! You must provide a valid keytool program!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${OPENSSL}x" == "x" ; then
++ echo "ERROR! You must provide a valid path to openssl!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${OUTFILE}x" == "x" ; then
++ echo "ERROR! You must provide a valid output file!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++# Get on with the work
++
++# If using a CAFILE, split it into individual files in a temp directory
++if test "${CAFILE}x" != "x" ; then
++ TEMPDIR=`mktemp -d`
++ CADIR="${TEMPDIR}"
++
++ # Get a list of staring lines for each cert
++ CERTLIST=`grep -n "^-----BEGIN" "${CAFILE}" | cut -d ":" -f 1`
++
++ # Get a list of ending lines for each cert
++ ENDCERTLIST=`grep -n "^-----END" "${CAFILE}" | cut -d ":" -f 1`
++
++ # Start a loop
++ for certbegin in `echo "${CERTLIST}"` ; do
++ for certend in `echo "${ENDCERTLIST}"` ; do
++ if test "${certend}" -gt "${certbegin}"; then
++ break
++ fi
++ done
++ sed -n "${certbegin},${certend}p" "${CAFILE}" >
"${CADIR}/${certbegin}.pem"
++ keyhash=`${OPENSSL} x509 -noout -in "${CADIR}/${certbegin}.pem"
-hash`
++ echo "Generated PEM file with hash: ${keyhash}."
++ done
++fi
++
++# Write the output file
++for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
++do
++
++ # Make sure the certificate date is valid...
++ date=$( ${OPENSSL} x509 -enddate -in "${cert}" -noout | sed
's/^notAfter=//' )
++ mydate "${date}"
++ if test "${certdate}" -lt "${today}" ; then
++ echo "${cert} expired on ${certdate}! Skipping..."
++ unset date certdate
++ continue
++ fi
++ unset date certdate
++ ls "${cert}"
++ tempfile=`mktemp`
++ certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
++ certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
++ sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
++ echo yes | "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
++ "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
++ rm "${tempfile}"
++done
++
++if test "${TEMPDIR}x" != "x" ; then
++ rm -rf "${TEMPDIR}"
++fi
++exit 0
++
+
diff --git a/java/icedtea7/icedtea-2.2.1.tar.gz.sig
b/java/icedtea7/icedtea-2.2.1.tar.gz.sig
new file mode 100644
index 0000000..4f02dff
Binary files /dev/null and b/java/icedtea7/icedtea-2.2.1.tar.gz.sig differ
diff --git a/java/icedtea7/icedtea-7.2.2-no_suffix.patch
b/java/icedtea7/icedtea-7.2.2-no_suffix.patch
new file mode 100644
index 0000000..8331b4f
--- /dev/null
+++ b/java/icedtea7/icedtea-7.2.2-no_suffix.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User Andrew John Hughes <ahughes AT redhat.com>
+# Date 1338297380 -3600
+# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
+# Parent 2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
+Don't add a suffix for building the default, IcedTea.
+
+2012-05-25 Andrew John Hughes <ahughes AT redhat.com>
+
+ * Makefile.am:
+ (versioning): Don't add a suffix if building
+ the default project, 'icedtea'.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1435,7 +1435,7 @@
+ echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
+ >>openjdk/jdk/make/common/shared/Defs.gmk ;
+ endif
+- if test x"$(PROJECT_NAME)" != "xjdk7"; then \
++ if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" !=
"xicedtea"; then \
+ proj_suffix="-$(PROJECT_NAME)"; \
+ fi ; \
+ if test x"$(VERSION_SUFFIX)" != "x"; then \
+
diff --git a/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig
b/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig
new file mode 100644
index 0000000..95f5708
Binary files /dev/null and
b/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig differ
diff --git a/java/icedtea7/icedtea.gpg b/java/icedtea7/icedtea.gpg
new file mode 100644
index 0000000..c757d9d
Binary files /dev/null and b/java/icedtea7/icedtea.gpg differ
diff --git a/java/icedtea7/icedtea7-2.1-fixed_paths.patch
b/java/icedtea7/icedtea7-2.1-fixed_paths.patch
new file mode 100644
index 0000000..887c33b
--- /dev/null
+++ b/java/icedtea7/icedtea7-2.1-fixed_paths.patch
@@ -0,0 +1,128 @@
+diff -urN icedtea-2.1/Makefile.am icedtea-mod/Makefile.am
+--- icedtea-2.1/Makefile.am 2012-02-15 05:31:02.313600639 -0600
++++ icedtea-mod/Makefile.am 2012-02-24 22:55:28.648066501 -0600
+@@ -235,7 +235,8 @@
+
+ # Patch list
+
+-ICEDTEA_PATCHES =
++ICEDTEA_PATCHES = \
++ patches/openjdk-smgl-paths.patch
+
+ # Conditional patches
+
+diff -urN icedtea-2.1/patches/openjdk-smgl-paths.patch
icedtea-mod/patches/openjdk-smgl-paths.patch
+--- icedtea-2.1/patches/openjdk-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
++++ icedtea-mod/patches/openjdk-smgl-paths.patch 2012-02-24
22:42:53.452019788 -0600
+@@ -0,0 +1,111 @@
++diff -ur openjdk.orig/corba/make/common/shared/Defs-utils.gmk
openjdk/corba-mod/make/common/shared/Defs-utils.gmk
++--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2012-02-15
02:26:34.000000000 -0600
+++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2012-02-24
22:20:19.380936091 -0600
++@@ -85,15 +85,15 @@
++ DIFF = $(UTILS_USR_BIN_PATH)diff
++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
++ ECHO = $(UTILS_COMMAND_PATH)echo
++-EGREP = $(UTILS_COMMAND_PATH)egrep
+++EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_USR_BIN_PATH)expr
++ FILE = $(UTILS_USR_BIN_PATH)file
++ FIND = $(UTILS_USR_BIN_PATH)find
++ FMT = $(UTILS_COMMAND_PATH)fmt
++ GDB = $(UTILS_USR_BIN_PATH)gdb
++-GREP = $(UTILS_COMMAND_PATH)grep
+++GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
++-HEAD = $(UTILS_USR_BIN_PATH)head
+++HEAD = $(UTILS_COMMAND_PATH)head
++ ID = $(UTILS_COMMAND_PATH)id
++ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
++ KSH = $(UTILS_COMMAND_PATH)ksh
++@@ -121,9 +121,9 @@
++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
++ SORT = $(UTILS_COMMAND_PATH)sort
++ STRIP = $(UTILS_CCS_BIN_PATH)strip
++-TAIL = $(UTILS_USR_BIN_PATH)tail
+++TAIL = $(UTILS_COMMAND_PATH)tail
++ TAR = $(UTILS_COMMAND_PATH)tar
++-TEST = $(UTILS_USR_BIN_PATH)test
+++TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_COMMAND_PATH)touch
++ TR = $(UTILS_USR_BIN_PATH)tr
++ TRUE = $(UTILS_COMMAND_PATH)true
++@@ -131,7 +131,7 @@
++ UNIQ = $(UTILS_USR_BIN_PATH)uniq
++ UNZIP = $(UTILS_USR_BIN_PATH)unzip
++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
++-WC = $(UTILS_USR_BIN_PATH)wc
+++WC = $(UTILS_COMMAND_PATH)wc
++ WHICH = $(UTILS_USR_BIN_PATH)which
++ YACC = $(UTILS_CCS_BIN_PATH)yacc
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++diff -ur openjdk.orig/hotspot/make/linux/makefiles/sa.make
openjdk/hotspot-mod/make/linux/makefiles/sa.make
++--- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2012-02-15
02:26:53.000000000 -0600
+++++ openjdk/hotspot/make/linux/makefiles/sa.make 2012-02-24
22:23:28.397947770 -0600
++@@ -45,8 +45,8 @@
++
++ # gnumake 3.78.1 does not accept the *s that
++ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
++-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
++-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
+++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
+++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
++
++ AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
++ AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
++diff -ur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk
openjdk/jdk/make/common/shared/Defs-utils.gmk
++--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2012-02-15
02:26:50.000000000 -0600
+++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-24
22:29:40.256970757 -0600
++@@ -101,17 +101,17 @@
++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
++ DUMP = $(UTILS_CCS_BIN_PATH)dump
++ ECHO = $(UTILS_COMMAND_PATH)echo
++-EGREP = $(UTILS_COMMAND_PATH)egrep
+++EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_USR_BIN_PATH)expr
++ FILE = $(UTILS_USR_BIN_PATH)file
++ FIND = $(UTILS_USR_BIN_PATH)find
++ FMT = $(UTILS_COMMAND_PATH)fmt
++ GDB = $(UTILS_USR_BIN_PATH)gdb
++-GREP = $(UTILS_COMMAND_PATH)grep
+++GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
++ # GZIP is used for solaris. Linux and windows use tar czf
++ GZIP = $(UTILS_COMMAND_PATH)gzip
++-HEAD = $(UTILS_USR_BIN_PATH)head
+++HEAD = $(UTILS_COMMAND_PATH)head
++ HG = hg
++ ID = $(UTILS_COMMAND_PATH)id
++ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
++@@ -137,9 +137,9 @@
++ SH = $(UTILS_COMMAND_PATH)sh
++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
++ SORT = $(UTILS_COMMAND_PATH)sort
++-TAIL = $(UTILS_USR_BIN_PATH)tail
+++TAIL = $(UTILS_COMMAND_PATH)tail
++ TAR = $(UTILS_COMMAND_PATH)tar
++-TEST = $(UTILS_USR_BIN_PATH)test
+++TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_COMMAND_PATH)touch
++ TR = $(UTILS_USR_BIN_PATH)tr
++ TRUE = $(UTILS_COMMAND_PATH)true
++@@ -148,7 +148,7 @@
++ UNZIP = $(UTILS_USR_BIN_PATH)unzip
++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
++ XARGS = $(UTILS_USR_BIN_PATH)xargs
++-WC = $(UTILS_USR_BIN_PATH)wc
+++WC = $(UTILS_COMMAND_PATH)wc
++ WHICH = $(UTILS_USR_BIN_PATH)which
++ YACC = $(UTILS_CCS_BIN_PATH)yacc
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++@@ -195,7 +195,7 @@
++ # others have it in /usr/bin.
++ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
++ $(wildcard $(UTILS_USR_BIN_PATH)sort))
++- NAWK = $(USRBIN_PATH)gawk
+++ NAWK = $(UNIXCOMMAND_PATH)gawk
++ # Intrinsic unix command, with backslash-escaped character interpretation
++ ECHO = /bin/echo -e
++ # These are really in UTILS_USR_BIN_PATH on Linux
diff --git a/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch
b/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch
new file mode 100644
index 0000000..c2d98d2
--- /dev/null
+++ b/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch
@@ -0,0 +1,114 @@
+diff -urN icedtea-2.2.1/Makefile.am icedtea-mod/Makefile.am
+--- icedtea-2.2.1/Makefile.am 2012-06-16 21:28:55.521850613 -0500
++++ icedtea-mod/Makefile.am 2012-06-16 21:44:32.499840110 -0500
+@@ -235,7 +235,8 @@
+
+ # Patch list
+
+-ICEDTEA_PATCHES =
++ICEDTEA_PATCHES = \
++ patches/openjdk-smgl-paths.patch
+
+ # Conditional patches
+
+diff -urN icedtea-2.2.1/patches/openjdk-smgl-paths.patch
icedtea-mod/patches/openjdk-smgl-paths.patch
+--- icedtea-2.2.1/patches/openjdk-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
++++ icedtea-mod/patches/openjdk-smgl-paths.patch 2012-06-16
21:43:04.238841099 -0500
+@@ -0,0 +1,97 @@
++diff -ur openjdk.orig/corba/make/common/shared/Defs-utils.gmk
openjdk/corba/make/common/shared/Defs-utils.gmk
++--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2012-06-16
21:31:20.103848993 -0500
+++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2012-06-16
21:35:09.405846422 -0500
++@@ -92,15 +92,15 @@
++ DIFF = $(UTILS_USR_BIN_PATH)diff
++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
++ ECHO = $(UTILS_COMMAND_PATH)echo
++-EGREP = $(UTILS_COMMAND_PATH)egrep
+++EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_USR_BIN_PATH)expr
++ FILE = $(UTILS_USR_BIN_PATH)file
++ FIND = $(UTILS_USR_BIN_PATH)find
++ FMT = $(UTILS_COMMAND_PATH)fmt
++ GDB = $(UTILS_USR_BIN_PATH)gdb
++-GREP = $(UTILS_COMMAND_PATH)grep
+++GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
++-HEAD = $(UTILS_USR_BIN_PATH)head
+++HEAD = $(UTILS_COMMAND_PATH)head
++ ID = $(UTILS_COMMAND_PATH)id
++ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
++ KSH = $(UTILS_COMMAND_PATH)ksh
++@@ -128,9 +128,9 @@
++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
++ SORT = $(UTILS_COMMAND_PATH)sort
++ STRIP = $(UTILS_CCS_BIN_PATH)strip
++-TAIL = $(UTILS_USR_BIN_PATH)tail
+++TAIL = $(UTILS_COMMAND_PATH)tail
++ TAR = $(UTILS_COMMAND_PATH)tar
++-TEST = $(UTILS_USR_BIN_PATH)test
+++TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_COMMAND_PATH)touch
++ TR = $(UTILS_USR_BIN_PATH)tr
++ TRUE = $(UTILS_COMMAND_PATH)true
++@@ -138,7 +138,7 @@
++ UNIQ = $(UTILS_USR_BIN_PATH)uniq
++ UNZIP = $(UTILS_USR_BIN_PATH)unzip
++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
++-WC = $(UTILS_USR_BIN_PATH)wc
+++WC = $(UTILS_COMMAND_PATH)wc
++ WHICH = $(UTILS_USR_BIN_PATH)which
++ YACC = $(UTILS_CCS_BIN_PATH)yacc
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++diff -ur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk
openjdk/jdk/make/common/shared/Defs-utils.gmk
++--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2012-06-16
21:31:18.773849007 -0500
+++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-06-16
21:39:14.804843671 -0500
++@@ -108,17 +108,17 @@
++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
++ DUMP = $(UTILS_CCS_BIN_PATH)dump
++ ECHO = $(UTILS_COMMAND_PATH)echo
++-EGREP = $(UTILS_COMMAND_PATH)egrep
+++EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_USR_BIN_PATH)expr
++ FILE = $(UTILS_USR_BIN_PATH)file
++ FIND = $(UTILS_USR_BIN_PATH)find
++ FMT = $(UTILS_COMMAND_PATH)fmt
++ GDB = $(UTILS_USR_BIN_PATH)gdb
++-GREP = $(UTILS_COMMAND_PATH)grep
+++GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
++ # GZIP is used for solaris. Linux and windows use tar czf
++ GZIP = $(UTILS_COMMAND_PATH)gzip
++-HEAD = $(UTILS_USR_BIN_PATH)head
+++HEAD = $(UTILS_COMMAND_PATH)head
++ HG = hg
++ ID = $(UTILS_COMMAND_PATH)id
++ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
++@@ -145,9 +145,9 @@
++ SH = $(UTILS_COMMAND_PATH)sh
++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
++ SORT = $(UTILS_COMMAND_PATH)sort
++-TAIL = $(UTILS_USR_BIN_PATH)tail
+++TAIL = $(UTILS_COMMAND_PATH)tail
++ TAR = $(UTILS_COMMAND_PATH)tar
++-TEST = $(UTILS_USR_BIN_PATH)test
+++TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_COMMAND_PATH)touch
++ TR = $(UTILS_USR_BIN_PATH)tr
++ TRUE = $(UTILS_COMMAND_PATH)true
++@@ -156,7 +156,7 @@
++ UNZIP = $(UTILS_USR_BIN_PATH)unzip
++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
++ XARGS = $(UTILS_USR_BIN_PATH)xargs
++-WC = $(UTILS_USR_BIN_PATH)wc
+++WC = $(UTILS_COMMAND_PATH)wc
++ WHICH = $(UTILS_USR_BIN_PATH)which
++ YACC = $(UTILS_CCS_BIN_PATH)yacc
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++@@ -203,7 +203,7 @@
++ # others have it in /usr/bin.
++ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
++ $(wildcard $(UTILS_USR_BIN_PATH)sort))
++- NAWK = $(USRBIN_PATH)gawk
+++ NAWK = $(UNIXCOMMAND_PATH)gawk
++ # Intrinsic unix command, with backslash-escaped character interpretation
++ ECHO = /bin/echo -e
++ # These are really in UTILS_USR_BIN_PATH on Linux
diff --git a/java/icedtea7/java.sh b/java/icedtea7/java.sh
new file mode 100644
index 0000000..7091558
--- /dev/null
+++ b/java/icedtea7/java.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+JAVA_HOME=/usr/lib/j2sdk
+
+export JAVA_HOME
+export PATH=$PATH:$JAVA_HOME/bin
diff --git a/java/icedtea7/jaxp.tar.gz.sig b/java/icedtea7/jaxp.tar.gz.sig
new file mode 100644
index 0000000..411d198
Binary files /dev/null and b/java/icedtea7/jaxp.tar.gz.sig differ
diff --git a/java/icedtea7/jaxws.tar.gz.sig b/java/icedtea7/jaxws.tar.gz.sig
new file mode 100644
index 0000000..4676510
Binary files /dev/null and b/java/icedtea7/jaxws.tar.gz.sig differ
diff --git a/java/icedtea7/jdk.tar.gz.sig b/java/icedtea7/jdk.tar.gz.sig
new file mode 100644
index 0000000..7605238
Binary files /dev/null and b/java/icedtea7/jdk.tar.gz.sig differ
diff --git a/java/icedtea7/langtools.tar.gz.sig
b/java/icedtea7/langtools.tar.gz.sig
new file mode 100644
index 0000000..98bf8d1
Binary files /dev/null and b/java/icedtea7/langtools.tar.gz.sig differ
diff --git a/java/icedtea7/openjdk.tar.gz.sig
b/java/icedtea7/openjdk.tar.gz.sig
new file mode 100644
index 0000000..bd0158e
Binary files /dev/null and b/java/icedtea7/openjdk.tar.gz.sig differ
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index a2f3a8d..071eeb8 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,17 @@
+2012-06-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.36: added
+
+2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.4
+ * info/patches/maintenance_patches_3/patch-3.4.4: added
+
+2012-06-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.35: added
+
+2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.3
+ * info/patches/maintenance_patches_3/patch-3.4.3: added
+
2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.4.2
* info/patches/maintenance_patches_3/patch-3.4.2: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35
new file mode 100755
index 0000000..3ac1087
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.35"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="6706ac9c09a93531dfe9292da470074aab13b21e"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36
new file mode 100755
index 0000000..4c3c037
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.36"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="6262b28bca22d8d8498c0173d52c708fa749e5eb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3
new file mode 100755
index 0000000..455df98
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8585de4b59b6f8aeb510cd28a748be78bb8b24bb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4
new file mode 100755
index 0000000..ea70dbc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8427d8827822e3f1dead50c73817dfc992b50d4f"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 75e2fbc..0478a86 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.4
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.4.2
+LATEST_maintenance_patches_3=patch-3.4.4
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/virtualbox-module/DETAILS
b/kernels/virtualbox-module/DETAILS
index 679304e..a34cceb 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
SPELL=virtualbox-module
- VERSION=4.1.16
+ VERSION=4.1.18
SOURCE=virtualbox-module-$VERSION.tar.gz
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index f1fb092..c9a738d 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2012-06-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.18
+
2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.1.16

diff --git a/libs/c-ares/DETAILS b/libs/c-ares/DETAILS
index 207cacd..52f22d6 100755
--- a/libs/c-ares/DETAILS
+++ b/libs/c-ares/DETAILS
@@ -1,5 +1,5 @@
SPELL=c-ares
- VERSION=1.8.0
+ VERSION=1.9.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://c-ares.haxx.se/download/$SOURCE
diff --git a/libs/c-ares/HISTORY b/libs/c-ares/HISTORY
index 34d554a..5af8ea3 100644
--- a/libs/c-ares/HISTORY
+++ b/libs/c-ares/HISTORY
@@ -1,3 +1,6 @@
+2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.1
+
2012-05-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.0

diff --git a/libs/gavl/DETAILS b/libs/gavl/DETAILS
index c3ee5b0..d05bc81 100755
--- a/libs/gavl/DETAILS
+++ b/libs/gavl/DETAILS
@@ -1,5 +1,5 @@
SPELL=gavl
- VERSION=1.2.0
+ VERSION=1.4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.sourceforge.net/gmerlin/$SOURCE
diff --git a/libs/gavl/HISTORY b/libs/gavl/HISTORY
index 289acbb..8f27bbf 100644
--- a/libs/gavl/HISTORY
+++ b/libs/gavl/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.0
+
2011-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0

diff --git a/libs/gavl/gavl-1.2.0.tar.gz.sig b/libs/gavl/gavl-1.2.0.tar.gz.sig
deleted file mode 100644
index 26b4050..0000000
Binary files a/libs/gavl/gavl-1.2.0.tar.gz.sig and /dev/null differ
diff --git a/libs/gavl/gavl-1.4.0.tar.gz.sig b/libs/gavl/gavl-1.4.0.tar.gz.sig
new file mode 100644
index 0000000..43a1b95
Binary files /dev/null and b/libs/gavl/gavl-1.4.0.tar.gz.sig differ
diff --git a/libs/girara/DETAILS b/libs/girara/DETAILS
index 0518024..c0b315e 100755
--- a/libs/girara/DETAILS
+++ b/libs/girara/DETAILS
@@ -1,6 +1,6 @@
SPELL=girara
- VERSION=0.1.2
-
SOURCE_HASH=sha512:e1e70a63ef30fa8a952badd012d29912fb96dd6e4f272317db9e0ba2059718ca2307fd4ed98b525f692f236c11e3cf10c59c74f4741bc625aff1a390c24b6a36
+ VERSION=0.1.3
+
SOURCE_HASH=sha512:108e8643f44fb1016ffd31e6d6133b6fa46c9625d69f548569a92fe07442025918c78fb4564f41a66ba6967d2e947959946747fd65c0f045f7adc99ce6177e0b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pwmt.org/projects/girara/download/$SOURCE
diff --git a/libs/girara/HISTORY b/libs/girara/HISTORY
index 42dc6e4..6a9e58a 100644
--- a/libs/girara/HISTORY
+++ b/libs/girara/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.1.3
+
2012-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.1.2

diff --git a/libs/libmpc/DEPENDS b/libs/libmpc/DEPENDS
index ac63329..bd9fef3 100755
--- a/libs/libmpc/DEPENDS
+++ b/libs/libmpc/DEPENDS
@@ -1,4 +1,11 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends autoconf &&
depends automake &&
+
+if spell_ok automake && is_version_less $(installed_version automake) 1.12;
then
+ force_depends automake
+fi &&
+
depends gmp &&
depends mpfr
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
index 6c80fd8..631fdcd 100644
--- a/libs/libmpc/HISTORY
+++ b/libs/libmpc/HISTORY
@@ -1,3 +1,11 @@
+2012-06-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fixed build when automake < 1.12 is installed
+
+2012-06-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * TRIGGERS: added, to recast on mpfr update to prevent some linking
+ errors after in gcc (mpfr_get_z_exp) if it was on hold
+ * DETAILS: PATCHLEVEL++ for installing TRIGGERS
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1; trigger recast to fix the extra-portability
bug

diff --git a/libs/libmpc/TRIGGERS b/libs/libmpc/TRIGGERS
new file mode 100755
index 0000000..8045e83
--- /dev/null
+++ b/libs/libmpc/TRIGGERS
@@ -0,0 +1 @@
+on_cast mpfr cast_self
diff --git a/libs/libplist/DETAILS b/libs/libplist/DETAILS
index be9637b..e8e775d 100755
--- a/libs/libplist/DETAILS
+++ b/libs/libplist/DETAILS
@@ -1,9 +1,9 @@
SPELL=libplist
- VERSION=1.3
+ VERSION=1.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://github.com/downloads/JonathanBeck/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://www.libimobiledevice.org/downloads/$SOURCE
WEB_SITE=http://www.libimobiledevice.org/
ENTERED=20101010
LICENSE[0]=GPL
diff --git a/libs/libplist/HISTORY b/libs/libplist/HISTORY
index e785f15..4be7df1 100644
--- a/libs/libplist/HISTORY
+++ b/libs/libplist/HISTORY
@@ -1,3 +1,6 @@
+2012-06-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 1.8 and changed source url
+
2010-10-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD: spell created, version 1.3

diff --git a/libs/libplist/libplist-1.3.tar.bz2.sig
b/libs/libplist/libplist-1.3.tar.bz2.sig
deleted file mode 100644
index d8c9d49..0000000
Binary files a/libs/libplist/libplist-1.3.tar.bz2.sig and /dev/null differ
diff --git a/libs/libplist/libplist-1.8.tar.bz2.sig
b/libs/libplist/libplist-1.8.tar.bz2.sig
new file mode 100644
index 0000000..2dbfc33
Binary files /dev/null and b/libs/libplist/libplist-1.8.tar.bz2.sig differ
diff --git a/libs/libusb-compat/HISTORY b/libs/libusb-compat/HISTORY
index e269556..5223ab8 100644
--- a/libs/libusb-compat/HISTORY
+++ b/libs/libusb-compat/HISTORY
@@ -1,3 +1,7 @@
+2012-06-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: added
+ libusbx now defines usbi_log_level, so remove it
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/libs/libusb-compat/PRE_BUILD b/libs/libusb-compat/PRE_BUILD
new file mode 100755
index 0000000..c387a63
--- /dev/null
+++ b/libs/libusb-compat/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# libusbx now defines usbi_log_level
+if is_depends_enabled $SPELL libusbx;then
+ sed -i '/usbi_log_level/,/};/d' libusb/core.c
+fi
diff --git a/libs/libusbx/DETAILS b/libs/libusbx/DETAILS
index 71bc0e6..4cef0c3 100755
--- a/libs/libusbx/DETAILS
+++ b/libs/libusbx/DETAILS
@@ -1,6 +1,6 @@
SPELL=libusbx
- VERSION=1.0.11
-
SOURCE_HASH=sha512:73b1f8592e80f79f5dfd3588a84ef94bf3f76e74b3027e9c455d5bc7fb99276998514c587505b19116ed22d5c1973ba0943daef723e8360c99befe583fa688fc
+ VERSION=1.0.12
+
SOURCE_HASH=sha512:61064373760d8eca3e6b0a0835d5323ba494587dc407dd743d0cdfd96922cd659bb0692a0c2793943dcc94ddda27cca0a946f2f5bacba72b64b742c88563236d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/libs/libusbx/HISTORY b/libs/libusbx/HISTORY
index a7366fb..a82e7a4 100644
--- a/libs/libusbx/HISTORY
+++ b/libs/libusbx/HISTORY
@@ -1,3 +1,6 @@
+2012-06-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.0.12
+
2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: fix url for libusb-compat

diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index 43fa479..9f631e3 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,11 +1,10 @@
SPELL=lua
- VERSION=5.2.0
- PATCHLEVEL=1
+ VERSION=5.2.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
SOURCE_URL[1]=http://www.tecgraf.puc-rio.br/lua/mirror/ftp/$SOURCE
-
SOURCE_HASH=sha512:48c4a35323309c983a785a320b9a5058401c8b6cc0a4296ace66ab13ecb435d5274fdbaa28498f232619bda3bdee6eae9d264421406a83e55a418e2a6e95388a
+
SOURCE_HASH=sha512:d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb
WEB_SITE=http://www.lua.org/
ENTERED=20020309
LICENSE[0]=MIT
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index eaa57fe..438d46e 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,7 @@
+2012-06-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.1
+ * lua.pc: updated to 5.2.1
+
2012-05-26 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD: fix x86_64 check

diff --git a/lua-forge/lua/lua.pc b/lua-forge/lua/lua.pc
index 6f55d19..d4113d8 100644
--- a/lua-forge/lua/lua.pc
+++ b/lua-forge/lua/lua.pc
@@ -5,7 +5,7 @@
# grep '^V=' ../Makefile
V= 5.2
# grep '^R=' ../Makefile
-R= 5.2.0
+R= 5.2.1

# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
prefix= /usr
diff --git a/net/dnstop/DEPENDS b/net/dnstop/DEPENDS
new file mode 100755
index 0000000..a8ec60d
--- /dev/null
+++ b/net/dnstop/DEPENDS
@@ -0,0 +1 @@
+depends libpcap
diff --git a/net/dnstop/DETAILS b/net/dnstop/DETAILS
new file mode 100755
index 0000000..84fe621
--- /dev/null
+++ b/net/dnstop/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=dnstop
+ VERSION=20120611
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://dns.measurement-factory.com/tools/$SPELL/src/$SOURCE
+
SOURCE_HASH=sha512:0151484fe4c6052c5a820b416073b8e9ab4eff8ce8c9a56de38c7afecb4942c549f73a395abe5396faa28eef01c79cc96af167a1c1120a1b2ae58de2cd1bacc8
+ WEB_SITE=http://dns.measurement-factory.com/tools/dnstop/
+ ENTERED=20120620
+ LICENSE=BSD
+ SHORT="displays various tables of DNS traffic on your network"
+cat << EOF
+dnstop is a libpcap application (ala tcpdump) that displays
+various tables of DNS traffic on your network.
+EOF
diff --git a/net/dnstop/HISTORY b/net/dnstop/HISTORY
new file mode 100644
index 0000000..7043b92
--- /dev/null
+++ b/net/dnstop/HISTORY
@@ -0,0 +1,3 @@
+2012-06-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 20120611
+
diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS
index 179db8d..97b5811 100755
--- a/net/libpcap/DETAILS
+++ b/net/libpcap/DETAILS
@@ -1,5 +1,5 @@
SPELL=libpcap
- VERSION=1.2.1
+ VERSION=1.3.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 2b3a32b..b9264df 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,6 @@
+2012-06-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.0
+
2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: added, for missing flags
* DEPENDS: added optional depends on BLUEZ; corrected flags
diff --git a/net/minidlna/HISTORY b/net/minidlna/HISTORY
index 6225a1d..04d4da3 100644
--- a/net/minidlna/HISTORY
+++ b/net/minidlna/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, minidlna.patch: added ffmpeg fix
+
2012-02-16 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.0.24

diff --git a/net/minidlna/PRE_BUILD b/net/minidlna/PRE_BUILD
new file mode 100755
index 0000000..1e3ce88
--- /dev/null
+++ b/net/minidlna/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p1 < "${SPELL_DIRECTORY}/minidlna.patch"
diff --git a/net/minidlna/minidlna.patch b/net/minidlna/minidlna.patch
new file mode 100644
index 0000000..adb02c4
--- /dev/null
+++ b/net/minidlna/minidlna.patch
@@ -0,0 +1,46 @@
+Common subdirectories: minidlna-1.0.24/linux and minidlna-1.0.24-fixed/linux
+diff -Nau minidlna-1.0.24/metadata.c minidlna-1.0.24-fixed/metadata.c
+--- minidlna-1.0.24/metadata.c 2012-02-14 19:44:56.000000000 +0100
++++ minidlna-1.0.24-fixed/metadata.c 2012-06-19 17:11:39.150099226 +0200
+@@ -710,7 +710,7 @@
+ DPRINTF(E_WARN, L_METADATA, "Opening %s failed!\n", path);
+ return 0;
+ }
+- av_find_stream_info(ctx);
++ avformat_find_stream_info(ctx, NULL);
+ //dump_format(ctx, 0, NULL, 0);
+ for( i=0; i<ctx->nb_streams; i++)
+ {
+@@ -732,7 +732,7 @@
+ /* This must not be a video file. */
+ if( !vc )
+ {
+- av_close_input_file(ctx);
++ avformat_close_input(&ctx);
+ if( !is_audio(path) )
+ DPRINTF(E_DEBUG, L_METADATA, "File %s does not
contain a video stream.\n", basename(path));
+ return 0;
+@@ -1514,10 +1514,10 @@
+ {
+ if( ctx->metadata )
+ {
+- AVMetadataTag *tag = NULL;
++ AVDictionaryEntry *tag = NULL;
+
+ //DEBUG DPRINTF(E_DEBUG, L_METADATA, "Metadata:\n");
+- while( (tag = av_metadata_get(ctx->metadata, "", tag,
AV_METADATA_IGNORE_SUFFIX)) )
++ while( (tag = av_dict_get(ctx->metadata, "", tag,
AV_DICT_IGNORE_SUFFIX)) )
+ {
+ //DEBUG DPRINTF(E_DEBUG, L_METADATA, "
%-16s: %s\n", tag->key, tag->value);
+ if( strcmp(tag->key, "title") == 0 )
+@@ -1534,7 +1534,7 @@
+ #endif
+ #endif
+ video_no_dlna:
+- av_close_input_file(ctx);
++ avformat_close_input(&ctx);
+
+ #ifdef TIVO_SUPPORT
+ if( ends_with(path, ".TiVo") && is_tivo_file(path) )
+Common subdirectories: minidlna-1.0.24/po and minidlna-1.0.24-fixed/po
+Common subdirectories: minidlna-1.0.24/tagutils and
minidlna-1.0.24-fixed/tagutils
diff --git a/net/tcpdump/DETAILS b/net/tcpdump/DETAILS
index 60de1f2..a47f69b 100755
--- a/net/tcpdump/DETAILS
+++ b/net/tcpdump/DETAILS
@@ -1,5 +1,5 @@
SPELL=tcpdump
- VERSION=4.2.1
+ VERSION=4.3.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY
index a7185de..4e78c9a 100644
--- a/net/tcpdump/HISTORY
+++ b/net/tcpdump/HISTORY
@@ -1,3 +1,6 @@
+2012-06-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.3.0
+
2012-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.2.1
* PRE_BUILD, ppi.h: removed, fixed upstream
diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 2b2842e..19b6bb8 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbi
- VERSION=1.620
-
SOURCE_HASH=sha512:2588e5a74b469405cf6f859e46f41793eb67f1599084ce730fd99132b0106d246366ca30836e2f8dccbf85337ab1649bde9f4468239189a302fb93af4a6328fc
+ VERSION=1.622
+
SOURCE_HASH=sha512:6d45ccdfab58bc82eaf71a9637b0b58a303ba4f24584b1c7a75a9b2ca21662344d9fa444e97ad92783b6fe5621d5127efa07faeeafd05f1bb49739774e250434
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 461f22d..3bae266 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2012-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.622
+
2012-05-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.620

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 5c29c5c..cf3a691 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.3.13
- SECURITY_PATCH=17
-
SOURCE_HASH=sha512:230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405
+ VERSION=5.3.14
+ SECURITY_PATCH=18
+
SOURCE_HASH=sha512:3de478d4b69aa8dc085c7bc13cb84cd9e17322737cfadc1801dd8f0d33ca2855ca363825f4057a394d2adfa5910bad7af017e44d7ab18f66388651055b16d885
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
@@ -16,11 +16,11 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.3.13
-
SOURCE_HASH=sha512:230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405
+ VERSION=5.3.14
+
SOURCE_HASH=sha512:3de478d4b69aa8dc085c7bc13cb84cd9e17322737cfadc1801dd8f0d33ca2855ca363825f4057a394d2adfa5910bad7af017e44d7ab18f66388651055b16d885
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
- SECURITY_PATCH=17
+ SECURITY_PATCH=18
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
SECURITY_PATCH=17
@@ -41,9 +41,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4

SOURCE4_HASH=sha512:d3650e2a7a33b69c4d55125956a141af702fa61a8e470edb143ab49c5865ba18a34659c90e1c28c70826a7b3659a9eeae063a30ee5f7d0e8d4cf96d76320fa9c
else
- VERSION=5.3.13
- SECURITY_PATCH=17
-
SOURCE_HASH=sha512:230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405
+ VERSION=5.3.14
+ SECURITY_PATCH=18
+
SOURCE_HASH=sha512:3de478d4b69aa8dc085c7bc13cb84cd9e17322737cfadc1801dd8f0d33ca2855ca363825f4057a394d2adfa5910bad7af017e44d7ab18f66388651055b16d885
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 043d145..ff37adb 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.3.14, SECURITY_PATCH=18
+
2012-06-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated backports+security patches to 20120526; fixed
verification bug for suhosin patch
diff --git a/python-pypi/pyasn1/DEPENDS b/python-pypi/pyasn1/DEPENDS
new file mode 100755
index 0000000..e4ea57a
--- /dev/null
+++ b/python-pypi/pyasn1/DEPENDS
@@ -0,0 +1 @@
+depends PYTHON
diff --git a/python-pypi/pyasn1/DETAILS b/python-pypi/pyasn1/DETAILS
index d7803d9..ea87f99 100755
--- a/python-pypi/pyasn1/DETAILS
+++ b/python-pypi/pyasn1/DETAILS
@@ -1,9 +1,10 @@
SPELL=pyasn1
- VERSION=0.1.2
+ VERSION=0.1.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c7739106a791faca27eea3da66a3e5afb240eb04b0d25136fae181379008af00741a14a5647906fd791015c2ffbfbd6b426356532d627385f70f1c08db138f9b
+ SOURCE_URL[1]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:3f449f7c4fcc0097572294e41a1cf0dbb1ded79bcfbdd8dfb316e5a0dc113b851bd0c6ffab4455c1b0ffb9e251964b29617156961413aba2a92d8409420eb1b9
WEB_SITE=http://pyasn1.sourceforge.net/
ENTERED=20060930
LICENSE[0]=BSD
diff --git a/python-pypi/pyasn1/HISTORY b/python-pypi/pyasn1/HISTORY
index fb53f71..7fff58b 100644
--- a/python-pypi/pyasn1/HISTORY
+++ b/python-pypi/pyasn1/HISTORY
@@ -1,3 +1,7 @@
+2012-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.3; added pypi source url
+ * DEPENDS: added, for missing generic python dependency
+
2011-12-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.1.2

diff --git a/python-pypi/rsa/DEPENDS b/python-pypi/rsa/DEPENDS
index 6431ca2..fb4bc89 100755
--- a/python-pypi/rsa/DEPENDS
+++ b/python-pypi/rsa/DEPENDS
@@ -1,3 +1,3 @@
-depends python &&
+depends PYTHON &&
depends distribute &&
depends pyasn1
diff --git a/python-pypi/rsa/DETAILS b/python-pypi/rsa/DETAILS
index 6362fd6..7ad93cd 100755
--- a/python-pypi/rsa/DETAILS
+++ b/python-pypi/rsa/DETAILS
@@ -1,14 +1,14 @@
SPELL=rsa
- VERSION=3.0.1
- SOURCE=$SPELL-$VERSION.zip
+ VERSION=3.1.1
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:9e72a86d9de80efe59a5647e80b0beebc6bf4bb98d7c00d54931e512514cf666de7e09bc8b8809105b8480cdb6bfbdb7d9cb312de30ac0b45b5d1989249f2933
+
SOURCE_HASH=sha512:5a8e8836f90ec1db41fa87b0f81accbc22814e71581ec0b66be850966603d0210f28e05f3330f62a4622ada2faa6d0f14a7f21cc46415e7a61bc0a51bd2bce37
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.stuvel.eu/rsa
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20080424
- SHORT="Pure-Python RSA implementation"
+ SHORT="pure-Python RSA implementation"
cat << EOF
It's a module for calculating large primes, and RSA encryption, decryption,
signing and verification. Includes generating public and private keys.
diff --git a/python-pypi/rsa/HISTORY b/python-pypi/rsa/HISTORY
index fb06a43..be22b64 100644
--- a/python-pypi/rsa/HISTORY
+++ b/python-pypi/rsa/HISTORY
@@ -1,3 +1,10 @@
+2012-06-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.1
+
+2012-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1; fixed source url extension
+ * DEPENDS: python3 is supported
+
2011-09-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.1; corrected source extension

diff --git a/python-pypi/six/DEPENDS b/python-pypi/six/DEPENDS
new file mode 100755
index 0000000..e440941
--- /dev/null
+++ b/python-pypi/six/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/six/DETAILS b/python-pypi/six/DETAILS
new file mode 100755
index 0000000..5d345d3
--- /dev/null
+++ b/python-pypi/six/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=six
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:a3afc67451009044dfc57a90529a2d1ec4d2f98eba534dd74f529318a03c99d98d4850daed157177145763cd925393f4f0afaba20634b982e201bc7d422cc828
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://pypi.python.org/pypi/$SPELL
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/s/six/$SOURCE
+ LICENSE[0]=MIT
+ ENTERED=20120622
+ KEYWORDS="python"
+ SHORT="Python 2 and 3 compatibility utilities"
+cat << EOF
+Six is a Python 2 and 3 compatibility library. It provides utility functions
+for smoothing over the differences between the Python versions with the goal
+of writing Python code that is compatible on both Python versions
+EOF
diff --git a/python-pypi/six/HISTORY b/python-pypi/six/HISTORY
new file mode 100644
index 0000000..f7d97db
--- /dev/null
+++ b/python-pypi/six/HISTORY
@@ -0,0 +1,4 @@
+2012-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+ spell created
+
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index f0f1970..b6ef0eb 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.7.7
-
SOURCE_HASH=sha512:02ee0d77a54d1fd12993d29264f3f03f29a0fc18a10ea19e03ac7860f853954ca9ba45a6550591d76b729cc635cd562c02e8fcca23ec356c3af829b547a8bb62
+ VERSION=0.7.8
+
SOURCE_HASH=sha512:976ffd18ca4c824debbbdb7c66d6eed377a7eda0850873334f8b238318a321556303353a2abd03fae2e82c6abb9fb79b8eb46102cfd6ac7932bcfd9a9864f381
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index aee5132..5523035 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2012-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.8
+
2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.7
* DEPENDS: updated dependencies; fixed flags
diff --git a/science-libs/eigen2/DETAILS b/science-libs/eigen2/DETAILS
index b27971d..c46fd90 100755
--- a/science-libs/eigen2/DETAILS
+++ b/science-libs/eigen2/DETAILS
@@ -1,9 +1,9 @@
SPELL=eigen2
SPELLX=eigen
VERSION=2.0.17
-
SOURCE_HASH=sha512:3c03f6c98ac6a60b5afd1ff4820158a72eb9391084609ac8254cc901305457c163b788782b7f8d01b5d9359775c427dc58b8999c2638d18fcb808d81bc477869
+
SOURCE_HASH=sha512:8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72
SOURCE=$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-b23437e61a07
SOURCE_URL[0]=http://bitbucket.org/$SPELLX/$SPELLX/get/$SOURCE
WEB_SITE=http://eigen.tuxfamily.org
LICENSE[0]=GPL
diff --git a/science-libs/eigen2/HISTORY b/science-libs/eigen2/HISTORY
index e83a0c5..b45e152 100644
--- a/science-libs/eigen2/HISTORY
+++ b/science-libs/eigen2/HISTORY
@@ -1,3 +1,6 @@
+2012-06-21 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated sha512 and fixed SOURCE_DIRECTORY
+
2011-12-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.17

diff --git a/science/stellarium/DETAILS b/science/stellarium/DETAILS
index 87aaf80..733a575 100755
--- a/science/stellarium/DETAILS
+++ b/science/stellarium/DETAILS
@@ -1,9 +1,9 @@
SPELL=stellarium
- VERSION=0.11.2
+ VERSION=0.11.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:e5fd98a89a3d3c753ce81988fcdcd41fde3f393cadc38f6f6c92d4aab4c94950614f8e6194cf6c99c28184e5c1694f2eee827d15a0da6d1944be976ab1c728dc
+
SOURCE_HASH=sha512:4fadd766e452eb10f7567eba17727ac837f108819a09bd32bb9aec0ea503521414d9179f51d9ec65899f42812c15eb625b876e1ee76128a62c056d1ac8a1cb3d
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
WEB_SITE=http://www.stellarium.org
diff --git a/science/stellarium/HISTORY b/science/stellarium/HISTORY
index 02273dc..d596f6d 100644
--- a/science/stellarium/HISTORY
+++ b/science/stellarium/HISTORY
@@ -1,3 +1,6 @@
+2012-06-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.11.3
+
2012-03-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11.2

diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index e49d10b..e5e3ee6 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,5 +1,5 @@
SPELL=nmap
- VERSION=6.00
+ VERSION=6.01
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
# SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE_HASH=sha512:2abdcd6a4d991f6cc69e9e6732e82271affb562d66e8ac144392b83634b3d7e3356506bb2f4725c9b1d6ed36679456b598163a8c1c67bff7792d5ec62a4c6346
+
SOURCE_HASH=sha512:0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9
WEB_SITE=http://nmap.org/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 81b0995..fccb14a 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,6 @@
+2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.01
+
2012-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.00

diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 651eb8e..32855b8 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.8
+ VERSION=1.8.0
SECURITY_PATCH=36
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78
+
SOURCE_HASH=sha512:bd2b476dda089d27aba73ae5d5974757ec0fd1f6047adecad9966366cacd6e0565a313be1f14f59e38011cd18331f7cf4aaca69228d9af1201866c5174bf41d4
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 8d7a10a..da34d21 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.0
+
2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.8, SECURITY_PATCH=36

diff --git a/shell-term-fm/bash-completion/DETAILS
b/shell-term-fm/bash-completion/DETAILS
index ae8aa74..338247b 100755
--- a/shell-term-fm/bash-completion/DETAILS
+++ b/shell-term-fm/bash-completion/DETAILS
@@ -1,6 +1,6 @@
SPELL=bash-completion
- VERSION=1.3
-
SOURCE_HASH=sha512:f0c6eb3edce982d1306fdb7ba2cb598c08cff4bde8496fca369b3c4d2d3af0ef48dd494ab96258cc90f30b875a56759aad13a6b1bfb4928bfba4634cce6bf8be
+ VERSION=2.0
+
SOURCE_HASH=sha512:88d55f68bd5ab7c26b28e5d9f00b81ce8433c609d96a540a83c5f48400787368d4b5579a76fde6b268782f907d4d748f578d2550b70b2ccb2704657d98dae168
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://bash-completion.alioth.debian.org/files/$SOURCE
diff --git a/shell-term-fm/bash-completion/HISTORY
b/shell-term-fm/bash-completion/HISTORY
index 4c1f00b..605ce31 100644
--- a/shell-term-fm/bash-completion/HISTORY
+++ b/shell-term-fm/bash-completion/HISTORY
@@ -1,3 +1,6 @@
+2012-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0
+
2011-09-20 Bor Kraljič <pyrobor AT ver.si>
* smgl_completion: added gaze tablet that is now in devel sorcery

diff --git a/shell-term-fm/spacefm/DETAILS b/shell-term-fm/spacefm/DETAILS
index 9f99af3..95a6487 100755
--- a/shell-term-fm/spacefm/DETAILS
+++ b/shell-term-fm/spacefm/DETAILS
@@ -1,8 +1,8 @@
SPELL=spacefm
- VERSION=0.7.7
+ VERSION=0.7.8
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c5896b3b054f7c7700c041235ffe9219fe6e26813eb620d846ca92154a5777eab7c4ce687e09fd4434caacff8e222c0fe7f48d5e0b16fee980a85b5a4e95b44b
+
SOURCE_HASH=sha512:182d6bf23881e0b05d481e834a5aad0e65d39c19df3494fa37309f28f6423224757785430ab178e67c2d02fd65fc85b15082fa88f45c9e24347993c3e89da897
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://ignorantguru.github.com/spacefm/
LICENSE[0]=GPL
diff --git a/shell-term-fm/spacefm/HISTORY b/shell-term-fm/spacefm/HISTORY
index a6ee509..502411b 100644
--- a/shell-term-fm/spacefm/HISTORY
+++ b/shell-term-fm/spacefm/HISTORY
@@ -1,2 +1,5 @@
+2012-06-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.8
+
2012-05-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS: spell created, version 0.7.7
diff --git a/smgl/smgl-archspecs/DETAILS b/smgl/smgl-archspecs/DETAILS
index dce8f26..9ed54f0 100755
--- a/smgl/smgl-archspecs/DETAILS
+++ b/smgl/smgl-archspecs/DETAILS
@@ -1,5 +1,5 @@
SPELL=smgl-archspecs
- VERSION=0.8.2
+ VERSION=0.8.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/smgl/smgl-archspecs/HISTORY b/smgl/smgl-archspecs/HISTORY
index 7f35bad..4fd41de 100644
--- a/smgl/smgl-archspecs/HISTORY
+++ b/smgl/smgl-archspecs/HISTORY
@@ -1,3 +1,6 @@
+2012-06-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.3
+
2011-09-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.2

diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index ddb918a..efaf029 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -9,7 +9,7 @@ if [[ "$AVAHI_DAEMON" == 'n' ]]; then
OPTS="${OPTS} --with-xml=none"
fi &&

-if [[ "$AVAHI_NODBUS" == 'y' ]]; then
+if ! is_depends_enabled $SPELL dbus; then
OPTS="${OPTS} --disable-dbus"
fi &&

@@ -21,7 +21,14 @@ if [[ "$AVAHI_COMPAT_HOWL" == 'y' ]]; then
OPTS="$OPTS --enable-compat-howl"
fi &&

-OPTS="--disable-qt3 $OPTS" &&
+if ! is_depends_enabled $SPELL pygtk2; then
+ OPTS="$OPTS --disable-pygtk"
+fi &&

+if ! is_depends_enabled $SPELL gdbm; then
+ OPTS="$OPTS --disable-gdbm"
+fi &&
+
+OPTS="--disable-qt3 $OPTS" &&

default_build
diff --git a/utils/avahi/DEPENDS b/utils/avahi/DEPENDS
index 8947f1b..b2eb27d 100755
--- a/utils/avahi/DEPENDS
+++ b/utils/avahi/DEPENDS
@@ -16,7 +16,7 @@ optional_depends gtk+3 \
"Use GTK+3?" &&

optional_depends glib2 \
- "--enable-glib" "--disable-glib" \
+ "--enable-glib" "--disable-glib --disable-gobject" \
"Enable glib bindings?" &&

if ( is_depends_enabled $SPELL qt4 ) || \
@@ -37,11 +37,8 @@ depends libdaemon --enable-libdaemon &&
if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_DAEMON" == 'y' ]] || \
[[ "$AVAHI_CLIENT" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
depends dbus --enable-dbus
-else
- AVAHI_NODBUS=y
fi &&

-
if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
depends dbus-python '--enable-dbus' &&
depends pygtk2 '--enable-pygtk'
@@ -52,7 +49,8 @@ if [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
fi &&

if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_UTILS" == 'y' ]]; then
- optional_depends gdbm "--enable-gdbm" "--disable-gdbm" "Use GDBM?"
+ # disabled in build if not enabled
+ optional_depends gdbm "--enable-gdbm" "" "Use GDBM?"
fi &&

if [[ "$AVAHI_DISCOVER" == 'y' ]] && ( is_depends_enabled $SPELL gdbm ); then
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index b3e670d..d5ad365 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,14 @@
+2012-06-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: Setting variables in DEPENDS isn't persistent, so change
+ check for no D-BUS.
+ Explicitly disable pygtk annd gdbm if not enabled
+ * DEPENDS: if glib is disabled, disable gobject as well.
+ Remove setting AVAHI_NODBUS as it is not persistent.
+ Set disable gdbm flag in BUILD.
+ * PRE_BUILD: Do not run autoreconf as it seems to break install
+ * qt.patch: Changed. Lets patch configure rather than configure.ac
+ so autoreconf does not need to be run.
+
2012-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.31
* INSTALL: added
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index 493a8f6..d14e782 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
patch -p1 < $SPELL_DIRECTORY/qt.patch &&
-autoreconf &&
create_group netdev &&
create_group avahi &&
create_account avahi &&
diff --git a/utils/avahi/qt.patch b/utils/avahi/qt.patch
index ebeecc6..d02a2f2 100644
--- a/utils/avahi/qt.patch
+++ b/utils/avahi/qt.patch
@@ -1,20 +1,20 @@
---- avahi-0.6.23/configure.ac 2008-07-20 18:38:46.000000000 +0200
-+++ avahi-0.6.23.cp/configure.ac 2008-06-24 01:17:27.000000000 +0200
-@@ -482,7 +482,7 @@
- AC_SUBST(QT3_CFLAGS)
- AC_SUBST(QT3_LIBS)
- QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
-- AC_PATH_PROGS(MOC_QT3, [moc-qt3 moc], no, [$QT3_PREFIX])
-+ AC_PATH_PROGS(MOC_QT3, [moc-qt3 moc], no, [/usr/bin])
- if test "$MOC_QT3" = no; then
- AC_MSG_ERROR([Could not find QT3 moc])
- fi
-@@ -507,7 +507,7 @@
- AC_SUBST(QT4_CFLAGS)
- AC_SUBST(QT4_LIBS)
- QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
-- AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX])
-+ AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [/usr/bin/qt4])
- if test "$MOC_QT4" = no; then
- AC_MSG_ERROR([Could not find QT4 moc])
- fi
+--- avahi-0.6.31/configure 2012-02-14 17:36:33.221047221 -0500
++++ avahi-0.6.31.o/configure 2012-06-13 00:55:43.876468604 -0400
+@@ -20670,7 +20670,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $QT3_PREFIX
++for as_dir in /usr/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -20840,7 +20840,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $QT4_PREFIX
++for as_dir in /usr/bin/qt4
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 888757d..2fe1449 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus
- VERSION=1.4.20
-
SOURCE_HASH=sha512:d6bad9df110a7b93f278577b9e45c0a9c07fbc2d6bb89fbf0c4af09d9dc8bab91b4e62aee0db32536b1c6194fc638e7a1c99f48a74e0cf55fcb1cc121bbe57f7
+ VERSION=1.6.0
+
SOURCE_HASH=sha512:1011bf1bf43e795cfd39a5d2d092bbae8b4679d9f9a6a6565d9ca0246c484d7fb413c7f7e64c39e532741140d214393847b7db1c6a8d50cacd42ccbbff6ff0ba
SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 8a95d0a..5777021 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2012-06-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.0
+
2012-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.20

diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index a441b3c..f2d1c58 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
SPELL=grep
- VERSION=2.12
+ VERSION=2.10
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index 4048f61..07a9302 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,11 +1,3 @@
-2012-04-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.12
- * PRE_BUILD, grep-2.11.patch: deleted
-
-2012-03-12 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.11
- * PRE_BUILD, grep-2.11.patch: official patch added
-
2011-11-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10, tar.gz -> tar.xz
* DEPENDS, PRE_BUILD: updated to process xz tarball
diff --git a/utils/grep/PRE_BUILD b/utils/grep/PRE_BUILD
new file mode 100755
index 0000000..6f54504
--- /dev/null
+++ b/utils/grep/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+cd $SOURCE_DIRECTORY
diff --git a/utils/ipmitool/BUILD b/utils/ipmitool/BUILD
new file mode 100755
index 0000000..2e7a3d0
--- /dev/null
+++ b/utils/ipmitool/BUILD
@@ -0,0 +1,3 @@
+OPTS="$IPMITOOL_OPTS $OPTS" &&
+
+default_build
diff --git a/utils/ipmitool/CONFIGURE b/utils/ipmitool/CONFIGURE
new file mode 100755
index 0000000..43e9d38
--- /dev/null
+++ b/utils/ipmitool/CONFIGURE
@@ -0,0 +1,36 @@
+config_query_option IPMITOOL_OPTS "Enable IPMIv1.5 LAN interface?" y \
+ "--enable-intf-lan" \
+ "--disable-intf-lan" &&
+
+config_query_option IPMITOOL_OPTS "Enable IPMIv2.0 RMCP+ LAN interface?" y \
+ "--enable-intf-lanplus" \
+ "--disable-intf-lanplus" &&
+
+# TODO: requires freeipmi spell, must be moved to DEPENDS once ready
+#config_query_option IPMITOOL_OPTS "Enable FreeIPMI IPMI interface?" y \
+# "--enable-intf-free" \
+# "--disable-intf-free" &&
+
+config_query_option IPMITOOL_OPTS "Enable Linux OpenIPMI interface?" y \
+ "--enable-intf-open" \
+ "--disable-intf-open" &&
+
+config_query_option IPMITOOL_OPTS "Enable Intel IMB driver interface?" y \
+ "--enable-intf-imb" \
+ "--disable-intf-imb" &&
+
+config_query_option IPMITOOL_OPTS "Enable Solaris 9 x86 IPMI interface?" n \
+ "--enable-intf-lipmi" \
+ "--disable-intf-lipmi" &&
+
+config_query_option IPMITOOL_OPTS "Enable Solaris 10 x86 IPMI interface?" y \
+ "--enable-intf-bmc" \
+ "--disable-intf-bmc" &&
+
+config_query_option IPMITOOL_OPTS "Enable IPMI shell interface?" y \
+ "--enable-ipmishell" \
+ "--disable-ipmishell" &&
+
+config_query_option IPMITOOL_OPTS "Enable extra security checks on files
opened for read?" n \
+ "--enable-file-security" \
+ "--disable-file-security"
diff --git a/utils/ipmitool/DEPENDS b/utils/ipmitool/DEPENDS
new file mode 100755
index 0000000..ad88c25
--- /dev/null
+++ b/utils/ipmitool/DEPENDS
@@ -0,0 +1,7 @@
+depends ncurses &&
+depends readline &&
+
+optional_depends openssl \
+ "--disable-internal-md5" \
+ "--enable-internal-md5" \
+ "to use external MD5 library"
diff --git a/utils/ipmitool/DETAILS b/utils/ipmitool/DETAILS
index e1d9930..8cbe8d4 100755
--- a/utils/ipmitool/DETAILS
+++ b/utils/ipmitool/DETAILS
@@ -1,5 +1,6 @@
SPELL=ipmitool
VERSION=1.8.11
+ PATCHLEVEL=1
SECURITY_PATCH=1

SOURCE_HASH=sha512:48093790baf2532887ac87de9b55fbe38f46f271b84e6152e6b0ba11170b29aad78dfcd42036389750edbedff325476b8366b3ea1401b97148b8bc8c1bd71e4b
SOURCE="$SPELL-$VERSION.tar.gz"
diff --git a/utils/ipmitool/HISTORY b/utils/ipmitool/HISTORY
index 2135e79..5045bb0 100644
--- a/utils/ipmitool/HISTORY
+++ b/utils/ipmitool/HISTORY
@@ -1,3 +1,9 @@
+2012-06-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * DEPENDS: added, for missing dependencies
+ * CONFIGURE: added, for several configure options
+ * BUILD: added, to use IPMITOOL_OPTS
+
2012-01-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1; UPDATED -> ENTERED; cleaned up
* PRE_BUILD: added, to apply the patch
diff --git a/utils/pciutils/DETAILS b/utils/pciutils/DETAILS
index 985a652..0ab0db4 100755
--- a/utils/pciutils/DETAILS
+++ b/utils/pciutils/DETAILS
@@ -1,12 +1,13 @@
SPELL=pciutils
VERSION=3.1.9
-
SOURCE_HASH=sha512:9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$SOURCE
- SOURCE_URL[1]=$KERNEL_URL/pub/software/utils/pciutils/$SOURCE
- SOURCE_URL[2]=http://www.ibiblio.org/pub/Linux/hardware/$SOURCE
- WEB_SITE=http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html
+ SOURCE2_URL[0]=$SOURCE_URL.sign
+ SOURCE_GPG=pciutils.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=http://mj.ucw.cz/sw/pciutils/
ENTERED=20020125
LICENSE[0]=GPL
KEYWORDS="utils"
@@ -19,14 +20,13 @@ work on other systems as well.

The utilities include: (See manual pages for more details)

-lspci: displays detailed information about all PCI busses and
- devices in the system, replacing the original /proc/pci
- interface.
-
-setpci: allows to read from and write to PCI device
- configuration registers. For example, you can adjust
- the latency timers with it.
+lspci: displays detailed information about all PCI busses and
+devices in the system, replacing the original /proc/pci
+interface.

+setpci: allows to read from and write to PCI device
+configuration registers. For example, you can adjust
+the latency timers with it.

Included development headers and libpci.a library installation.

diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index c0f6a19..8146c4c 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,8 @@
+2012-06-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: leave only master mirror as it seems it's not broken;
updated
+ website; removed tabs; switched to upstream pgp checking
+ * pciutils.gpg: added, D70F82D public key (Martin Mares <mj AT ucw.cz>)
+
2012-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.9

diff --git a/utils/pciutils/pciutils.gpg b/utils/pciutils/pciutils.gpg
new file mode 100644
index 0000000..f6fd714
Binary files /dev/null and b/utils/pciutils/pciutils.gpg differ
diff --git a/utils/psmisc/DETAILS b/utils/psmisc/DETAILS
index 687180c..94cc65d 100755
--- a/utils/psmisc/DETAILS
+++ b/utils/psmisc/DETAILS
@@ -1,6 +1,6 @@
SPELL=psmisc
- VERSION=22.17
-
SOURCE_HASH=sha512:3e4aee636fb7d41d09f2903c029da1b297c8b5de7b8add2fc259cfa3742d381449a7bf2656a7ec66f096e45cc473167a2218cb85a26afb145689d0440cd79fc7
+ VERSION=22.18
+
SOURCE_HASH=sha512:710e8309b4d2c3da4b1117e6a81091b3248bc50abed74b8d993ce22acb67098b18fc9081f4e8b004869b0720bea091b2d2e49810a54217dfb46e74d1ba473dae
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index d8342e2..c530dc2 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 22.18
+
2012-06-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 22.17

diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 366bb0f..bbfb4f3 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,10 +1,10 @@
SPELL=virtualbox
- VERSION=4.1.16
+ VERSION=4.1.18
PATCHLEVEL=0
SOURCE=VirtualBox-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}

SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-
SOURCE_HASH=sha512:7d7c76026c78d6b59b5d1ab387394f78e7203355183ec40e4ec3374183fd75ef5e6327b8525f401516f6337a56f27fdd401e081ed0edb3e8ed12a08e0007d8b0
+
SOURCE_HASH=sha512:8053daaf45aa8ea4e56f7fc3b53b280ecbf184cb943ef574c7c1005557e762bcd626fe8b28693706c1c5385f497ea1baf39927b2cf83a09dc055076ec7bc8a3e
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 46226a0..4da007c 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2012-06-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.18
+
2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.1.16

diff --git a/video-libs/gmerlin-avdecoder/DETAILS
b/video-libs/gmerlin-avdecoder/DETAILS
index 45887eb..64b3da1 100755
--- a/video-libs/gmerlin-avdecoder/DETAILS
+++ b/video-libs/gmerlin-avdecoder/DETAILS
@@ -1,8 +1,8 @@
SPELL=gmerlin-avdecoder
- VERSION=1.1.0
+ VERSION=1.2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/gmerlin/$SOURCE
-
SOURCE_HASH=sha512:7bd21294b0ecc7d90fd90319863f81a2773ab4972e58434722c1071940250f5d53d23da093d66429f1e0435103af5fef14d26307f66abc55a7872d9fd068bf8e
+
SOURCE_HASH=sha512:aed4c138d8879417528decc6969946f4eb9fbc57cedb5c7158adfa191d121fc87c9d5ea4a2ac2bc91e3bebc94ca9536419e11bd5cfecc8555d88a1c223ec4649
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gmerlin.sourceforge.net/
LICENSE[0]=GPL
diff --git a/video-libs/gmerlin-avdecoder/HISTORY
b/video-libs/gmerlin-avdecoder/HISTORY
index 7774739..7bdecbf 100644
--- a/video-libs/gmerlin-avdecoder/HISTORY
+++ b/video-libs/gmerlin-avdecoder/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.0
+
2011-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.0

diff --git a/video-libs/gmerlin-encoders/DETAILS
b/video-libs/gmerlin-encoders/DETAILS
index 9add0f6..91bf0ac 100755
--- a/video-libs/gmerlin-encoders/DETAILS
+++ b/video-libs/gmerlin-encoders/DETAILS
@@ -1,8 +1,8 @@
SPELL=gmerlin-encoders
- VERSION=1.0.0
+ VERSION=1.2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/gmerlin/$SOURCE
-
SOURCE_HASH=sha512:3b2cf51eb31081f050ff3fc7245553077bfff8cec33a0eee63a287e61453f6ac0753154ac17ce2d2248501beadbbbd75cc27f09f9a4a2aef3645e3b5d1b7abff
+
SOURCE_HASH=sha512:d2dedcbc48c497e1d22137e64ee3d1f463439bb3dab09e3344f1642bea753e6ea23126b039f42e919d36b829048988b3dc51f81c2c6ed81257a72e59c47c4a6d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gmerlin.sourceforge.net/
LICENSE[0]=GPL
diff --git a/video-libs/gmerlin-encoders/HISTORY
b/video-libs/gmerlin-encoders/HISTORY
index 340852a..479142e 100644
--- a/video-libs/gmerlin-encoders/HISTORY
+++ b/video-libs/gmerlin-encoders/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.0
+
2011-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/video-libs/gmerlin/DETAILS b/video-libs/gmerlin/DETAILS
index 066cb87..d60b7f3 100755
--- a/video-libs/gmerlin/DETAILS
+++ b/video-libs/gmerlin/DETAILS
@@ -1,8 +1,8 @@
SPELL=gmerlin
- VERSION=1.0.0
+ VERSION=1.2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:fded30559f6d1849f5517544fdd32815f813990f44d6e4479cc4d2a34c429158dcf115b75aaad8c883420a394bf3d866d3a408c0f61629ab9d172c11e6e61719
+
SOURCE_HASH=sha512:9c7e5377f6fc29d201d1cad8adfc20e184a39b66028640460e9b021b6baee7a7146bd1a1e8a91dca2879d7c979c9b1cdaf9e07e421af090848d3bedcd58e090d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gmerlin.sourceforge.net
LICENSE[0]=GPL
diff --git a/video-libs/gmerlin/HISTORY b/video-libs/gmerlin/HISTORY
index 0a51df9..65cb487 100644
--- a/video-libs/gmerlin/HISTORY
+++ b/video-libs/gmerlin/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.0
+
2011-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 7ecf983..5633339 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -14,7 +14,7 @@ else
if [[ $WINE_BRANCH == devel ]]; then
VERSION=1.5.6
else
- VERSION=1.4
+ VERSION=1.4.1
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 1de182d..2db2457 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-06-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.1
+
2012-06-08 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.5.6




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (f7d453a67e2a7b833cef639eedb0c17bf4c61637), Treeve Jelbert, 06/23/2012

Archive powered by MHonArc 2.6.24.

Top of Page