Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-libpng grimoire by Ladislav Hagara (a5d46b8566f0ea9df18e16a4f3a9db5a8d84ac0d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-libpng grimoire by Ladislav Hagara (a5d46b8566f0ea9df18e16a4f3a9db5a8d84ac0d)
  • Date: Sun, 12 Dec 2010 15:59:27 -0600

GIT changes to devel-libpng grimoire by Ladislav Hagara <hgr AT vabo.cz>:

ChangeLog | 6
audio-creation/rakarrack/DEPENDS | 9
audio-creation/rakarrack/DETAILS | 19
audio-creation/rakarrack/HISTORY | 3
audio-libs/ladspa/BUILD | 7
audio-libs/ladspa/DETAILS | 24
audio-libs/ladspa/HISTORY | 8
audio-libs/ladspa/INSTALL | 18
audio-libs/ladspa/PREPARE | 1
audio-libs/ladspa/ladspa_sdk_1.13.tgz.sig |binary
audio-players/lxmusic/BUILD | 1
audio-players/lxmusic/DEPENDS | 2
audio-players/lxmusic/DETAILS | 18
audio-players/lxmusic/HISTORY | 5
audio-players/lxmusic/PRE_BUILD | 3
audio-players/mpd/CONFIGURE | 4
audio-players/mpd/DEPENDS | 81 ++-
audio-players/mpd/DETAILS | 4
audio-players/mpd/HISTORY | 7
audio-players/mpd/init.d/mpd | 3
audio-players/mpd/init.d/mpd.conf | 136 +++--
crypto/ccid/DETAILS | 6
crypto/ccid/HISTORY | 3
crypto/pcsc-lite/DETAILS | 6
crypto/pcsc-lite/HISTORY | 3
dev/null |binary
disk/libisofs/DETAILS | 4
disk/libisofs/HISTORY | 3
doc/xdvik/DETAILS | 4
doc/xdvik/HISTORY | 3
ftp/transmission/DETAILS | 2
ftp/transmission/HISTORY | 3
ftp/transmission/transmission-2.12.tar.bz2.sig | 0
ftp/transmission/transmission-2.13.tar.bz2.sig |binary
gnome2-libs/libgdata/DETAILS | 2
gnome2-libs/libgdata/HISTORY | 3
gnome2-libs/libgdata/libgdata-0.6.5.tar.bz2.sig | 0
gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig |binary
gnome2-libs/pangomm/DETAILS | 2
gnome2-libs/pangomm/HISTORY | 3
gnome2-libs/pangomm/pangomm-2.26.2.tar.bz2.sig | 0
gnome2-libs/pangomm/pangomm-2.26.3.tar.bz2.sig |binary
http/firefox/DETAILS | 4
http/firefox/HISTORY | 3
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 3
http/xulrunner/DETAILS | 6
http/xulrunner/HISTORY | 3
libs/elfutils/DETAILS | 2
libs/elfutils/HISTORY | 3
libs/pcre/BUILD | 4
libs/pcre/DETAILS | 2
libs/pcre/HISTORY | 4
libs/pcre/INSTALL | 2
libs/rasqal/DETAILS | 2
libs/rasqal/HISTORY | 3
mail/thunderbird/DETAILS | 4
mail/thunderbird/HISTORY | 3
net/cacti/DEPENDS | 4
net/cacti/DETAILS | 5
net/cacti/HISTORY | 7
net/cacti/PRE_BUILD | 20
net/cacti/pa.patch | 31 +
net/cacti/patches/data_source_deactivate.patch | 17
net/cacti/patches/graph_list_view.patch | 110 ++++
net/cacti/patches/html_output.patch | 71 ++
net/cacti/patches/ldap_group_authenication.patch | 11
net/cacti/patches/ping.patch | 23
net/cacti/patches/poller_interval.patch | 168 ++++++
net/cacti/patches/script_server_command_line_parse.patch | 136 +++++
net/spine/DETAILS | 4
net/spine/HISTORY | 6
net/spine/INSTALL | 3
net/spine/PRE_BUILD | 4
net/spine/config.patch | 11
net/spine/patches/mysql_client_reconnect.patch | 15
net/spine/patches/ping_reliability.patch | 45 -
net/spine/patches/snmp_v3_fix.patch | 88 ---
net/spine/patches/unified_issues.patch | 348
++++++++++++++
perl-cpan/ack/DETAILS | 4
perl-cpan/ack/HISTORY | 3
php-pear/php/DETAILS | 22
php-pear/php/HISTORY | 3
utils/nss-pam-ldapd/DETAILS | 2
utils/nss-pam-ldapd/HISTORY | 3
utils/youtube-dl/DETAILS | 9
utils/youtube-dl/HISTORY | 3
video-libs/frei0r-plugins/DEPENDS | 3
video-libs/frei0r-plugins/DETAILS | 27 +
video-libs/frei0r-plugins/HISTORY | 2
video-libs/frei0r-plugins/frei0r-plugins-1.2.1.tar.gz.sig |binary
video/minitube/DETAILS | 4
video/minitube/HISTORY | 3
video/mlt/DEPENDS | 5
video/mlt/HISTORY | 3
x11-libs/wine/DETAILS | 4
x11-libs/wine/HISTORY | 3
97 files changed, 1348 insertions(+), 342 deletions(-)

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

perl-cpan/ack: version 1.94

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

audio-players/lxmusic: removed, we have lxmusic at lxde section #15797

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

ccid 1.4.1

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

pcsc-lite 1.6.6

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

nss-pam-ldapd: => 0.7.13

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

mpd: => 0.16

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

php 5.3.4 and 5.2.15, SECURITY_PATCH++

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

libgdata 0.6.6

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

wine 1.3.9 and 1.2.2

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

transmission: => 2.13

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

thunderbird 3.1.7, SECURITY_PATCH=24

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

firefox 3.6.13

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

xulrunner 1.9.2.13, FFVERSION=3.6.13, SECURITY_PATCH=20

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

seamoney 2.0.11, SECURITY_PATCH=29

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

elfutils 0.150

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

pcre: => 8.11

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

libisofs: => 0.6.40

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

rakarrack: new spell

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

xdvik: update to 22.84.16

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

ladspa: changed spell offer installing the utils in addition to the header

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

mlt: added frei0r-plugins as optional depends

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

frei0r-plugins: New spell, minimal API for video effects

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

spine: => 0.8.7g

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

cacti: updated plugin arch to 2.8, added patches

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

rasqal: => 0.9.21

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

pangomm 2.26.3

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

youtube-dl 2010.12.09

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

minitube 1.3

diff --git a/ChangeLog b/ChangeLog
index f13b61a..02ded03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * audio-creation/rakarrack: new spell, guitar amp & effects
+
+2010-12-10 Robin Cook <rcook AT wyrms.net>
+ * video-libs/frei0r-plugins: new spell, Minimal API for video effects
+
2010-12-09 David Kowis <dkowis AT shlrm.org>
* net/collectd: new spell, statistics collection daemon

diff --git a/audio-creation/rakarrack/DEPENDS
b/audio-creation/rakarrack/DEPENDS
new file mode 100755
index 0000000..addc4ab
--- /dev/null
+++ b/audio-creation/rakarrack/DEPENDS
@@ -0,0 +1,9 @@
+depends fltk &&
+depends libxpm &&
+depends alsa-lib &&
+depends libsamplerate &&
+depends libsndfile &&
+# needs aconnect
+depends alsa-utils &&
+depends libxft &&
+depends JACK-DRIVER
diff --git a/audio-creation/rakarrack/DETAILS
b/audio-creation/rakarrack/DETAILS
new file mode 100755
index 0000000..16cf6ba
--- /dev/null
+++ b/audio-creation/rakarrack/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=rakarrack
+ VERSION=0.6.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:ac71e3915b44fc57904640662ebf4f1b40d2ef520b048b1586cc465964984896b236dae259c70f3f0a185396747ae73729a1cc2c490568f1c4e9238b7c1e9ce5
+ WEB_SITE=http://jack-rack.sourceforge.net/
+ ENTERED=20031208
+ LICENSE[0]=GPL
+ KEYWORDS="jack audio guitar"
+ SHORT="Guitar effects for Linux"
+cat << EOF
+Rakarrack is a richly featured multi-effects processor emulating a guitar
+effects pedalboard. Presets and user interface are optimized for guitar,
+but Rakarrack processes signals in stereo while it does not apply internal
+band-limiting filtering, and thus is well suited to all musical
+instruments and vocals. Rakarrack is designed for Linux distributions with
+Jack Audio Connection Kit.
+EOF
diff --git a/audio-creation/rakarrack/HISTORY
b/audio-creation/rakarrack/HISTORY
new file mode 100644
index 0000000..47cb8c4
--- /dev/null
+++ b/audio-creation/rakarrack/HISTORY
@@ -0,0 +1,3 @@
+2010-11-16 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, DETAILS: Created
+
diff --git a/audio-libs/ladspa/BUILD b/audio-libs/ladspa/BUILD
index 27ba77d..c8c2fef 100755
--- a/audio-libs/ladspa/BUILD
+++ b/audio-libs/ladspa/BUILD
@@ -1 +1,6 @@
-true
+if [ "$LADSPA_SDK" == "y" ]; then
+ cd $SOURCE_DIRECTORY/src &&
+ make
+else
+ true
+fi
diff --git a/audio-libs/ladspa/DETAILS b/audio-libs/ladspa/DETAILS
index 889e989..007462d 100755
--- a/audio-libs/ladspa/DETAILS
+++ b/audio-libs/ladspa/DETAILS
@@ -1,15 +1,15 @@
- SPELL=ladspa
- SOURCE=ladspa.h.txt
- VERSION=1.1
-SOURCE_URL[0]=http://www.ladspa.org/ladspa_sdk/$SOURCE
- WEB_SITE=http://www.ladspa.org
- GATHER_DOCS=off
- ENTERED=20020516
- UPDATED=20021010
- LICENSE[0]=LGPL
-
SOURCE_HASH=sha512:052eacfa7c81e6608e8d65e40abb5214e7dd02a856c5e72b520e837b4b3f824c163d35166d73446522ea34ffd62fdbb78d745e83ede426ba7acc826145f4eef2
- KEYWORDS="plugins audio"
- SHORT="Linux Audio Developer's Simple Plugin API (LADSPA)"
+ SPELL=ladspa
+ VERSION=1.13
+ SOURCE=${SPELL}_sdk_$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_sdk
+ SOURCE_URL[0]=http://www.ladspa.org/download/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ GATHER_DOCS=off
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.ladspa.org
+ ENTERED=20020516
+ KEYWORDS="plugins audio"
+ SHORT="Linux Audio Developer's Simple Plugin API (LADSPA)"
cat << EOF
Many audio synthesis and recording packages are in use or in development on
Linux. These work in many different ways. LADSPA provides a standard way for
diff --git a/audio-libs/ladspa/HISTORY b/audio-libs/ladspa/HISTORY
index e9a000c..f83bbe0 100644
--- a/audio-libs/ladspa/HISTORY
+++ b/audio-libs/ladspa/HISTORY
@@ -1,3 +1,11 @@
+2010-12-10 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: changed SOURCE to actual source file
+ changed SOURCE_URL to the actual source file
+ added SOURCE_DIRECTORY
+ * PREPARE: added query to install utils
+ * BUILD: added building utils
+ * INSTALL: added installing utils
+
2008-08-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: suggest swh-plugins #11720

diff --git a/audio-libs/ladspa/INSTALL b/audio-libs/ladspa/INSTALL
index bf1c246..8175d23 100755
--- a/audio-libs/ladspa/INSTALL
+++ b/audio-libs/ladspa/INSTALL
@@ -1,3 +1,19 @@
+cd $SOURCE_DIRECTORY &&
+
+if [ "$LADSPA_SDK" == "y" ]; then
+ echo "Installing LADSPA utils..." &&
+
+ mkdir -p "$INSTALL_ROOT/usr/lib/ladspa/" &&
+ mkdir -p "$INSTALL_ROOT/usr/bin/" &&
+ mkdir -p "$INSTALL_ROOT/usr/share/doc/ladspa" &&
+
+ cp plugins/* "$INSTALL_ROOT/usr/lib/ladspa/" &&
+ cp bin/* "$INSTALL_ROOT/usr/bin/" &&
+ cp doc/* "$INSTALL_ROOT/usr/share/doc/ladspa"
+fi &&
+
echo "Installing LADSPA header..." &&

-cp "$SOURCE_CACHE/$SOURCE" "$INSTALL_ROOT/usr/include/ladspa.h"
+mkdir -p "$INSTALL_ROOT/usr/include/" &&
+
+cp src/ladspa.h "$INSTALL_ROOT/usr/include/"
diff --git a/audio-libs/ladspa/PREPARE b/audio-libs/ladspa/PREPARE
new file mode 100755
index 0000000..b3f3b4d
--- /dev/null
+++ b/audio-libs/ladspa/PREPARE
@@ -0,0 +1 @@
+config_query LADSPA_SDK "Install SDK utils?" y
diff --git a/audio-libs/ladspa/ladspa_sdk_1.13.tgz.sig
b/audio-libs/ladspa/ladspa_sdk_1.13.tgz.sig
new file mode 100644
index 0000000..777789e
Binary files /dev/null and b/audio-libs/ladspa/ladspa_sdk_1.13.tgz.sig differ
diff --git a/audio-players/lxmusic/BUILD b/audio-players/lxmusic/BUILD
deleted file mode 100755
index 8f58e6d..0000000
--- a/audio-players/lxmusic/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-make
diff --git a/audio-players/lxmusic/DEPENDS b/audio-players/lxmusic/DEPENDS
deleted file mode 100755
index 8f86dd1..0000000
--- a/audio-players/lxmusic/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends xmms2 &&
-depends gtk+2
diff --git a/audio-players/lxmusic/DETAILS b/audio-players/lxmusic/DETAILS
deleted file mode 100755
index 1ba780d..0000000
--- a/audio-players/lxmusic/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
- SPELL=lxmusic
- VERSION=0.1.1
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-
SOURCE_HASH=sha512:4aa6d3fa6792055c099c95207141bb90d0708011f36a64be0307cadb4ac189e352bf546ed17d4d630e81391ae0aaff26f641b069da592260d9a076a7f586f581
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE=http://lxde.sourceforge.net/
- LICENSE[0]=GPL
- ENTERED=20070112
- SHORT="LXMusic is a very simple gtk+ xmms2 client written in pure
c."
-cat << EOF
-LXMusic is a very simple gtk+ client written in pure C. It has very few
-functionality, and can do nothing more than play the music. The UI is very
-clean and simple. This is currently aimed to be used as the default music
-player of LXDE (Lightweight X11 Desktop Environment) project. LXDE is a new
-project aimed to provide a new desktop environment with faster speed and
-less resoruce usage.
-EOF
diff --git a/audio-players/lxmusic/HISTORY b/audio-players/lxmusic/HISTORY
deleted file mode 100644
index 96263af..0000000
--- a/audio-players/lxmusic/HISTORY
+++ /dev/null
@@ -1,5 +0,0 @@
-2007-03-13 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: removed a sub_depends on CLIENTLIB it's always there
-
-2007-01-12 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-players/lxmusic/PRE_BUILD b/audio-players/lxmusic/PRE_BUILD
deleted file mode 100755
index fb070ba..0000000
--- a/audio-players/lxmusic/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit "s:^CFLAGS=:CFLAGS=$CFLAGS:" Makefile
diff --git a/audio-players/mpd/CONFIGURE b/audio-players/mpd/CONFIGURE
index 15394aa..56105dc 100755
--- a/audio-players/mpd/CONFIGURE
+++ b/audio-players/mpd/CONFIGURE
@@ -13,3 +13,7 @@ config_query_option MPD_OPTS "Enable writing to a pipe?" y \
config_query_option MPD_OPTS "Enable HTTP server output?" y \
"--enable-httpd-output" \
"--disable-httpd-output"
+
+config_query_option MPD_OPTS "Enable recorder file output plugin?" n \
+ "--enable-recorder-output" \
+ "--disable-recorder-output"
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index f8af27e..e293595 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,4 +1,5 @@
depends zlib &&
+depends glib2 &&

optional_depends libao \
"--enable-ao" \
@@ -10,6 +11,11 @@ optional_depends libcue \
"--disable-cue" \
"for CUE sheet support" &&

+optional_depends libffado \
+ "--enable-ffado" \
+ "--disable-ffado" \
+ "for libffado (FireWire) support" &&
+
optional_depends liblastfm \
"--enable-lastfm" \
"--disable-lastfm" \
@@ -21,14 +27,21 @@ optional_depends bzip2 \
"for bzip2 archive support" &&

optional_depends zziplib \
- "--enable-zip" \
- "--disable-zip" \
+ "--enable-zzip" \
+ "--disable-zzip" \
"for zip archive support" &&

optional_depends libvorbis \
- "--enable-vorbis-encoder" "" \
+ "--enable-vorbis" \
+ "--disable-vorbis" \
"for Ogg Vorbis support" &&

+if is_depends_enabled $SPELL libvorbis; then
+ config_query_option MPD_OPTS "Enable Ogg Vorbis encoder support?" y \
+ "--enable-vorbis-encoder" \
+ "--disable-vorbis-encoder"
+fi &&
+
optional_depends sidplay-libs \
"--enable-sidplay" \
"--disable-sidplay" \
@@ -40,9 +53,15 @@ optional_depends libmpcdec \
"for musepack support" &&

optional_depends flac \
- "--enable-flac --enable-oggflac" \
- "--disable-flac --disable-oggflac" \
- "for FLAC (and OggFLAC) support" &&
+ "--enable-flac" \
+ "--disable-flac" \
+ "for FLAC support" &&
+
+if is_depends_enabled $SPELL flac && is_depends_enabled flac libogg; then
+ config_query_option MPD_OPTS "Enable OggFLAC support?" y \
+ "--enable-oggflac" \
+ "--disable-oggflac"
+fi &&

optional_depends faad2 \
"--enable-aac" \
@@ -54,6 +73,17 @@ optional_depends audiofile \
"--disable-audiofile" \
"for WAVE, AIFF and AU file support" &&

+if is_depends_enabled $SPELL audiofile; then
+ config_query_option MPD_OPTS "Enable WAVE encoder support?" y \
+ "--enable-wave-encoder" \
+ "--disable-wave-encoder"
+fi &&
+
+optional_depends libsndfile \
+ "--enable-sndfile" \
+ "--disable-sndfile" \
+ "for sndfile support" &&
+
optional_depends alsa-lib \
"--enable-alsa" \
"--disable-alsa" \
@@ -77,7 +107,12 @@ optional_depends pulseaudio \
optional_depends libmad \
"--enable-mad" \
"--disable-mad" \
- "to use libmad (for mp3 files support)" &&
+ "for mp3 files support (libmad)" &&
+
+optional_depends mpg123 \
+ "--enable-mpg123" \
+ "--disable-mpg123" \
+ "for mp3 files support (libmpg123)" &&

optional_depends libid3tag \
"--enable-id3" \
@@ -87,18 +122,18 @@ optional_depends libid3tag \
optional_depends libmikmod \
"--enable-mikmod" \
"--disable-mikmod" \
- "for mod file support (libmikmod, default disabled)" &&
-
-optional_depends fluidsynth \
- "--enable-fluidsynth" \
- "--disable-fluidsynth" \
- "for MIDI support via fluidsynth" &&
+ "for mod file support (libmikmod)" &&

optional_depends libmodplug \
"--enable-modplug" \
"--disable-modplug" \
"for mod file support (libmodplug)" &&

+optional_depends fluidsynth \
+ "--enable-fluidsynth" \
+ "--disable-fluidsynth" \
+ "for MIDI support via fluidsynth" &&
+
optional_depends libsamplerate \
"--enable-lsr" \
"--disable-lsr" \
@@ -115,9 +150,15 @@ optional_depends wavpack \
"for WavPack support" &&

optional_depends lame \
- "--enable-lame-encoder" "" \
+ "--enable-lame-encoder" \
+ "--disable-lame-encoder" \
"for LAME encoder support" &&

+optional_depends twolame \
+ "--enable-twolame-encoder" \
+ "--disable-twolame-encoder" \
+ "for TwoLAME mp2 encoder support" &&
+
optional_depends curl \
"--enable-curl" \
"--disable-curl" \
@@ -133,6 +174,11 @@ optional_depends LIBAVCODEC \
"--disable-ffmpeg" \
"for FFMPEG support" &&

+optional_depends OPENAL \
+ "--enable-openal" \
+ "--disable-openal" \
+ "for OpenAL support" &&
+
optional_depends libmms \
"--enable-mms" \
"--disable-mms" \
@@ -141,4 +187,9 @@ optional_depends libmms \
optional_depends avahi \
"--with-zeroconf=avahi" \
"--with-zeroconf=no" \
- "for Zeroconf service discovery support"
+ "for Zeroconf service discovery support" &&
+
+optional_depends xmlto \
+ "--enable-documentation" \
+ "--disable-documentation" \
+ "to build documentation"
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 4fa3d91..8e0fea7 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.15.15
+ VERSION=0.16
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:d45334b387c55e691c8f7b29a6eb7fc194f685ff8679ce8e9243ed6d5f4b075b477e52726adb81ec3d453e3437a268356f9daef6b034f341ee1f0c007d9dcbfe
+
SOURCE_HASH=sha512:3cd44b081ef6f5e291d006f63015e1ab0b82dddc6a3e421db49e1984146bf9345ee1562acc1005e20f53b3fff7909d5717b340762a4b4e7b1fd01b0d8b2ae579
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index ec001bd..ae8c24b 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,10 @@
+2010-12-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.16
+ * DEPENDS: corrected flags, added new dependencies
+ * CONFIGURE: added new configure options
+ * init.d/mpd: ``--create-db'' isn't used anymore
+ * init.d/mpd.conf: updated example config file
+
2010-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15.15

diff --git a/audio-players/mpd/init.d/mpd b/audio-players/mpd/init.d/mpd
index 0f937de..0589b2b 100644
--- a/audio-players/mpd/init.d/mpd
+++ b/audio-players/mpd/init.d/mpd
@@ -4,8 +4,5 @@ PROGRAM=/usr/bin/mpd
ARGS="/etc/sysconfig/mpd"
RUNLEVEL=3
NEEDS=""
-MPD_DB="$(grep db_file /etc/sysconfig/mpd | cut -d \" -f 2)"
-
-[[ ! -f $MPD_DB ]] && ARGS="$ARGS --create-db"

. /etc/init.d/smgl_init
diff --git a/audio-players/mpd/init.d/mpd.conf
b/audio-players/mpd/init.d/mpd.conf
index 9193262..b14337c 100644
--- a/audio-players/mpd/init.d/mpd.conf
+++ b/audio-players/mpd/init.d/mpd.conf
@@ -49,6 +49,11 @@
#
#state_file "~/.mpd/state"
#
+# The location of the sticker database. This is a database which
+# manages dynamic information attached to songs.
+#
+#sticker_file "~/.mpd/sticker.sql"
+#

###############################################################################


@@ -61,6 +66,13 @@
#
#user "nobody"
#
+# This setting specifies the group that MPD will run as. If not specified
+# primary group of user specified with "user" setting will be used (if set).
+# This is useful if MPD needs to be a member of group such as "audio" to
+# have permission to use sound card.
+#
+#group "nogroup"
+#
# This setting sets the address for the daemon to listen on. Careful
attention
# should be paid if this is assigned to anything other then the default, any.
# This setting can deny access to control of the daemon.
@@ -102,6 +114,16 @@
#
#metadata_to_use
"artist,album,title,track,name,genre,date,composer,performer,disc"
#
+# This setting enables automatic update of MPD's database when files in
+# music_directory are changed.
+#
+#auto_update "yes"
+#
+# Limit the depth of the directories being watched, 0 means only watch
+# the music directory itself. There is no limit by default.
+#
+#auto_update_depth "3"
+#

###############################################################################


@@ -177,11 +199,12 @@ input {
#audio_output {
# type "alsa"
# name "My ALSA Device"
-# device "hw:0,0" # optional
-# format "44100:16:2" # optional
-# mixer_device "default" # optional
-# mixer_control "PCM" # optional
-# mixer_index "0" # optional
+## device "hw:0,0" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "default" # optional
+## mixer_control "PCM" # optional
+## mixer_index "0" # optional
#}
#
# An example of an OSS output:
@@ -189,10 +212,11 @@ input {
#audio_output {
# type "oss"
# name "My OSS Device"
-# device "/dev/dsp" # optional
-# format "44100:16:2" # optional
-# mixer_device "/dev/mixer" # optional
-# mixer_control "PCM" # optional
+## device "/dev/dsp" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "/dev/mixer" # optional
+## mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):
@@ -208,12 +232,25 @@ input {
# quality "5.0"
# bitrate "128"
# format "44100:16:1"
-# protocol "icecast2" # optional
-# user "source" # optional
-# description "My Stream Description" # optional
-# genre "jazz" # optional
-# public "no" # optional
-# timeout "2" # optional
+## protocol "icecast2" # optional
+## user "source" # optional
+## description "My Stream Description" # optional
+## genre "jazz" # optional
+## public "no" # optional
+## timeout "2" # optional
+## mixer_type "software" # optional
+#}
+#
+# An example of a recorder output:
+#
+#audio_output {
+# type "recorder"
+# name "My recorder"
+# encoder "vorbis" # optional, vorbis or lame
+# path "/var/lib/mpd/recorder/mpd.ogg"
+## quality "5.0" # do not define if bitrate is
defined
+# bitrate "128" # do not define if quality is
defined
+# format "44100:16:1"
#}
#
# An example of a httpd output (built-in HTTP streaming server):
@@ -223,9 +260,11 @@ input {
# name "My HTTP Stream"
# encoder "vorbis" # optional, vorbis or lame
# port "8000"
-# quality "5.0" # do not define if bitrate is
defined
+# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6
+## quality "5.0" # do not define if bitrate is
defined
# bitrate "128" # do not define if quality is
defined
# format "44100:16:1"
+# max_clients "0" # optional 0=no limit
#}
#
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
@@ -233,8 +272,8 @@ input {
#audio_output {
# type "pulse"
# name "My Pulse Output"
-# server "remote_server" # optional
-# sink "remote_server_sink" # optional
+## server "remote_server" # optional
+## sink "remote_server_sink" # optional
#}
#
## Example "pipe" output:
@@ -255,6 +294,7 @@ input {
#audio_output {
# type "null"
# name "My Null Output"
+# mixer_type "none" # optional
#}
#
# This setting will change all decoded audio to be converted to the specified
@@ -273,38 +313,11 @@ input {

###############################################################################


-# Volume control mixer
########################################################
-#
-# These are the global volume control settings. By default, this setting will
-# be detected to the available audio output device, with preference going to
-# hardware mixing. Hardware and software mixers for individual audio_output
-# sections cannot yet be mixed.
-#
-# An example for controlling an ALSA, OSS or Pulseaudio mixer; If this
-# setting is used other sound applications will be affected by the volume
-# being controlled by MPD.
-#
-#mixer_type "hardware"
-#
-# An example for controlling all mixers through software. This will control
-# all controls, even if the mixer is not supported by the device and will not
-# affect any other sound producing applications.
-#
-#mixer_type "software"
-#
-# This example will not allow MPD to touch the mixer at all and will disable
-# all volume controls.
-#
-#mixer_type "disabled"
-#
-###############################################################################
-
-
# Normalization automatic volume adjustments
##################################
#
# This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "album" or "track". See <http://www.replaygain.org> for more
-# details. This setting is disabled by default.
+# the argument "off", "album" or "track". See <http://www.replaygain.org>
+# for more details. This setting is off by default.
#
#replaygain "album"
#
@@ -357,8 +370,7 @@ input {
# Character Encoding
##########################################################
#
# If file or directory names do not display correctly for your locale then
you
-# may need to modify this setting. After modification of this setting mpd
-# --create-db must be run to change the database.
+# may need to modify this setting.
#
#filesystem_charset "UTF-8"
#
@@ -367,3 +379,29 @@ input {
#id3v1_encoding "ISO-8859-1"
#

###############################################################################
+
+
+# SIDPlay decoder
#############################################################
+#
+# songlength_database:
+# Location of your songlengths file, as distributed with the HVSC.
+# The sidplay plugin checks this for matching MD5 fingerprints.
+# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
+#
+# default_songlength:
+# This is the default playing time in seconds for songs not in the
+# songlength database, or in case you're not using a database.
+# A value of 0 means play indefinitely.
+#
+# filter:
+# Turns the SID filter emulation on or off.
+#
+#decoder {
+# plugin "sidplay"
+# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt"
+# default_songlength "120"
+# filter "true"
+#}
+#
+###############################################################################
+
diff --git a/crypto/ccid/DETAILS b/crypto/ccid/DETAILS
index 2aad884..26fea30 100755
--- a/crypto/ccid/DETAILS
+++ b/crypto/ccid/DETAILS
@@ -1,9 +1,9 @@
SPELL=ccid
- VERSION=1.4.0
-
SOURCE_HASH=sha512:088591a3e782c613a41b33dc0ff5c2bd1e92cf209c1a9d8e23e8f1ace86aa0524bdc245688df3ffbb06cfae487ea3966741a6a7a694a92f3c30a40f233104503
+ VERSION=1.4.1
+
SOURCE_HASH=sha512:1041c151773e391db64de1e3173c26ef4bbc5a73edd0bc4b3bb82fe0d0aea6ab5f6579b19f9e07661f0b49010930873e627fd189243fbc5a6e28676e65233f14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3333/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3475/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/ccid.html
LICENSE[0]=LGPL
ENTERED=20070123
diff --git a/crypto/ccid/HISTORY b/crypto/ccid/HISTORY
index 2668c5f..610653e 100644
--- a/crypto/ccid/HISTORY
+++ b/crypto/ccid/HISTORY
@@ -1,3 +1,6 @@
+2010-12-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.1
+
2010-08-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index aead4f4..7563557 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
- VERSION=1.6.4
-
SOURCE_HASH=sha512:4f6aaab1fbd1652a8dc84c151ef7d4568c076c2090b4a6059b9362940a8da7a6e50421a0cfb3ff6b2383733385e63686d95884ba4b9ad28f4cbcab2cfac29210
+ VERSION=1.6.6
+
SOURCE_HASH=sha512:b3b13a4d11cdccc2483bdc81acb8d7e2a38b2a7b35b90d2ff2562ec8205d0d493720fe28432c51f2917ed02a1771c63bbeee6aed54a8d6fee7e299d90aa7f43b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3337/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3479/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
LICENSE[0]=BSD
ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index c3ffdba..a6daf0f 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2010-12-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.6
+
2010-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.4
* BUILD, DEPENDS, CONFIGURE: removed obsolete options,
diff --git a/disk/libisofs/DETAILS b/disk/libisofs/DETAILS
index fa3bc0c..614a1db 100755
--- a/disk/libisofs/DETAILS
+++ b/disk/libisofs/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBISOFS_SVN == y ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=0.6.38
-
SOURCE_HASH=sha512:f96ca85ade395c3a54e61bacba9a4279f9c8c9a40cda0161ba58875aaadcfa56ffdaaea4049224eb1b2d90d151fa48c58556c0d4f66f296aae5c1f6bb1bea6d4
+ VERSION=0.6.40
+
SOURCE_HASH=sha512:b8cf2424819be5c71b0c734ca69b2ad686512cfbec9c00d8441174908015d215ad91e5ae6acf25e1231c6ec3aba074a1f77ed5ab0098a70c12818d62d239e4bc
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
index aa24477..fdc99ef 100644
--- a/disk/libisofs/HISTORY
+++ b/disk/libisofs/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.40
+
2010-10-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.38

diff --git a/doc/xdvik/DETAILS b/doc/xdvik/DETAILS
index c243dad..5cb630f 100755
--- a/doc/xdvik/DETAILS
+++ b/doc/xdvik/DETAILS
@@ -1,9 +1,9 @@
SPELL=xdvik
- VERSION=22.84.10
+ VERSION=22.84.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/xdvi/${SOURCE}
-SOURCE_HASH=sha512:288b743ceb2a259ea0143de2312cde4e6ca78b8b5b3831aef729d87e85fd0b58a6efebaea4349286bbe699179c063889b2052a1331d2b9589a674464f2899ce7
+SOURCE_HASH=sha512:e95c94bd9e6c161cef3f7b9278761eee0dfa34c5bf1765426a33152fe2cec3705de183d981d68421b7b1b2877e75d7c4b9d0c0056ae8aa3f50d6b6275384af8a
WEB_SITE=http://xdvi.sourceforge.net/
ENTERED=20060929
KEYWORDS="doc"
diff --git a/doc/xdvik/HISTORY b/doc/xdvik/HISTORY
index 32b4e4e..161b26a 100644
--- a/doc/xdvik/HISTORY
+++ b/doc/xdvik/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated to 22.84.16 .
+
2009-08-06 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* PROVIDES: added for XDVI
* DEPENDS: fix GUI selection, also t1lib is hard depend we use
diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index f082311..560c38e 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,5 +1,5 @@
SPELL=transmission
- VERSION=2.12
+ VERSION=2.13
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://mirrors.m0k.org/$SPELL/files/$SOURCE
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index e0187c1..db93d51 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.13
+
2010-11-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.12

diff --git a/ftp/transmission/transmission-2.12.tar.bz2.sig
b/ftp/transmission/transmission-2.12.tar.bz2.sig
deleted file mode 100644
index dd799ce..0000000
Binary files a/ftp/transmission/transmission-2.12.tar.bz2.sig and /dev/null
differ
diff --git a/ftp/transmission/transmission-2.13.tar.bz2.sig
b/ftp/transmission/transmission-2.13.tar.bz2.sig
new file mode 100644
index 0000000..f8a6496
Binary files /dev/null and b/ftp/transmission/transmission-2.13.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgdata/DETAILS b/gnome2-libs/libgdata/DETAILS
index 078e7c1..8429bf1 100755
--- a/gnome2-libs/libgdata/DETAILS
+++ b/gnome2-libs/libgdata/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgdata
- VERSION=0.6.5
+ VERSION=0.6.6
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgdata/HISTORY b/gnome2-libs/libgdata/HISTORY
index b74d5a8..b6ca3b1 100644
--- a/gnome2-libs/libgdata/HISTORY
+++ b/gnome2-libs/libgdata/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.6
+
2010-10-01 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.6.5

diff --git a/gnome2-libs/libgdata/libgdata-0.6.5.tar.bz2.sig
b/gnome2-libs/libgdata/libgdata-0.6.5.tar.bz2.sig
deleted file mode 100644
index 53dd7f6..0000000
Binary files a/gnome2-libs/libgdata/libgdata-0.6.5.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig
b/gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig
new file mode 100644
index 0000000..ba9a208
Binary files /dev/null and b/gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig
differ
diff --git a/gnome2-libs/pangomm/DETAILS b/gnome2-libs/pangomm/DETAILS
index ed7fe18..f6c638d 100755
--- a/gnome2-libs/pangomm/DETAILS
+++ b/gnome2-libs/pangomm/DETAILS
@@ -1,5 +1,5 @@
SPELL=pangomm
- VERSION=2.26.2
+ VERSION=2.26.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/pangomm/HISTORY b/gnome2-libs/pangomm/HISTORY
index 501901f..cadc207 100644
--- a/gnome2-libs/pangomm/HISTORY
+++ b/gnome2-libs/pangomm/HISTORY
@@ -1,3 +1,6 @@
+2010-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.26.3
+
2010-05-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.26.2

diff --git a/gnome2-libs/pangomm/pangomm-2.26.2.tar.bz2.sig
b/gnome2-libs/pangomm/pangomm-2.26.2.tar.bz2.sig
deleted file mode 100644
index 708c6ac..0000000
Binary files a/gnome2-libs/pangomm/pangomm-2.26.2.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/pangomm/pangomm-2.26.3.tar.bz2.sig
b/gnome2-libs/pangomm/pangomm-2.26.3.tar.bz2.sig
new file mode 100644
index 0000000..9ebf8b8
Binary files /dev/null and b/gnome2-libs/pangomm/pangomm-2.26.3.tar.bz2.sig
differ
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index fa50051..c66d003 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.12
+ VERSION=3.6.13
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,7 +17,7 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=37
+ SECURITY_PATCH=38
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 26e6f9a..93db3d4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.13, SECURITY_PATCH=38
+
2010-11-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel to version 4.0b7

diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 6dfac96..ff40edd 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,12 +1,12 @@
SPELL=seamonkey
- VERSION=2.0.10
+ VERSION=2.0.11
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:daf440a601e8e1cda8f534dab74fdcdd7a618cccd407f83331cd7ad7df9574fa7ed4e94ef44c6a79a76ab0845186dfc52d65f379f2e2a0a4762f5993ecb0a939
+
SOURCE_HASH=sha512:408956e17cb14bf851a7a5811f107a683ad3db45aef172a9eabcc1928bf0682a1096c95a08c5ebd577772f73f25ee54b4ffa0694af619ebe17d87808cf34806d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=28
+ SECURITY_PATCH=29
ENTERED=20010922
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 9f4728a..a2f340c 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.11, SECURITY_PATCH=29
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 2a032fa..19f5607 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
SPELL=xulrunner
- VERSION=1.9.2.12
- FFVERSION=3.6.12
+ VERSION=1.9.2.13
+ FFVERSION=3.6.13
SOURCE=firefox-$FFVERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://www.mozilla.org/
- SECURITY_PATCH=19
+ SECURITY_PATCH=20
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 7097c09..13f9b9a 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.2.13, FFVERSION=3.6.13, SECURITY_PATCH=20
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/libs/elfutils/DETAILS b/libs/elfutils/DETAILS
index 13fc5b0..d7adbf8 100755
--- a/libs/elfutils/DETAILS
+++ b/libs/elfutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=elfutils
- VERSION=0.149
+ VERSION=0.150
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_GPG="gnu.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/libs/elfutils/HISTORY b/libs/elfutils/HISTORY
index b7f44a0..ac58bb0 100644
--- a/libs/elfutils/HISTORY
+++ b/libs/elfutils/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.150
+
2010-09-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.149

diff --git a/libs/pcre/BUILD b/libs/pcre/BUILD
index 943a688..8789da5 100755
--- a/libs/pcre/BUILD
+++ b/libs/pcre/BUILD
@@ -6,6 +6,4 @@ if [[ $BUILDUTF8 == y ]]; then

fi &&

-make_single &&
-default_build &&
-make_normal
+default_build
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 639c60c..19a5259 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=8.10
+ VERSION=8.11
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 422fef5..1fdfa0d 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,7 @@
+2010-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 8.11
+ * BUILD, INSTALL: remove make_single
+
2010-10-04 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Use make_single, fails with multiple jobs (actually fails)

diff --git a/libs/pcre/INSTALL b/libs/pcre/INSTALL
deleted file mode 100755
index 03b8bb9..0000000
--- a/libs/pcre/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-make_single &&
-default_install
diff --git a/libs/rasqal/DETAILS b/libs/rasqal/DETAILS
index 275dbda..f328349 100755
--- a/libs/rasqal/DETAILS
+++ b/libs/rasqal/DETAILS
@@ -1,5 +1,5 @@
SPELL=rasqal
- VERSION=0.9.20
+ VERSION=0.9.21
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/librdf/$SOURCE
diff --git a/libs/rasqal/HISTORY b/libs/rasqal/HISTORY
index 430c4f1..3f3f3d0 100644
--- a/libs/rasqal/HISTORY
+++ b/libs/rasqal/HISTORY
@@ -1,3 +1,6 @@
+2010-12-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.21
+
2010-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.20

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index f7a7f30..09d9a81 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=3.1.6
+ VERSION=3.1.7
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=23
+ SECURITY_PATCH=24
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 25f9b04..069dbaf 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1.7, SECURITY_PATCH=24
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/net/cacti/DEPENDS b/net/cacti/DEPENDS
index 4563082..f430700 100755
--- a/net/cacti/DEPENDS
+++ b/net/cacti/DEPENDS
@@ -2,4 +2,6 @@ depends WEBSERVER &&
depends PHP &&
depends rrdtool &&
depends MYSQL &&
-depends net-snmp
+depends net-snmp &&
+
+suggest_depends spine "" "" "for high-performance poller support"
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 9648da4..6d2abbe 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,12 +1,13 @@
SPELL=cacti
VERSION=0.8.7g
SECURITY_PATCH=1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
if [[ $CACTI_PA == y ]]; then
- VERSION_PA=2.7
+ VERSION_PA=2.8
SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.tar.gz
SOURCE2_URL[0]=http://mirror.cactiusers.org/downloads/plugins/$SOURCE2
-
SOURCE2_HASH=sha512:a7d7f00fd0a1bb38b40234d48d94681945854c512f012cb3b032356e92e568be409fc1eab5eac7b8db870c264a4b8dbf18676bbba5bca006bd735854e09dae6d
+
SOURCE2_HASH=sha512:4ac6f3bb459def465ef63f87e9129f11b42e351f14c2ceb53f3b1dd5e824c9ad939c3bdec0e51ea864631e94fd99dc8c72eaf0e9ed4de61bd06ab9db92015b85
SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 7422e65..43cd4c5 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,10 @@
+2010-12-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated plugin arch to 2.8
+ * DEPENDS: added spine suggest dependency
+ * PRE_BUILD: reimplement patching logic
+ * patches/*: added 0.8.7g patches
+ * pa.patch: added, to use with the latest official patches
+
2010-10-20 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.8.7g

diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 12e9f98..6fbe833 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -1,11 +1,4 @@
default_pre_build &&
-
-if [[ $CACTI_PA == y ]]; then
- mk_source_dir "$SOURCE_DIRECTORY2"
- cd "$SOURCE_DIRECTORY2" &&
- unpack_file 2
-fi &&
-
cd "$SOURCE_DIRECTORY" &&

if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
@@ -15,6 +8,17 @@ if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
fi &&

if [[ $CACTI_PA == y ]]; then
+ mk_source_dir "$SOURCE_DIRECTORY2"
+ cd "$SOURCE_DIRECTORY2" &&
+ unpack_file 2 &&
+
+ patch -p1 < "$SPELL_DIRECTORY/pa.patch" &&
+
+ cd "$SOURCE_DIRECTORY" &&
+
cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
- patch -p1 <
"$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
+ patch -p1 <
"$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
&&
+
+ # cleaning up post-patching
+ rm -f *.orig
fi
diff --git a/net/cacti/pa.patch b/net/cacti/pa.patch
new file mode 100644
index 0000000..eb4e7ce
--- /dev/null
+++ b/net/cacti/pa.patch
@@ -0,0 +1,31 @@
+--- cacti-PA-2.8/cacti-plugin-arch/cacti-plugin-0.8.7g-PA-v2.8.diff
2010-07-10 02:40:54.000000000 +0400
++++ cacti-PA-2.8-patched/cacti-plugin-arch/cacti-plugin-0.8.7g-PA-v2.8.diff
2010-12-09 15:17:56.372139350 +0300
+@@ -203,9 +203,9 @@
+ if (sizeof($data_sources) > 0) {
+ foreach ($data_sources as $data_source) {
+ + $data_source =
api_plugin_hook_function('data_sources_table', $data_source);
+- $data_template_name =
((empty($data_source["data_template_name"])) ? "<em>None</em>" :
$data_source["data_template_name"]);
+- $data_input_name =
((empty($data_source["data_input_name"])) ? "<em>External</em>" :
$data_source["data_input_name"]);
+- $poller_interval =
((isset($poller_intervals[$data_source["local_data_id"]])) ?
$poller_intervals[$data_source["local_data_id"]] : 0);
++ /* we're escaping strings here, so no need to escape
them on form_selectable_cell */
++ $data_template_name =
((empty($data_source["data_template_name"])) ? "<em>None</em>" :
htmlspecialchars($data_source["data_template_name"]));
++ $data_input_name =
((empty($data_source["data_input_name"])) ? "<em>External</em>" :
htmlspecialchars($data_source["data_input_name"]));
+ diff -Naur cacti-0.8.7g-old/graph_image.php cacti-0.8.7g/graph_image.php
+ --- cacti-0.8.7g-old/graph_image.php 2010-07-09 18:33:46.000000000 -0400
+ +++ cacti-0.8.7g/graph_image.php 2010-07-09 18:34:11.000000000 -0400
+@@ -2395,14 +2395,12 @@
+ /* Populate each execution file with appropriate information
*/
+ foreach ($polling_hosts as $item) {
+ if ($host_count == 1) {
+-@@ -446,9 +450,11 @@
++@@ -446,7 +450,9 @@
+
+ /* sleep the appripriate amount of time */
+ if ($poller_runs_completed < $poller_runs) {
+ + api_plugin_hook('poller_bottom');
+- db_close();
+ usleep($sleep_time * 1000000);
+- db_connect_real($database_hostname,
$database_username, $database_password, $database_default, $database_type,
$database_port);
+ + api_plugin_hook('poller_top');
+ }
+ }else if (read_config_option('log_verbosity') >=
POLLER_VERBOSITY_MEDIUM || $debug) {
diff --git a/net/cacti/patches/data_source_deactivate.patch
b/net/cacti/patches/data_source_deactivate.patch
new file mode 100644
index 0000000..1a3f727
--- /dev/null
+++ b/net/cacti/patches/data_source_deactivate.patch
@@ -0,0 +1,17 @@
+--- cacti-0.8.7g/lib/api_data_source.php 2010-07-09 18:33:46.000000000
-0400
++++ cacti-0.8.7g-patched/lib/api_data_source.php 2010-07-27
21:30:31.000000000 -0400
+@@ -131,12 +131,12 @@
+
+ $i++;
+
+- if ($i % 1000) {
++ if (!($i % 1000)) {
+ db_execute("DELETE FROM poller_item WHERE
local_data_id IN ($ids_to_disable)");
+ db_execute("UPDATE data_template_data SET
active='' WHERE local_data_id IN ($ids_to_disable)");
+
+ $i = 0;
+- $ids_to_delete = "";
++ $ids_to_disable = "";
+ }
+ }
+
diff --git a/net/cacti/patches/graph_list_view.patch
b/net/cacti/patches/graph_list_view.patch
new file mode 100644
index 0000000..47a5b72
--- /dev/null
+++ b/net/cacti/patches/graph_list_view.patch
@@ -0,0 +1,110 @@
+--- cacti-0.8.7g/graph_view.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/graph_view.php 2010-07-27 21:30:31.000000000
-0400
+@@ -204,7 +204,7 @@
+ $sql_where = "";
+ $sql_join = "";
+ }
+- /* the user select a bunch of graphs of the 'list' view and wants
them dsplayed here */
++ /* the user select a bunch of graphs of the 'list' view and wants
them displayed here */
+ if (isset($_REQUEST["style"])) {
+ if (get_request_var_request("style") == "selective") {
+
+@@ -296,8 +296,9 @@
+ $sql_where =
get_graph_permissions_sql($current_user["policy_graphs"],
$current_user["policy_hosts"], $current_user["policy_graph_templates"]);
+
+ $hosts =
db_fetch_assoc("SELECT DISTINCT host.id, host.description as name
+- FROM
(graph_templates_graph,graph_local)
+- LEFT
JOIN host ON (host.id=graph_local.host_id)
++ FROM
host
++ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
++ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
+ LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
+ LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
+ WHERE
graph_templates_graph.local_graph_id=graph_local.id
+@@ -327,8 +328,9 @@
+ <?php
+ if
(read_config_option("auth_method") != 0) {
+
$graph_templates = db_fetch_assoc("SELECT DISTINCT graph_templates.*
+- FROM
(graph_templates_graph,graph_local)
+- LEFT
JOIN host ON (host.id=graph_local.host_id)
++ FROM
host
++ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
++ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
+ LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
+ LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
+ WHERE
graph_templates_graph.local_graph_id=graph_local.id
+@@ -514,10 +516,10 @@
+ }else{
+ /* if any of the settings changed, reset the page number */
+ $changed = false;
+- $changed += check_changed("host_id",
"sess_graphs_view_list_host");
+- $changed += check_changed("rows",
"sess_graphs_view_list_rows");
+- $changed += check_changed("graph_template_id",
"sess_graphs_view_list_graph_template");
+- $changed += check_changed("filter",
"sess_graphs_view_list_filter");
++ $changed += check_changed("host_id",
"sess_graph_view_list_host");
++ $changed += check_changed("rows",
"sess_graph_view_list_rows");
++ $changed += check_changed("graph_template_id",
"sess_graph_view_list_graph_template");
++ $changed += check_changed("filter",
"sess_graph_view_list_filter");
+ if ($changed) $_REQUEST["page"] = 1;
+ }
+
+@@ -563,7 +565,7 @@
+ ?>
+ <tr bgcolor="#<?php print $colors["panel"];?>">
+ <td>
+- <form style="margin:0px;padding:0px;" name="form_graph_list"
method="POST" onSubmit='form_graph(document.chk,document.form_graph_list)'
action="graph_view.php">
++ <form style="margin:0px;padding:0px;" name="form_graph_list"
method="POST" onSubmit='form_graph(document.chk,document.form_graph_list)'>
+ <table width="100%" cellpadding="0" cellspacing="0">
+ <tr>
+ <td nowrap style='white-space:
nowrap;' width="40">
+@@ -578,8 +580,9 @@
+ $sql_where =
get_graph_permissions_sql($current_user["policy_graphs"],
$current_user["policy_hosts"], $current_user["policy_graph_templates"]);
+
+ $hosts =
db_fetch_assoc("SELECT DISTINCT host.id, host.description as name
+- FROM
(graph_templates_graph,graph_local)
+- LEFT
JOIN host ON (host.id=graph_local.host_id)
++ FROM
host
++ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
++ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
+ LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
+ LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
+ WHERE
graph_templates_graph.local_graph_id=graph_local.id
+@@ -608,8 +611,9 @@
+ <?php
+ if
(read_config_option("auth_method") != 0) {
+
$graph_templates = db_fetch_assoc("SELECT DISTINCT graph_templates.*
+- FROM
(graph_templates_graph,graph_local)
+- LEFT
JOIN host ON (host.id=graph_local.host_id)
++ FROM
host
++ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
++ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
+ LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
+ LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
+ WHERE
graph_templates_graph.local_graph_id=graph_local.id
+@@ -736,13 +740,13 @@
+
+ html_start_box("", "100%", $colors["header"], "1", "center", "");
+ print $nav;
+- html_header_checkbox(array("Graph Title", "Graph Size"));
++ html_header_checkbox(array("Graph Title", "Graph Size"), false);
+
+ $i = 0;
+ if (sizeof($graphs)) {
+ foreach ($graphs as $graph) {
+ form_alternate_row_color($colors["alternate"],
$colors["light"], $i, 'line' . $graph["local_graph_id"]); $i++;
+- form_selectable_cell("<strong><a href='" .
htmlspecialchars("graph.php?local_graph_id=" . $graph["local_graph_id"] .
"&rra_id=all") . "'>" . htmlspecialchars($graph["title_cache"]) .
"</a><strong>", $graph["local_graph_id"]);
++ form_selectable_cell("<strong><a href='" .
htmlspecialchars("graph.php?local_graph_id=" . $graph["local_graph_id"] .
"&rra_id=all") . "'>" . htmlspecialchars($graph["title_cache"]) .
"</a></strong>", $graph["local_graph_id"]);
+ form_selectable_cell($graph["height"] . "x" .
$graph["width"], $graph["local_graph_id"]);
+ form_checkbox_cell($graph["title_cache"],
$graph["local_graph_id"]);
+ form_end_row();
+@@ -795,8 +799,8 @@
+ strDel = strDel.substring(0,strDel.length - 1);
+ strURL = '&graph_add=' + strAdd + '&graph_remove=' + strDel;
+ return strNavURL + strURL;
+- alert(strAdd);
+- alert(strDel);
++ //alert(strAdd);
++ //alert(strDel);
+ }
+ function url_go(strURL) {
+ document.location = strURL;
diff --git a/net/cacti/patches/html_output.patch
b/net/cacti/patches/html_output.patch
new file mode 100644
index 0000000..22f0985
--- /dev/null
+++ b/net/cacti/patches/html_output.patch
@@ -0,0 +1,71 @@
+--- cacti-0.8.7g/lib/html_form.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/lib/html_form.php 2010-07-27 21:30:31.000000000
-0400
+@@ -65,7 +65,7 @@
+
form_alternate_row_color($colors["form_alternate1"],
$colors["form_alternate2"], $i, 'row_' . $field_name);
+ }
+
+- print "<td width='" .
((isset($config_array["left_column_width"])) ?
$config_array["left_column_width"] : "50%") . "'>\n<font
class='textEditTitle'>" . htmlspecialchars($field_array["friendly_name"]) .
"</font><br>\n";
++ print "<td width='" .
((isset($config_array["left_column_width"])) ?
$config_array["left_column_width"] : "50%") . "'>\n<font
class='textEditTitle'>" . $field_array["friendly_name"] . "</font><br>\n";
+
+ if (isset($field_array["sub_checkbox"])) {
+
form_checkbox($field_array["sub_checkbox"]["name"],
$field_array["sub_checkbox"]["value"],
+--- cacti-0.8.7g/lib/data_query.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/lib/data_query.php 2010-07-27 21:30:31.000000000
-0400
+@@ -620,6 +620,7 @@
+ }
+
+ /* update the cache */
++ /* TODO: if both $sort field and $title_format are empty, this yields
funny results */
+ db_execute("update host_snmp_query set sort_field = '$sort_field',
title_format = '$title_format' where host_id = '$host_id' and snmp_query_id =
'$data_query_id'");
+ }
+
+--- cacti-0.8.7g/data_sources.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/data_sources.php 2010-07-27 21:30:31.000000000
-0400
+@@ -899,7 +899,7 @@
+ <td bgcolor='#" . $colors["header"] . "'
class='textHeaderDark'>
+ <strong>Data Source Item</strong>
$header_label
+ </td>
+- <td class='textHeaderDark' align='right'
bgcolor='" . $colors["header"] . "'>
++ <td class='textHeaderDark' align='right'
bgcolor='#" . $colors["header"] . "'>
+ " . ((!empty($_GET["id"]) &&
(empty($data_template["id"]))) ? "<strong><a class='linkOverDark' href='" .
htmlspecialchars("data_sources.php?action=rrd_add&id=" . $_GET["id"]) .
"'>New</a>&nbsp;</strong>" : "") . "
+ </td>
+ </tr>\n";
+@@ -1310,16 +1310,17 @@
+ $i = 0;
+ if (sizeof($data_sources) > 0) {
+ foreach ($data_sources as $data_source) {
+- $data_template_name =
((empty($data_source["data_template_name"])) ? "<em>None</em>" :
$data_source["data_template_name"]);
+- $data_input_name =
((empty($data_source["data_input_name"])) ? "<em>External</em>" :
$data_source["data_input_name"]);
++ /* we're escaping strings here, so no need to escape
them on form_selectable_cell */
++ $data_template_name =
((empty($data_source["data_template_name"])) ? "<em>None</em>" :
htmlspecialchars($data_source["data_template_name"]));
++ $data_input_name =
((empty($data_source["data_input_name"])) ? "<em>External</em>" :
htmlspecialchars($data_source["data_input_name"]));
+ $poller_interval =
((isset($poller_intervals[$data_source["local_data_id"]])) ?
$poller_intervals[$data_source["local_data_id"]] : 0);
+ form_alternate_row_color($colors["alternate"],
$colors["light"], $i, 'line' . $data_source["local_data_id"]); $i++;
+ form_selectable_cell("<a class='linkEditMain' href='"
. htmlspecialchars("data_sources.php?action=ds_edit&id=" .
$data_source["local_data_id"]) . "' title='" . $data_source["name_cache"] .
"'>" . ((get_request_var_request("filter") != "") ? eregi_replace("(" .
preg_quote(get_request_var_request("filter")) . ")", "<span
style='background-color: #F8D93D;'>\\1</span>",
title_trim(htmlspecialchars($data_source["name_cache"]),
read_config_option("max_title_data_source"))) :
title_trim(htmlspecialchars($data_source["name_cache"]),
read_config_option("max_title_data_source"))) . "</a>",
$data_source["local_data_id"]);
+ form_selectable_cell($data_source['local_data_id'],
$data_source['local_data_id']);
+-
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>",
htmlspecialchars($data_input_name)) : htmlspecialchars($data_input_name)),
$data_source["local_data_id"]);
++
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>", $data_input_name) :
$data_input_name), $data_source["local_data_id"]);
+
form_selectable_cell(get_poller_interval($poller_interval),
$data_source["local_data_id"]);
+ form_selectable_cell(($data_source['active'] == "on"
? "Yes" : "No"), $data_source["local_data_id"]);
+-
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>",
htmlspecialchars($data_source['data_template_name'])) :
htmlspecialchars($data_source['data_template_name'])),
$data_source["local_data_id"]);
++
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>", $data_template_name) :
$data_template_name), $data_source["local_data_id"]);
+ form_checkbox_cell($data_source["name_cache"],
$data_source["local_data_id"]);
+ form_end_row();
+ }
+--- cacti-0.8.7g/graphs.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/graphs.php 2010-07-27 21:30:31.000000000 -0400
+@@ -1317,11 +1317,12 @@
+ $i = 0;
+ if (sizeof($graph_list) > 0) {
+ foreach ($graph_list as $graph) {
+- $template_name = ((empty($graph["name"])) ?
"<em>None</em>" : $graph["name"]);
++ /* we're escaping strings here, so no need to escape
them on form_selectable_cell */
++ $template_name = ((empty($graph["name"])) ?
"<em>None</em>" : htmlspecialchars($graph["name"]));
+ form_alternate_row_color($colors["alternate"],
$colors["light"], $i, 'line' . $graph["local_graph_id"]); $i++;
+ form_selectable_cell("<a class='linkEditMain' href='"
. htmlspecialchars("graphs.php?action=graph_edit&id=" .
$graph["local_graph_id"]) . "' title='" .
htmlspecialchars($graph["title_cache"]) . "'>" .
((get_request_var_request("filter") != "") ? eregi_replace("(" .
preg_quote(get_request_var_request("filter")) . ")", "<span
style='background-color: #F8D93D;'>\\1</span>",
title_trim(htmlspecialchars($graph["title_cache"]),
read_config_option("max_title_graph"))) :
title_trim(htmlspecialchars($graph["title_cache"]),
read_config_option("max_title_graph"))) . "</a>", $graph["local_graph_id"]);
+ form_selectable_cell($graph["local_graph_id"],
$graph["local_graph_id"]);
+-
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>",
htmlspecialchars($template_name)) : htmlspecialchars($template_name)),
$graph["local_graph_id"]);
++
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>", $template_name) :
$template_name), $graph["local_graph_id"]);
+ form_selectable_cell($graph["height"] . "x" .
$graph["width"], $graph["local_graph_id"]);
+ form_checkbox_cell($graph["title_cache"],
$graph["local_graph_id"]);
+ form_end_row();
diff --git a/net/cacti/patches/ldap_group_authenication.patch
b/net/cacti/patches/ldap_group_authenication.patch
new file mode 100644
index 0000000..00894c0
--- /dev/null
+++ b/net/cacti/patches/ldap_group_authenication.patch
@@ -0,0 +1,11 @@
+--- cacti-0.8.7g/lib/ldap.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/lib/ldap.php 2010-07-27 21:30:31.000000000 -0400
+@@ -250,7 +250,7 @@
+ if ($ldap_response) {
+ if ($this->group_require == 1) {
+ /* Process group membership if
required */
+- if ($ldap_group_member_type == 1) {
++ if ($this->group_member_type == 1) {
+ $ldap_group_response =
@ldap_compare($ldap_conn, $this->group_dn, $this->group_attrib, $this->dn);
+ } else {
+ $ldap_group_response =
@ldap_compare($ldap_conn, $this->group_dn, $this->group_attrib,
$this->username);
diff --git a/net/cacti/patches/ping.patch b/net/cacti/patches/ping.patch
new file mode 100644
index 0000000..a48050b
--- /dev/null
+++ b/net/cacti/patches/ping.patch
@@ -0,0 +1,23 @@
+diff -ruBbd cacti-0.8.7g/lib/ping.php cacti-0.8.7g-patched/lib/ping.php
+--- cacti-0.8.7g/lib/ping.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/lib/ping.php 2010-08-31 20:31:22.000000000 -0400
+@@ -577,12 +577,16 @@
+ switch(socket_select($r =
array($this->socket), $w = array($this->socket), $f = array($this->socket),
$to_sec, $to_usec)){
+ case 2:
+ /* connection refused */
+- $this->ping_response = "TCP ping
connection refused";
+- $this->ping_status = "down";
++ $this->time =
$this->get_time($this->precision);
++
++ if (($this->time*1000) <=
$this->timeout) {
++ $this->ping_response = "TCP
Ping connection refused (" . $this->time*1000 . " ms)";
++ $this->ping_status =
$this->time*1000;
++ }
+
+ $this->close_socket();
+
+- return false;
++ return true; /* "connection refused"
says: host is alive (else ping would time out) */
+ case 1:
+ /* connected, so calculate the total
time and return */
+ $this->time =
$this->get_time($this->precision);
diff --git a/net/cacti/patches/poller_interval.patch
b/net/cacti/patches/poller_interval.patch
new file mode 100644
index 0000000..dac3956
--- /dev/null
+++ b/net/cacti/patches/poller_interval.patch
@@ -0,0 +1,168 @@
+diff -ruBbd cacti-0.8.7g/lib/database.php
cacti-0.8.7g-patched/lib/database.php
+--- cacti-0.8.7g/lib/database.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/lib/database.php 2010-08-31 20:31:22.000000000
-0400
+@@ -38,14 +38,14 @@
+ $cnn = NewADOConnection($db_type);
+ $class = get_class($cnn);
+
+- if (!is_a($cnn_id, $class)) {
+- $cnn_id = $cnn;
+- }
+-
+ $hostport = $host . ":" . $port;
+
+ while ($i <= $retries) {
+ if ($cnn->PConnect($hostport,$user,$pass,$db_name)) {
++ if (!is_a($cnn_id, $class)) {
++ $cnn_id = $cnn;
++ }
++
+ return($cnn);
+ }
+
+@@ -92,7 +92,7 @@
+ while (1) {
+ $query = $db_conn->Execute($sql);
+
+- if (($query) || ($db_conn->ErrorNo() == 1032)) {
++ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() ==
1032)) {
+ return(1);
+ }else if (($db_conn->ErrorNo() == 1049) ||
($db_conn->ErrorNo() == 1051)) {
+ printf("FATAL: Database or Table does not exist");
+@@ -143,7 +143,7 @@
+
+ $query = $db_conn->Execute($sql);
+
+- if (($query) || ($db_conn->ErrorNo() == 1032)) {
++ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() == 1032)) {
+ if (!$query->EOF) {
+ if ($col_name != '') {
+ $column = $query->fields[$col_name];
+@@ -184,7 +184,7 @@
+ $db_conn->SetFetchMode(ADODB_FETCH_ASSOC);
+ $query = $db_conn->Execute($sql);
+
+- if (($query) || ($db_conn->ErrorNo() == 1032)) {
++ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() == 1032)) {
+ if (!$query->EOF) {
+ $fields = $query->fields;
+
+@@ -222,7 +222,7 @@
+ $db_conn->SetFetchMode(ADODB_FETCH_ASSOC);
+ $query = $db_conn->Execute($sql);
+
+- if (($query) || ($db_conn->ErrorNo() == 1032)) {
++ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() == 1032)) {
+ while ((!$query->EOF) && ($query)) {
+ $data{sizeof($data)} = $query->fields;
+ $query->MoveNext();
+diff -ruBbd cacti-0.8.7g/poller.php cacti-0.8.7g-patched/poller.php
+--- cacti-0.8.7g/poller.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/poller.php 2010-08-31 20:31:22.000000000 -0400
+@@ -109,7 +109,7 @@
+ }
+
+ /* record the start time */
+-list($micro,$seconds) = split(" ", microtime());
++list($micro,$seconds) = explode(" ", microtime());
+ $poller_start = $seconds + $micro;
+ $overhead_time = 0;
+
+@@ -140,7 +140,7 @@
+ WHERE rrd_next_step<=0
+ GROUP BY host_id
+ ORDER BY host_id"),
"host_id", "data_sources");
+- $poller_runs = $cron_interval / $poller_interval;
++ $poller_runs = intval($cron_interval / $poller_interval);
+
+ define("MAX_POLLER_RUNTIME", $poller_runs * $poller_interval - 2);
+ }else{
+@@ -211,10 +211,11 @@
+
+ $poller_runs_completed = 0;
+ $poller_items_total = 0;
++$polling_hosts = array_merge(array(0 => array("id" => "0")),
db_fetch_assoc("SELECT id FROM host WHERE disabled='' ORDER BY id"));
+
+ while ($poller_runs_completed < $poller_runs) {
+ /* record the start time for this loop */
+- list($micro,$seconds) = split(" ", microtime());
++ list($micro,$seconds) = explode(" ", microtime());
+ $loop_start = $seconds + $micro;
+
+ /* calculate overhead time */
+@@ -222,8 +223,6 @@
+ $overhead_time = $loop_start - $poller_start;
+ }
+
+- $polling_hosts = array_merge(array(0 => array("id" => "0")),
db_fetch_assoc("SELECT id FROM host WHERE disabled = '' ORDER BY id"));
+-
+ /* initialize counters for script file handling */
+ $host_count = 1;
+
+@@ -375,7 +374,7 @@
+
+ break;
+ }else {
+- if (read_config_option("log_verbosity") >=
POLLER_VERBOSITY_MEDIUM) {
++ if (read_config_option("log_verbosity") >=
POLLER_VERBOSITY_MEDIUM || $debug) {
+ print "Waiting on " .
($started_processes - $finished_processes) . " of " . $started_processes . "
pollers.\n";
+ }
+
+@@ -390,7 +389,7 @@
+
+ break;
+ }else{
+- sleep(1);
++ usleep(500);
+ }
+ }
+ }
+@@ -427,28 +426,27 @@
+ $poller_runs_completed++;
+
+ /* record the start time for this loop */
+- list($micro,$seconds) = split(" ", microtime());
++ list($micro,$seconds) = explode(" ", microtime());
+ $loop_end = $seconds + $micro;
++ $loop_time = $loop_end - $loop_start;
+
+- if (($loop_end - $loop_start) < $poller_interval) {
++ if ($loop_time < $poller_interval) {
+ if ($poller_runs_completed == 1) {
+- $sleep_time = ($poller_interval - ($loop_end -
$loop_start) - $overhead_time);
+- }else{
+- $sleep_time = ($poller_interval - ($loop_end -
$loop_start));
++ $sleep_time = $poller_interval - $loop_time -
$overhead_time;
++ } else {
++ $sleep_time = $poller_interval - $loop_time;
+ }
+
+ /* log some nice debug information */
+- if (read_config_option('log_verbosity') >=
POLLER_VERBOSITY_DEBUG) {
+- echo "Loop Time is: " . ($loop_end - $loop_start) .
"\n";
+- echo "Sleep Time is: " . $sleep_time . "\n";
+- echo "Total Time is: " . ($loop_end - $poller_start)
. "\n";
++ if (read_config_option('log_verbosity') >=
POLLER_VERBOSITY_DEBUG || $debug) {
++ echo "Loop Time is: " . round($loop_time, 2) . "\n";
++ echo "Sleep Time is: " . round($sleep_time, 2) . "\n";
++ echo "Total Time is: " . round($loop_end -
$poller_start, 2) . "\n";
+ }
+
+ /* sleep the appripriate amount of time */
+ if ($poller_runs_completed < $poller_runs) {
+- db_close();
+ usleep($sleep_time * 1000000);
+- db_connect_real($database_hostname,
$database_username, $database_password, $database_default, $database_type,
$database_port);
+ }
+ }else if (read_config_option('log_verbosity') >=
POLLER_VERBOSITY_MEDIUM || $debug) {
+ cacti_log("WARNING: Cacti Polling Cycle Exceeded Poller
Interval by " . $loop_end-$loop_start-$poller_interval . " seconds", TRUE,
"POLLER");
+@@ -459,7 +457,7 @@
+ $hosts_per_process, $num_polling_items, $rrds_processed) {
+
+ /* take time and log performance data */
+- list($micro,$seconds) = split(" ", microtime());
++ list($micro,$seconds) = explode(" ", microtime());
+ $loop_end = $seconds + $micro;
+
+ $cacti_stats = sprintf(
+
diff --git a/net/cacti/patches/script_server_command_line_parse.patch
b/net/cacti/patches/script_server_command_line_parse.patch
new file mode 100644
index 0000000..8cddf18
--- /dev/null
+++ b/net/cacti/patches/script_server_command_line_parse.patch
@@ -0,0 +1,136 @@
+--- cacti-0.8.7g/script_server.php 2010-07-09 18:33:46.000000000 -0400
++++ cacti-0.8.7g-patched/script_server.php 2010-07-27 21:30:31.000000000
-0400
+@@ -72,7 +72,7 @@
+ }
+
+ /* record the script start time */
+-list($micro,$seconds) = split(" ", microtime());
++list($micro,$seconds) = explode(" ", microtime());
+ $start = $seconds + $micro;
+
+ /* some debugging */
+@@ -171,7 +171,11 @@
+
+ if (isset($command_array[2])) {
+ $parameters = trim($command_array[2]);
+- $parameter_array = explode(" ",
trim($command_array[2]));
++ $parameter_array = array();
++ if (!parseArgs($parameters,
$parameter_array)) {
++ cacti_log("WARNING: Script
Server count not parse '$parameters' for $function", false, "PHPSVR");
++ return "U";
++ }
+ }else{
+ $parameters = "";
+ $parameters_array = array();
+@@ -236,3 +240,111 @@
+ exit (-1);
+ }
+ }
++
++function parseArgs($string, &$str_list, $debug = false) {
++ $delimiters = array("'",'"');
++ $delimited = false;
++ $str_list = array();
++
++ if ($debug) echo "String: '" . $string . "'\n";
++
++ foreach($delimiters as $delimiter) {
++ if (strpos($string, $delimiter) !== false) {
++ $delimited = true;
++ break;
++ }
++ }
++
++ /* process the simple case */
++ if (!$delimited) {
++ $str_list = explode(" ", $string);
++
++ if ($debug) echo "Output: '" . implode(",", $str_list) .
"'\n";
++
++ return true;
++ }
++
++ /* Break str down into an array of characters and process */
++ $char_array = str_split($string);
++ $escaping = false;
++ $indelim = false;
++ $parse_ok = true;
++ $curstr = '';
++ foreach($char_array as $char) {
++ switch ($char) {
++ case '\'':
++ case '"':
++ if (!$indelim) {
++ if (!$escaping) {
++ $indelim = true;
++ }else{
++ $curstr .= $char;
++ $escaping = false;
++ }
++ }elseif (!$escaping) {
++ $str_list[] = $curstr;
++ $curstr = '';
++ $indelim = false;
++ }elseif ($escaping) {
++ $curstr .= $char;
++ $escaping = false;
++ }
++
++ break;
++ case '\\':
++ if ($escaping) {
++ $curstr .= $char;
++ $escaping = false;
++ }else{
++ $escaping = true;
++ }
++
++ break;
++ case ' ':
++ if ($escaping) {
++ $parse_ok = false;
++ $msg = 'Parse error attempting to parse
string';
++ }elseif ($indelim) {
++ $curstr .= $char;
++ }elseif (strlen($curstr)) {
++ $str_list[] = $curstr;
++ $curstr = '';
++ }
++
++ break;
++ case '`':
++ $parse_ok = false;
++ $msg = 'Backtic (`) characters not allowed';
++
++ break;
++ default:
++ if ($escaping) {
++ $parse_ok = false;
++ $msg = 'Parse error attempting to parse
string';
++ }else{
++ $curstr .= $char;
++ }
++ break;
++ }
++
++ if (!$parse_ok) {
++ break;
++ }
++ }
++
++ /* Add the last str to the string array */
++ if ($indelim || $escaping) {
++ $parse_ok = false;
++ $msg = 'Parse error attempting to parse string';
++ }
++
++ if (!$parse_ok) {
++ echo "ERROR: " . $msg . " '" . $string . "'\n";
++ }else{
++ $str_list[] = $curstr;
++ }
++
++ if ($debug) echo "Output: '" . implode(",", $str_list) . "'\n";
++
++ return $parse_ok;
++}
diff --git a/net/spine/DETAILS b/net/spine/DETAILS
index 0b83afb..27a7865 100755
--- a/net/spine/DETAILS
+++ b/net/spine/DETAILS
@@ -1,8 +1,8 @@
SPELL=spine
- VERSION=0.8.7e
+ VERSION=0.8.7g
SOURCE=cacti-$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:7ec964922770f7db89fdf62dff74fdd98397a045239e9e776efd8f07791d243125211d660acc54060cb7e386d8d9997e6cef2c4fc1364e7076f8e3c6ddd90536
+
SOURCE_HASH=sha512:be0dd06649005085b2ef6c773e934e9dedd35d7c2d990637ae45347c5e27d8076f046f7b08ea497e183b688661b63b4135e6cecefe4c74f4b422f7008e90f117
SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION"
WEB_SITE=http://www.cacti.net/spine_info.php
LICENSE[0]=LGPL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index 1713793..1fccfc0 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,9 @@
+2010-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.7g
+ * INSTALL: upstream finally fixed conf trashing issue
+ * PRE_BUILD: removed reconf
+ * patches/unified_issues.patch: added official patch
+
2010-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: fixed compilation with newer autotools; apply the patch
* INSTALL: added, to properly install config file
diff --git a/net/spine/INSTALL b/net/spine/INSTALL
index 283f5a5..bd369c0 100755
--- a/net/spine/INSTALL
+++ b/net/spine/INSTALL
@@ -1,3 +1,4 @@
default_install &&

-install_config_file "$SOURCE_DIRECTORY/spine.conf"
"$INSTALL_ROOT/etc/spine.conf"
+install_config_file "$SOURCE_DIRECTORY/spine.conf.dist" \
+ "$INSTALL_ROOT/etc/spine.conf"
diff --git a/net/spine/PRE_BUILD b/net/spine/PRE_BUILD
index 66c1a66..4f1cd3f 100755
--- a/net/spine/PRE_BUILD
+++ b/net/spine/PRE_BUILD
@@ -1,10 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/config.patch" &&
-
-libtoolize --copy --force --install &&
-
if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
patch -p1 < $patch
diff --git a/net/spine/config.patch b/net/spine/config.patch
deleted file mode 100644
index 808eb3a..0000000
--- a/net/spine/config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2009-06-29 06:03:36.000000000 +0400
-+++ Makefile.am 2010-05-21 19:53:22.980952845 +0400
-@@ -2,7 +2,4 @@
-
- spine_SOURCES = sql.c spine.c util.c snmp.c locks.c poller.c nft_popen.c
php.c ping.c keywords.c error.c
-
--configdir = $(sysconfdir)
--config_DATA = spine.conf
--
- bin_PROGRAMS = spine
-\ No newline at end of file
diff --git a/net/spine/patches/mysql_client_reconnect.patch
b/net/spine/patches/mysql_client_reconnect.patch
deleted file mode 100644
index 5880915..0000000
--- a/net/spine/patches/mysql_client_reconnect.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 0.8.7e/sql.c 2009-06-28 21:45:02.000000000 -0400
-+++ ../branches/0.8.7/sql.c 2009-08-18 20:51:30.000000000 -0400
-@@ -186,6 +186,12 @@
- die("FATAL: MySQL options unable to set timeout value");
- }
-
-+ my_bool reconnect = 1;
-+ options_error = mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
-+ if (options_error < 0) {
-+ die("FATAL: MySQL options unable to set reconnect option\n");
-+ }
-+
- while (tries > 0) {
- tries--;
-
diff --git a/net/spine/patches/ping_reliability.patch
b/net/spine/patches/ping_reliability.patch
deleted file mode 100644
index 0535fa5..0000000
--- a/net/spine/patches/ping_reliability.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 0.8.7e/ping.c 2009-06-28 21:45:02.000000000 -0400
-+++ ../branches/0.8.7/ping.c 2009-08-18 20:51:30.000000000 -0400
-@@ -890,7 +890,7 @@
- return(cleaned_hostname);
- }
-
--/*! \fn unsigned short get_checksum(void* buf, int len)
-+/*! \fn unsigned short int get_checksum(void* buf, int len)
- * \brief calculates a 16bit checksum of a packet buffer
- * \param buf the input buffer to calculate the checksum of
- * \param len the size of the input buffer
-@@ -898,11 +898,12 @@
- * \return 16bit checksum of an input buffer of size len.
- *
- */
--unsigned short get_checksum(void* buf, int len) {
-+unsigned short int get_checksum(void* buf, int len) {
- int nleft = len;
- int32_t sum = 0;
-- unsigned short answer;
-- unsigned short* w = (unsigned short*)buf;
-+ unsigned short int answer;
-+ unsigned short int* w = (unsigned short int*)buf;
-+ unsigned short int odd_byte = 0;
-
- while (nleft > 1) {
- sum += *w++;
-@@ -910,7 +911,8 @@
- }
-
- if (nleft == 1) {
-- sum += *(unsigned char*)w;
-+ *(unsigned char*)(&odd_byte) = *(unsigned char*)w;
-+ sum += odd_byte;
- }
-
- sum = (sum >> 16) + (sum & 0xffff);
---- 0.8.7e/ping.h 2009-06-28 21:45:02.000000000 -0400
-+++ ../branches/0.8.7/ping.h 2009-08-18 20:51:30.000000000 -0400
-@@ -142,4 +142,4 @@
- extern char *remove_tcp_udp_from_hostname(char *hostname);
- extern void update_host_status(int status, host_t *host, ping_t *ping, int
availability_method);
- extern int init_sockaddr(struct sockaddr_in *name, const char *hostname,
unsigned short int port);
--extern unsigned short get_checksum(void* buf, int len);
-+extern unsigned short int get_checksum(void* buf, int len);
diff --git a/net/spine/patches/snmp_v3_fix.patch
b/net/spine/patches/snmp_v3_fix.patch
deleted file mode 100644
index 6efe173..0000000
--- a/net/spine/patches/snmp_v3_fix.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 0.8.7e/configure.ac 2009-06-28 21:45:02.000000000 -0400
-+++ ../branches/0.8.7/configure.ac 2009-08-18 20:51:30.000000000 -0400
-@@ -351,6 +351,21 @@
- AC_MSG_RESULT([no])
- fi
-
-+# ****************** Force Net-SNMP Version Checks ***********************
-+# If we should use the system popen or nifty popen
-+AC_MSG_CHECKING(whether to verify net-snmp library vs header versions)
-+AC_ARG_ENABLE(strict-snmp,
-+ [ --enable-strict-snmp Enable checking of Net-SNMP library vs
header versions (default: disabled)],
-+ [ ENABLED_SNMP_VERSION=$enableval ],
-+ [ ENABLED_SNMP_VERSION=no ]
-+ )
-+if test "$ENABLED_SNMP_VERSION" = "yes"; then
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE(VERIFY_PACKAGE_VERSION, 1, If we are going to force Net-SNMP
library and header versons to be the same)
-+else
-+ AC_MSG_RESULT([no])
-+fi
-+
- # ****************** gethostbyname_r Check ***********************
- # Linux Variant
- AC_MSG_CHECKING([for glibc gethostbyname_r])
---- 0.8.7e/snmp.c 2009-06-28 21:45:02.000000000 -0400
-+++ ../branches/0.8.7/snmp.c 2009-08-18 20:51:30.000000000 -0400
-@@ -91,7 +91,7 @@
- netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_BARE_VALUE, 1);
- netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_NUMERIC_TIMETICKS, 1);
-
-- #ifdef PACKAGE_VERSION
-+ #if defined(VERIFY_PACKAGE_VERSION) && defined(PACKAGE_VERSION)
- /* check that the headers we compiled with match the library
we linked with -
- apparently not defined in UCD-SNMP...
- */
-@@ -215,24 +215,22 @@
- session.securityName = snmp_username;
- session.securityNameLen = strlen(session.securityName);
-
-+ if (snmp_context && strlen(snmp_context)) {
- session.contextName = snmp_context;
- session.contextNameLen = strlen(session.contextName);
-+ }
-
- session.securityAuthKeyLen = USM_AUTH_KU_LEN;
-
-- /* set the engineBoots and engineTime to null so that they
are discovered */
-- session.engineBoots = 0;
-- session.engineTime = 0;
--
- /* set the authentication protocol */
- if (strcmp(snmp_auth_protocol, "MD5") == 0) {
- /* set the authentication method to MD5 */
-- session.securityAuthProto =
snmp_duplicate_objid(usmHMACMD5AuthProtocol, OIDSIZE(usmHMACMD5AuthProtocol));
-- session.securityAuthProtoLen =
OIDSIZE(usmHMACMD5AuthProtocol);
-+ session.securityAuthProto =
snmp_duplicate_objid(usmHMACMD5AuthProtocol, USM_AUTH_PROTO_MD5_LEN);
-+ session.securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN;
- }else{
- /* set the authentication method to SHA1 */
-- session.securityAuthProto =
snmp_duplicate_objid(usmHMACSHA1AuthProtocol,
OIDSIZE(usmHMACSHA1AuthProtocol));
-- session.securityAuthProtoLen =
OIDSIZE(usmHMACSHA1AuthProtocol);
-+ session.securityAuthProto =
snmp_duplicate_objid(usmHMACSHA1AuthProtocol, USM_AUTH_PROTO_SHA_LEN);
-+ session.securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
- }
-
- /* set the authentication key to the hashed version. The
password must me at least 8 char */
-@@ -255,16 +253,16 @@
- session.securityLevel =
SNMP_SEC_LEVEL_AUTHNOPRIV;
- }else{
- if (strcmp(snmp_priv_protocol, "DES") == 0) {
-- session.securityPrivProto =
snmp_duplicate_objid(usmDESPrivProtocol, OIDSIZE(usmDESPrivProtocol));
-- session.securityPrivProtoLen =
OIDSIZE(usmDESPrivProtocol);
-+ session.securityPrivProto =
snmp_duplicate_objid(usmDESPrivProtocol, USM_PRIV_PROTO_DES_LEN);
-+ session.securityPrivProtoLen =
USM_PRIV_PROTO_DES_LEN;
- session.securityPrivKeyLen =
USM_PRIV_KU_LEN;
-
- /* set the security level to authenticate,
and encrypted */
- session.securityLevel =
SNMP_SEC_LEVEL_AUTHPRIV;
- }else{
-- #if defined(usmAESPrivProtocol) &&
SNMP_DEFAULT_PRIV_PROTO == usmAESPrivProtocol
-- session.securityPrivProto =
snmp_duplicate_objid(usmAESPrivProtocol, OIDSIZE(usmAESPrivProtocol));
-- session.securityPrivProtoLen =
OIDSIZE(usmAESPrivProtocol);
-+ #if defined(USM_PRIV_PROTO_AES_LEN)
-+ session.securityPrivProto =
snmp_duplicate_objid(usmAESPrivProtocol, USM_PRIV_PROTO_AES_LEN);
-+ session.securityPrivProtoLen =
USM_PRIV_PROTO_AES_LEN;
- session.securityPrivKeyLen =
USM_PRIV_KU_LEN;
- #else
- session.securityPrivProto =
snmp_duplicate_objid(usmAES128PrivProtocol, OIDSIZE(usmAES128PrivProtocol));
diff --git a/net/spine/patches/unified_issues.patch
b/net/spine/patches/unified_issues.patch
new file mode 100644
index 0000000..d24cdaa
--- /dev/null
+++ b/net/spine/patches/unified_issues.patch
@@ -0,0 +1,348 @@
+diff -ruBbd cacti-spine-0.8.7g.old/ChangeLog cacti-spine-0.8.7g/ChangeLog
+--- cacti-spine-0.8.7g.old/ChangeLog 2010-07-09 19:25:56.000000000 -0400
++++ cacti-spine-0.8.7g/ChangeLog 2010-08-31 20:21:22.000000000 -0400
+@@ -1,5 +1,13 @@
+ The Cacti Group | spine
+
++Patched 0.8.7g
++-bug#0001669: Problems with getting data from script using SPINE on Windows
Server 2003 x32
++-bug#0001829: Wrong string numerical value got from Spine SNMP poller
++-bug: Net-snmp API issues cause spine crashes with some SNMP agents
++-bug: Host list not properly initialized
++-bug: Mutex locking issues cause deadlocks in Windows
++-bug: Escape windows type back slashes in scripts
++
+ 0.8.7g
+ -feature: Multi threaded host polling
+
+diff -ruBbd cacti-spine-0.8.7g.old/poller.c cacti-spine-0.8.7g/poller.c
+--- cacti-spine-0.8.7g.old/poller.c 2010-07-09 17:39:53.000000000 -0400
++++ cacti-spine-0.8.7g/poller.c 2010-08-31 20:18:58.000000000 -0400
+@@ -57,21 +57,26 @@
+ host_data_ids = poller_details.host_data_ids;
+ snprintf(host_time, SMALL_BUFSIZE, "%s", poller_details.host_time);
+
+- thread_mutex_unlock(LOCK_THREAD);
+-
+ free(arg);
+
++ thread_ready = TRUE;
++
+ SPINE_LOG_DEBUG(("DEBUG: In Poller, About to Start Polling of Host"));
+
+ poll_host(host_id, host_thread, last_host_thread, host_data_ids,
host_time);
+
+- thread_mutex_lock(LOCK_THREAD);
+-
++ while (TRUE) {
++ if (thread_mutex_trylock(LOCK_THREAD) == 0) {
+ active_threads--;
++ thread_mutex_unlock(LOCK_THREAD);
+
+- SPINE_LOG_DEBUG(("DEBUG: The Value of Active Threads is %i"
,active_threads));
++ break;
++ }
+
+- thread_mutex_unlock(LOCK_THREAD);
++ usleep(100);
++ }
++
++ SPINE_LOG_DEBUG(("DEBUG: The Value of Active Threads is %i"
,active_threads));
+
+ /* end the thread */
+ pthread_exit(0);
+@@ -965,7 +970,7 @@
+ poll_result = exec_poll(host,
poller_items[i].arg1);
+
+ /* process the result */
+- if ((is_numeric(poll_result)) ||
(is_multipart_output(poll_result))) {
++ if ((is_numeric(poll_result)) ||
(is_multipart_output(trim(poll_result)))) {
+ snprintf(poller_items[i].result,
RESULTS_BUFFER, "%s", poll_result);
+ }else if (is_hexadecimal(snmp_oids[j].result,
TRUE)) {
+ snprintf(poller_items[i].result,
RESULTS_BUFFER, "%lld", hex2dec(poll_result));
+@@ -998,7 +1003,7 @@
+ poll_result = php_cmd(poller_items[i].arg1,
php_process);
+
+ /* process the output */
+- if ((is_numeric(poll_result)) ||
(is_multipart_output(poll_result))) {
++ if ((is_numeric(poll_result)) ||
(is_multipart_output(trim(poll_result)))) {
+ snprintf(poller_items[i].result,
RESULTS_BUFFER, "%s", poll_result);
+ }else if (is_hexadecimal(snmp_oids[j].result,
TRUE)) {
+ snprintf(poller_items[i].result,
RESULTS_BUFFER, "%lld", hex2dec(poll_result));
+@@ -1247,7 +1252,7 @@
+ if (is_numeric(result)) {
+ return TRUE;
+ }else{
+- if (is_multipart_output(result)) {
++ if (is_multipart_output(trim(result))) {
+ return TRUE;
+ }else{
+ return FALSE;
+@@ -1290,7 +1295,7 @@
+
+ /* compensate for back slashes in arguments */
+ #if defined(__CYGWIN__)
+- proc_command = add_slashes(command, 2);
++ proc_command = add_slashes(command);
+ #else
+ proc_command = command;
+ #endif
+@@ -1340,7 +1345,7 @@
+ FD_SET(cmd_fd, &fds);
+
+ /* wait x seonds for pipe response */
+- switch (select(cmd_fd+1, &fds, NULL, NULL, &timeout)) {
++ switch (select(FD_SETSIZE, &fds, NULL, NULL, &timeout)) {
+ case -1:
+ switch (errno) {
+ case EBADF:
+@@ -1381,11 +1386,13 @@
+ break;
+ }
+ case 0:
++ #ifdef USING_TPOPEN
+ SPINE_LOG(("Host[%i] ERROR: The POPEN timed out",
current_host->id));
+
+- #ifdef USING_TPOPEN
+ close_fd = FALSE;
+ #else
++ SPINE_LOG(("Host[%i] ERROR: The NIFTY POPEN timed
out", current_host->id));
++
+ pid = nft_pchild(cmd_fd);
+ kill(pid, SIGKILL);
+ #endif
+diff -ruBbd cacti-spine-0.8.7g.old/snmp.c cacti-spine-0.8.7g/snmp.c
+--- cacti-spine-0.8.7g.old/snmp.c 2010-07-09 17:39:53.000000000 -0400
++++ cacti-spine-0.8.7g/snmp.c 2010-08-31 20:18:58.000000000 -0400
+@@ -499,13 +499,9 @@
+ size_t out_len = 0;
+
+ if ((buf = (u_char *) calloc(buf_len, 1)) != 0) {
+- if (sprint_realloc_value(&buf, &buf_len, &out_len, 1,
+- objid, objidlen, variable)) {
++ sprint_realloc_by_type(&buf, &buf_len, &out_len, 1, variable,
NULL, NULL, NULL);
+ snprintf(obuf, buf_len, "%s", buf);
+ }else{
+- snprintf(obuf, buf_len, "%s [TRUNCATED]", buf);
+- }
+- }else{
+ SET_UNDEFINED(obuf);
+ }
+
+@@ -528,6 +524,7 @@
+ int i;
+ int array_count;
+ int index_count;
++ char temp_result[RESULTS_BUFFER];
+
+ struct nameStruct {
+ oid name[MAX_OID_LEN];
+@@ -570,11 +567,13 @@
+ for(i = 0; i < num_oids && vars; i++) {
+ if
(!IS_UNDEFINED(snmp_oids[i].result)) {
+ #ifdef USE_NET_SNMP
+-
snmp_snprint_value(snmp_oids[i].result, RESULTS_BUFFER, vars->name,
vars->name_length, vars);
++
snmp_snprint_value(temp_result, RESULTS_BUFFER, vars->name,
vars->name_length, vars);
+ #else
+-
sprint_value(snmp_oids[i].result, vars->name, vars->name_length, vars);
++ sprint_value(temp_result,
vars->name, vars->name_length, vars);
+ #endif
+
++ snprintf(snmp_oids[i].result,
RESULTS_BUFFER, "%s", trim(temp_result));
++
+ vars = vars->next_variable;
+ }
+ }
+diff -ruBbd cacti-spine-0.8.7g.old/spine.c cacti-spine-0.8.7g/spine.c
+--- cacti-spine-0.8.7g.old/spine.c 2010-07-09 17:39:53.000000000 -0400
++++ cacti-spine-0.8.7g/spine.c 2010-08-31 20:18:58.000000000 -0400
+@@ -94,6 +94,7 @@
+ int num_hosts = 0;
+ int active_threads = 0;
+ int active_scripts = 0;
++int thread_ready = FALSE;
+
+ config_t set;
+ php_t *php_processes = 0;
+@@ -134,7 +135,7 @@
+ int poller_counter = 0;
+ int last_active_threads = 0;
+ int valid_conf_file = FALSE;
+- long int EXTERNAL_THREAD_SLEEP = 5000;
++ long int EXTERNAL_THREAD_SLEEP = 50;
+ long int internal_thread_sleep;
+ char querybuf[BIG_BUFSIZE], *qp = querybuf;
+ char *host_time = NULL;
+@@ -196,6 +197,7 @@
+
+ /* we attempt to support scripts better in cygwin */
+ #if defined(__CYGWIN__)
++ setenv("CYGWIN", "nodosfilewarning", 1);
+ if (file_exists("./sh.exe")) {
+ set.cygwinshloc = 0;
+ printf("NOTE: The Shell Command Exists in the current
directory\n");
+@@ -281,7 +283,7 @@
+
+ else if (STRMATCH(arg, "-H") ||
+ STRIMATCH(arg, "--hostlist")) {
+- snprintf(set.host_id_list, BIG_BUFSIZE, getarg(opt,
&argv));
++ snprintf(set.host_id_list, BIG_BUFSIZE, "%s",
getarg(opt, &argv));
+ }
+
+ else if (STRMATCH(arg, "-h") ||
+@@ -584,6 +586,11 @@
+ poller_details->host_data_ids = itemsPT;
+ poller_details->host_time = host_time;
+
++ /* this variable tells us that the child had
loaded the poller
++ * poller_details structure and we can move
on to the next thread
++ */
++ thread_ready = FALSE;
++
+ /* create child process */
+ thread_status =
pthread_create(&threads[device_counter], &attr, child, poller_details);
+
+@@ -596,6 +603,11 @@
+ }
+ active_threads++;
+
++ /* wait for the child to read
and process the structure */
++ while (!thread_ready) {
++
usleep(internal_thread_sleep);
++ }
++
+ SPINE_LOG_DEBUG(("DEBUG: The
Value of Active Threads is %i", active_threads));
+
+ break;
+@@ -603,7 +615,7 @@
+ SPINE_LOG(("ERROR: The System
Lacked the Resources to Create a Thread"));
+ break;
+ case EFAULT:
+- SPINE_LOG(("ERROR: The Thread
or Attribute Was Invalid"));
++ SPINE_LOG(("ERROR: The Thread
or Attribute were Invalid"));
+ break;
+ case EINVAL:
+ SPINE_LOG(("ERROR: The Thread
Attribute is Not Initialized"));
+@@ -613,6 +625,8 @@
+ break;
+ }
+
++ thread_mutex_unlock(LOCK_THREAD);
++
+ /* get current time and exit program if time
limit exceeded */
+ if (poller_counter >= 20) {
+ current_time = get_time_as_double();
+diff -ruBbd cacti-spine-0.8.7g.old/spine.h cacti-spine-0.8.7g/spine.h
+--- cacti-spine-0.8.7g.old/spine.h 2010-07-09 17:39:53.000000000 -0400
++++ cacti-spine-0.8.7g/spine.h 2010-08-31 20:18:58.000000000 -0400
+@@ -504,5 +504,6 @@
+ extern char start_datetime[20];
+ extern char config_paths[CONFIG_PATHS][BUFSIZE];
+ extern int active_threads;
++extern int thread_ready;
+
+ #endif /* not _SPINE_H_ */
+diff -ruBbd cacti-spine-0.8.7g.old/util.c cacti-spine-0.8.7g/util.c
+--- cacti-spine-0.8.7g.old/util.c 2010-07-09 17:39:53.000000000 -0400
++++ cacti-spine-0.8.7g/util.c 2010-08-31 20:18:58.000000000 -0400
+@@ -755,7 +755,7 @@
+ /* empty string is not all digits */
+ if ( *string == '\0' ) return FALSE;
+
+- while ( isdigit(*string) )
++ while ( isdigit((int)*string) )
+ string++;
+
+ return *string == '\0';
+@@ -773,7 +773,7 @@
+ */
+ int is_ipaddress(const char *string) {
+ while (*string) {
+- if ((isdigit(*string)) ||
++ if ((isdigit((int)*string)) ||
+ (*string == '.') ||
+ (*string == ':')) {
+ string++;
+@@ -887,7 +887,7 @@
+ i = strlen(string);
+
+ while (i >= 0) {
+- if (isdigit(string[i])) {
++ if (isdigit((int)string[i])) {
+ break;
+ }else{
+ string[i] = '\0';
+@@ -898,17 +898,15 @@
+ return string;
+ }
+
+-/*! \fn char *add_slashes(char *string, int arguments_2_strip)
+- * \brief change all backslashes to forward slashes for the first n
arguements.
++/*! \fn char *add_slashes(char *string)
++ * \brief add escaping to back slashes on for Windows type commands.
+ * \param string the string to replace slashes
+- * \param arguments_2_strip the number of space delimited arguments to
reverse
+ *
+ * \return a pointer to the modified string. Variable must be freed by
parent.
+ *
+ */
+-char *add_slashes(char *string, int arguments_2_strip) {
++char *add_slashes(char *string) {
+ int length;
+- int space_count;
+ int position;
+ int new_position;
+ char *return_str;
+@@ -919,9 +917,8 @@
+ return_str[0] = '\0';
+
+ length = strlen(string);
+- space_count = 0;
+ position = 0;
+- new_position = position;
++ new_position = 0;
+
+ /* simply return on blank string */
+ if (!length) {
+@@ -931,17 +928,9 @@
+ while (position < length) {
+ /* backslash detected, change to forward slash */
+ if (string[position] == '\\') {
+- /* only add slashes for first x arguments */
+- if (space_count < arguments_2_strip) {
+- return_str[new_position] = '/';
+- }else{
+- return_str[new_position] = string[position];
+- }
+- /* end of argument detected */
+- }else if (string[position] == ' ') {
+- return_str[new_position] = ' ';
+- space_count++;
+- /* normal character detected */
++ return_str[new_position] = '\\';
++ new_position++;
++ return_str[new_position] = '\\';
+ }else{
+ return_str[new_position] = string[position];
+ }
+@@ -1248,7 +1237,7 @@
+ seteuid(0);
+
+ if (geteuid() != 0) {
+- SPINE_LOG_DEBUG(("WARNING: Spine NOT running asroot. This is
require if using ICMP. Please run \"chmod +s;chown root:root spine\" to
resolve."));
++ SPINE_LOG_DEBUG(("WARNING: Spine NOT running asroot. This is
required if using ICMP. Please run \"chmod +s;chown root:root spine\" to
resolve."));
+ set.icmp_avail = FALSE;
+ }else{
+ SPINE_LOG_DEBUG(("DEBUG: Spine is running asroot."));
+diff -ruBbd cacti-spine-0.8.7g.old/util.h cacti-spine-0.8.7g/util.h
+--- cacti-spine-0.8.7g.old/util.h 2010-07-09 17:39:53.000000000 -0400
++++ cacti-spine-0.8.7g/util.h 2010-08-31 20:18:58.000000000 -0400
+@@ -54,7 +54,7 @@
+ extern int is_hexadecimal(const char * str, const short ignore_space);
+
+ /* string and file functions */
+-extern char *add_slashes(char *string, int arguments_2_strip);
++extern char *add_slashes(char *string);
+ extern int file_exists(const char *filename);
+ extern char *strip_alpha(char *string);
+ extern char *strncopy(char *dst, const char *src, size_t n);
diff --git a/perl-cpan/ack/DETAILS b/perl-cpan/ack/DETAILS
index b905f73..7762ae0 100755
--- a/perl-cpan/ack/DETAILS
+++ b/perl-cpan/ack/DETAILS
@@ -1,6 +1,6 @@
SPELL=ack
- VERSION=1.92
-
SOURCE_HASH=sha512:8ebfc3768a09a2db40afe5d56709946699ee3bdbcee963942d76a3055dddbbc01c8be8e5d47d8ab6a37f29433846340530da9d7a93187f4c6a8c02816446583a
+ VERSION=1.94
+
SOURCE_HASH=sha512:4636eec0816a1a7d05c5213f51a5dc439123e534866dd9803333fe0c762107cf94085915820dbf1a13d0e2b86e278ce6fba2b9892fd59db2998c3dd44fa48469
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/perl-cpan/ack/HISTORY b/perl-cpan/ack/HISTORY
index 6c630f5..30c68d5 100644
--- a/perl-cpan/ack/HISTORY
+++ b/perl-cpan/ack/HISTORY
@@ -1,3 +1,6 @@
+2010-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.94
+
2010-01-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.92

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 019a921..e1695e1 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.3.3
- SECURITY_PATCH=10
-
SOURCE_HASH=sha512:eeaf77befbea3a678f330766518836be87ee6fd53b50fbd9c75048a81b33ed87351327d1e7c103092029b17452d2cff5bca7376e107c662cf3ad30137d52479f
+ VERSION=5.3.4
+ SECURITY_PATCH=11
+
SOURCE_HASH=sha512:6b44ec05b44c7c341d70c6ff5352b4c3699aefaae087a786aac71bfd1b5b621e0b8ecf2f35db3a95451b5b54b9f45118a6b075cb1187f246128f38d70802f64a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
@@ -15,14 +15,14 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.3.3
-
SOURCE_HASH=sha512:7d2b29e6cc652e78d0118dac43862aaaecf85b49f62fad83355639712b7e1bdcabfbd3ebea93759563da3a1f32ae556fb65094ce9d0642030f794867f2d0f6a4
+ VERSION=5.3.4
+
SOURCE_HASH=sha512:6b44ec05b44c7c341d70c6ff5352b4c3699aefaae087a786aac71bfd1b5b621e0b8ecf2f35db3a95451b5b54b9f45118a6b075cb1187f246128f38d70802f64a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
elif [[ $PHP5_BRANCH == legacy ]]; then
- VERSION=5.2.14
- SECURITY_PATCH=12
-
SOURCE_HASH=sha512:ffe6a6ae707e7a0a00db60bc6c28c286a7f326ca9011940dbd797227ae34ed8e18e026883e865b82f16f57bcadd9ebb2b6dd69eecbc6219d8ccf680fbd71b9c3
+ VERSION=5.2.15
+ SECURITY_PATCH=13
+
SOURCE_HASH=sha512:84b705b24983bd891c057fe25b7a8c6a7dbf0a0882765be4811599b4b76a43ca339098b312f4f6be16ece5c94038e595217567c69dd1cd6c046801d70703ba78
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
@@ -34,9 +34,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
else
- VERSION=5.3.3
- SECURITY_PATCH=10
-
SOURCE_HASH=sha512:eeaf77befbea3a678f330766518836be87ee6fd53b50fbd9c75048a81b33ed87351327d1e7c103092029b17452d2cff5bca7376e107c662cf3ad30137d52479f
+ VERSION=5.3.4
+ SECURITY_PATCH=11
+
SOURCE_HASH=sha512:6b44ec05b44c7c341d70c6ff5352b4c3699aefaae087a786aac71bfd1b5b621e0b8ecf2f35db3a95451b5b54b9f45118a6b075cb1187f246128f38d70802f64a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 4157e14..94e6f59 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2010-12-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.3.4 and 5.2.15, SECURITY_PATCH++
+
2010-11-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: mysql -> MYSQL

diff --git a/utils/nss-pam-ldapd/DETAILS b/utils/nss-pam-ldapd/DETAILS
index 3338430..d4eab4f 100755
--- a/utils/nss-pam-ldapd/DETAILS
+++ b/utils/nss-pam-ldapd/DETAILS
@@ -1,5 +1,5 @@
SPELL=nss-pam-ldapd
- VERSION=0.7.12
+ VERSION=0.7.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://arthurdejong.org/$SPELL/$SOURCE
diff --git a/utils/nss-pam-ldapd/HISTORY b/utils/nss-pam-ldapd/HISTORY
index 4880ba2..dda1d0d 100644
--- a/utils/nss-pam-ldapd/HISTORY
+++ b/utils/nss-pam-ldapd/HISTORY
@@ -1,3 +1,6 @@
+2010-12-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.13
+
2010-10-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.12

diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 992d0fa..f5677dd 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,13 +1,14 @@
SPELL=youtube-dl
- VERSION=2010.10.24
+ VERSION=2010.12.09
SOURCE=$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://bitbucket.org/rg3/youtube-dl/raw/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:e55587b1bc39be5327f57ff2a50e07ed55faa63346bacdd89c03f4ff48c1758ce6a072145568ce235c02cb79f8b05bdaf1f4e6f80d0ba9d161fe5982b05d5c7f
+ SOURCE_URL[0]=https://github.com/rg3/youtube-dl/raw/$VERSION/$SOURCE
+ SOURCE_HINTS[0]="no-check-certificate"
+
SOURCE_HASH=sha512:4a86a01d78be897b1b784b5d8511227395769a02f14041c61a2abb309466174febb753a9e8ec12802287e992b485b01d045a6d0b7dacf04b6ae5b8d9cfecfa2b
FORCE_DOWNLOAD=on
LICENSE[0]=BSD
KEYWORDS="utils"
- WEB_SITE=http://bitbucket.org/rg3/youtube-dl/wiki/Home
+ WEB_SITE=http://rg3.github.com/youtube-dl/
ENTERED=20080320
SHORT='command-line program to download YouTube videos'
cat << EOF
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index 657ffa9..b66b342 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2010-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2010.12.09, new WEB_SITE and SOURCE_URL[0], SOURCE_HINTS[0]
+
2010-10-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2010.10.24

diff --git a/video-libs/frei0r-plugins/DEPENDS
b/video-libs/frei0r-plugins/DEPENDS
new file mode 100755
index 0000000..9dd3ace
--- /dev/null
+++ b/video-libs/frei0r-plugins/DEPENDS
@@ -0,0 +1,3 @@
+optional_depends gavl "" "" "Required for scale0tilt and vectorscope
filters?" &&
+optional_depends opencv "" "" "Required for facebl0r filter?"
+
diff --git a/video-libs/frei0r-plugins/DETAILS
b/video-libs/frei0r-plugins/DETAILS
new file mode 100755
index 0000000..9f127aa
--- /dev/null
+++ b/video-libs/frei0r-plugins/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=frei0r-plugins
+ VERSION=1.2.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=ftp://ftp.dyne.org/frei0r/releases/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://frei0r.dyne.org/
+ ENTERED=20101210
+ KEYWORDS="video"
+ SHORT="Minimalistic plugin API for video effects"
+cat << EOF
+What Frei0r is
+Frei0r is a minimalistic plugin API for video effects.
+The main emphasis is on simplicity for an API that will round up the most
common
+video effects into simple filters, sources and mixers that can be controlled
by
+parameters. It's our hope that this way these simple effects can be shared
+between many applications, avoiding their reimplementation by different
projects.
+What Frei0r is not
+Frei0r is not meant as a competing standard to more ambitious efforts that
try
+to satisfy the needs of many different applications and more complex effects.
+It is not meant as a generic API for all kinds of video applications, as it
+doesn't provides things like an extensive parameter mechanism or event
handling.
+Eventually the frei0r API can be wrapped by higher level APIs expanding its
+functionalities (for instance as GStreamer, MLT, FFmpeg and others do).
+EOF
+
diff --git a/video-libs/frei0r-plugins/HISTORY
b/video-libs/frei0r-plugins/HISTORY
new file mode 100644
index 0000000..f21fedd
--- /dev/null
+++ b/video-libs/frei0r-plugins/HISTORY
@@ -0,0 +1,2 @@
+2010-12-10 Robin Cook <rcook AT wyrms.net>
+ * new spell: DETAILS DEPENDS
diff --git a/video-libs/frei0r-plugins/frei0r-plugins-1.2.1.tar.gz.sig
b/video-libs/frei0r-plugins/frei0r-plugins-1.2.1.tar.gz.sig
new file mode 100644
index 0000000..374ac46
Binary files /dev/null and
b/video-libs/frei0r-plugins/frei0r-plugins-1.2.1.tar.gz.sig differ
diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
index 90aa916..c87da25 100755
--- a/video/minitube/DETAILS
+++ b/video/minitube/DETAILS
@@ -1,8 +1,8 @@
SPELL=minitube
- VERSION=1.2
+ VERSION=1.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://flavio.tordini.org/files/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:a58a90c60545163d48fa0069754eec5af49c5a435ce9d04b4e9c72802ea9c9dbe395fef7ebda48d60fa91806b2f70f3f22d24c449daab98f3bb404198644f5d0
+
SOURCE_HASH=sha512:f31d65d6d1e58c1e5ccb25423270710fd340a01ed39064c0c67460355a1bc5758d04001716cf2bc3439e414aee374fab4d4e9ae2558cca25892dbaecab6bca1b
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 34dd628..14b778d 100644
--- a/video/minitube/HISTORY
+++ b/video/minitube/HISTORY
@@ -1,3 +1,6 @@
+2010-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3
+
2010-10-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2

diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index ce16215..6a5624a 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -52,6 +52,11 @@ optional_depends xine-lib \
"--disable-xine" \
"Enable Xine Module" &&

+optional_depends frei0r-plugins \
+ "--enable-frei0r" \
+ "--disable-frei0r" \
+ "Enable the frei0r module?" &&
+
optional_depends qt-x11 \
"--enable-qimage --qimage-includedir=/usr/include/qt" \
"--disable-qimage" \
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 8cbebec..102a7fb 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2010-12-10 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: added frei0r-plugin as optional
+
2010-09-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.10

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 816efbb..d54418c 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,9 +12,9 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.3.8
+ VERSION=1.3.9
else
- VERSION=1.2.1
+ VERSION=1.2.2
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index e448182..b0ab557 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.9 and 1.2.2
+
2010-11-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.8




  • [SM-Commit] GIT changes to devel-libpng grimoire by Ladislav Hagara (a5d46b8566f0ea9df18e16a4f3a9db5a8d84ac0d), Ladislav Hagara, 12/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page