Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (d00984d61fe8f5beab0b9f014646a429301a7b19)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (d00984d61fe8f5beab0b9f014646a429301a7b19)
  • Date: Mon, 15 Aug 2011 01:42:14 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 12
VERSION | 2
audio-libs/libogg/DETAILS | 4
audio-libs/libogg/HISTORY | 3
chat-im/gajim/DEPENDS | 1
chat-im/gajim/HISTORY | 3
crypto/gnutls/DEPENDS | 7
crypto/gnutls/DETAILS | 4
crypto/gnutls/HISTORY | 4
crypto/nss/DETAILS | 4
crypto/nss/HISTORY | 3
crypto/opensc/DETAILS | 4
crypto/opensc/HISTORY | 3
crypto/p11-kit/DETAILS | 21
crypto/p11-kit/HISTORY | 2
crypto/polarssl/BUILD | 1
crypto/polarssl/DETAILS | 13
crypto/polarssl/HISTORY | 2
crypto/polarssl/PRE_BUILD | 6
dev/null |binary
devel/diffutils/DETAILS | 4
devel/diffutils/HISTORY | 3
disk/gdisk/DEPENDS | 3
disk/gdisk/DETAILS | 11
disk/gdisk/HISTORY | 4
disk/lvm/DETAILS | 4
disk/lvm/HISTORY | 3
editors/jedit/DETAILS | 4
editors/jedit/HISTORY | 5
editors/jedit/build.properties_4.3.2.patch | 8
editors/jedit/build.properties_4.4.1.patch | 8
fonts-x11/terminus-font/DETAILS | 4
fonts-x11/terminus-font/HISTORY | 3
ftp/wget/DEPENDS | 2
ftp/wget/DETAILS | 2
ftp/wget/HISTORY | 8
ftp/wget/PRE_BUILD | 3
ftp/wget/wget-1.12-CVE-2010-2252.patch | 155 --
ftp/wget/wget.gpg |binary
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 6
graphics/ufraw/DEPENDS | 8
graphics/ufraw/DETAILS | 4
graphics/ufraw/HISTORY | 4
http/apache22/DEPENDS | 6
http/apache22/HISTORY | 3
http/firefox/BUILD | 19
http/firefox/CONFIGURE | 10
http/firefox/DEPENDS | 18
http/firefox/DETAILS | 5
http/firefox/HISTORY | 22
http/firefox/INSTALL | 8
http/firefox/PRE_BUILD | 41
http/firefox/curl.patch | 84 +
http/firefox/firefox-xulrunner.patch | 14
http/firefox/glyph.patch | 15
http/firefox/mozconfig3 | 28
http/firefox/mozconfig4 | 28
http/firefox/mozconfig5 | 28
http/links-twibright/DETAILS | 4
http/links-twibright/HISTORY | 3
http/nginx/BUILD | 16
http/nginx/CONFIGURE | 13
http/nginx/DEPENDS | 2
http/nginx/DETAILS | 35
http/nginx/HISTORY | 17
http/nginx/PREPARE | 6
http/nginx/PRE_BUILD | 12
http/nginx/syslog-0.6.patch | 277 ----
http/nginx/syslog-0.8-1.0.config | 5
http/nginx/syslog-0.8-1.0.patch | 686
++++++++++
kde4-support/soprano/DETAILS | 4
kde4-support/soprano/HISTORY | 3
kde4/kdelibs4/DEPENDS | 2
kde4/kdelibs4/HISTORY | 3
kernels/linux/HISTORY | 15
kernels/linux/PREPARE | 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.32.44 | 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.33.17 | 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4 | 6
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1 | 6
kernels/linux/latest.defaults | 4
kernels/linux/volatiles | 1
libs/apr-util/HISTORY | 3
libs/apr-util/PRE_SUB_DEPENDS | 5
libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS | 5
libs/apr-util/SUB_DEPENDS | 6
libs/icu/DETAILS | 8
libs/icu/HISTORY | 3
libs/libdrm/DEPENDS | 1
libs/libdrm/HISTORY | 3
libs/libofx/BUILD | 2
libs/libofx/DEPENDS | 6
libs/libofx/DETAILS | 4
libs/libofx/HISTORY | 7
libs/libofx/PRE_BUILD | 2
libs/libofx/gcc43.patch | 157 --
libs/libvirt/DETAILS | 2
libs/libvirt/HISTORY | 3
libs/libvirt/libvirt-0.9.1.tar.gz.sig | 0
libs/libvirt/libvirt-0.9.4.tar.gz.sig |binary
libs/nspr/DETAILS | 4
libs/nspr/HISTORY | 3
mail/pflogsumm/BUILD | 1
mail/pflogsumm/DEPENDS | 5
mail/pflogsumm/DETAILS | 16
mail/pflogsumm/HISTORY | 3
mail/pflogsumm/INSTALL | 3
mail/pflogsumm/PRE_BUILD | 6
mail/pflogsumm/pflogsumm-1.1.1_metalog.patch | 16
mail/thunderbird/BUILD | 3
mail/thunderbird/DETAILS | 2
mail/thunderbird/HISTORY | 6
mail/thunderbird/INSTALL | 3
mail/thunderbird/PRE_BUILD | 2
net/ethtool/DETAILS | 4
net/ethtool/HISTORY | 3
net/socat/DETAILS | 11
net/socat/HISTORY | 3
perl-cpan/net-ssleay/BUILD | 2
perl-cpan/net-ssleay/HISTORY | 3
php-pear/php/CONFIGURE | 8
php-pear/php/DEPENDS | 17
php-pear/php/HISTORY | 4
printer/ghostscript/DEPENDS | 2
printer/ghostscript/DETAILS | 4
printer/ghostscript/HISTORY | 6
python-pypi/pyasn1/DETAILS | 8
python-pypi/pyasn1/HISTORY | 5
python-pypi/rsa/DEPENDS | 3
python-pypi/rsa/DETAILS | 4
python-pypi/rsa/HISTORY | 4
python-pypi/werkzeug/DETAILS | 4
python-pypi/werkzeug/HISTORY | 3
science-libs/vrui/BUILD | 1
science-libs/vrui/DETAILS | 29
science-libs/vrui/HISTORY | 2
science-libs/vrui/PREPARE | 1
science-libs/vrui/PRE_BUILD | 4
shell-term-fm/mc/CONFIGURE | 4
shell-term-fm/mc/DEPENDS | 6
shell-term-fm/mc/HISTORY | 3
smgl/basesystem/DEPENDS | 2
smgl/basesystem/HISTORY | 3
utils/bluez/CONFIGURE | 2
utils/bluez/DETAILS | 2
utils/bluez/HISTORY | 4
utils/pcmciautils/DETAILS | 2
utils/pcmciautils/HISTORY | 3
utils/qemu/BUILD | 37
utils/qemu/CONFIGURE | 10
utils/qemu/DEPENDS | 64
utils/qemu/DETAILS | 28
utils/qemu/HISTORY | 9
utils/qemu/PREPARE | 4
utils/qemu/qemu-0.11.1.tar.gz.sig | 0
utils/qemu/qemu-0.12.5.tar.gz.sig | 0
utils/quvi/DETAILS | 4
utils/quvi/HISTORY | 3
utils/sysklogd/DETAILS | 6
utils/sysklogd/HISTORY | 7
utils/sysklogd/PRE_BUILD | 7
utils/sysklogd/sysklogd-1.4.1-kernel_header.patch | 100 -
utils/usbutils/DETAILS | 11
utils/usbutils/HISTORY | 3
video-libs/libass/DETAILS | 4
video-libs/libass/HISTORY | 3
video/ffmpeg/DETAILS | 4
video/ffmpeg/HISTORY | 3
video/guvcview/DETAILS | 4
video/guvcview/HISTORY | 3
video/minitube/DETAILS | 4
video/minitube/HISTORY | 3
windowmanagers/openbox/DEPENDS | 12
windowmanagers/openbox/DETAILS | 4
windowmanagers/openbox/HISTORY | 5
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
xfce/thunar/DETAILS | 4
xfce/thunar/HISTORY | 3
180 files changed, 1548 insertions(+), 1088 deletions(-)

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

links-twibright 2.3

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

guvcview: => 1.5.0

commit edfc6fddf106d0d21103e67cac26c43a9ecb4b7e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

soprano: updated spell to 2.7.0

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

terminus-font: => 4.36

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

usbutils 004

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

icu: => 4.8.1

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

lvm 2.02.87

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

net-ssleay: made build non-interactive

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

libofx: => 0.9.4

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

mc: added option to select low-level search engine

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

kdelibs4: fixed minor typo in DEPENDS (removeble -> removable)

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

bluez: fixed minor typo in CONFIGURE (progams -> programs)

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

ufraw: updated version to 0.18, cleaned up unknown flags for exiv2 and
lensfun dependencies

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

bluez: updated version to 4.95

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

imagemagick: Updated toversion 6.7.1-4

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

crypto/polarssl: new spell, embedded SSL/TLS cryptographic library

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

diffutils 3.1

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

wget: --with-ssl -> --with-ssl=openssl

Seems gnutls is default now, wget spell needs update.
With next version update.

$ wget --version
+digest +https -ipv6 +iri +large-file +nls -ntlm +opie +ssl/openssl

$ wget --version
+digest +https -ipv6 +iri +large-file +nls -ntlm +opie +ssl/gnutls

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

gdisk: => 0.7.2

commit 0bae33b50c74013c42378ba4e768f697557a4f5e
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

openbox: Updated to 3.5.0 and added new dependencies

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

openbox: Added subdependency X for pango

commit 14a31e65534d607ada21d7a331b0c36aec4abe8a
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

libdrm: Added libpciaccess to DEPENDS

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

ghostscript: fixed broken printing -- added missing cups flag (don't just
bump versions, but test basic functionality)

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

nginx: => 1.0.5 (stable), 0.8.54 (legacy), 0.7.69 (old), 1.1.0 (devel)

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

nspr: updated version to 4.8.9

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

pflogsumm: new spell, logfile analyzer utility for Postfix mailer

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

ghostscript: => 9.04

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

sysklogd: updated version to 1.5.0, PATCHLEVEL=0
removed obsolete 1.4.1 patch
compilation uses sorcery configured CFLAGS and LDFLAGS

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

qemu: => 0.15.0

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

ffmpeg: => 0.7.3

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

nss: updated version to 3.12.11 (fix compilation issue with kernel >
2.6)

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

php: corrected apache configure flags and int gd deps

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

apache22: improved dependency check

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

apr-util: added LDAP subdependency

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

libogg 1.3.0

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

jedit: updated version to 4.4.1

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

basesystem: fixed dependency on module-init-tools for kernel 3.x

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

wget 1.13

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

socat: => 1.7.1.3 (security)

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

opensc 0.12.2

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

linux 2.6.32.44

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

linux 2.6.33.17

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

gnutls 2.12.8

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

crypto/p11-kit: new spell, load and enumerate PKCS#11 modules

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

libvirt 0.9.4

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

ethtool 3.0

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

science-libs: new spell, Virtual Reality User Interface Library

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

rsa: => 3.0

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

pyasn1: => 0.0.13

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

quvi 0.2.19

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

linux: removed extra volatiles

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

linux: version sort OK

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

thunderbird: Updated to version 5.0. Various fixes need for
this specific build.

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

pcmciautils 018

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

libass 0.9.13

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

firefox: Added a few missing options

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

VERSION: 0.60-test

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

gajim: added libxscrnsaver suggest dep

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

imagemagick: Updated to version 6.7.1-2

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

werkzeug: => 0.7.1

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

thunar: => 1.2.2

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

firefox: Few cleanups including patch to remove extra glyph in
title bar.

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

firefox: Major spell update to get 5.0.1 to build. Works for me. :)

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

video/minitube: version 1.5

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

wine: Updated devel to 1.3.26

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

linux 2.6.39.4

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

linux 3.0.1

diff --git a/ChangeLog b/ChangeLog
index 42d6f97..861ea13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-08-12 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/polarssl: new spell, embedded SSL/TLS cryptographic library
+
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * mail/pflogsumm: new spell, logfile analyzer utility for Postfix
mailer
+
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/p11-kit: new spell, way to load and enumerate PKCS#11 modules
+
+2011-08-08 Ladislav Hagara <hgr AT vabo.cz>
+ * science-libs/vrui: new spell, Virtual Reality User Interface Library
+
2011-08-04 Ladislav Hagara <hgr AT vabo.cz>
* libs/libfreenect: new spell, drivers and libraries for the Xbox
Kinect

diff --git a/VERSION b/VERSION
index c19ae48..1d8f979 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.59-test
+0.60-test
diff --git a/audio-libs/libogg/DETAILS b/audio-libs/libogg/DETAILS
index b6d8779..e55db09 100755
--- a/audio-libs/libogg/DETAILS
+++ b/audio-libs/libogg/DETAILS
@@ -1,6 +1,6 @@
SPELL=libogg
- VERSION=1.2.2
-
SOURCE_HASH=sha512:3a342efd05dd0a8c55a149c9de5d8e6327d1e9bc822ab0ccefae05737ddb9a5027bec56487f7fcab935c218c6fb185c6c7c07d15d69f6b098d4d7e43e95085bb
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:4861d7f61a6e7be289676f642a20c547e883fc6a14609387b0e1662b9b1b7ead76aa697e0542bbc85fd61bce28d0b2182fd35926d858afee976f8f27f752bf8e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.xiph.org/releases/ogg/$SOURCE
diff --git a/audio-libs/libogg/HISTORY b/audio-libs/libogg/HISTORY
index 35872fc..1c9f727 100644
--- a/audio-libs/libogg/HISTORY
+++ b/audio-libs/libogg/HISTORY
@@ -1,3 +1,6 @@
+2011-08-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.0
+
2010-12-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.2

diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index b02cb7c..e5df6c4 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -9,4 +9,5 @@ suggest_depends farsight2 "" "" "for ability to start audio
and video chat" &&
suggest_depends pyopenssl "" "" "for secure connections support" &&
suggest_depends dbus-python "" "" "to control Gajim via commandline" &&
suggest_depends pycrypto "" "" "for encrypting chat messages" &&
+suggest_depends libxscrnsaver "" "" "for automatic status support" &&
suggest_depends gtkspell "" "" "for spell checking support"
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 95936fc..090dac1 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added libxscrnsaver suggest dep
+
2011-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.14.4

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index 119197f..cc90c3e 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -24,4 +24,9 @@ optional_depends "libcfg+" \
optional_depends "guile" \
"--enable-guile" \
"--disable-guile" \
- "for GNU Guile bindings"
+ "for GNU Guile bindings" &&
+
+optional_depends "p11-kit" \
+ "--with-p11-kit" \
+ "--without-p11-kit" \
+ "for PKCS#11 support"
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 8b40c4d..6812702 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -70,9 +70,9 @@ case $GNUTLS_BRANCH in

SOURCE_HASH=sha512:2856827ebf9e85592d373d1b0031257da6a3ce9256a51fa0d1a1661c6778f913b51ba1a51c919ef14b3f1737c7babc37bc0eb13524be981c8059bebe94e2ece3
;;
2.12)
- VERSION=2.12.7
+ VERSION=2.12.8
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:727abef7b38704315dff89d39a7ab91f55ff7615a5958d6b988a03ec6e3701fd4537c8792ada45ae2afb290b23d8dbb009090dab1ae15da27d3b19aefbbf515c
+
SOURCE_HASH=sha512:f793dded6adbcd1e52c32662d9615e9ad86262126b32a96367909236dbbb6107437f3c01bf6e06f57d07d7438ac5d75e8ea6677152eea18c03db05dcb275716b
;;
esac

diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index f0f5398..47c65f2 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.12.8
+ * DEPENDS: optional_depends p11-kit added
+
2011-06-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.12.7

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 18bb66d..921417f 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -13,12 +13,12 @@ case $NSS_BRANCH in
PATCHLEVEL=1
;;
3.12)
- VERSION=3.12.10
+ VERSION=3.12.11
SECURITY_PATCH=1
# FFVERSION=3.6.2
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:ce6fe98e18ca3a2401e9a56b878a6b65439a113a9bd3222a3f144e6d795907b1974d4ac7e4ffdc8d437a931acba056bc26c2ceebf3bff468b47b180635d107c6
+
SOURCE_HASH=sha512:3ed1134c972cee9ac23a77adc4c38eeb0597d0734b13b561ec74480560eb77b259ebc9708e4ecd8cc1565bfb6ae9e471c7131dd26ca48e6b427284c3c005ec6a
# SOURCE=firefox-$FFVERSION.source.tar.bz2
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index e7af691..45e031e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.12.11
+
2011-05-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.12.10

diff --git a/crypto/opensc/DETAILS b/crypto/opensc/DETAILS
index 7429089..99a077b 100755
--- a/crypto/opensc/DETAILS
+++ b/crypto/opensc/DETAILS
@@ -1,11 +1,11 @@
SPELL=opensc
- VERSION=0.12.0
+ VERSION=0.12.2
SECURITY_PATCH=3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.opensc-project.org/files/opensc/${SOURCE}

-
SOURCE_HASH=sha512:78785b9fa77d7b8a40099757fad13faeba85d56ec9cd545466b769345278b89c90fe741bcd884022ca726ceb84ba917f48c32335a55d9d0dede0bb05823729e7
+
SOURCE_HASH=sha512:544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

WEB_SITE=http://www.opensc-project.org
diff --git a/crypto/opensc/HISTORY b/crypto/opensc/HISTORY
index 0f3680a..94931b4 100644
--- a/crypto/opensc/HISTORY
+++ b/crypto/opensc/HISTORY
@@ -1,3 +1,6 @@
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.12.2
+
2011-02-25 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.12.0
SECURITY_PATCH++ CVE-2010-4523
diff --git a/crypto/p11-kit/DETAILS b/crypto/p11-kit/DETAILS
new file mode 100755
index 0000000..9cec721
--- /dev/null
+++ b/crypto/p11-kit/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=p11-kit
+ VERSION=0.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:0a8f178e1ab3661219d1d760d7a5815de4f3e9328bdd9819123d90b7703b0a660bbce412b7e0de08ada4c58e628654250338af1da180939eb7e0fda70da927fe
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://p11-glue.freedesktop.org/releases/$SOURCE
+# SOURCE2=$SOURCE.sig
+# SOURCE2_URL[0]=$SOURCE_URL.sig
+# SOURCE_GPG=gnu.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
+ WEB_SITE=http://p11-glue.freedesktop.org/p11-kit.html
+ ENTERED=20110809
+ LICENSE[0]=BSD
+ SHORT="provides a way to load and enumerate PKCS#11 modules"
+cat << EOF
+p11-kit provides a way to load and enumerate PKCS#11 modules.
+Provides a standard configuration setup for installing PKCS#11 modules
+in such a way that they're discoverable.
+
+Also solves problems with coordinating the use of PKCS#11 by different
+components or libraries living in the same process.
+EOF
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
new file mode 100644
index 0000000..45ce93a
--- /dev/null
+++ b/crypto/p11-kit/HISTORY
@@ -0,0 +1,2 @@
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: spell created, version 0.3
diff --git a/crypto/polarssl/BUILD b/crypto/polarssl/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/crypto/polarssl/BUILD
@@ -0,0 +1 @@
+make
diff --git a/crypto/polarssl/DETAILS b/crypto/polarssl/DETAILS
new file mode 100755
index 0000000..afdc0b8
--- /dev/null
+++ b/crypto/polarssl/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=polarssl
+ VERSION=1.0.0
+ SOURCE=$SPELL-$VERSION-gpl.tgz
+ SOURCE_URL[0]=http://polarssl.org/code/releases/$SOURCE
+
SOURCE_HASH=sha512:565665db485811f0978f31d1f7b0d4aeddbfb65afc486348b99d37e62b54abb670fadf5953af67af8b8547cd8bc708a63bdef9a24051bd8426c8b83211dd68da
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://polarssl.org/
+ LICENSE[0]=GPL
+ ENTERED=20110812
+ SHORT="open source embedded SSL/TLS cryptographic library"
+cat << EOF
+Open Source embedded SSL/TLS cryptographic library.
+EOF
diff --git a/crypto/polarssl/HISTORY b/crypto/polarssl/HISTORY
new file mode 100644
index 0000000..19558a1
--- /dev/null
+++ b/crypto/polarssl/HISTORY
@@ -0,0 +1,2 @@
+2011-08-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, PRE_BUILD, BUILD: spell created, version 1.0.0
diff --git a/crypto/polarssl/PRE_BUILD b/crypto/polarssl/PRE_BUILD
new file mode 100755
index 0000000..d16f366
--- /dev/null
+++ b/crypto/polarssl/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:DESTDIR=/usr/local:DESTDIR=$INSTALL_ROOT/usr:" Makefile &&
+sed -i "s:# CFLAGS += -fPIC:CFLAGS += -fPIC:" library/Makefile &&
+sed -i "s/all: static/all: static shared/" library/Makefile
diff --git a/devel/diffutils/DETAILS b/devel/diffutils/DETAILS
index 2466ee0..9f5fe2c 100755
--- a/devel/diffutils/DETAILS
+++ b/devel/diffutils/DETAILS
@@ -1,11 +1,11 @@
SPELL=diffutils
- VERSION=3.0
+ VERSION=3.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
- SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=gnu-verified.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/diffutils/
ENTERED=20010922
diff --git a/devel/diffutils/HISTORY b/devel/diffutils/HISTORY
index 20d092c..7691c33 100644
--- a/devel/diffutils/HISTORY
+++ b/devel/diffutils/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1, gnu.gpg -> gnu-verified.gpg, signed by 000BEEEE
+
2011-04-10 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added gettext optional dependency

diff --git a/disk/gdisk/DEPENDS b/disk/gdisk/DEPENDS
index f148724..f8b933f 100755
--- a/disk/gdisk/DEPENDS
+++ b/disk/gdisk/DEPENDS
@@ -1 +1,2 @@
-depends -sub CXX gcc
+depends -sub CXX gcc &&
+depends popt
diff --git a/disk/gdisk/DETAILS b/disk/gdisk/DETAILS
index d7ab3e1..ca834b3 100755
--- a/disk/gdisk/DETAILS
+++ b/disk/gdisk/DETAILS
@@ -1,9 +1,10 @@
SPELL=gdisk
- VERSION=0.6.14
- SOURCE=$SPELL-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.rodsbooks.com/gdisk/$SOURCE
-
SOURCE_HASH=sha512:2c4b83d6aadd355e7791ba6d6f1ec458ce9e550ad63422834eb164dcd020b18936ecbd9d8b3e7e1cce225dacd2ac630cc6b0986594212a54df400d359dcf5158
+ SPELLX=gptfdisk
+ VERSION=0.7.2
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
+
SOURCE_HASH=sha512:88c7a6c5c329b034e1def9944635435fe39dcf2d64524bcbabd2f85a2f94508792581e7b9706507ce61a4cc8cc063531ea3e3f1dad0991218364934fc45528c7
WEB_SITE=http://www.rodsbooks.com/gdisk/
ENTERED=20091207
LICENSE[0]=GPL
diff --git a/disk/gdisk/HISTORY b/disk/gdisk/HISTORY
index 6b7ca74..0c814f2 100644
--- a/disk/gdisk/HISTORY
+++ b/disk/gdisk/HISTORY
@@ -1,3 +1,7 @@
+2011-08-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.2; renewed urls
+ * DEPENDS: added missing popt dependency (needed for sgdisk)
+
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/disk/lvm/DETAILS b/disk/lvm/DETAILS
index c3a59cc..35b707f 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
SPELL=lvm
- VERSION=2.02.86
+ VERSION=2.02.87
SOURCE=LVM2.$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-
SOURCE_HASH=sha512:53d5b378623c206c52250c80c6caf6275d1b280360a6fe1554536560f4a536d6b7cb577845caadf24f4820592d092f2bb4d91b432c25cd716cce02b2dc294ba2
+
SOURCE_HASH=sha512:dd41d834550a18ed9cd8e62fa4ade76937e6e6d6572fe7b9fd7eaac7369f24100bb4b86f562c6b018f246f2d54a839ceb3d8532d4706e48d15cdd0956e001250
WEB_SITE=http://sources.redhat.com/lvm2/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 7993b7d..c0df616 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2011-08-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.02.87
+
2011-07-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.86

diff --git a/editors/jedit/DETAILS b/editors/jedit/DETAILS
index 9b7a01c..d0c2d34 100755
--- a/editors/jedit/DETAILS
+++ b/editors/jedit/DETAILS
@@ -1,11 +1,11 @@
SPELL=jedit
- VERSION=4.3.2
+ VERSION=4.4.1
SOURCE=jedit${VERSION}source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/jEdit
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
WEB_SITE=http://www.jedit.org
ENTERED=20040608
-
SOURCE_HASH=sha512:471fa64ec0e60a39b3e63af8d790e088960d4b81d5eb07cb7f0bbf7a2db31c3d4956024d1f7491eafcc08215e04a13fb92c20b13f5ee9025e7acc2301fabf192
+
SOURCE_HASH=sha512:7d1587c6868b9c584f58a2a61f496f7aa260e727e8a65dc3522749011336de11e87bdc35e7c2b9ad25023d570a2e272ea97615126b7aa3bde3ba531f9deaf70c
LICENSE[0]=GPL
KEYWORDS="editors"
SHORT="jEdit is a mature and well-designed programmer's text
editor that has been in development for over 5 years."
diff --git a/editors/jedit/HISTORY b/editors/jedit/HISTORY
index 6e5bfae..5a5be26 100644
--- a/editors/jedit/HISTORY
+++ b/editors/jedit/HISTORY
@@ -1,3 +1,8 @@
+2011-08-10 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.4.1
+ * build.properties_4.3.2.patch: removed
+ * build.properties_4.4.1.patch: added from former .patch
+
2010-12-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.3.2, updated SOURCE_URL
* build.properties_4.3.patch: removed
diff --git a/editors/jedit/build.properties_4.3.2.patch
b/editors/jedit/build.properties_4.3.2.patch
deleted file mode 100644
index d92dfd9..0000000
--- a/editors/jedit/build.properties_4.3.2.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urNp jEdit.orig/build.properties jEdit/build.properties
---- jEdit.orig/build.properties 1970-01-01 01:00:00.000000000 +0100
-+++ jEdit/build.properties 2006-08-08 21:07:34.000000000 +0200
-@@ -0,0 +1,4 @@
-+xsltproc.executable=xsltproc
-+docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.76
-+docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
-+fop.dir=/usr/share/fop-0.20.5
diff --git a/editors/jedit/build.properties_4.4.1.patch
b/editors/jedit/build.properties_4.4.1.patch
new file mode 100644
index 0000000..d92dfd9
--- /dev/null
+++ b/editors/jedit/build.properties_4.4.1.patch
@@ -0,0 +1,8 @@
+diff -urNp jEdit.orig/build.properties jEdit/build.properties
+--- jEdit.orig/build.properties 1970-01-01 01:00:00.000000000 +0100
++++ jEdit/build.properties 2006-08-08 21:07:34.000000000 +0200
+@@ -0,0 +1,4 @@
++xsltproc.executable=xsltproc
++docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.76
++docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
++fop.dir=/usr/share/fop-0.20.5
diff --git a/fonts-x11/terminus-font/DETAILS b/fonts-x11/terminus-font/DETAILS
index 68e5a20..c797949 100755
--- a/fonts-x11/terminus-font/DETAILS
+++ b/fonts-x11/terminus-font/DETAILS
@@ -1,9 +1,9 @@
SPELL=terminus-font
- VERSION=4.35
+ VERSION=4.36
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:f38014c31c37f617d3df7f828348a67054f8630976a5a210f8807b958705544ddb5f91a391320537c37f419508462dbda1c3d682c3ceff0ff67ece5f7b9e9cd8
+
SOURCE_HASH=sha512:c42b8aac1cb7ba8d2259a1d1c37fccc885b91818129802917c01697397f3cb9ee6ce5510a42892ab531597d339e65462292ea72d7927598271fc24c31ef7a033
WEB_SITE=http://terminus-font.sourceforge.net/
ENTERED=20050720
LICENSE[0]=GPL
diff --git a/fonts-x11/terminus-font/HISTORY b/fonts-x11/terminus-font/HISTORY
index 892702e..99cdba8 100644
--- a/fonts-x11/terminus-font/HISTORY
+++ b/fonts-x11/terminus-font/HISTORY
@@ -1,3 +1,6 @@
+2011-08-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.36
+
2011-05-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.35

diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index 076d02f..88eeb81 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -17,7 +17,7 @@ optional_depends "texinfo" \
"to build info files" &&

optional_depends "openssl" \
- "--with-ssl" \
+ "--with-ssl=openssl" \
"--without-ssl" \
"for https and ftps" &&

diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index c075962..81d1ea6 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,5 +1,5 @@
SPELL=wget
- VERSION=1.12
+ VERSION=1.13
SECURITY_PATCH=1
PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 9f4fa46..ce1e8c1 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,11 @@
+2011-08-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: --with-ssl -> --with-ssl=openssl
+
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.13
+ * wget.gpg: added key C03363F4
+ * PRE_BUILD, wget-1.12-CVE-2010-2252.patch: removed
+
2011-04-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added libidn optional dependency

diff --git a/ftp/wget/PRE_BUILD b/ftp/wget/PRE_BUILD
deleted file mode 100755
index b337b86..0000000
--- a/ftp/wget/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/wget-1.12-CVE-2010-2252.patch
diff --git a/ftp/wget/wget-1.12-CVE-2010-2252.patch
b/ftp/wget/wget-1.12-CVE-2010-2252.patch
deleted file mode 100644
index d1d797a..0000000
--- a/ftp/wget/wget-1.12-CVE-2010-2252.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/doc/wget.texi wget/doc/wget.texi
---- wget~/doc/wget.texi 2010-09-05 15:32:44.000000000 +0200
-+++ wget/doc/wget.texi 2010-09-05 15:32:44.000000000 +0200
-@@ -1487,6 +1487,13 @@
- @code{Content-Disposition} headers to describe what the name of a
- downloaded file should be.
-
-+@cindex Trust server names
-+@item --trust-server-names
-+
-+If this is set to on, on a redirect the last component of the
-+redirection URL will be used as the local file name. By default it is
-+used the last component in the original URL.
-+
- @cindex authentication
- @item --auth-no-challenge
-
-@@ -2797,6 +2804,10 @@
- Turn on recognition of the (non-standard) @samp{Content-Disposition}
- HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
-
-+@item trust_server_names = on/off
-+If set to on, use the last component of a redirection URL for the local
-+file name.
-+
- @item continue = on/off
- If set to on, force continuation of preexistent partially retrieved
- files. See @samp{-c} before setting it.
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/http.c wget/src/http.c
---- wget~/src/http.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/http.c 2010-09-05 15:32:44.000000000 +0200
-@@ -2410,8 +2410,9 @@
- /* The genuine HTTP loop! This is the part where the retrieval is
- retried, and retried, and retried, and... */
- uerr_t
--http_loop (struct url *u, char **newloc, char **local_file, const char
*referer,
-- int *dt, struct url *proxy, struct iri *iri)
-+http_loop (struct url *u, struct url *original_url, char **newloc,
-+ char **local_file, const char *referer, int *dt, struct url
*proxy,
-+ struct iri *iri)
- {
- int count;
- bool got_head = false; /* used for time-stamping and filename
detection */
-@@ -2457,7 +2458,8 @@
- }
- else if (!opt.content_disposition)
- {
-- hstat.local_file = url_file_name (u);
-+ hstat.local_file =
-+ url_file_name (opt.trustservernames ? u : original_url);
- got_name = true;
- }
-
-@@ -2497,7 +2499,7 @@
-
- /* Send preliminary HEAD request if -N is given and we have an existing
- * destination file. */
-- file_name = url_file_name (u);
-+ file_name = url_file_name (opt.trustservernames ? u : original_url);
- if (opt.timestamping
- && !opt.content_disposition
- && file_exists_p (file_name))
-@@ -2852,9 +2854,9 @@
-
- /* Remember that we downloaded the file for later ".orig" code. */
- if (*dt & ADDED_HTML_EXTENSION)
-- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
- else
-- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-
- ret = RETROK;
- goto exit;
-@@ -2885,9 +2887,9 @@
-
- /* Remember that we downloaded the file for later ".orig"
code. */
- if (*dt & ADDED_HTML_EXTENSION)
-- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
- else
-- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_NORMALLY,
hstat.local_file);
-
- ret = RETROK;
- goto exit;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/http.h wget/src/http.h
---- wget~/src/http.h 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/http.h 2010-09-05 15:32:44.000000000 +0200
-@@ -33,8 +33,8 @@
-
- struct url;
-
--uerr_t http_loop (struct url *, char **, char **, const char *, int *,
-- struct url *, struct iri *);
-+uerr_t http_loop (struct url *, struct url *, char **, char **, const char
*,
-+ int *, struct url *, struct iri *);
- void save_cookies (void);
- void http_cleanup (void);
- time_t http_atotm (const char *);
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/init.c wget/src/init.c
---- wget~/src/init.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/init.c 2010-09-05 15:32:44.000000000 +0200
-@@ -243,6 +243,7 @@
- { "timeout", NULL, cmd_spec_timeout },
- { "timestamping", &opt.timestamping, cmd_boolean },
- { "tries", &opt.ntry, cmd_number_inf },
-+ { "trustservernames", &opt.trustservernames, cmd_boolean },
- { "useproxy", &opt.use_proxy, cmd_boolean },
- { "user", &opt.user, cmd_string },
- { "useragent", NULL, cmd_spec_useragent },
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/main.c wget/src/main.c
---- wget~/src/main.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/main.c 2010-09-05 15:32:44.000000000 +0200
-@@ -266,6 +266,7 @@
- { "timeout", 'T', OPT_VALUE, "timeout", -1 },
- { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
- { "tries", 't', OPT_VALUE, "tries", -1 },
-+ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
- { "user", 0, OPT_VALUE, "user", -1 },
- { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
- { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
-@@ -675,6 +676,8 @@
- N_("\
- -I, --include-directories=LIST list of allowed directories.\n"),
- N_("\
-+ --trust-server-names use the name specified by the redirection url last
component.\n"),
-+ N_("\
- -X, --exclude-directories=LIST list of excluded directories.\n"),
- N_("\
- -np, --no-parent don't ascend to the parent
directory.\n"),
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/options.h wget/src/options.h
---- wget~/src/options.h 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/options.h 2010-09-05 15:32:44.000000000 +0200
-@@ -242,6 +242,7 @@
- char *encoding_remote;
- char *locale;
-
-+ bool trustservernames;
- #ifdef __VMS
- int ftp_stmlf; /* Force Stream_LF format for binary FTP. */
- #endif /* def __VMS */
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/retr.c wget/src/retr.c
---- wget~/src/retr.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/retr.c 2010-09-05 15:32:44.000000000 +0200
-@@ -689,7 +689,8 @@
- #endif
- || (proxy_url && proxy_url->scheme == SCHEME_HTTP))
- {
-- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url,
iri);
-+ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl,
dt,
-+ proxy_url, iri);
- }
- else if (u->scheme == SCHEME_FTP)
- {
diff --git a/ftp/wget/wget.gpg b/ftp/wget/wget.gpg
index bbc8b99..9aad033 100644
Binary files a/ftp/wget/wget.gpg and b/ftp/wget/wget.gpg differ
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 9bd85de..02f67b9 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.7.1-0
+ VERSION=6.7.1-4
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
SOURCE_HASH=sha512:ae5c8340e77c6310ca472c941cb2277c80b28a1ec2c566de3bcb8fd53e62cff4ef74d86efbe6aaff161b6be4c43075a5e59fef1bb143a54e49275d0469f4c589
+
SOURCE_HASH=sha512:334c52c8705aafa25023c382fd4d0cd3e64bd0dbc11d7521f93447a03b2cb49cde1d5c595c44a9337308e32b6466e665ee2164571089dd78420c8219e96f95c2
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 9310b88..63cdd30 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,9 @@
+2011-08-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to verison 6.7.1-4
+
+2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.7.1-2
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed optional dependency on g++ to gcc with
sub-depends on CXX
diff --git a/graphics/ufraw/DEPENDS b/graphics/ufraw/DEPENDS
index 30992db..86ba339 100755
--- a/graphics/ufraw/DEPENDS
+++ b/graphics/ufraw/DEPENDS
@@ -28,12 +28,12 @@ optional_depends tiff \
"" \
"for tiff support" &&
optional_depends exiv2 \
- "--with-exiv2" \
- "--without-exiv2" \
+ "" \
+ "" \
"for exif support" &&
optional_depends lensfun \
- "--with-lensfun" \
- "--without-lensfun" \
+ "" \
+ "" \
"lensfun support" &&
optional_depends cfitsio \
"" \
diff --git a/graphics/ufraw/DETAILS b/graphics/ufraw/DETAILS
index 331b2ba..2baf495 100755
--- a/graphics/ufraw/DETAILS
+++ b/graphics/ufraw/DETAILS
@@ -11,10 +11,10 @@ if [[ "$UFRAW_CVS" == "y" ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs
else
- VERSION=0.17
+ VERSION=0.18
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c18204a6aaea647cb0d13572ec2f99b5f36eb76e7d7c4d696b5c6fbcb53b26ec9c5a1c6016ece81ae31fb709d24146a2a13ff02dda4e72476e3dc1500741503c
+
SOURCE_HASH=sha512:3f1279b2fc9fe1dd19670a9f4e84dcbc9766de5efcb070ced006e6b7ad4956d7bc51cec437a9c47f1bbfbe22eb348c67afb8d6e5772e07a135b0c7b4abf2d7e6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://ufraw.sourceforge.net/
diff --git a/graphics/ufraw/HISTORY b/graphics/ufraw/HISTORY
index 4bfa3c4..b89eee8 100644
--- a/graphics/ufraw/HISTORY
+++ b/graphics/ufraw/HISTORY
@@ -1,3 +1,7 @@
+2011-08-12 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.18
+ * DEPENDS: cleaned up unknown flags for exiv2 and lensfun
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index af158fc..46d5d82 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,8 +1,10 @@
-#depends apr "--with-apr=${INSTALL_ROOT}/usr" &&
-#depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
depends apr &&
depends apr-util &&

+if list_find "$OPTS" "ldap"; then
+ depends -sub LDAP apr-util
+fi &&
+
optional_depends openssl \
'--enable-ssl' \
'--disable-ssl' \
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 22a3116..09d50bb 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: force LDAP version of apr-util if any ldap module is
selected
+
2011-05-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.19; SECURITY_PATCH++ (CVE-2011-1928)
swapped source urls; modified short desc
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 498a968..e7cd074 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -4,13 +4,6 @@ FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
export MOZ_PHOENIX=1 &&

#
-# Only strip if the user wants us to
-#
-if echo $LDFLAGS | grep -q -- '-s'; then
- OPTS="$OPTS --enable-strip"
-fi &&
-
-#
# No fast optimization for Mozilla, bit us so many times...
#
CFLAGS="${CFLAGS//-Os/-O2}" &&
@@ -23,19 +16,7 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
#
CFLAGS="${CFLAGS//-ffast-math/}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
-
-if [[ "$FIREFOX_CVS" == "y" ]]; then
- autoconf-2.13 &&

-# workaround for configure not handling --disable-webm correctly
- if [[ $OPTS =~ --disable-webm ]]; then
- echo ac_add_options --disable-webm >> .mozconfig
- fi
-fi &&
-
-# necko-wifi is part of xulrunner if enabled, but firefox
-# compile fails without wireless_tools without this option
-echo ac_add_options --disable-necko-wifi >> .mozconfig &&
echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&

make_single &&
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index b3dce72..704b84d 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -1,4 +1,10 @@
-config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n
+config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n &&

config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you may
\
-be restricted in distributing these binaries IAW mozilla policies" n
+be restricted in distributing these binaries IAW mozilla policies" n &&
+
+config_query FIREFOX_SAFE "Enable safe browsing (anti-phishing)
implementation?" n &&
+
+config_query FIREFOX_STRIP \
+ 'Remove debugging symbols?' \
+ n
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index b38a77f..e860798 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,6 +1,6 @@
depends atk &&
depends curl &&
-depends -sub CXX gcc &&
+depends -sub CXX gcc &&
depends glib2 &&
depends JPEG &&
depends pango &&
@@ -10,22 +10,16 @@ depends zlib &&
depends cairo &&
depends python &&
depends libnotify &&
-if [[ "$FIREFOX_CVS" = "n" ]]; then
depends nspr &&
depends -sub "3.12.x" nss &&
-depends -sub APNG libpng &&
-depends xulrunner
-else
depends autoconf-2.13 &&
-depends libnotify &&
-optional_depends yasm \
- "--enable-webm" \
- "--disable-webm" \
- "enables the WebM video format"
-fi &&
-
depends gtk+2 &&
depends libidl &&

+optional_depends yasm "" "" "Support for WebM media (VP8 video and Vorbis
Audio)" &&
+optional_depends wireless_tools "" "" "for geolocation via WiFi access
points" &&
+optional_depends alsa-lib "" "" "for audio support" &&
+
+
suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index bfb88a3..c933eea 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,14 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=4.0.1
+ VERSION=5.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
-#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.15
+ VERSION=5.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 861acfc..53c87c2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,25 @@
+2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Added option for safe browsing
+ * DEPENDS: Added optional depends yasm removed depends yasm
+ * PRE_BUILD: Enable options for safe browsing and optioanl yasm
+
+2011-08-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel and stable to version 5.0.1
+ * CONFIGURE: Added option to strip debugging symbols
+ * DEPENDS: Added depends yasm for web video
+ Removed depends libpng, needs newer version
+ Removed depends xulrunner, won't build against
+ Added optional for wireless tools and alsa-lib
+ * INSTALL: Removed ln -s for xulrunnerplugins
+ * PRE_BUILD: Added curl patch and options to setup .mozconfig file
+ Added glyph.patch
+ * curl.patch: Added patch for curl-7.21.7
+ * mozconfig3: Removed old file
+ * mozconfig4: Removed old file
+ * mozconfig5: Updated and added new .mozconfig file
+ * firefox-xulrunner.patch: Removed un-needed patch
+ * glyph.patch: Fedora patch to removed char in title bar
+
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/http/firefox/INSTALL b/http/firefox/INSTALL
index 5364ea7..17466d9 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -42,10 +42,4 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
test -h $FIREFOX_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $FIREFOX_HOME/libnssckbi.so
fi
-fi &&
-
-
-ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
- "$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
-
-
+fi
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f2f9e2b..635e323 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,15 +3,44 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla* &&

-patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&
+#Fix compilation with curl-7.21.7
+# https://bug673072.bugzilla.mozilla.org/attachment.cgi?id=547353
+patch -p0 < $SPELL_DIRECTORY/curl.patch &&

-if [[ "$FIREFOX_CVS" == "n" ]]; then
- cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig
+#Fedora patch to remove glyph in title bar
+# http://osdir.com/ml/scm-fedora-commits/2011-06/msg10320.html
+patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
+
+cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+
+if [[ "$FIREFOX_SAFE" == "y" ]]; then
+ sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
else
- cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig
-fi
+ sed -i '27iac_add_options --disable-safe-browsing' .mozconfig
+fi &&
+
+if is_depends_enabled $SPELL wireless_tools; then
+ sed -i '27iac_add_options --enable-necko-wifi' .mozconfig
+else
+ sed -i '27iac_add_options --disable-necko-wifi' .mozconfig
+fi &&
+
+if is_depends_enabled $SPELL yasm; then
+ sed -i '27iac_add_options --enable-webm' .mozconfig
+else
+ sed -i '27iac_add_options --disable-webm' .mozconfig
+fi &&
+
+if ! is_depends_enabled $SPELL alsa-lib; then
+ sed -i '27iac_add_options --disable-ogg' .mozconfig &&
+ sed -i '27iac_add_options --disable-wave' .mozconfig
+fi &&
+
+if [[ "$FIREFOX_STRIP" == "y" ]]; then
+ sed -i '27iac_add_options --enable-strip' .mozconfig
+fi &&


if [[ $FIREFOX_OFFICIAL == y ]]; then
- sed -i '24iac_add_options --enable-official-branding' .mozconfig || return
1
+ sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
fi
diff --git a/http/firefox/curl.patch b/http/firefox/curl.patch
new file mode 100644
index 0000000..66b90cc
--- /dev/null
+++ b/http/firefox/curl.patch
@@ -0,0 +1,84 @@
+diff -r 15b32ce27a28 config/system-headers
+--- config/system-headers Thu Jul 21 20:50:16 2011 +1200
++++ config/system-headers Thu Jul 21 21:28:49 2011 +1200
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff -r 15b32ce27a28 js/src/config/system-headers
+--- js/src/config/system-headers Thu Jul 21 20:50:16 2011 +1200
++++ js/src/config/system-headers Thu Jul 21 21:28:49 2011 +1200
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff -r 15b32ce27a28
toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+--- toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
Thu Jul 21 20:50:16 2011 +1200
++++ toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
Thu Jul 21 21:28:49 2011 +1200
+@@ -28,17 +28,16 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #include "common/linux/http_upload.h"
+
+ #include <assert.h>
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+
+ namespace {
+
+ // Callback to get the response data from server.
+ static size_t WriteCallback(void *ptr, size_t size,
+ size_t nmemb, void *userp) {
+ if (!userp)
+ return 0;
+diff -r 15b32ce27a28
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+---
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
Thu Jul 21 20:50:16 2011 +1200
++++
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
Thu Jul 21 21:28:49 2011 +1200
+@@ -24,17 +24,16 @@
+ // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+
+ #include <iostream>
+ #include <string>
+
+ #include "common/linux/libcurl_wrapper.h"
+
+ using std::string;
diff --git a/http/firefox/firefox-xulrunner.patch
b/http/firefox/firefox-xulrunner.patch
deleted file mode 100644
index e9cabf9..0000000
--- a/http/firefox/firefox-xulrunner.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig 2009-06-30 09:00:33.000000000 -0500
-+++ config/rules.mk 2009-06-30 09:00:57.000000000 -0500
-@@ -67,6 +67,11 @@
- SKIP_COPY_XULRUNNER=1
- endif
-
-+# Don't copy xulrunner files at install time, when using system xulrunner
-+ifdef LIBXUL_SDK
-+ SKIP_COPY_XULRUNNER=1
-+endif
-+
- # ELOG prints out failed command when building silently (gmake -s).
- ifneq (,$(findstring -s,$(MAKEFLAGS)))
- ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
diff --git a/http/firefox/glyph.patch b/http/firefox/glyph.patch
new file mode 100644
index 0000000..420205c
--- /dev/null
+++ b/http/firefox/glyph.patch
@@ -0,0 +1,15 @@
+diff -up browser/base/Makefile.in.fu browser/base/Makefile.in
+--- browser/base/Makefile.in.fu 2011-07-01 22:40:52.048773336 -0300
++++ browser/base/Makefile.in 2011-07-01 22:42:30.866213879 -0300
+@@ -62,10 +62,9 @@ EXTRA_JS_MODULES = \
+
+ include $(topsrcdir)/config/rules.mk
+
+-PRE_RELEASE_SUFFIX := ""
++PRE_RELEASE_SUFFIX :=
+
+ DEFINES += \
+- -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+ -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
+ -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
+ $(NULL)
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
deleted file mode 100644
index fa47e6e..0000000
--- a/http/firefox/mozconfig3
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# See http://www.mozilla.org/build/ for build instructions.
-#
-
-# Options for client.mk.
-mk_add_options MOZ_CO_PROJECT=browser
-
-# Options for 'configure' (same as command-line options).
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --with-system-png=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-pango
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --with-system-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
diff --git a/http/firefox/mozconfig4 b/http/firefox/mozconfig4
deleted file mode 100644
index 5fd53fb..0000000
--- a/http/firefox/mozconfig4
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# See http://www.mozilla.org/build/ for build instructions.
-#
-
-# Options for client.mk.
-mk_add_options MOZ_CO_PROJECT=browser
-
-# Options for 'configure' (same as command-line options).
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-#ac_add_options --with-system-png=/usr/lib
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-pango
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-#ac_add_options --with-system-libxul
-#ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
new file mode 100644
index 0000000..25aef0c
--- /dev/null
+++ b/http/firefox/mozconfig5
@@ -0,0 +1,28 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
+mk_add_options AUTOCONF=autoconf2.13
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --disable-system-png
+ac_add_options --enable-application=browser
+ac_add_options --disable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
diff --git a/http/links-twibright/DETAILS b/http/links-twibright/DETAILS
index f3adce0..3347715 100755
--- a/http/links-twibright/DETAILS
+++ b/http/links-twibright/DETAILS
@@ -1,10 +1,10 @@
SPELL=links-twibright
- VERSION=2.2
+ VERSION=2.3
SOURCE_NAME=links
SOURCE=$SOURCE_NAME-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_NAME-$VERSION
SOURCE_URL[0]=http://links.twibright.com/download/$SOURCE
-
SOURCE_HASH=sha512:8e2cc0dcbfd853807c6c53c357c716abf23ea24f107bafb2502d5dbeebad5a009696a188621bffd0e2e532391216a6d00a4538d59e4ea89ea982d5506fe51e56
+
SOURCE_HASH=sha512:da4db7d6cc9b61d0f69b7f56bcee0581fd8d7b2b582c6f0bcd54285e52c3981ed3e53d643530d7a2701abfaf5cc19de04f5851f4c3d5af4fcbc7f6da25c9e22b
LICENSE[0]=GPL
WEB_SITE=http://links.twibright.com/
ENTERED=20011027
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 554ecbe..dd41b42 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2011-08-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.3
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* links{,-dfb,-fb,-x11}.desktop: added generic name

diff --git a/http/nginx/BUILD b/http/nginx/BUILD
index c9f3298..15c6438 100755
--- a/http/nginx/BUILD
+++ b/http/nginx/BUILD
@@ -1,8 +1,22 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
create_account nginx &&

persistent_add TEMP_DIR &&
local TEMP_DIR="$INSTALL_ROOT/var/spool/nginx" &&

+if [[ $NGINX_SYSLOG == n ]]; then
+ OPTS="--http-log-path=$INSTALL_ROOT/var/log/nginx/access.log \
+ --error-log-path=$INSTALL_ROOT/var/log/nginx/error.log \
+ $OPTS"
+else
+ if is_version_less $VERSION 0.8; then
+ OPTS="--with-syslog $OPTS"
+ else
+ OPTS="--add-module=$SOURCE_DIRECTORY/syslog $OPTS"
+ fi
+fi &&
+
./configure --prefix="$INSTALL_ROOT/etc/nginx" \
--conf-path="$INSTALL_ROOT/etc/nginx/nginx.conf" \
--sbin-path="$INSTALL_ROOT/usr/sbin/nginx" \
@@ -12,8 +26,6 @@ local TEMP_DIR="$INSTALL_ROOT/var/spool/nginx" &&
--http-client-body-temp-path="$TEMP_DIR/client_body_temp" \
--http-proxy-temp-path="$TEMP_DIR/proxy_temp" \
--http-fastcgi-temp-path="$TEMP_DIR/fastcgi_temp" \
- --http-log-path="$INSTALL_ROOT/var/log/nginx/access.log" \
- --error-log-path="$INSTALL_ROOT/var/log/nginx/error.log" \
$NGINX_OPTS \
$OPTS &&

diff --git a/http/nginx/CONFIGURE b/http/nginx/CONFIGURE
index 356eb6d..79893db 100755
--- a/http/nginx/CONFIGURE
+++ b/http/nginx/CONFIGURE
@@ -1,2 +1,11 @@
-config_query_option NGINX_OPTS "build with syslog support?" n \
- "--with-syslog" ""
+. "$GRIMOIRE/FUNCTIONS" &&
+
+if is_version_less $VERSION 1.1; then
+ config_query NGINX_SYSLOG "Build with syslog support?" n
+else
+ persistent_add NGINX_SYSLOG &&
+ local NGINX_SYSLOG="n"
+fi &&
+
+config_query_option NGINX_OPTS "Build with mail support?" n \
+ "--with-mail" ""
diff --git a/http/nginx/DEPENDS b/http/nginx/DEPENDS
index e386f07..ae99755 100755
--- a/http/nginx/DEPENDS
+++ b/http/nginx/DEPENDS
@@ -9,6 +9,6 @@ optional_depends perl \
"--with-http_perl_module" "" \
"for embedded Perl support" &&

-if list_find "$NGINX_OPTS" "--with-syslog"; then
+if [[ $NGINX_SYSLOG == y ]]; then
depends SYSTEM-LOGGER
fi
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index 60646e1..fd494ef 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -1,21 +1,32 @@
SPELL=nginx
-if [[ $NGINX_RELEASE == legacy ]]; then
- VERSION=0.6.39
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:b8ec805b146eb4050b66987e00d23568cab8dfb620ad021b02e09aac6df37919d17e9ef6102b3b08fbb8b07262da46d595e263b3de62d83f0be624dd8a3822d8
-else
- VERSION=0.7.68
+
+if [[ -z $NGINX_RELEASE ]]; then
+ NGINX_RELEASE="stable"
+fi
+
+case "$NGINX_RELEASE" in
+ stable)
+ VERSION=1.0.5
+ ;;
+ legacy)
+ VERSION=0.8.54
+ ;;
+ old)
+ VERSION=0.7.69
SECURITY_PATCH=2
+ ;;
+ devel)
+ VERSION=1.1.0
+ ;;
+esac
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
- SOURCE2_URL=http://sysoev.ru/$SPELL/$SOURCE2
+ SOURCE_URL[0]=http://nginx.org/download/$SOURCE
+ SOURCE2_URL=$SOURCE_URL.asc
SOURCE_GPG=sysoev.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-fi
- PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://sysoev.ru/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE=http://nginx.net/
+ WEB_SITE=http://nginx.org/
LICENSE[0]=BSD
ENTERED=20090203
SHORT="HTTP server and mail proxy server"
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index b4e84a2..974e541 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,20 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.5 (stable), 0.8.54 (legacy), 0.7.69
+ (old), 1.1.0 (devel); renewed source urls
+ * PREPARE: added 'old' and 'devel' branches
+ * PRE_BUILD: correctly check version to apply syslog patches
+ * DEPENDS: use NGINX_SYSLOG
+ * CONFIGURE: syslog support isn't available for devel version
+ * BUILD: handle configure flags for syslog selection
+ * syslog-0.6.patch: removed, 0.6 branch support has been dropped
+ * syslog-0.8-1.0.{patch,config}: added, for syslog support in
production
+ use (from https://github.com/yaoweibin/nginx_syslog_patch) for 0.8
and
+ 1.0 branches
+
+2011-03-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * PREPARE: added 0.8 branch as stable, marked 0.7 as legacy
+ * CONFIGURE: added mail option
+
2010-12-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* init.d/nginx: added graceful reload
diff --git a/http/nginx/PREPARE b/http/nginx/PREPARE
index e261436..5b30791 100755
--- a/http/nginx/PREPARE
+++ b/http/nginx/PREPARE
@@ -1,3 +1,5 @@
config_query_list NGINX_RELEASE "Select which release to build:" \
- stable \
- legacy
+ stable \
+ legacy \
+ old \
+ devel
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index 1760c95..d46cfa0 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -1,10 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if list_find "$NGINX_OPTS" "--with-syslog"; then
- if [[ $NGINX_RELEASE == legacy ]]; then
- patch -p0 < "$SPELL_DIRECTORY/syslog-0.6.patch"
- else
+if [[ $NGINX_SYSLOG == y ]]; then
+ if is_version_less $VERSION 0.8; then
patch -p0 < "$SPELL_DIRECTORY/syslog-0.7.patch"
+ else
+ mkdir syslog &&
+ cp "$SPELL_DIRECTORY/syslog-0.8-1.0.config" syslog/config &&
+ patch -p1 < "$SPELL_DIRECTORY/syslog-0.8-1.0.patch"
fi
fi
diff --git a/http/nginx/syslog-0.6.patch b/http/nginx/syslog-0.6.patch
deleted file mode 100644
index 5f636b8..0000000
--- a/http/nginx/syslog-0.6.patch
+++ /dev/null
@@ -1,277 +0,0 @@
---- auto/make.orig 2008-03-18 11:36:27.000000000 +0100
-+++ auto/make 2008-05-16 11:12:43.000000000 +0200
-@@ -13,6 +13,10 @@
- ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
- ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
-
-+#SYSLOG
-+if [[ "${USE_SYSLOG}" == "YES" ]]; then
-+ CFLAGS="$CFLAGS -DUSE_SYSLOG"
-+fi
-
- cat << END >
$NGX_MAKEFILE
-
---- auto/options.orig 2008-04-29 11:27:55.000000000 +0200
-+++ auto/options 2008-05-16 11:12:43.000000000 +0200
-@@ -102,6 +102,8 @@
- MD5_OPT=
- MD5_ASM=NO
-
-+USE_SYSLOG=NO
-+
- USE_SHA1=NO
- SHA1=NONE
- SHA1_OPT=
-@@ -225,6 +227,8 @@
- --with-md5-opt=*) MD5_OPT="$value" ;;
- --with-md5-asm) MD5_ASM=YES ;;
-
-+ --with-syslog) USE_SYSLOG=YES ;;
-+
- --with-sha1=*) SHA1="$value" ;;
- --with-sha1-opt=*) SHA1_OPT="$value" ;;
- --with-sha1-asm) SHA1_ASM=YES ;;
-@@ -233,6 +237,8 @@
- --with-zlib-opt=*) ZLIB_OPT="$value" ;;
- --with-zlib-asm=*) ZLIB_ASM="$value" ;;
-
-+ --with-syslog) USE_SYSLOG="YES" ;;
-+
- --test-build-devpoll) NGX_TEST_BUILD_DEVPOLL=YES ;;
- --test-build-eventport) NGX_TEST_BUILD_EVENTPORT=YES ;;
- --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;;
-@@ -341,6 +347,8 @@
- --with-md5-opt=OPTIONS set additional options for md5 building
- --with-md5-asm use md5 assembler sources
-
-+ --with-syslog use syslog instead of files to
log messages
-+
- --with-sha1=DIR set path to sha1 library sources
- --with-sha1-opt=OPTIONS set additional options for sha1
building
- --with-sha1-asm use sha1 assembler sources
-@@ -356,6 +364,8 @@
-
- --with-debug enable the debugging logging
-
-+ --with-syslog enable syslog support (disables
writing to file)
-+
- END
-
- exit 1
---- auto/summary.orig 2008-04-29 11:27:55.000000000 +0200
-+++ auto/summary 2008-05-16 11:12:43.000000000 +0200
-@@ -83,6 +83,11 @@
- *) echo " + using zlib library: $ZLIB" ;;
- esac
-
-+case $USE_SYSLOG in
-+ YES) echo " + using syslog" ;;
-+ *) echo " + syslog is not used" ;;
-+esac
-+
- echo
-
-
---- src/core/nginx.c.orig 2007-12-10 13:09:51.000000000 +0100
-+++ src/core/nginx.c 2008-05-16 11:12:43.000000000 +0200
-@@ -9,6 +9,9 @@
- #include <ngx_event.h>
- #include <nginx.h>
-
-+#ifdef USE_SYSLOG
-+#include <syslog.h>
-+#endif
-
- static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
- static ngx_int_t ngx_getopt(ngx_cycle_t *cycle, int argc, char *const
*argv);
-@@ -221,6 +224,11 @@
- ngx_ssl_init(log);
- #endif
-
-+ /* SYSLOG SUPPORT */
-+#ifdef USE_SYSLOG
-+ openlog("nginx", LOG_ODELAY, LOG_DAEMON);
-+#endif
-+
- /* init_cycle->log is required for signal handlers and ngx_getopt() */
-
- ngx_memzero(&init_cycle, sizeof(ngx_cycle_t));
-@@ -358,6 +366,10 @@
- ngx_single_process_cycle(cycle);
- }
-
-+#ifdef USE_SYSLOG
-+ closelog();
-+#endif
-+
- return 0;
- }
-
---- src/core/ngx_conf_file.c.orig 2008-04-29 11:28:42.000000000 +0200
-+++ src/core/ngx_conf_file.c 2008-05-16 11:12:43.000000000 +0200
-@@ -751,6 +751,11 @@
- full.data = NULL;
- #endif
-
-+#ifdef USE_SYSLOG
-+if (name) {
-+ name = NULL;
-+}
-+#endif
- if (name) {
- full = *name;
-
---- src/core/ngx_log.c.orig 2009-04-01 20:19:22.000000000 +0400
-+++ src/core/ngx_log.c 2009-04-25 19:45:12.992533679 +0400
-@@ -7,6 +7,9 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
-
-+#ifdef USE_SYSLOG
-+#include <syslog.h>
-+#endif
-
- static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void
*conf);
-
-@@ -81,17 +84,22 @@
- #endif
- u_char errstr[NGX_MAX_ERROR_STR], *p, *last;
-
-+#ifndef USE_SYSLOG
- if (log->file->fd == NGX_INVALID_FILE) {
- return;
- }
-+#endif
-
- last = errstr + NGX_MAX_ERROR_STR;
-
-+#ifdef USE_SYSLOG
-+ p = errstr;
-+#else
- ngx_memcpy(errstr, ngx_cached_err_log_time.data,
- ngx_cached_err_log_time.len);
-
- p = errstr + ngx_cached_err_log_time.len;
--
-+#endif
- p = ngx_snprintf(p, last - p, " [%s] ", err_levels[level]);
-
- /* pid#tid */
-@@ -150,7 +158,22 @@
-
- ngx_linefeed(p);
-
-+#ifdef USE_SYSLOG
-+ /* allocate a string which can hold the error message */
-+ char *syslogstr;
-+
-+ if ((syslogstr = calloc((p - errstr + 1), sizeof(char))) != NULL)
-+ {
-+ strncpy(syslogstr, errstr, p - errstr);
-+
-+ /* write to syslog */
-+ syslog(LOG_CRIT, "%s", syslogstr);
-+
-+ free(syslogstr);
-+ }
-+#else
- (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
-+#endif
- }
-
-
-@@ -234,6 +257,9 @@
- ngx_log_t *log;
- ngx_str_t *value, *name;
-
-+#ifdef USE_SYSLOG
-+ name = value = NULL;
-+#else
- if (args) {
- value = args->elts;
- name = &value[1];
-@@ -241,6 +267,7 @@
- } else {
- name = NULL;
- }
-+#endif
-
- log = ngx_pcalloc(cycle->pool, sizeof(ngx_log_t));
- if (log == NULL) {
---- src/http/modules/ngx_http_log_module.c.orig 2007-11-15
15:26:36.000000000 +0100
-+++ src/http/modules/ngx_http_log_module.c 2008-05-16 11:56:39.000000000
+0200
-@@ -9,6 +9,9 @@
- #include <ngx_http.h>
- #include <nginx.h>
-
-+#ifdef USE_SYSLOG
-+#include <syslog.h>
-+#endif
-
- typedef struct ngx_http_log_op_s ngx_http_log_op_t;
-
-@@ -160,7 +163,11 @@
-
-
- static ngx_str_t ngx_http_combined_fmt =
-+#ifdef USE_SYSLOG
-+ ngx_string("$remote_addr - $remote_user "
-+#else
- ngx_string("$remote_addr - $remote_user [$time_local] "
-+#endif
- "\"$request\" $status $body_bytes_sent "
- "\"$http_referer\" \"$http_user_agent\"");
-
-@@ -285,6 +292,20 @@
- ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf,
- size_t len)
- {
-+#ifdef USE_SYSLOG
-+ /* allocate a string which can hold the error message */
-+ char *syslogstr;
-+
-+ if ((syslogstr = calloc((len + 1), sizeof(char))) != NULL)
-+ {
-+ strncpy(syslogstr, buf, len);
-+
-+ /* write to syslog */
-+ syslog(LOG_NOTICE, "%s", syslogstr);
-+
-+ free(syslogstr);
-+ }
-+#else
- time_t now;
- ssize_t n;
- ngx_err_t err;
-@@ -322,6 +343,7 @@
-
- log->error_log_time = now;
- }
-+#endif
- }
-
-
-@@ -654,7 +676,11 @@
- return NGX_CONF_ERROR;
- }
-
-+#ifdef USE_SYLOG
-+ log->file = ngx_conf_open_file(cf->cycle, NULL);
-+#else
- log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log);
-+#endif
- if (log->file == NULL) {
- return NGX_CONF_ERROR;
- }
-@@ -706,7 +732,11 @@
- return NGX_CONF_ERROR;
- }
-
-+#ifdef USE_SYSLOG
-+ log->file = ngx_conf_open_file(cf->cycle, NULL);
-+#else
- log->file = ngx_conf_open_file(cf->cycle, &value[1]);
-+#endif
- if (log->file == NULL) {
- return NGX_CONF_ERROR;
- }
diff --git a/http/nginx/syslog-0.8-1.0.config
b/http/nginx/syslog-0.8-1.0.config
new file mode 100644
index 0000000..05bfcfe
--- /dev/null
+++ b/http/nginx/syslog-0.8-1.0.config
@@ -0,0 +1,5 @@
+
+ngx_feature="nginx_syslog_patch"
+ngx_feature_name="nginx_syslog_patch"
+ngx_feature_run=no
+have=NGX_ENABLE_SYSLOG . auto/have
diff --git a/http/nginx/syslog-0.8-1.0.patch b/http/nginx/syslog-0.8-1.0.patch
new file mode 100644
index 0000000..74262b8
--- /dev/null
+++ b/http/nginx/syslog-0.8-1.0.patch
@@ -0,0 +1,686 @@
+diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
+index 7986707..9902ef7 100644
+--- a/src/core/ngx_cycle.c
++++ b/src/core/ngx_cycle.c
+@@ -84,6 +84,12 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
+ cycle->pool = pool;
+ cycle->log = log;
+ cycle->new_log.log_level = NGX_LOG_ERR;
++#if (NGX_ENABLE_SYSLOG)
++ cycle->new_log.facility = SYSLOG_FACILITY;
++ cycle->new_log.facility = ERR_SYSLOG_PRIORITY;
++ cycle->new_log.syslog_on = 0;
++ cycle->new_log.syslog_set = 0;
++#endif
+ cycle->old_cycle = old_cycle;
+
+ cycle->conf_prefix.len = old_cycle->conf_prefix.len;
+diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
+index 4433314..9411fc9 100644
+--- a/src/core/ngx_log.c
++++ b/src/core/ngx_log.c
+@@ -9,6 +9,15 @@
+
+
+ static char *ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
++#if (NGX_ENABLE_SYSLOG)
++static char *ngx_set_syslog(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
++void log_exit(ngx_cycle_t *cycle);
++
++typedef struct{
++ ngx_str_t name;
++ ngx_int_t macro;
++} ngx_string_to_macro_t;
++#endif
+
+
+ static ngx_command_t ngx_errlog_commands[] = {
+@@ -20,6 +29,15 @@ static ngx_command_t ngx_errlog_commands[] = {
+ 0,
+ NULL},
+
++#if (NGX_ENABLE_SYSLOG)
++ {ngx_string("syslog"),
++ NGX_MAIN_CONF|NGX_CONF_TAKE12,
++ ngx_set_syslog,
++ 0,
++ 0,
++ NULL},
++#endif
++
+ ngx_null_command
+ };
+
+@@ -42,7 +60,11 @@ ngx_module_t ngx_errlog_module = {
+ NULL, /* init thread */
+ NULL, /* exit thread */
+ NULL, /* exit process */
+- NULL, /* exit master */
++#if (NGX_ENABLE_SYSLOG)
++ log_exit, /* exit master */
++#else
++ NULL,
++#endif
+ NGX_MODULE_V1_PADDING
+ };
+
+@@ -51,6 +73,44 @@ static ngx_log_t ngx_log;
+ static ngx_open_file_t ngx_log_file;
+ ngx_uint_t ngx_use_stderr = 1;
+
++#if (NGX_ENABLE_SYSLOG)
++static ngx_string_to_macro_t ngx_syslog_facilities[] = {
++ {ngx_string("auth"), LOG_AUTH},
++ {ngx_string("authpriv"), LOG_AUTHPRIV},
++ {ngx_string("cron"), LOG_CRON},
++ {ngx_string("daemon"), LOG_DAEMON},
++ {ngx_string("ftp"), LOG_FTP},
++ {ngx_string("kern"), LOG_KERN},
++ {ngx_string("local0"), LOG_LOCAL0},
++ {ngx_string("local1"), LOG_LOCAL1},
++ {ngx_string("local2"), LOG_LOCAL2},
++ {ngx_string("local3"), LOG_LOCAL3},
++ {ngx_string("local4"), LOG_LOCAL4},
++ {ngx_string("local5"), LOG_LOCAL5},
++ {ngx_string("local6"), LOG_LOCAL6},
++ {ngx_string("local7"), LOG_LOCAL7},
++ {ngx_string("lpr"), LOG_LPR},
++ {ngx_string("mail"), LOG_MAIL},
++ {ngx_string("news"), LOG_NEWS},
++ {ngx_string("syslog"), LOG_SYSLOG},
++ {ngx_string("user"), LOG_USER},
++ {ngx_string("uucp"), LOG_UUCP},
++ { ngx_null_string, 0}
++};
++
++static ngx_string_to_macro_t ngx_syslog_priorities[] = {
++ {ngx_string("emerg"), LOG_EMERG},
++ {ngx_string("alert"), LOG_ALERT},
++ {ngx_string("crit"), LOG_CRIT},
++ {ngx_string("error"), LOG_ERR},
++ {ngx_string("err"), LOG_ERR},
++ {ngx_string("warn"), LOG_WARNING},
++ {ngx_string("notice"),LOG_NOTICE},
++ {ngx_string("info"), LOG_INFO},
++ {ngx_string("debug"), LOG_DEBUG},
++ { ngx_null_string, 0}
++};
++#endif
+
+ static ngx_str_t err_levels[] = {
+ ngx_null_string,
+@@ -88,11 +148,16 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log,
ngx_err_t err,
+ va_list args;
+ #endif
+ u_char *p, *last, *msg;
++#if (NGX_ENABLE_SYSLOG)
++ u_char *errstr_syslog;
++#endif
+ u_char errstr[NGX_MAX_ERROR_STR];
+
++#if !(NGX_ENABLE_SYSLOG)
+ if (log->file->fd == NGX_INVALID_FILE) {
+ return;
+ }
++#endif
+
+ last = errstr + NGX_MAX_ERROR_STR;
+
+@@ -101,6 +166,10 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log,
ngx_err_t err,
+
+ p = errstr + ngx_cached_err_log_time.len;
+
++#if (NGX_ENABLE_SYSLOG)
++ errstr_syslog = p;
++#endif
++
+ p = ngx_slprintf(p, last, " [%V] ", &err_levels[level]);
+
+ /* pid#tid */
+@@ -139,11 +208,27 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log,
ngx_err_t err,
+
+ ngx_linefeed(p);
+
++#if (NGX_ENABLE_SYSLOG)
++ if (log->file != NULL && log->file->name.len != 0) {
++ (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
++ }
++
++ /* Don't send the debug level info to syslog */
++ if (log->syslog_on && level < NGX_LOG_DEBUG) {
++ /* write to syslog */
++ syslog(log->priority, "%.*s", (int)(p - errstr_syslog),
errstr_syslog);
++ }
++#else
+ (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
++#endif
+
+ if (!ngx_use_stderr
+ || level > NGX_LOG_WARN
++#if (NGX_ENABLE_SYSLOG)
++ || (log->file != NULL && log->file->fd == ngx_stderr))
++#else
+ || log->file->fd == ngx_stderr)
++#endif
+ {
+ return;
+ }
+@@ -364,6 +449,50 @@ ngx_log_create(ngx_cycle_t *cycle, ngx_str_t *name)
+
+ return log;
+ }
++
++
++#if (NGX_ENABLE_SYSLOG)
++ngx_int_t
++ngx_log_get_priority(ngx_conf_t *cf, ngx_str_t *priority)
++{
++ ngx_int_t p = 0;
++ ngx_uint_t n, match = 0;
++
++ for (n = 0; ngx_syslog_priorities[n].name.len != 0; n++) {
++ if (ngx_strncmp(priority->data, ngx_syslog_priorities[n].name.data,
++ ngx_syslog_priorities[n].name.len) == 0) {
++ p = ngx_syslog_priorities[n].macro;
++ match = 1;
++ }
++ }
++
++ if (!match) {
++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++ "invalid syslog priority \"%V\"", priority);
++ return -1;
++ }
++
++ return p;
++}
++
++
++char *
++ngx_log_set_priority(ngx_conf_t *cf, ngx_str_t *priority, ngx_log_t *log)
++{
++ log->priority = ERR_SYSLOG_PRIORITY;
++
++ if (priority->len == 0) {
++ return NGX_CONF_OK;
++ }
++
++ log->priority = ngx_log_get_priority(cf, priority);
++ if (log->priority == (-1)) {
++ return NGX_CONF_ERROR;
++ }
++
++ return NGX_CONF_OK;
++}
++#endif
+
+
+ char *
+@@ -424,6 +553,13 @@ static char *
+ ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ {
+ ngx_str_t *value, name;
++#if (NGX_ENABLE_SYSLOG)
++ u_char *off = NULL;
++ ngx_str_t priority;
++
++ ngx_str_null(&name);
++ ngx_str_null(&priority);
++#endif
+
+ if (cf->cycle->new_log.file) {
+ return "is duplicate";
+@@ -431,7 +567,44 @@ ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void
*conf)
+
+ value = cf->args->elts;
+
++#if (NGX_ENABLE_SYSLOG)
++ if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
++ if (!cf->cycle->new_log.syslog_set) {
++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++ "You must set the syslog directive and enable it
first.");
++ return NGX_CONF_ERROR;
++ }
++
++ cf->cycle->new_log.syslog_on = 1;
++
++ if (value[1].data[sizeof("syslog") - 1] == ':') {
++ priority.len = value[1].len - sizeof("syslog");
++ priority.data = value[1].data + sizeof("syslog");
++
++ off = (u_char *)ngx_strchr(priority.data, (int) '|');
++ if (off != NULL) {
++ priority.len = off - priority.data;
++
++ off++;
++ name.len = value[1].data + value[1].len - off;
++ name.data = off;
++ }
++ }
++ else {
++ if (value[1].len > sizeof("syslog")) {
++ name.len = value[1].len - sizeof("syslog");
++ name.data = value[1].data + sizeof("syslog");
++ }
++ }
++
++ if (ngx_log_set_priority(cf, &priority, &cf->cycle->new_log) ==
NGX_CONF_ERROR) {
++ return NGX_CONF_ERROR;
++ }
++ }
++ else if (ngx_strcmp(value[1].data, "stderr") == 0) {
++#else
+ if (ngx_strcmp(value[1].data, "stderr") == 0) {
++#endif
+ ngx_str_null(&name);
+
+ } else {
+@@ -452,3 +625,63 @@ ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void
*conf)
+
+ return ngx_log_set_levels(cf, &cf->cycle->new_log);
+ }
++
++
++#if (NGX_ENABLE_SYSLOG)
++
++#define SYSLOG_IDENT_NAME "nginx"
++
++static char *
++ngx_set_syslog(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
++{
++ char *program;
++ ngx_str_t *value;
++ ngx_int_t facility, match = 0;
++ ngx_uint_t n;
++
++ value = cf->args->elts;
++
++ if (cf->cycle->new_log.syslog_set) {
++ return "is duplicate";
++ }
++
++ cf->cycle->new_log.syslog_set = 1;
++
++ for (n = 0; ngx_syslog_facilities[n].name.len != 0; n++) {
++ if (ngx_strncmp(value[1].data, ngx_syslog_facilities[n].name.data,
++ ngx_syslog_facilities[n].name.len) == 0) {
++ facility = ngx_syslog_facilities[n].macro;
++ match = 1;
++ break;
++ }
++ }
++
++ if (match) {
++ cf->cycle->new_log.facility = facility;
++ cf->cycle->new_log.priority = ERR_SYSLOG_PRIORITY;
++ }
++ else {
++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++ "invalid syslog facility \"%V\"", &value[1]);
++ return NGX_CONF_ERROR;
++ }
++
++ program = SYSLOG_IDENT_NAME;
++ if (cf->args->nelts > 2) {
++ program = (char *) value[2].data;
++ }
++
++ openlog(program, LOG_ODELAY, facility);
++
++ return NGX_CONF_OK;
++}
++
++
++void log_exit(ngx_cycle_t *cycle)
++{
++ if (cycle->new_log.syslog_set) {
++ closelog();
++ }
++}
++#endif
++
+diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h
+index 1054836..14288ee 100644
+--- a/src/core/ngx_log.h
++++ b/src/core/ngx_log.h
+@@ -11,6 +11,13 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+
++#if (NGX_ENABLE_SYSLOG)
++#include <syslog.h>
++
++#define SYSLOG_FACILITY LOG_LOCAL5
++#define ERR_SYSLOG_PRIORITY LOG_ERR
++#endif
++
+
+ #define NGX_LOG_STDERR 0
+ #define NGX_LOG_EMERG 1
+@@ -60,6 +67,13 @@ struct ngx_log_s {
+ */
+
+ char *action;
++
++#if (NGX_ENABLE_SYSLOG)
++ ngx_int_t priority;
++ ngx_int_t facility;
++ unsigned syslog_on:1; /* unsigned :1 syslog_on */
++ unsigned syslog_set:1; /*unsigned :1 syslog_set */
++#endif
+ };
+
+
+@@ -197,6 +211,10 @@ void ngx_cdecl ngx_log_debug_core(ngx_log_t *log,
ngx_err_t err,
+
+ ngx_log_t *ngx_log_init(u_char *prefix);
+ ngx_log_t *ngx_log_create(ngx_cycle_t *cycle, ngx_str_t *name);
++#if (NGX_ENABLE_SYSLOG)
++ngx_int_t ngx_log_get_priority(ngx_conf_t *cf, ngx_str_t *priority);
++char * ngx_log_set_priority(ngx_conf_t *cf, ngx_str_t *priority, ngx_log_t
*log);
++#endif
+ char *ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log);
+ void ngx_cdecl ngx_log_abort(ngx_err_t err, const char *fmt, ...);
+ void ngx_cdecl ngx_log_stderr(ngx_err_t err, const char *fmt, ...);
+diff --git a/src/http/modules/ngx_http_log_module.c
b/src/http/modules/ngx_http_log_module.c
+index e6a7fdb..51c4384 100644
+--- a/src/http/modules/ngx_http_log_module.c
++++ b/src/http/modules/ngx_http_log_module.c
+@@ -8,6 +8,11 @@
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+
++#if (NGX_ENABLE_SYSLOG)
++#include <syslog.h>
++
++#define HTTP_SYSLOG_PRIORITY LOG_NOTICE
++#endif
+
+ typedef struct ngx_http_log_op_s ngx_http_log_op_t;
+
+@@ -51,6 +56,11 @@ typedef struct {
+ time_t disk_full_time;
+ time_t error_log_time;
+ ngx_http_log_fmt_t *format;
++
++#if (NGX_ENABLE_SYSLOG)
++ ngx_int_t priority;
++ unsigned syslog_on:1; /* unsigned :1 syslog_on
*/
++#endif
+ } ngx_http_log_t;
+
+
+@@ -318,11 +328,27 @@ ngx_http_log_write(ngx_http_request_t *r,
ngx_http_log_t *log, u_char *buf,
+ time_t now;
+ ssize_t n;
+ ngx_err_t err;
+-
++
++#if (NGX_ENABLE_SYSLOG)
++ n = 0;
++ if (log->syslog_on) {
++ syslog(log->priority, "%.*s", (int)len, buf);
++ }
++#endif
++
+ if (log->script == NULL) {
+ name = log->file->name.data;
++#if (NGX_ENABLE_SYSLOG)
++ if (name != NULL) {
++ n = ngx_write_fd(log->file->fd, buf, len);
++ }
++ else {
++ n = len;
++ }
++#else
+ n = ngx_write_fd(log->file->fd, buf, len);
+
++#endif
+ } else {
+ name = NULL;
+ n = ngx_http_log_script_write(r, log->script, &name, buf, len);
+@@ -836,6 +862,10 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void
*parent, void *child)
+ log->script = NULL;
+ log->disk_full_time = 0;
+ log->error_log_time = 0;
++#if (NGX_ENABLE_SYSLOG)
++ log->priority = HTTP_SYSLOG_PRIORITY;
++ log->syslog_on = 0;
++#endif
+
+ lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module);
+ fmt = lmcf->formats.elts;
+@@ -861,6 +891,13 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t
*cmd, void *conf)
+ ngx_http_log_main_conf_t *lmcf;
+ ngx_http_script_compile_t sc;
+
++#if (NGX_ENABLE_SYSLOG)
++ u_char *off;
++ ngx_str_t priority;
++ ngx_uint_t syslog_on = 0;
++ name = priority = (ngx_str_t)ngx_null_string;
++#endif
++
+ value = cf->args->elts;
+
+ if (ngx_strcmp(value[1].data, "off") == 0) {
+@@ -873,6 +910,38 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t
*cmd, void *conf)
+ "invalid parameter \"%V\"", &value[2]);
+ return NGX_CONF_ERROR;
+ }
++#if (NGX_ENABLE_SYSLOG)
++ else if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) ==
0) {
++ if (!cf->cycle->new_log.syslog_set) {
++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++ "You must set the syslog directive and
enable it first.");
++ return NGX_CONF_ERROR;
++ }
++
++ syslog_on = 1;
++ if (value[1].data[sizeof("syslog") - 1] == ':') {
++ priority.len = value[1].len - sizeof("syslog");
++ priority.data = value[1].data + sizeof("syslog");
++
++ off = (u_char*) ngx_strchr(priority.data, '|');
++ if (off != NULL) {
++ priority.len = off - priority.data;
++
++ off++;
++ name.len = value[1].data + value[1].len - off;
++ name.data = off;
++ }
++ }
++ else {
++ if (value[1].len > sizeof("syslog")) {
++ name.len = value[1].len - sizeof("syslog");
++ name.data = value[1].data + sizeof("syslog");
++ }
++ }
++ } else {
++ name = value[1];
++ }
++#endif
+
+ if (llcf->logs == NULL) {
+ llcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t));
+@@ -890,6 +959,52 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t
*cmd, void *conf)
+
+ ngx_memzero(log, sizeof(ngx_http_log_t));
+
++#if (NGX_ENABLE_SYSLOG)
++ log->syslog_on = syslog_on;
++
++ if (priority.len == 0) {
++ log->priority = HTTP_SYSLOG_PRIORITY;
++ }
++ else {
++ log->priority = ngx_log_get_priority(cf, &priority);
++ }
++
++ if (name.len != 0) {
++ n = ngx_http_script_variables_count(&name);
++
++ if (n == 0) {
++ log->file = ngx_conf_open_file(cf->cycle, &name);
++ if (log->file == NULL) {
++ return NGX_CONF_ERROR;
++ }
++ } else {
++ if (ngx_conf_full_name(cf->cycle, &name, 0) != NGX_OK) {
++ return NGX_CONF_ERROR;
++ }
++ log->script = ngx_pcalloc(cf->pool,
sizeof(ngx_http_log_script_t));
++ if (log->script == NULL) {
++ return NGX_CONF_ERROR;
++ }
++ ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
++ sc.cf = cf;
++ sc.source = &name;
++ sc.lengths = &log->script->lengths;
++ sc.values = &log->script->values;
++ sc.variables = n;
++ sc.complete_lengths = 1;
++ sc.complete_values = 1;
++ if (ngx_http_script_compile(&sc) != NGX_OK) {
++ return NGX_CONF_ERROR;
++ }
++ }
++ }
++ else {
++ log->file = ngx_conf_open_file(cf->cycle, &name);
++ if (log->file == NULL) {
++ return NGX_CONF_ERROR;
++ }
++ }
++#else
+ n = ngx_http_script_variables_count(&value[1]);
+
+ if (n == 0) {
+@@ -897,7 +1012,7 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t
*cmd, void *conf)
+ if (log->file == NULL) {
+ return NGX_CONF_ERROR;
+ }
+-
++
+ } else {
+ if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+ return NGX_CONF_ERROR;
+@@ -922,6 +1037,7 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t
*cmd, void *conf)
+ return NGX_CONF_ERROR;
+ }
+ }
++#endif
+
+ if (cf->args->nelts >= 3) {
+ name = value[2];
+diff --git a/src/http/ngx_http_core_module.c
b/src/http/ngx_http_core_module.c
+index 597b64c..d45beb7 100644
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -1393,6 +1393,9 @@ ngx_http_update_location_config(ngx_http_request_t *r)
+
+ if (r == r->main) {
+ r->connection->log->file = clcf->error_log->file;
++#if (NGX_ENABLE_SYSLOG)
++ r->connection->log->priority = clcf->error_log->priority;
++#endif
+
+ if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+ r->connection->log->log_level = clcf->error_log->log_level;
+@@ -4280,17 +4283,72 @@ ngx_http_core_error_log(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
+
+ ngx_str_t *value;
+
++#if (NGX_ENABLE_SYSLOG)
++ u_char *off = NULL;
++ ngx_int_t syslog_on = 0;
++ ngx_str_t name, priority;
++
++ name = priority = (ngx_str_t) ngx_null_string;
++#endif
++
+ if (clcf->error_log) {
+ return "is duplicate";
+ }
+
+ value = cf->args->elts;
+
++#if (NGX_ENABLE_SYSLOG)
++ if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
++ if (!cf->cycle->new_log.syslog_set) {
++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++ "You must set the syslog directive and enable it
first.");
++ return NGX_CONF_ERROR;
++ }
++
++ syslog_on = 1;
++
++ if (value[1].data[sizeof("syslog") - 1] == ':') {
++ priority.len = value[1].len - sizeof("syslog");
++ priority.data = value[1].data + sizeof("syslog");
++
++ off = (u_char*) ngx_strchr(priority.data, '|');
++ if (off != NULL) {
++ priority.len = off - priority.data;
++
++ off++;
++ name.len = value[1].data + value[1].len - off;
++ name.data = off;
++ }
++ }
++ else {
++ if (value[1].len > sizeof("syslog")) {
++ name.len = value[1].len - sizeof("syslog");
++ name.data = value[1].data + sizeof("syslog");
++ }
++ }
++ } else {
++ name = value[1];
++ }
++
++ clcf->error_log = ngx_log_create(cf->cycle, &name);
++#else
+ clcf->error_log = ngx_log_create(cf->cycle, &value[1]);
++#endif
+ if (clcf->error_log == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
++#if (NGX_ENABLE_SYSLOG)
++ if (syslog_on) {
++ clcf->error_log->syslog_on = 1;
++ if (ngx_log_set_priority(cf, &priority, clcf->error_log) ==
NGX_CONF_ERROR) {
++ return NGX_CONF_ERROR;
++ }
++ }
++
++ clcf->error_log->log_level = 0;
++#endif
++
+ if (cf->args->nelts == 2) {
+ clcf->error_log->log_level = NGX_LOG_ERR;
+ return NGX_CONF_OK;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 2cef4fa..d9debda 100644
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -432,6 +432,9 @@ ngx_http_init_request(ngx_event_t *rev)
+
+ clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+ c->log->file = clcf->error_log->file;
++#if (NGX_ENABLE_SYSLOG)
++ c->log->priority = clcf->error_log->priority;
++#endif
+ if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+ c->log->log_level = clcf->error_log->log_level;
+ }
+@@ -1768,6 +1771,9 @@ found:
+
+ clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+ r->connection->log->file = clcf->error_log->file;
++#if (NGX_ENABLE_SYSLOG)
++ r->connection->log->priority = clcf->error_log->priority;
++#endif
+
+ if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+ r->connection->log->log_level = clcf->error_log->log_level;
diff --git a/kde4-support/soprano/DETAILS b/kde4-support/soprano/DETAILS
index 193fc3e..a59bbfd 100755
--- a/kde4-support/soprano/DETAILS
+++ b/kde4-support/soprano/DETAILS
@@ -1,6 +1,6 @@
SPELL=soprano
- VERSION=2.6.0
-
SOURCE_HASH=sha512:186aa45d35b7d925adbee296ce716ef958681d67d2c86a78891d047bbdd08703387c78126619bfddc1ff46ff4341cd76a60e479bb21e35759460ce0154fbdbcd
+ VERSION=2.7.0
+
SOURCE_HASH=sha512:34b8650e67cef3e1032a0737a7c7c4db97149659f7a8b21e7e67c9129a7ebd92a213d30775791a61279f1865cf15b13cdf190e4e9fb73aed3537ddb626e1f047
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://sourceforge.net/projects/soprano/files/Soprano/$VERSION/$SOURCE/download
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index e1e8752..4e7b7ba 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,6 @@
+2011-08-14 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.7.0
+
2011-02-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.6.0

diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 7496e0e..d3c6a59 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -6,7 +6,7 @@ depends soprano &&
depends redland &&
depends raptor &&
depends libdbusmenu-qt &&
-optional_depends udisks '' '' 'mounting removeble drives' &&
+optional_depends udisks '' '' 'mounting removable drives' &&
optional_depends libxscrnsaver '' '' 'screen saver support' &&
optional_depends FAM '' '' 'file change notification' &&
optional_depends acl '' '' 'access control lists support' &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 3af317a..4418544 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-12 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: fixed minor typo (removeble -> removable)
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.0

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 4968dbe..9627ce7 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,18 @@
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * info/patches/maintenance_patches/patch-2.6.33.17: added
+ * info/patches/maintenance_patches/patch-2.6.32.44: added
+
+2011-08-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * PREPARE: apply natural version sorting
+ * volatiles: the whole ^/lib/modules is located in global volatiles in
+ /var/lib/sorcery/volatiles
+
+2011-08-05 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.0.1
+ * info/patches/maintenance_patches_3/patch-3.0.1: added
+ * latest.defaults: updated latest to patch-2.6.39.4
+ * info/patches/maintenance_patches/patch-2.6.39.4: added
+
2011-08-02 Ladislav Hagara <hgr AT vabo.cz>
* info/patches/maintenance_patches/patch-2.6.35.14: added

diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index 4b3cc17..26552bc 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -294,7 +294,7 @@ function custom_kernel()
function new_tree_menu()
{
menu=""
- versions="`ls -r1 $KERNELS_DIRECTORY`"
+ versions="`ls -1vr $KERNELS_DIRECTORY/`"
for version in $versions
do
menu="${menu}${version} Linux_Kernel Select_one "
@@ -333,7 +333,7 @@ function patch_list()
patches="`ls -1 $KPATCHES_DIRECTORY/`"
for patch in $patches
do
- patchvers="`ls -1r $KPATCHES_DIRECTORY/${patch}`"
+ patchvers="`ls -1vr $KPATCHES_DIRECTORY/${patch}`"
found="false"
for patchver in $patchvers
do
@@ -371,7 +371,7 @@ function list_specific_patch_dir()
fi
echo $2
fi
- patchvers="`ls -1r $KPATCHES_DIRECTORY/$2`"
+ patchvers="`ls -1vr $KPATCHES_DIRECTORY/$2`"
for patchver in $patchvers
do
source_patch $patchver
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.44
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.44
new file mode 100755
index 0000000..242e381
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.44
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.44"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.17
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.17
new file mode 100755
index 0000000..60d2ce1
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.17
@@ -0,0 +1,6 @@
+appliedkernels="2.6.33"
+patchversion="${appliedkernels}.17"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4
new file mode 100755
index 0000000..7a19f67
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.39"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1
new file mode 100755
index 0000000..47f5fb5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1
@@ -0,0 +1,6 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 1120540..40a591b 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
LATEST_3=3.0
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
-LATEST_maintenance_patches=patch-2.6.39.3
-LATEST_maintenance_patches_3=patch-3.0
+LATEST_maintenance_patches=patch-2.6.39.4
+LATEST_maintenance_patches_3=patch-3.0.1
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/linux/volatiles b/kernels/linux/volatiles
index 5fc9c0f..ddfc271 100755
--- a/kernels/linux/volatiles
+++ b/kernels/linux/volatiles
@@ -1,2 +1 @@
-^/lib/modules/*/modules.*
^/boot/config-*
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 1c0f808..150cd32 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added LDAP subdependency
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: fixed dependency flags

diff --git a/libs/apr-util/PRE_SUB_DEPENDS b/libs/apr-util/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/SUB_DEPENDS b/libs/apr-util/SUB_DEPENDS
new file mode 100755
index 0000000..a7d6161
--- /dev/null
+++ b/libs/apr-util/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) message "apr-util with OpenLDAP support requested, forcing openldap
dependency" &&
+ depends openldap "--with-ldap";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index f1caa22..d6e4a06 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,12 +1,12 @@
SPELL=icu
if [[ "$ICU_DEV" == 'y' ]]; then
- VERSION=4.8
-
SOURCE_HASH=sha512:11a7334ae009dc244667935b71eaca384545c57a096c8b954437081d0edce14379a5bdf5527de89cfd7cac15df5aa0039dc4f4200d7db7db623dfc84df5df4f7
+ VERSION=4.8.1
+
SOURCE_HASH=sha512:767750b247dd062de1a1d85eca38a33fb3115ccd56fcb3649def5674526868b473f59837dfe93d1f659c6ac774a169c7b29cf875d243881508a2c815dc6677ed
VX=${VERSION//.r/r}
else
- VERSION=4.8
+ VERSION=4.8.1
VX=$VERSION
-
SOURCE_HASH=sha512:11a7334ae009dc244667935b71eaca384545c57a096c8b954437081d0edce14379a5bdf5527de89cfd7cac15df5aa0039dc4f4200d7db7db623dfc84df5df4f7
+
SOURCE_HASH=sha512:767750b247dd062de1a1d85eca38a33fb3115ccd56fcb3649def5674526868b473f59837dfe93d1f659c6ac774a169c7b29cf875d243881508a2c815dc6677ed
fi
SPELLX=icu4c
VERSIONX=${VERSION//./_}
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 5e2ab55..e0fe13e 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2011-08-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.8.1 (both)
+
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/libs/libdrm/DEPENDS b/libs/libdrm/DEPENDS
index 2b6c15d..29cb633 100755
--- a/libs/libdrm/DEPENDS
+++ b/libs/libdrm/DEPENDS
@@ -1,4 +1,5 @@
depends libpthread-stubs &&
+depends libpciaccess &&

optional_depends udev \
"--enable-udev" \
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index fa7b032..51e31d1 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2011-08-09 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DEPENDS: Added libpciaccess
+
2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.26

diff --git a/libs/libofx/BUILD b/libs/libofx/BUILD
new file mode 100755
index 0000000..b4704fd
--- /dev/null
+++ b/libs/libofx/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" --disable-static" &&
+default_build
diff --git a/libs/libofx/DEPENDS b/libs/libofx/DEPENDS
index ab2f4af..b2a2e17 100755
--- a/libs/libofx/DEPENDS
+++ b/libs/libofx/DEPENDS
@@ -1,4 +1,8 @@
depends -sub CXX gcc &&
depends curl &&
depends opensp &&
-depends openssl
+depends openssl &&
+depends libtool &&
+optional_depends pkgconfig '' '' 'package detection' &&
+optional_depends doxygen '' '' 'build documentation' &&
+optional_depends libxml++ '' '' 'build ofxconnect examples'
diff --git a/libs/libofx/DETAILS b/libs/libofx/DETAILS
index 233f67e..a2cf25d 100755
--- a/libs/libofx/DETAILS
+++ b/libs/libofx/DETAILS
@@ -11,8 +11,8 @@ if [ "${LIBOFX_CVS}" == "y" ]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
else
- VERSION=0.9.1
-
SOURCE_HASH=sha512:892e4a430bbbe467af31d639810cf1a63c3b2e414059b56d7c83ef26be95c47f7e6eec6cf1547cefc36e910278f5b061e30a4901d3b229149e66076d989ae9ca
+ VERSION=0.9.4
+
SOURCE_HASH=sha512:8e61a1cf3a41721b4e34fefc0a6f6ce9867e52e7e9b22f449b1f73d077e430c0c2aaa197dfcea0b0657e99fcb768357960dde2f4839fb6e06e8db45d85335bc7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/libs/libofx/HISTORY b/libs/libofx/HISTORY
index b4e0002..9f6a589 100644
--- a/libs/libofx/HISTORY
+++ b/libs/libofx/HISTORY
@@ -1,3 +1,10 @@
+2011-08-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.4
+ * PRE_BUILD: don't apply gcc43 patch
+ * gcc43.patch: deleted
+ * DEPENDS: add libtool, optional pkgconfig, doxygen, libxml++
+ * BUILD: only build dynamic libraries(static ones fail for me)
+
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/libs/libofx/PRE_BUILD b/libs/libofx/PRE_BUILD
index 4b85747..9e0b535 100755
--- a/libs/libofx/PRE_BUILD
+++ b/libs/libofx/PRE_BUILD
@@ -3,6 +3,4 @@ cd $SOURCE_DIRECTORY &&

if [ "${LIBOFX_CVS}" == "y" ]; then
NOCONFIGURE="ON" ./autogen.sh
-else
- patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
fi
diff --git a/libs/libofx/gcc43.patch b/libs/libofx/gcc43.patch
deleted file mode 100644
index 2b7bf2e..0000000
--- a/libs/libofx/gcc43.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Modfied from
http://lists4.opensuse.org/opensuse-commit/2007-11/msg00393.html
-#
-diff -Naur libofx-0.8.3.orig/lib/context.hh libofx-0.8.3/lib/context.hh
---- libofx-0.8.3.orig/lib/context.hh 2008-03-22 16:46:56.140089316 -0700
-+++ libofx-0.8.3/lib/context.hh 2008-03-22 16:50:19.762089412 -0700
-@@ -13,8 +13,9 @@
-
- #ifndef CONTEXT_H
- #define CONTEXT_H
--#include <string.h>
--#include <time.h> // for time_t
-+#include <string>
-+#include <cstring>
-+#include <ctime> // for time_t
- #include "libofx.h"
- #include "ParserEventGeneratorKit.h"
-
-diff -Naur libofx-0.8.3.orig/lib/getopt.c libofx-0.8.3/lib/getopt.c
---- libofx-0.8.3.orig/lib/getopt.c 2008-03-22 16:46:56.138090763 -0700
-+++ libofx-0.8.3/lib/getopt.c 2008-03-22 16:51:35.755087850 -0700
-@@ -39,7 +39,8 @@
- # endif
- #endif
-
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstlib>
-
- /* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
-@@ -65,14 +66,14 @@
- #ifdef __GNU_LIBRARY__
- /* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
--# include <stdlib.h>
-+# include <cstdlib>
- # include <unistd.h>
- #endif /* GNU C library. */
-
- #ifdef VMS
- # include <unixlib.h>
- # if HAVE_STRING_H - 0
--# include <string.h>
-+# include <cstring>
- # endif
- #endif
-
-diff -Naur libofx-0.8.3.orig/lib/ofx_container_transaction.cpp
libofx-0.8.3/lib/ofx_container_transaction.cpp
---- libofx-0.8.3.orig/lib/ofx_container_transaction.cpp 2008-03-22
16:46:56.137089391 -0700
-+++ libofx-0.8.3/lib/ofx_container_transaction.cpp 2008-03-22
16:51:55.572087807 -0700
-@@ -22,6 +22,7 @@
- #endif
-
- #include <string>
-+#include <cstdlib>
- #include "messages.hh"
- #include "libofx.h"
- #include "ofx_containers.hh"
-diff -Naur libofx-0.8.3.orig/lib/ofx_request_accountinfo.cpp
libofx-0.8.3/lib/ofx_request_accountinfo.cpp
---- libofx-0.8.3.orig/lib/ofx_request_accountinfo.cpp 2008-03-22
16:46:56.137089391 -0700
-+++ libofx-0.8.3/lib/ofx_request_accountinfo.cpp 2008-03-22
16:52:57.719088277 -0700
-@@ -22,6 +22,7 @@
- #endif
-
- #include <string>
-+#include <cstdlib>
- #include "libofx.h"
- #include "ofx_request_accountinfo.hh"
-
-diff -Naur libofx-0.8.3.orig/lib/ofx_request.cpp
libofx-0.8.3/lib/ofx_request.cpp
---- libofx-0.8.3.orig/lib/ofx_request.cpp 2008-03-22 16:46:56.137089391
-0700
-+++ libofx-0.8.3/lib/ofx_request.cpp 2008-03-22 16:52:45.584088317 -0700
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <cstring>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
-diff -Naur libofx-0.8.3.orig/lib/ofx_request_statement.cpp
libofx-0.8.3/lib/ofx_request_statement.cpp
---- libofx-0.8.3.orig/lib/ofx_request_statement.cpp 2008-03-22
16:46:56.137089391 -0700
-+++ libofx-0.8.3/lib/ofx_request_statement.cpp 2008-03-22 16:53:23.258088668
-0700
-@@ -22,6 +22,8 @@
- #endif
-
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include "libofx.h"
- #include "ofx_utilities.hh"
- #include "ofx_request_statement.hh"
-diff -Naur libofx-0.8.3.orig/lib/ofx_utilities.cpp
libofx-0.8.3/lib/ofx_utilities.cpp
---- libofx-0.8.3.orig/lib/ofx_utilities.cpp 2008-03-22 16:46:56.138090763
-0700
-+++ libofx-0.8.3/lib/ofx_utilities.cpp 2008-03-22 16:54:01.984088246 -0700
-@@ -19,9 +19,11 @@
- #include <iostream>
- #include "ParserEventGeneratorKit.h"
- #include "SGMLApplication.h"
--#include <time.h>
-+#include <ctime>
- #include <string>
--#include <locale.h>
-+#include <cstring>
-+#include <clocale>
-+#include <cstdlib>
- #include "messages.hh"
- #include "ofx_utilities.hh"
-
-diff -Naur libofx-0.8.3.orig/lib/ofx_utilities.hh
libofx-0.8.3/lib/ofx_utilities.hh
---- libofx-0.8.3.orig/lib/ofx_utilities.hh 2008-03-22 16:46:56.140089316
-0700
-+++ libofx-0.8.3/lib/ofx_utilities.hh 2008-03-22 16:54:20.736087907 -0700
-@@ -17,8 +17,9 @@
-
***************************************************************************/
- #ifndef OFX_UTIL_H
- #define OFX_UTIL_H
--#include <string.h>
--#include <time.h> // for time_t
-+#include <string>
-+#include <cstring>
-+#include <ctime> // for time_t
- #include "ParserEventGeneratorKit.h"
- using namespace std;
- /* This file contains various simple functions for type conversion & al */
-diff -Naur libofx-0.8.3.orig/ofxconnect/cmdline.c
libofx-0.8.3/ofxconnect/cmdline.c
---- libofx-0.8.3.orig/ofxconnect/cmdline.c 2008-03-22 16:46:56.063088460
-0700
-+++ libofx-0.8.3/ofxconnect/cmdline.c 2008-03-22 16:54:41.572088480 -0700
-@@ -9,9 +9,9 @@
- */
-
-
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-
- /* If we use autoconf. */
- #ifdef HAVE_CONFIG_H
-diff -Naur libofx-0.8.3.orig/ofxdump/ofxdump.cpp
libofx-0.8.3/ofxdump/ofxdump.cpp
---- libofx-0.8.3.orig/ofxdump/ofxdump.cpp 2008-03-22 16:46:56.063088460
-0700
-+++ libofx-0.8.3/ofxdump/ofxdump.cpp 2008-03-22 16:55:19.420088363 -0700
-@@ -30,8 +30,11 @@
- #include <iostream>
- #include <iomanip>
- #include <string>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- #include "libofx.h"
--#include <stdio.h> /* for printf() */
-+#include <cstdio> /* for printf() */
- #include <config.h> /* Include config constants, e.g., VERSION TF
*/
- #include <errno.h>
-
diff --git a/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
index 805f058..7ae5972 100755
--- a/libs/libvirt/DETAILS
+++ b/libs/libvirt/DETAILS
@@ -1,5 +1,5 @@
SPELL=libvirt
- VERSION=0.9.1
+ VERSION=0.9.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index e0563d7..17a1818 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2011-08-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.4
+
2011-05-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.9.1
* CONFIGURE: Add query for VMware Workstation/Player support
diff --git a/libs/libvirt/libvirt-0.9.1.tar.gz.sig
b/libs/libvirt/libvirt-0.9.1.tar.gz.sig
deleted file mode 100644
index 891a0d3..0000000
Binary files a/libs/libvirt/libvirt-0.9.1.tar.gz.sig and /dev/null differ
diff --git a/libs/libvirt/libvirt-0.9.4.tar.gz.sig
b/libs/libvirt/libvirt-0.9.4.tar.gz.sig
new file mode 100644
index 0000000..ac9af74
Binary files /dev/null and b/libs/libvirt/libvirt-0.9.4.tar.gz.sig differ
diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index e922f7b..bc20dfc 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,11 +1,11 @@
SPELL=nspr
- VERSION=4.8.8
+ VERSION=4.8.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
-
SOURCE_HASH=sha512:26deadeb89b4ce161ea9bf04271ba7895c78cfab1fa4cd1c82b2d5f835381e4c26c9348b690e688c870c842d5465d45113f4dc44cf71ee35d0b64cdde21bcd51
+
SOURCE_HASH=sha512:78e2f444b92af0e931b81a2f0c517c3583010af3c5e5a556d881531289fcf0b2ec17dd623b307938605fbdd0a7d6e4e3e257b4151dc757a8b47a5b2f129081f2
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=MPL
GATHER_DOCS=no
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index aecc392..dc4d3b6 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.8.9
+
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/mail/pflogsumm/BUILD b/mail/pflogsumm/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/mail/pflogsumm/BUILD
@@ -0,0 +1 @@
+true
diff --git a/mail/pflogsumm/DEPENDS b/mail/pflogsumm/DEPENDS
new file mode 100755
index 0000000..354388c
--- /dev/null
+++ b/mail/pflogsumm/DEPENDS
@@ -0,0 +1,5 @@
+depends perl &&
+
+runtime_depends date-calc &&
+
+optional_depends metalog "" "" "for Metalog support (via patch)"
diff --git a/mail/pflogsumm/DETAILS b/mail/pflogsumm/DETAILS
new file mode 100755
index 0000000..f866b17
--- /dev/null
+++ b/mail/pflogsumm/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=pflogsumm
+ VERSION=1.1.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://jimsun.linxnet.com/downloads/$SOURCE
+ SOURCE_URL[1]=ftp://jimsun.linxnet.com/pub/postfix_contrib/$SOURCE
+
SOURCE_HASH=sha512:efde17ddaaeee9ea87b9c2e1aacc523a419627bb08233bc09e8ae2a7d7d8538f3414fb363202ceb482381ebc1791913e71750340ca457ac67d1a6882881987f9
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://jimsun.linxnet.com/postfix_contrib.html
+ LICENSE[0]=GPL
+ ENTERED=20110811
+ SHORT="logfile analyzer utility for Postfix mailer"
+cat << EOF
+Pflogsumm.pl is designed to provide an over-view of postfix activity,
+with just enough detail to give the administrator a "heads up" for potential
+trouble spots.
+EOF
diff --git a/mail/pflogsumm/HISTORY b/mail/pflogsumm/HISTORY
new file mode 100644
index 0000000..6370b9e
--- /dev/null
+++ b/mail/pflogsumm/HISTORY
@@ -0,0 +1,3 @@
+2011-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * {PRE_,}BUILD, DEPENDS, DETAILS, INSTALL,
+ pflogsumm-1.1.1_metalog.patch: spell created
diff --git a/mail/pflogsumm/INSTALL b/mail/pflogsumm/INSTALL
new file mode 100755
index 0000000..5942426
--- /dev/null
+++ b/mail/pflogsumm/INSTALL
@@ -0,0 +1,3 @@
+install -vm 755 pflogsumm.pl "$INSTALL_ROOT/usr/bin/pflogsumm" &&
+install -vm 755 -d "$INSTALL_ROOT/usr/share/man/man1" &&
+install -vm 644 pflogsumm.1 "$INSTALL_ROOT/usr/share/man/man1"
diff --git a/mail/pflogsumm/PRE_BUILD b/mail/pflogsumm/PRE_BUILD
new file mode 100755
index 0000000..ce7e0a0
--- /dev/null
+++ b/mail/pflogsumm/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if is_depends_enabled $SPELL metalog; then
+ patch -p0 -i "$SPELL_DIRECTORY/pflogsumm-1.1.1_metalog.patch"
+fi
diff --git a/mail/pflogsumm/pflogsumm-1.1.1_metalog.patch
b/mail/pflogsumm/pflogsumm-1.1.1_metalog.patch
new file mode 100644
index 0000000..87d2627
--- /dev/null
+++ b/mail/pflogsumm/pflogsumm-1.1.1_metalog.patch
@@ -0,0 +1,16 @@
+*** pflogsumm.pl 2011-04-25 12:10:15.189036001 +0400
+--- pflogsumm.pl.metalog 2011-04-25 12:10:04.633036001 +0400
+***************
+*** 539,544 ****
+--- 539,549 ----
+ while(<>) {
+ next if(defined($dateStr) && ! /^$dateStr/o);
+ s/: \[ID \d+ [^\]]+\] /: /o; # lose "[ID nnnnnn some.thing]" stuff
++
#------------------------------------------------------------------------
++ # metalog hack by David B. Ferguson <david AT linuxnet.ca> 08/19/2008
++ # see http://linuxnet.ca/postfix/pflogsumm_metalog.html for latest
++ s/\[(postfix|$syslogName)\/(.*)\] /metalog $1\/$2\[54321\]: /;
++
#------------------------------------------------------------------------
+ my $logRmdr;
+ next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr)
=
+ /^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index ffe9a9b..e1dc3e4 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,4 +1,4 @@
-cd $SOURCE_DIRECTORY/comm-1.9.2 &&
+cd $SOURCE_DIRECTORY/comm-* &&

THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
export MOZ_THUNDERBIRD="1" &&
@@ -34,7 +34,6 @@ fi
./configure --prefix=${INSTALL_ROOT}/usr \
--with-user-appdir=.thunderbird \
--enable-application=mail \
- --enable-static \
--disable-crashreporter \
$OPTS &&

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 98f1b40..1759406 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=3.1.10
+ VERSION=5.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index c77aa53..2aab2c8 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,9 @@
+2011-08-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 5.0
+ * PRE_BUILD: Updated directory name
+ * BUILD: Updated directory name. Removed invalid option "enable
static"
+ * INSTALL: regxpcon doesn't exist now. Removed it and touch command
+
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/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index d5a11ca..03e7069 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -8,9 +8,6 @@ make install &&
cd ${INSTALL_ROOT}/usr/lib/thunderbird &&
export LD_LIBRARY_PATH="$THUNDERBIRD_HOME" &&
export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
-$SOURCE_DIRECTORY/comm-1.9.2/mozilla/dist/bin/regxpcom &&
-touch `find . -name *.rdf` &&
-

#
# Create symlink from NSS Root CA store, if it exists. NSS requires this
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index dc78bba..4a4232a 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,4 +1,4 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file '' &&
-cd comm-1.9.2
+cd comm-*
diff --git a/net/ethtool/DETAILS b/net/ethtool/DETAILS
index dd301b3..012fca4 100755
--- a/net/ethtool/DETAILS
+++ b/net/ethtool/DETAILS
@@ -1,9 +1,9 @@
SPELL=ethtool
- VERSION=2.6.37
+ VERSION=3.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/software/network/ethtool/$SOURCE
-
SOURCE_HASH=sha512:6891f572855ea3c98bbe3d96eb4d4e5df56c901d98b61c18ef91be0b28b0952ba779ce93e79276173f2a433e1eab8ed1437624c86d919a3c5ab9098e5a5dfd58
+
SOURCE_HASH=sha512:8a1ae1fa50a28c9fd525f19b695b739bc6f896575315a281cc4b751241385c949d8960e402796b5f36450861063546f037516d41daaea099e7b14ff38f4f1fdb
WEB_SITE=http://www.kernel.org/pub/software/network/ethtool/
LICENSE[0]=GPL
ENTERED=20040702
diff --git a/net/ethtool/HISTORY b/net/ethtool/HISTORY
index 00fa89c..f6c06d5 100644
--- a/net/ethtool/HISTORY
+++ b/net/ethtool/HISTORY
@@ -1,3 +1,6 @@
+2011-08-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0
+
2011-02-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.37, new WEB_SITE and SOURCE_URL[0]

diff --git a/net/socat/DETAILS b/net/socat/DETAILS
index 3b987d4..20e9149 100755
--- a/net/socat/DETAILS
+++ b/net/socat/DETAILS
@@ -1,14 +1,15 @@
SPELL=socat
- VERSION=1.7.1.1
-
SOURCE_HASH=sha512:bf741a50c29f43afb76830c72f1059e38008fcca137090b01b4ac975a45d97acabc9b7e0d39aff37a199052285ad6559dc3550d0e829f346bb504ad57a85b78a
+ VERSION=1.7.1.3
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:63aac334427c6b0c3feb34e72ac0b9f4984775a9c9d1062a679314bf773b7e7768871444d9dfe062d2a6831241cccdd421ddd3abccc262827ca7eed149333b56
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.dest-unreach.org/socat/download/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.dest-unreach.org/$SPELL/download/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.dest-unreach.org/socat/
ENTERED=20031106
KEYWORDS="net"
- SHORT="Relay for bidirectional data transfer."
+ SHORT="Relay for bidirectional data transfer"
cat << EOF
socat is a relay for bidirectional data transfer between two independent data
channels. Each of these data channels may be a file, pipe, device (serial
line
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index aa322d8..6a466c6 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,6 @@
+2011-08-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.1.3; SECURITY_PATCH++
+
2009-05-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.1.1

diff --git a/perl-cpan/net-ssleay/BUILD b/perl-cpan/net-ssleay/BUILD
index 1061a7b..6b9f249 100755
--- a/perl-cpan/net-ssleay/BUILD
+++ b/perl-cpan/net-ssleay/BUILD
@@ -1,3 +1,3 @@
DEFINE="-DPERL5" &&

-default_build_perl
+echo n | default_build_perl
diff --git a/perl-cpan/net-ssleay/HISTORY b/perl-cpan/net-ssleay/HISTORY
index 5a42e9a..9e9b2b3 100644
--- a/perl-cpan/net-ssleay/HISTORY
+++ b/perl-cpan/net-ssleay/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: made build non-interactive
+
2010-06-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.36
change SOURCE, SOURCE_URL, and SOURCE_DIRECTORY
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 847589f..cf387bd 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -29,10 +29,10 @@ config_query_option PHP5_OPTS "Enable pcntl support (Only
affects CLI/CGI)" n \
message "${MESSAGE_COLOR}Apache-based and *CGI SAPIs are mutually exclusive
(though both FastCGI and CGI can be enabled at the same
time)${DEFAULT_COLOR}" &&

config_query_list PHP5_SAPI "What SAPI do you want to use?" \
- apache cgi &&
+ apache cgi none &&

if [[ $PHP5_SAPI == cgi ]]; then
- PHP5_OPTS="${PHP5_OPTS} --enable-cgi" &&
+ PHP5_OPTS="--enable-cgi --without-apxs --without-apxs2 ${PHP5_OPTS}" &&

if [[ $PHP5_BRANCH == legacy ]]; then
config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
@@ -40,9 +40,9 @@ if [[ $PHP5_SAPI == cgi ]]; then
else
message "${MESSAGE_COLOR}The FastCGI SAPI is now always enabled since
PHP 5.3.0${DEFAULT_COLOR}"
fi
-else
+elif [[ $PHP5_SAPI == apache ]]; then
config_query_list PHP5_APACHE "Which Apache module to build?" \
- none handler filter
+ handler filter
fi &&

if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" ||
list_find "$PHP5_OPTS" "--enable-fastcgi" ; then
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 96fdf3a..60c9928 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -51,8 +51,14 @@ optional_depends pth \
if [[ $PHP5_SAPI == apache ]]; then
case "${PHP5_APACHE}" in
handler) depends APACHE;;
- filter) depends APACHE2;;
- esac
+ filter) depends APACHE2 '--with-apxs2 --without-apxs';;
+ esac &&
+
+ if [[ "$(get_spell_provider $SPELL APACHE)" == 'apache1' ]]; then
+ PHP5_OPTS="--with-apxs --without-apxs2 $PHP5_OPTS"
+ else
+ PHP5_OPTS="--with-apxs2 --without-apxs $PHP5_OPTS"
+ fi
fi &&

if [[ "$PHP5_PCRE" == "none" ]]; then
@@ -220,6 +226,10 @@ if [[ "${PHP5_GD}" != "none" ]]; then
"--without-xpm" \
"for XPM image support" &&

+ if [[ "${PHP5_GD}" == "internal" ]]; then
+ depends JPEG "--with-jpeg-dir=${INSTALL_ROOT}/usr" &&
+ depends libpng "--with-png-dir=${INSTALL_ROOT}/usr"
+ else
optional_depends JPEG \
"--with-jpeg-dir=${INSTALL_ROOT}/usr" \
"--without-jpeg-dir" \
@@ -228,7 +238,8 @@ if [[ "${PHP5_GD}" != "none" ]]; then
optional_depends libpng \
"--with-png-dir=${INSTALL_ROOT}/usr" \
"--without-png-dir" \
- "for PNG support (for GD)" &&
+ "for PNG support (for GD)"
+ fi &&

optional_depends t1lib \
"--with-t1lib=${INSTALL_ROOT}/usr" \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index fd5f13f..0201766 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, CONFIGURE: corrected apache flags; moved 'none' SAPI
selector
+ to a proper place; fixed dependencies for internal gd
+
2011-03-18 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to version 5.3.6

diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 8abb6a4..d424e00 100755
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -33,7 +33,7 @@ optional_depends libpaper \
"papersize support" &&

optional_depends "CUPS" \
- "--enable-cups" \
+ "--enable-cups --with-install-cups" \
"--disable-cups" \
"CUPS print spooler support" &&

diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index c4c758e..1aae961 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,6 +1,6 @@
SPELL=ghostscript
- VERSION=9.02
-
SOURCE_HASH=sha512:a25d65b60b1be8b81de1d7cb55b256c0de883b21b65a7ff241e36a6baf5ec5efbd166031f24e25864417245774a523a0795948c763559875e0b22caa5a61cf5e
+ VERSION=9.04
+
SOURCE_HASH=sha512:f4fd2b5d82a1f9aa918f21a85571f3684778be5b6fe868ae19165717b212aac99b515bb94e3589c3a01b7f836829a283da2162583d4d2dc3c7c267b1926a17ed
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ghostscript.com/
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index b871877..293af8d 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,9 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fixed broken printing -- added missing cups flag
+
+2011-08-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.04
+
2011-04-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional libidn

diff --git a/python-pypi/pyasn1/DETAILS b/python-pypi/pyasn1/DETAILS
index abd6dc3..683d6ae 100755
--- a/python-pypi/pyasn1/DETAILS
+++ b/python-pypi/pyasn1/DETAILS
@@ -1,14 +1,14 @@
SPELL=pyasn1
- VERSION=0.0.5a
+ VERSION=0.0.13
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:e85202bae72b4a7a114a9ba690c9b992f0249469e55553babed7f9ccbc97593c0b94861dabead96371f5d7151585e5c23a7de7b483b36a33304576de10e771f5
+
SOURCE_HASH=sha512:7e54b75367efeed796bf36f80d3c9f541aaefdc535339f091d7ef857d3ef56b8324e1cc4995e08fc88b1bf21565aef94b444e9dd856ce21b5b2d3c8ca080c7c5
WEB_SITE=http://pyasn1.sourceforge.net/
ENTERED=20060930
LICENSE[0]=BSD
KEYWORDS="python devel"
- SHORT="This is an implementation of ASN.1 types and codecs in
Python programming language."
+ SHORT="implementation of ASN.1 types and codecs in Python"
cat << EOF
This is an implementation of ASN.1 types and codecs in Python programming
language. It has been first written to support particular protocol (SNMP)
diff --git a/python-pypi/pyasn1/HISTORY b/python-pypi/pyasn1/HISTORY
index 094f8e7..0def9a4 100644
--- a/python-pypi/pyasn1/HISTORY
+++ b/python-pypi/pyasn1/HISTORY
@@ -1,4 +1,5 @@
+2011-08-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.0.13
+
2006-09-30 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS, HISTORY: Created this spell
-
-
diff --git a/python-pypi/rsa/DEPENDS b/python-pypi/rsa/DEPENDS
index 503782e..6431ca2 100755
--- a/python-pypi/rsa/DEPENDS
+++ b/python-pypi/rsa/DEPENDS
@@ -1,2 +1,3 @@
depends python &&
-depends SETUPTOOLS
+depends distribute &&
+depends pyasn1
diff --git a/python-pypi/rsa/DETAILS b/python-pypi/rsa/DETAILS
index c27f420..42a093a 100755
--- a/python-pypi/rsa/DETAILS
+++ b/python-pypi/rsa/DETAILS
@@ -1,8 +1,8 @@
SPELL=rsa
- VERSION=1.3.3
+ VERSION=3.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:eb76c35011d2e4470c77a497d80e6a317b869e88774e058679664470b9e41db765b034708cc4ec9e32e9c9cecb5f2b8f5b8339042dd298194319ff089edeedbb
+
SOURCE_HASH=sha512:763e7e8c7b0aece12fbbcfe8d3e4d1cc77b8bb6691463bd1b25c162803f2db8ae8aaef51b7d52f1ff7c6b312cc79c5f79030f7a9fe9d093f3e1b02b64e54361a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.stuvel.eu/rsa
GATHER_DOCS=off
diff --git a/python-pypi/rsa/HISTORY b/python-pypi/rsa/HISTORY
index 8a2c147..885fc00 100644
--- a/python-pypi/rsa/HISTORY
+++ b/python-pypi/rsa/HISTORY
@@ -1,3 +1,7 @@
+2011-08-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0
+ * DEPENDS: rsa requires only distribute now; added pyasn1 req dep
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/python-pypi/werkzeug/DETAILS b/python-pypi/werkzeug/DETAILS
index 78cf2b9..5f52bd3 100755
--- a/python-pypi/werkzeug/DETAILS
+++ b/python-pypi/werkzeug/DETAILS
@@ -1,8 +1,8 @@
SPELL=werkzeug
- VERSION=0.7
+ VERSION=0.7.1
SOURCE=Werkzeug-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/W/Werkzeug/${SOURCE}
-
SOURCE_HASH=sha512:0692aef85abd8e794665158321379e33f28f726d0258f086b983f611959abf1c89e2213f0dcdda6bc567ab056def2ca08648bdbe6cd544e483daec31692fefd3
+
SOURCE_HASH=sha512:fb831ae7d1fc8a750534bd596975eb08bfdd3ae6310660cb1976e82cd107e29c3a05fbcb6e5df1bf9c741d4c9af8c522bab1efb916cfa6bd7dcdfa77b13a1aeb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Werkzeug-${VERSION}"
WEB_SITE=http://werkzeug.pocoo.org/
LICENSE[0]=BSD
diff --git a/python-pypi/werkzeug/HISTORY b/python-pypi/werkzeug/HISTORY
index 955f486..5b25245 100644
--- a/python-pypi/werkzeug/HISTORY
+++ b/python-pypi/werkzeug/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.1
+
2011-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7

diff --git a/science-libs/vrui/BUILD b/science-libs/vrui/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/science-libs/vrui/BUILD
@@ -0,0 +1 @@
+make
diff --git a/science-libs/vrui/DETAILS b/science-libs/vrui/DETAILS
new file mode 100755
index 0000000..0120935
--- /dev/null
+++ b/science-libs/vrui/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=vrui
+
+if [ -z "$VRUI_BRANCH" ] || [ "$VRUI_BRANCH" == "DEFAULT" ]; then
+ VRUI_BRANCH="2.0"
+fi
+
+case $VRUI_BRANCH in
+ 2.0)
+ VERSION=2.0-003
+
SOURCE_HASH=sha512:1931591a858a01ba27e16ff8e14c5c3e69a828b2274131c7259f87e1655d524411064b51de2767ba1e0018fda899ba0ca6144ea006eb56280f5cd6db9620377e
+ ;;
+ 2.1)
+ VERSION=2.1-001
+
SOURCE_HASH=sha512:cdb72358c046b544131410c44bd39cfb8478c95f4da4737c4aaee8f5d7fe5967cec824b903399f4655a2ec31d9fa7af6e020cf175c756cca9b7b2cab24c0324e
+ ;;
+esac
+
+ SOURCE=Vrui-$VERSION.tar.gz
+ SOURCE_URL[0]=http://www.idav.ucdavis.edu/~okreylos/ResDev/Vrui/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/Vrui-$VERSION
+ WEB_SITE=http://www.idav.ucdavis.edu/~okreylos/ResDev/Vrui/
+ LICENSE[0]=GPL
+ ENTERED=20110808
+ SHORT="Virtual Reality User Interface Library"
+cat << EOF
+The Vrui VR toolkit - Virtual Reality User Interface Library - simplifies
+creation of portable and highly interactive fully-immersive virtual reality
+applications.
+EOF
diff --git a/science-libs/vrui/HISTORY b/science-libs/vrui/HISTORY
new file mode 100644
index 0000000..e8696d7
--- /dev/null
+++ b/science-libs/vrui/HISTORY
@@ -0,0 +1,2 @@
+2011-08-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, PREPARE, PRE_BUILD, BUILD: spell created
diff --git a/science-libs/vrui/PREPARE b/science-libs/vrui/PREPARE
new file mode 100755
index 0000000..0c3cee5
--- /dev/null
+++ b/science-libs/vrui/PREPARE
@@ -0,0 +1 @@
+config_query_list VRUI_BRANCH "Which branch of Vrui VR toolkit do you want
to build?" DEFAULT 2.0 2.1
diff --git a/science-libs/vrui/PRE_BUILD b/science-libs/vrui/PRE_BUILD
new file mode 100755
index 0000000..1498bc3
--- /dev/null
+++ b/science-libs/vrui/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i 's:INSTALLDIR = $(HOME)/Vrui:INSTALLDIR = /opt/Vrui:' makefile
diff --git a/shell-term-fm/mc/CONFIGURE b/shell-term-fm/mc/CONFIGURE
index 0324c87..bd53804 100755
--- a/shell-term-fm/mc/CONFIGURE
+++ b/shell-term-fm/mc/CONFIGURE
@@ -2,6 +2,10 @@ config_query_list MC_SCREEN "Which screen library to use?" \
ncurses \
slang &&

+config_query_list MC_SEARCH "Select low-level search engine" \
+ glib \
+ pcre &&
+
config_query_option MC_CHARSET "Enable charset selection and conversion?" y \
"--enable-charset" \
"--disable-charset"
diff --git a/shell-term-fm/mc/DEPENDS b/shell-term-fm/mc/DEPENDS
index 279c46f..788c1cc 100755
--- a/shell-term-fm/mc/DEPENDS
+++ b/shell-term-fm/mc/DEPENDS
@@ -2,6 +2,12 @@ depends glib2 &&

depends $MC_SCREEN "--with-screen=$MC_SCREEN" &&

+if [[ $MC_SEARCH == pcre ]]; then
+ depends $MC_SEARCH "--with-search-engine=$MC_SEARCH"
+else
+ depends glib2 "--with-search-engine=$MC_SEARCH"
+fi &&
+
optional_depends gpm \
"--with-gpm-mouse" \
"--without-gpm-mouse" \
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 3aea352..31395de 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, CONFIGURE: added option to select low-level search engine
+
2011-07-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.7.5.3, gz -> bz2

diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index e25b694..2ca6756 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -21,7 +21,7 @@ depends locale &&
depends make &&
. $GRIMOIRE/FUNCTIONS &&
local KVER=$(get_kernel_version) &&
-if (( ${KVER:2:1} < 6 )); then
+if [[ ${KVER:0:3} < 2.6 ]]; then
depends modutils
else
depends module-init-tools
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 5cacca8..f2e0438 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,6 @@
+2011-08-10 Julien"_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: fixed kernel version test, which chooses dependency on
modutils for kernel < 2.6 and module-init-tools otherwise, for the new 3.x
scheme
+
2011-04-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: removed unzip as a required dependency

diff --git a/utils/bluez/CONFIGURE b/utils/bluez/CONFIGURE
index cf0d9eb..5e84b97 100755
--- a/utils/bluez/CONFIGURE
+++ b/utils/bluez/CONFIGURE
@@ -4,7 +4,7 @@ config_query_option BLUEZOPTS "Build PAN daemon?" n
"--enable-pand" "--disable-p
config_query_option BLUEZOPTS "Build DUN daemon?" n "--enable-dund"
"--disable-dund" &&
config_query_option BLUEZOPTS "Build Tracing daemon?" n "--enable-tracer"
"--disable-tracer" &&
config_query_option BLUEZOPTS "Build the utilities?" y "--enable-tools"
"--disable-tools" &&
-config_query_option BLUEZOPTS "Build the test progams?" n "--enable-test"
"--disable-test" &&
+config_query_option BLUEZOPTS "Build the test programs?" n "--enable-test"
"--disable-test" &&
config_query_option BLUEZOPTS "Build HID mode switching utility?" n
"--enable-hid2hci" "--disable-hid2hci" &&
config_query_option BLUEZOPTS "Build DFU firmware upgrade utility?" n
"--enable-dfutool" "--disable-dfutool" &&
config_query_option BLUEZOPTS "Build BCCMD interface utility?" n
"--enable-bccmd" "--disable-bccmd" &&
diff --git a/utils/bluez/DETAILS b/utils/bluez/DETAILS
index f11a3c6..8cb8453 100755
--- a/utils/bluez/DETAILS
+++ b/utils/bluez/DETAILS
@@ -1,5 +1,5 @@
SPELL=bluez
- VERSION=4.93
+ VERSION=4.95
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE2_IGNORE=signature
diff --git a/utils/bluez/HISTORY b/utils/bluez/HISTORY
index b54392d..f7c219f 100644
--- a/utils/bluez/HISTORY
+++ b/utils/bluez/HISTORY
@@ -1,3 +1,7 @@
+2011-08-12 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.95
+ * CONFIGURE: fixed minor typo (progams -> programs)
+
2011-05-10 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 4.93
* DEPENDS: added optional deps on hal and libcap-ng
diff --git a/utils/pcmciautils/DETAILS b/utils/pcmciautils/DETAILS
index ffe2c5c..61f0e43 100755
--- a/utils/pcmciautils/DETAILS
+++ b/utils/pcmciautils/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcmciautils
- VERSION=017
+ VERSION=018
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=${SOURCE}.sign
SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/pcmcia/$SOURCE
diff --git a/utils/pcmciautils/HISTORY b/utils/pcmciautils/HISTORY
index 6996868..b0d4acb 100644
--- a/utils/pcmciautils/HISTORY
+++ b/utils/pcmciautils/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 018
+
2010-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 017

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index dd22723..0962926 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,39 +1,4 @@
-message "Target list: $QEMU_ARCHS" &&
-
-if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.11" ]]; then
- if [[ ! $OPTS =~ "--disable-kqemu" ]]; then
- #
- # Disable PIC if building soft MMU targets
- # Pentium3/4 or athlon(-xp) breaks on building soft MMU
- # generally shrinking march down to pentium-mmx
- #
- if grep -q softmmu <<< "$QEMU_ARCHS"; then
- # we need to check does 0.10 act the same way
- message "${MESSAGE_COLOR}QEMU $QEMU_VER has a build problem with
advanced CFLAGS.${DEFAULT_COLOR}" &&
- message "${MESSAGE_COLOR}Trying to make it work, starting with removal
of any sse flags.${DEFAULT_COLOR}" &&
- # sse seems to be bad; -march=pentium -m3dnow worked, though
- list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
- if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
-
- # -march=prescott was added after
- if [[ "$CFLAGS" =~ -march=prescott ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
- if [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
k6-3.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=k6-3"
- fi &&
- disable_pic
- fi
- fi
-fi &&
+message "${MESSAGE_COLOR}Target list: $QEMU_ARCHS${DEFAULT_COLOR}" &&

cd "${SOURCE_DIRECTORY}" &&

diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 5c70f6f..092b75f 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/archs` &&
persistent_add QEMU_ARCHS &&

@@ -24,13 +26,13 @@ fi
config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
oss alsa sdl esd pa fmod &&

-if [[ $QEMU_VER == "0.14" ]]; then
+if is_version_less $QEMU_VER 0.14; then
config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
- hda ac97 es1370 sb16 cs4231a adlib gus
+ ac97 es1370 sb16 cs4231a adlib gus
else
config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
- ac97 es1370 sb16 cs4231a adlib gus
+ hda ac97 es1370 sb16 cs4231a adlib gus
fi &&

config_query_option QEMU_KVM "Enable KVM acceleration support" y \
- "" "--disable-kvm"
+ "" "--disable-kvm"
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 9008247..78f182a 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -15,69 +15,7 @@ if list_find "esd" $QEMU_AUDIO; then
fi &&

case $QEMU_VER in
- 0.10)
- optional_depends sdl \
- "" \
- "--disable-gfx-check" \
- "for graphical output (recommended)" &&
-
- optional_depends kqemu \
- "" \
- "--disable-kqemu" \
- "for kernel acceleration support" &&
-
- optional_depends BLUEZ \
- "" \
- "--disable-bluez" \
- "for Bluetooth support" &&
-
- optional_depends ncurses \
- "" \
- "--disable-curses" \
- "for curses output" &&
-
- suggest_depends gnutls \
- "" \
- "--disable-vnc-tls" \
- "to enable TLS encryption for VNC server"
- ;;
- 0.11)
- optional_depends sdl \
- "" \
- "--disable-sdl" \
- "for graphical output (recommended)" &&
-
- optional_depends kqemu \
- "" \
- "--disable-kqemu" \
- "for kernel acceleration support" &&
-
- optional_depends curl \
- "" \
- "--disable-curl" \
- "for curl connectivity support" &&
-
- optional_depends BLUEZ \
- "" \
- "--disable-bluez" \
- "for Bluetooth support" &&
-
- optional_depends ncurses \
- "" \
- "--disable-curses" \
- "for curses output" &&
-
- suggest_depends gnutls \
- "" \
- "--disable-vnc-tls" \
- "to enable TLS encryption for VNC server" &&
-
- suggest_depends LIBSASL \
- "" \
- "--disable-vnc-sasl" \
- "to enable SASL encryption for VNC server"
- ;;
- 0.12)
+ 0.12|*)
optional_depends sdl \
"--enable-sdl" \
"--disable-sdl" \
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 333b694..76eebc8 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,16 +1,10 @@
SPELL=qemu

if [[ -z $QEMU_VER ]]; then
- QEMU_VER="0.14"
+ QEMU_VER="0.15"
fi

case ${QEMU_VER:0:4} in
- 0.10)
- VERSION=0.10.6
- ;;
- 0.11)
- VERSION=0.11.1
- ;;
0.12)
VERSION=0.12.5
;;
@@ -20,26 +14,26 @@ case ${QEMU_VER:0:4} in
0.14)
VERSION=0.14.1
;;
+ 0.15)
+ VERSION=0.15.0
+ ;;
esac
+
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://mirror.its.uidaho.edu/pub/savannah/$SPELL/$SOURCE
-
-if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.13" ]] || [[ $QEMU_VER ==
"0.14" ]]; then
+if [[ $QEMU_VER == "0.12" ]] || [[ $QEMU_VER == "0.14" ]]; then
+ SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+else
+ SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
+fi
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
- SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
-else
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-fi
-
DISTCC_HOSTS=
LICENSE[0]=GPL
LICENSE[1]=LGPL
- PATCHLEVEL=1
- WEB_SITE=http://www.nongnu.org/qemu/
+ WEB_SITE=http://qemu.org/
KEYWORDS="emulator utils"
ENTERED=20051102
SHORT="generic and open source processor emulator"
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 5db6313..566d435 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,12 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added 0.15 branch; dropped 0.10 and 0.11 support as per
+ offsite; corrected mirrors for different branches; use only upstream
+ gpg keycheck
+ * BUILD: removed deprecated limitations
+ * DEPENDS: keep case selector from 0.12 up to the latest branch
+ * PREPARE: made 0.15 default
+ * CONFIGURE: corrected sound card selection per branch
+
2011-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.14.1

diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index 1ad3020..cbd6b4c 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,6 +1,6 @@
if [[ ${#QEMU_VER} -eq 6 ]]; then
- QEMU_VER=${QEMU_VER:0:4}
+ QEMU_VER=${QEMU_VER:0:4}
fi

config_query_list QEMU_VER "Which branch to build?" \
- 0.14 0.13 0.12 0.11 0.10
+ 0.15 0.14 0.13 0.12
diff --git a/utils/qemu/qemu-0.11.1.tar.gz.sig
b/utils/qemu/qemu-0.11.1.tar.gz.sig
deleted file mode 100644
index c5e7abd..0000000
Binary files a/utils/qemu/qemu-0.11.1.tar.gz.sig and /dev/null differ
diff --git a/utils/qemu/qemu-0.12.5.tar.gz.sig
b/utils/qemu/qemu-0.12.5.tar.gz.sig
deleted file mode 100644
index a34dd23..0000000
Binary files a/utils/qemu/qemu-0.12.5.tar.gz.sig and /dev/null differ
diff --git a/utils/quvi/DETAILS b/utils/quvi/DETAILS
index 88d02ba..c617715 100755
--- a/utils/quvi/DETAILS
+++ b/utils/quvi/DETAILS
@@ -1,9 +1,9 @@
SPELL=quvi
- VERSION=0.2.17
+ VERSION=0.2.19
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:7d39011c4fcf18175a1a6c8031236a4279075c97664de3b040a6dba1762005338238bb4693f15acb76678bd27c0da1b5195991d9312087be7f79ef8db5752f2a
+
SOURCE_HASH=sha512:156eabd9674ec120279950295914b96c907cee7bd7d3bf09270734ca2af06736d842a7f21b4b400df461bb9c87986789ecb6104621e3f6a22a7a2631998e2b6e
WEB_SITE=http://quvi.sourceforge.net/
ENTERED=20110131
LICENSE[0]=GPL
diff --git a/utils/quvi/HISTORY b/utils/quvi/HISTORY
index 223651c..f4587dc 100644
--- a/utils/quvi/HISTORY
+++ b/utils/quvi/HISTORY
@@ -1,3 +1,6 @@
+2011-08-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.19
+
2011-06-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.17

diff --git a/utils/sysklogd/DETAILS b/utils/sysklogd/DETAILS
index e114a60..a5ad152 100755
--- a/utils/sysklogd/DETAILS
+++ b/utils/sysklogd/DETAILS
@@ -1,10 +1,10 @@
SPELL=sysklogd
- VERSION=1.4.1
- PATCHLEVEL=1
+ VERSION=1.5
+ PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/system/daemons/$SOURCE
-
SOURCE_HASH=sha512:01924f9b9c72e3a0ee1a530eb8bd39779ca52dfabb62725085c6d3d71898777e6a47dae1c104ad6d376064c66b9dada9e3ba27e98ba92915a0875e789d8b2c8b
+
SOURCE_HASH=sha512:19ef104c03a8c87ea30c811fe54bb30e7c73a2834a83c8720841f0d553d41508dbf052d4e3dd9ea929eedff31e9fbb79f8c05546f48005b74f01ebf2a57e48f7
WEB_SITE=http://www.ibiblio.org/pub/Linux/system/daemons
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/utils/sysklogd/HISTORY b/utils/sysklogd/HISTORY
index dd40a2d..6e14c73 100644
--- a/utils/sysklogd/HISTORY
+++ b/utils/sysklogd/HISTORY
@@ -1,3 +1,10 @@
+2011-08-08 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.5, PATCHLEVEL=0
+ * PRE_BUILD: added sedit rules to use sorcery configured CFLAGS and
+ LDFLAGS, adapted sedit rules for BINDIR and MANDIR to the new
version,
+ removed old version patch
+ * sysklogd-1.4.1-kernel_header.patch: removed, obsolete
+
2008-08-05 Jeremy Blosser <jblosser-smgl AT firinn.org>
* BUILD: Moved most to PRE_BUILD.
* PRE_BUILD: Added, with support for large log files option.
diff --git a/utils/sysklogd/PRE_BUILD b/utils/sysklogd/PRE_BUILD
index 9c9857f..8a39c54 100755
--- a/utils/sysklogd/PRE_BUILD
+++ b/utils/sysklogd/PRE_BUILD
@@ -2,9 +2,10 @@ default_pre_build &&

cd "${SOURCE_DIRECTORY}" &&

-patch -p1 < $SCRIPT_DIRECTORY/sysklogd-1.4.1-kernel_header.patch
&&
-sedit "s:BINDIR = /usr/sbin:BINDIR=$INSTALL_ROOT/sbin:" Makefile
&&
-sedit "s:MANDIR = /usr/man:MANDIR=$INSTALL_ROOT/usr/share/man:" Makefile
&&
+sedit "s:-O3:${CFLAGS} -D_GNU_SOURCE:" Makefile &&
+sedit "s:LDFLAGS= -s:LDFLAGS= ${LDFLAGS}:" Makefile &&
+sedit "s:BINDIR = \$(prefix)/usr/sbin:BINDIR=$INSTALL_ROOT/sbin:" Makefile
&&
+sedit "s:MANDIR = \$(prefix):MANDIR = $INSTALL_ROOT:" Makefile &&

if [ "${LARGE_FILES}" == "y" ]; then
sedit "s:SYSLOGD_FLAGS=:SYSLOGD_FLAGS= -D_FILE_OFFSET_BITS=64
-D_LARGEFILE_SOURCE:" Makefile
diff --git a/utils/sysklogd/sysklogd-1.4.1-kernel_header.patch
b/utils/sysklogd/sysklogd-1.4.1-kernel_header.patch
deleted file mode 100644
index a30a202..0000000
--- a/utils/sysklogd/sysklogd-1.4.1-kernel_header.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Submitted by: DJ Lucas (dj_at_lucasit_dot_com)
-Date: 2003-08-17
-Initial Package Version: 1.4.1
-Origin: Linux Standard Base Project
-Description: This patch fixes a dependacy on kernel includes.
- Specifically, it removes the need to have kernel/module.h around. It
- is usable when building a linux-2.6 based system to get around
- compile problems. Source link:
- http://freestandards.org/pipermail/lsb-impl/2002-October/000466.html
-
-diff -Naur sysklogd-1.4.1-orig/Makefile sysklogd-1.4.1/Makefile
---- sysklogd-1.4.1-orig/Makefile 1998-10-12 20:25:15.000000000 +0000
-+++ sysklogd-1.4.1/Makefile 2003-08-17 19:14:38.000000000 +0000
-@@ -3,7 +3,7 @@
- CC= gcc
- #CFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall
-fno-strength-reduce
-+CFLAGS= $(RPM_OPT_FLAGS) -DSYSV -D_GNU_SOURCE -Wall
- LDFLAGS= -s
-
- # Look where your install program is.
-diff -Naur sysklogd-1.4.1-orig/ksym_mod.c sysklogd-1.4.1/ksym_mod.c
---- sysklogd-1.4.1-orig/ksym_mod.c 2000-09-12 21:15:28.000000000 +0000
-+++ sysklogd-1.4.1/ksym_mod.c 2003-08-17 19:14:38.000000000 +0000
-@@ -93,7 +93,7 @@
- #include <linux/time.h>
- #include <linux/module.h>
- #else /* __GLIBC__ */
--#include <linux/module.h>
-+#include "module.h"
- extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
- extern int get_kernel_syms __P ((struct kernel_sym *__table));
- #endif /* __GLIBC__ */
-diff -Naur sysklogd-1.4.1-orig/module.h sysklogd-1.4.1/module.h
---- sysklogd-1.4.1-orig/module.h 1970-01-01 00:00:00.000000000 +0000
-+++ sysklogd-1.4.1/module.h 2003-08-17 19:14:38.000000000 +0000
-@@ -0,0 +1,62 @@
-+/* this file eliminates the need to include <kernel/module.h> */
-+/* Module definitions for klogd's module support */
-+struct kernel_sym
-+{
-+ unsigned long value;
-+ char name[60];
-+};
-+
-+struct module_symbol
-+{
-+ unsigned long value;
-+ const char *name;
-+};
-+
-+struct module_ref
-+{
-+ struct module *dep; /* "parent" pointer */
-+ struct module *ref; /* "child" pointer */
-+ struct module_ref *next_ref;
-+};
-+
-+struct module_info
-+{
-+ unsigned long addr;
-+ unsigned long size;
-+ unsigned long flags;
-+ long usecount;
-+};
-+
-+
-+typedef struct { volatile int counter; } atomic_t;
-+
-+struct module
-+{
-+ unsigned long size_of_struct; /* == sizeof(module) */
-+ struct module *next;
-+ const char *name;
-+ unsigned long size;
-+
-+ union
-+ {
-+ atomic_t usecount;
-+ long pad;
-+ } uc; /* Needs to keep its size - so says
rth */
-+
-+ unsigned long flags; /* AUTOCLEAN et al */
-+
-+ unsigned nsyms;
-+ unsigned ndeps;
-+
-+ struct module_symbol *syms;
-+ struct module_ref *deps;
-+ struct module_ref *refs;
-+ int (*init)(void);
-+ void (*cleanup)(void);
-+ const struct exception_table_entry *ex_table_start;
-+ const struct exception_table_entry *ex_table_end;
-+#ifdef __alpha__
-+ unsigned long gp;
-+#endif
-+};
-+
diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index af0c45b..94a2bd6 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,9 +1,14 @@
SPELL=usbutils
- VERSION=003
-
SOURCE_HASH=sha512:c66b754eb7ae49fa54211983f16a3343489366dadddd0126ada5883e39432869fa0e9787c0e3c88c2db34688a27c6b4b5c3b5ea6f9129add6b3288b6b20abd7b
+ VERSION=004
+
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sign
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/usb/usbutils/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.sign
+ SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.linux-usb.org/
ENTERED=20021218
LICENSE[0]=GPL
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index cdad02a..5a59a17 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2011-08-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 004, upstream gpg checking
+
2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 003

diff --git a/video-libs/libass/DETAILS b/video-libs/libass/DETAILS
index a2caa60..50ac84a 100755
--- a/video-libs/libass/DETAILS
+++ b/video-libs/libass/DETAILS
@@ -1,8 +1,8 @@
SPELL=libass
- VERSION=0.9.12
+ VERSION=0.9.13
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:345b5138875a31bce4f08bd378ab064d01b26cb51df2010056970158e8f845519f4aedebb0e0609200781e9e28e000ceba17b30e81ba5925f97499b09347e461
+
SOURCE_HASH=sha512:d093a3cd4ff832b82b2648bdc22d0fa4f786e90fb10ca19c35327e79ac5117177fc882615816b4d0bba61cf89b5c49af30bab8cef2367ee3d318d1e76437e9de
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/libass";
LICENSE[0]=ISC
diff --git a/video-libs/libass/HISTORY b/video-libs/libass/HISTORY
index d05944d..5dabd45 100644
--- a/video-libs/libass/HISTORY
+++ b/video-libs/libass/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.13
+
2011-07-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.12, GPL -> ISC

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index c94f645..52ab999 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffmpeg
- VERSION=0.7.2
+ VERSION=0.7.3
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-
SOURCE_HASH=sha512:b3afe6745348401e96666fdd5d67bfe3fc2628bf0be4f179f27ca07a9ffb47a86944374523d322b7dad2a752cc02de58c0a84f77ad92666bc2cf69e4005a0d42
+
SOURCE_HASH=sha512:666a474528e368bfd489b34c84916cf81d1e8ad790004656863e44a6ce09e14156309c5a2896f3258da9511535afd28858d6ed67681f5b4031b517ff7e55182c
#case $FFAMR in
# none);;
# *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 11d6277..4ec62bc 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.3
+
2011-07-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.2

diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index cdff8f5..ac855dd 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,8 +1,8 @@
SPELL=guvcview
- VERSION=1.4.4
+ VERSION=1.5.0
SOURCE=${SPELL}-src-${VERSION}.tar.gz
SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:806de47194de94145302d4e4c1de37be99953c72d5277465ba44a3a81168e38c88cc423b87b432af635474ce197743fc30ed9a472705dede0392f212af9033b5
+
SOURCE_HASH=sha512:c5d266eb0165eab0973b78ad527bf7806dc1e77d8a4e8d318c613acfaf764677c7a560156b25eb0a6fae5651d1a3e38ed83bb675885be4d1dcc63e57746d886a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
WEB_SITE=http://guvcview.berlios.de/
LICENSE[0]=GPL
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index a3a7699..3239bda 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.0
+
2011-03-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.4

diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
index 1a446e5..f2d4c65 100755
--- a/video/minitube/DETAILS
+++ b/video/minitube/DETAILS
@@ -1,8 +1,8 @@
SPELL=minitube
- VERSION=1.4.3
+ VERSION=1.5
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://flavio.tordini.org/files/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:caa01c498097f76f64e011d91b0a65505a0a0f3cedd3472b9c823d9e7bd1b5504652383613781a5f5515cda6a43ec69d8ecae8e07a541e5a755fafd16a82a60f
+
SOURCE_HASH=sha512:6d673cdc28e22b988e27e9d5dab08e46c2d3c3adeebd90e1baeb21fd7d3d69f844b01e0ef03083c3cc06d41304fc63b6195d902b1e91fa040bd2d8b681ecb98f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://flavio.tordini.org/minitube";
LICENSE[0]=GPL
diff --git a/video/minitube/HISTORY b/video/minitube/HISTORY
index afed8fb..d956d23 100644
--- a/video/minitube/HISTORY
+++ b/video/minitube/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: 1.5
+
2011-05-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 1.4.3

diff --git a/windowmanagers/openbox/DEPENDS b/windowmanagers/openbox/DEPENDS
index 5eb5cd2..82a2218 100755
--- a/windowmanagers/openbox/DEPENDS
+++ b/windowmanagers/openbox/DEPENDS
@@ -2,7 +2,7 @@ depends xorg-libs &&
depends fontconfig &&
depends glib2 &&
depends libxml2 &&
-depends pango &&
+depends -sub "X" pango &&
depends libxfixes &&

optional_depends libxcursor \
@@ -10,6 +10,16 @@ optional_depends libxcursor \
"--disable-xcursor" \
"for Xcursor extension support" &&

+optional_depends libxrandr \
+ "--enable-xrandr" \
+ "--disable-xrandr" \
+ "for xrandr support" &&
+
+optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "for X11 Xinerama extension support" &&
+
optional_depends libsm \
"--enable-session-management" \
"--disable-session-management" \
diff --git a/windowmanagers/openbox/DETAILS b/windowmanagers/openbox/DETAILS
index e4ea5a8..ac9e647 100755
--- a/windowmanagers/openbox/DETAILS
+++ b/windowmanagers/openbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=openbox
- VERSION=3.4.11.2
+ VERSION=3.5.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://openbox.org/dist/openbox/$SOURCE
-
SOURCE_HASH=sha512:a585c6f6b68c444aa266f158b9920bd994dd0545f2f1deac784c02e3230f356e279efc04d33bf199d4ab242c444e99814c141d6d921a9499bbc0cf07bed050e8
+
SOURCE_HASH=sha512:208d2641e171eca5fae0a2104a9b3c6d685293b4d66a18c0c2900df267453911b8738ef239fd84656b41440a0568279de67b9af798a6457b7716b1aab14704b5
WEB_SITE=http://www.openbox.org
ENTERED=20030126
LICENSE[0]=GPL
diff --git a/windowmanagers/openbox/HISTORY b/windowmanagers/openbox/HISTORY
index 89998ad..c65d0da 100644
--- a/windowmanagers/openbox/HISTORY
+++ b/windowmanagers/openbox/HISTORY
@@ -1,3 +1,8 @@
+2011-08-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 3.5.0
+ * DEPENDS: requires subdependency X for pango,
+ added optional dependencies on libxrandr and libxinerama
+
2010-07-15 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.11.2

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 1486027..30aeed5 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.3.25
+ VERSION=1.3.26
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f259ddc..da08716 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2011-08-05 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated latest devel to 1.3.26
+
2011-07-27 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated latest devel to 1.3.25

diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index d25f2ae..fb42c07 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunar
- VERSION=1.3.0
+ VERSION=1.2.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Thunar-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://thunar.xfce.org/
-
SOURCE_HASH=sha512:c6254fcd64038a245f2ea16d753f18c672df0c164b33b63787800617a7666390f19814fa5e50bcda290326bff2e93a9141ba0b6576099498f0f3070df78020ce
+
SOURCE_HASH=sha512:6bb932ae6820ebab47e82b2fd43afec868db0ea5631b74543a7e42573a40aaac21bfc6322a9c903b95cffa119d0685e4e0c716522931562611e64d20246d4e55
LICENSE[0]=GPL
LICENSE[1]=LGPL
ENTERED=20030608
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index dc8be69..f00fdbb 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.2 -- return back to stable branch
+
2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: switched from EXTRAS to GUDEV for udev




  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (d00984d61fe8f5beab0b9f014646a429301a7b19), Bor Kraljič, 08/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page