Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (b9e5fec1941d6c8d02a6a9b96237eb270229510d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (b9e5fec1941d6c8d02a6a9b96237eb270229510d)
  • Date: Wed, 20 Dec 2006 16:08:49 -0600

GIT changes to stable-0.4 grimoire by Eric Sandall
<sandalle AT moby.localdomain>:

ChangeLog | 3
archive/zoo/HISTORY | 3
archive/zoo/INSTALL | 4
audio-libs/openal/CONFIGURE | 1
audio-libs/openal/DETAILS | 22
audio-libs/openal/HISTORY | 8
audio-libs/openal/PREPARE | 5
audio-libs/openal/openal-20050601.tar.bz2.sig |binary
audio-players/xmms2/HISTORY | 4
audio-players/xmms2/PREPARE | 10
chat-im/gaim-xmms-remote/DEPENDS | 3
chat-im/gaim-xmms-remote/HISTORY | 3
chat-irc/ircd-hybrid/DETAILS | 2
chat-irc/ircd-hybrid/HISTORY | 3
chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig |binary
collab/HORDE_PREPARE | 6
collab/chora/DETAILS | 6
collab/chora/HISTORY | 3
collab/drupal/CONFIGURE | 64 ++
collab/drupal/DEPENDS | 7
collab/drupal/DETAILS | 12
collab/drupal/FINAL | 13
collab/drupal/HISTORY | 52 ++
collab/drupal/INSTALL | 95 +++-
collab/drupal/PREPARE | 14
collab/drupal/drupal-4.6.5.tar.gz.sig | 0
collab/drupal/drupal-4.6.9.tar.gz.sig |binary
collab/drupal/drupal-4.7.3.tar.gz.sig |binary
collab/gollem/DETAILS | 6
collab/gollem/HISTORY | 4
collab/horde/DETAILS | 11
collab/horde/HISTORY | 4
collab/horde/horde-3.1.3.tar.gz.sig |binary
collab/imp/DETAILS | 11
collab/imp/HISTORY | 4
collab/imp/imp-h3-4.1.3.tar.gz.sig |binary
collab/ingo/DETAILS | 11
collab/ingo/HISTORY | 5
collab/ingo/ingo-h3-1.1.1.tar.gz.sig |binary
collab/kronolith/DETAILS | 11
collab/kronolith/HISTORY | 4
collab/kronolith/kronolith-h3-2.1.2.tar.gz.sig |binary
collab/mimp/DETAILS | 6
collab/mimp/HISTORY | 4
collab/mnemo/DETAILS | 11
collab/mnemo/HISTORY | 4
collab/mnemo/mnemo-h3-2.1.tar.gz.sig |binary
collab/nag/DETAILS | 11
collab/nag/HISTORY | 4
collab/nag/nag-h3-2.1.1.tar.gz.sig |binary
collab/passwd/DETAILS | 6
collab/passwd/HISTORY | 4
collab/turba/DETAILS | 11
collab/turba/HISTORY | 4
collab/turba/turba-h3-2.1.2.tar.gz.sig |binary
crypto/opencdk/DETAILS | 4
crypto/opencdk/HISTORY | 3
crypto/openssl/DETAILS | 8
crypto/openssl/HISTORY | 5
database/mdbtools/DETAILS | 20
database/mdbtools/HISTORY | 6
database/mdbtools/PREPARE | 6
dev/null |binary
doc/tetex-texmf/DETAILS | 2
doc/tetex-texmf/HISTORY | 4
ftp/dctc/DEPENDS | 9
ftp/dctc/DETAILS | 1
ftp/dctc/HISTORY | 6
ftp/dctc/PRE_BUILD | 1
ftp/fags/BUILD | 8
ftp/fags/FINAL | 1
ftp/fags/HISTORY | 4
ftp/fags/INSTALL | 29 -
ftp/fags/init.d/fags | 8
graphics/blender_cvs/DETAILS | 6
graphics/blender_cvs/HISTORY | 5
graphics/blender_cvs/PREPARE | 1
http/mozilla-nightly/DETAILS | 12
http/mozilla-nightly/HISTORY | 4
http/mozilla-nightly/PREPARE | 1
kde-look/slicker/DETAILS | 4
kde-look/slicker/HISTORY | 4
kde-look/slicker/PREPARE | 1
libs/apr-util0/DETAILS | 2
libs/apr-util0/HISTORY | 6
libs/glibc/BUILD | 7
libs/glibc/HISTORY | 4
mail/qwikmail/DETAILS | 1
mail/qwikmail/HISTORY | 3
net/ifplugd/DETAILS | 2
net/ifplugd/HISTORY | 27 +
net/ifplugd/INSTALL | 5
net/ifplugd/PRE_BUILD | 6
net/ifplugd/conf/ifplugd.conf | 42 +
net/ifplugd/init.d/ifplugd | 54 +-
net/nagios/CONFIGURE | 7
net/nagios/DEPENDS | 2
net/nagios/DETAILS | 6
net/nagios/HISTORY | 15
net/nagios/PRE_BUILD | 18
net/nagios/nagios-2.0-both.patch | 565
+++++++++++++++++++++++++
net/nagios/nagios-2.0-ipaddress.patch | 360 +++++++++++++++
net/nagios/nagios-2.0-snmpcommunity.patch | 287 ++++++++++++
net/nagios/nagios-2.0-statusmap.patch | 50 ++
printer/cups/DEPENDS | 1
printer/cups/HISTORY | 5
utils/lshw/CONFIGURE | 6
utils/lshw/HISTORY | 18
video-libs/qc-usb/BUILD | 2
video-libs/qc-usb/DETAILS | 4
video-libs/qc-usb/HISTORY | 11
video-libs/qc-usb/INSTALL | 2
video-libs/qc-usb/TRIGGERS | 1
video-libs/qc-usb/qc-usb-0.6.4.tar.gz.sig |binary
video/transcode/DETAILS | 2
video/transcode/HISTORY | 5
windowmanagers/sawfish/DETAILS | 23 -
windowmanagers/sawfish/HISTORY | 5
windowmanagers/sawfish/PREPARE | 6
windowmanagers/tinywm/HISTORY | 3
windowmanagers/tinywm/PRE_BUILD | 3
windowmanagers/wm2/DETAILS | 5
windowmanagers/wm2/HISTORY | 5
windowmanagers/wm2/PREPARE | 1
x11/tomboy/DETAILS | 4
x11/tomboy/HISTORY | 7
x11/tomboy/PREPARE | 1
127 files changed, 1990 insertions(+), 241 deletions(-)

New commits:
commit b9e5fec1941d6c8d02a6a9b96237eb270229510d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT moby.localdomain>

transcode: use our mirror as download location because the upstream ones
are gone

Bug #13120

Conflicts:

video/transcode/HISTORY

commit 5b722f303387eda96820cfc6b48d581b0e4a40d4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated imp to 4.1.3

Bug #13057

Conflicts:

collab/imp/HISTORY

commit 3d58f3a56ca980b28cb1adf0447dddbfae320c08
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated ingo to 1.1.1

Bug #13056

Conflicts:

collab/ingo/HISTORY

commit e7328536237b6a177e57803d8749ffa983a22835
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated kronolith to 2.1.2

Bug #13055

Conflicts:

collab/kronolith/HISTORY

commit 0a309baa472b47e3859d70be3f15b5b4c36ea3de
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated mnemo to 2.1

Bug #13054

Conflicts:

collab/mnemo/HISTORY

commit 9d33e7a67363fea22a83f3762532a3184582536f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated horde to 3.1.3

Bug #13058

Conflicts:

collab/horde/DETAILS
collab/horde/HISTORY

commit a3cdf7d0507650f9c499ca0840a37623dd0301c3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated nag to 2.1.1

Bug #13058

Conflicts:

collab/nag/HISTORY

commit 030498605b5251536c655ac96ec9f2562c9e1644
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated turba to 2.1.2

Bug #13052

Conflicts:

collab/turba/HISTORY

commit 4ffe2e3244fe1de5232550b4b7cb3743001bd0fd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified chora, gollem, horde, imp, ingo, kronolith, mimp, menmo, nag,
passwd, and truba to use the normal CVS auto-update query now in HORDE_PREPARE

Bug #13050

Conflicts:

ChangeLog
collab/chora/HISTORY
collab/gollem/HISTORY
collab/horde/HISTORY
collab/imp/HISTORY
collab/ingo/HISTORY
collab/kronolith/HISTORY
collab/mimp/HISTORY
collab/mnemo/HISTORY
collab/nag/HISTORY
collab/passwd/HISTORY
collab/turba/HISTORY

commit 5f9ecf03801e49f86aa281de4906ea9cfeb9763e
Author: Eric Sandall <sandalle AT moby.localdomain>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Revert "Modified chora, gollem, horde, imp, ingo, kronolith, mimp, menmo,
nag, passwd, and truba to use the normal CVS auto-update query now in
HORDE_PREPARE"

This reverts commit f5c21c352c3f7944249cb0e18bd025c5172631b1.

Removed too much from ChangeLog. :(

commit f5c21c352c3f7944249cb0e18bd025c5172631b1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified chora, gollem, horde, imp, ingo, kronolith, mimp, menmo, nag,
passwd, and truba to use the normal CVS auto-update query now in HORDE_PREPARE

Bug #13050

Conflicts:

ChangeLog
collab/chora/HISTORY
collab/gollem/HISTORY
collab/horde/HISTORY
collab/imp/HISTORY
collab/ingo/HISTORY
collab/kronolith/HISTORY
collab/mimp/HISTORY
collab/mnemo/HISTORY
collab/nag/HISTORY
collab/passwd/HISTORY
collab/turba/HISTORY

commit b4cd114c222123f6e48325725b8249d252afa585
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified mdbtools to use proper cvs auto-update queries and checks

Bug #13048

Conflicts:

database/mdbtools/DETAILS
database/mdbtools/HISTORY

commit 12bc30fb31b1d0aef8a27f37e406b3a676ccf64e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Use sha512 instead of md5 and use proper CVS update/auto-update

commit e808325361be1fac120cb23fb24b7d7838505287
Author: Eric Sandall <sandalle AT moby.localdomain>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Revert "httpd-dev updated to 2.2.3"

This reverts commit d96f965aa71297ee6fb0491434259eb77708cdac.

Does not affect Bug #13047

commit abf00377f8b3c03e92f98017bf190f33a4855eed
Author: Eric Sandall <sandalle AT moby.localdomain>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Revert "openal fixed non-cvs source"

This reverts commit 222a2e28ac4f376669b449a4e91aaf8a4e4adad2.

Did not apply correctly

commit 222a2e28ac4f376669b449a4e91aaf8a4e4adad2
Author: David Brown <dmlb2000 AT gmail.com>
Commit: Eric Sandall <sandalle AT moby.localdomain>

openal fixed non-cvs source

Conflicts:

audio-libs/openal/DETAILS
audio-libs/openal/HISTORY

commit d96f965aa71297ee6fb0491434259eb77708cdac
Author: David Brown <dmlb2000 AT gmail.com>
Commit: Eric Sandall <sandalle AT moby.localdomain>

httpd-dev updated to 2.2.3

Part 1/3 of Bug #13047

Conflicts:

http/httpd-dev/DETAILS
http/httpd-dev/HISTORY

commit aed59af9b9723475a06c91205147a9b9d2e9cf3d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified blender_cvs to use proper CVS update/auto-update

Bug #13046

Conflicts:

graphics/blender_cvs/HISTORY

commit 2771dd542e103eff8d7d18aecb6166c19b8e766a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified mozilla-nightly to properly use CVS auto-update

Bug #13045

Conflicts:

http/mozilla-nightly/HISTORY

commit 696ed4bba59929cd18df6a654cac17e047ea23d3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified slicker to properly use CVS auto-update

Bug #13044

Conflicts:

kde-look/slicker/HISTORY

commit 2c3d0b809a7d5be6a7936eac666090dcd1ec961e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified sawfish to properly use CVS update/auto-update

Bug #13043

Conflicts:

windowmanagers/sawfish/DETAILS
windowmanagers/sawfish/HISTORY

commit d880ca40704e4a3520bbf447de8e6021f85c7979
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified wm2 to properly use CVS auto-update

Bug #13042

Conflicts:

windowmanagers/wm2/HISTORY

commit b9f2df3cf6c5f5e343abfbffd3a5b1b8474170f7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Modified tomboy to properly use CVS auto-update

Bug #13041

Conflicts:

x11/tomboy/HISTORY

commit b8c3cc4c2d9baad039f3d2a6cfc34e1a37f00c6c
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT moby.localdomain>

opencdk: sha1 -> sha512 [Bug 12942]

Conflicts:

crypto/opencdk/DETAILS
crypto/opencdk/HISTORY

commit 6aee218befe0bb57639b300e3f7cef5b05e804c3
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Eric Sandall <sandalle AT moby.localdomain>

xmms2: minor fix in PREPARE RFI: 12930

Conflicts:

audio-players/xmms2/HISTORY
audio-players/xmms2/PREPARE

commit e101908861519daec47959518c6e3bb90b7c5df1
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

dctc: fixing bugs 11600 and 12917

Conflicts:

ftp/dctc/DEPENDS
ftp/dctc/DETAILS
ftp/dctc/HISTORY

commit ad4e2462b68859fd1be60e8eab696ef8dbb3141e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated hash to tetex-texmf (safe changes)

Bug #12903

Conflicts:

doc/tetex-texmf/HISTORY

commit 57da8ea1901d03f8e0173971cfbc78646ac6908d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

cups: added dependency on g++ #12871

Conflicts:

printer/cups/HISTORY

commit 203eef0d0f6f699cffb39d94529f2a0a3fe5fefe
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

lshw: use smarter query logic #12791

Bug #12791

Conflicts:

utils/lshw/HISTORY

commit 19117dcbddfeb143746908b825644f67f603e65c
Author: Eric Sandall <sandalle AT moby.localdomain>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Added URL to qwikmail (Bug #12725)

commit 7f239dc73dcaaa511e2f4b3d21345b3689f9a65b
Author: Jason Flatt <jflatt AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Drupal security fixes updating the versions to 4.6.9 and 4.7.3.

commit 963f2d421a9be4891d5d068c0e54fd34ace915b3
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

./collab/drupal/drupal-4.6.6.tar.gz.sig: 2006/06/15 sync from p4

commit 3cb5fa0a4c4b5b28599ae6822c3e90678bd7e599
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

./collab/drupal: 2006/06/15 sync from p4

commit fa58c0fac75b65f8b33de91ffdd3b2e50937b6ba
Author: Jeremy Blosser <jblosser AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

sync ./collab/drupal from test

commit ad642a81db5172e0bdabbaa32f6149648870c742
Author: Pieter Lenaerts <e-type AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

tinywm: fixing X11 prefix if install_root is used

Bug #12435

Conflicts:

windowmanagers/tinywm/HISTORY

commit 9b4095841966339bb349dd9721f48fb2d3eb35b1
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

change www.apache.org to archive.apache.org in SOURCE_URL

Bug #12130

Conflicts:

libs/apr-util0/DETAILS
libs/apr-util0/HISTORY

commit 98cbf08a087dedb263989b2d18bd8b0573594481
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

glibc: handle 32-bit mode on 64-bit (x86_64) processors correctly #11904

Bug #11904

Conflicts:

libs/glibc/HISTORY

commit 67655d9881e7700cb2eb89404ed950fdc5b0db8f
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

net/ifplugd: 2006/06/15 sync from p4

commit 7960326903897322e3f72f2cb073a5479617cd2f
Author: Jeremy Blosser <jblosser AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

sync net/ifplugd from test

commit baf2703a3cafe3d94a12b747e095d03d9f72a1d5
Author: Jeremy Blosser <jblosser AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

sync net/nagios from test

commit d642e45ef858401d1a4643a2a354b5c027742ce7
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

video-libs/qc-usb: 2006/06/15 sync from p4

Bug #10280

Conflicts:

video-libs/qc-usb/HISTORY
video-libs/qc-usb/INSTALL

commit 31ea5bbc7f233565130d9ea82cc92d37f5f79803
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Eric Sandall <sandalle AT moby.localdomain>

crypto/openssl: updated to version 0.9.8c

Bug #13081

Conflicts:

crypto/openssl/DETAILS

commit 91b4b12ed336212cc0119be3ef721c943fe35df2
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

./archive/zoo: 2006/06/15 sync from p4

Bug #11953

Conflicts:

archive/zoo/HISTORY

commit a00c977ad6e054f5e02083e65ae804eb153200ea
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

Updated ircd-hybrid to 7.2.2

Bug #12582

Conflicts:

chat-irc/ircd-hybrid/DETAILS
chat-irc/ircd-hybrid/HISTORY

commit 13859e5549893b96e68a7bd0c01d4e5526f54ac5
Author: root <root AT fawkes.sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

./chat-im/gaim-xmms-remote: 2006/06/15 sync from p4

commit 85e466636447e354944efc67a544885224d28942
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Eric Sandall <sandalle AT moby.localdomain>

fags: removed broken init install

Bug #10115

Conflicts:

ftp/fags/HISTORY
ftp/fags/INSTALL

diff --git a/ChangeLog b/ChangeLog
index dddda55..2fa3183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* audio-drivers/podxt renamed to line6

+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * collab/HORDE_PREPARE: Ask for auto-updating CVS on system-update
+
2006-11-11 George Sherwood <george AT beernabeer.com>
* chat-im/gnomemeeting: removed, been deprecated for 10 months
* chat-im/openh323: removed, doesn't build. Not used any more.
diff --git a/archive/zoo/HISTORY b/archive/zoo/HISTORY
index 67cc647..58b981a 100644
--- a/archive/zoo/HISTORY
+++ b/archive/zoo/HISTORY
@@ -1,3 +1,6 @@
+2006-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * INSTALL: /usr/man -> /usr/share/man [Bug 11953]
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/archive/zoo/INSTALL b/archive/zoo/INSTALL
index 6a9275b..c9d57fb 100755
--- a/archive/zoo/INSTALL
+++ b/archive/zoo/INSTALL
@@ -1,5 +1,5 @@
# adapted from the .spec file provided with the source RPM
install -m 755 -s fiz ${INSTALL_ROOT}/usr/bin/fiz
install -m 755 -s zoo ${INSTALL_ROOT}/usr/bin/zoo
- install -m 644 fiz.1 ${INSTALL_ROOT}/usr/man/man1/fiz.1
- install -m 644 zoo.1 ${INSTALL_ROOT}/usr/man/man1/zoo.1
+ install -m 644 fiz.1 ${INSTALL_ROOT}/usr/share/man/man1/fiz.1
+ install -m 644 zoo.1 ${INSTALL_ROOT}/usr/share/man/man1/zoo.1
diff --git a/audio-libs/openal/CONFIGURE b/audio-libs/openal/CONFIGURE
deleted file mode 100755
index f068483..0000000
--- a/audio-libs/openal/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query OPENAL_CVS "Would you like to have the latest cvs?" n
diff --git a/audio-libs/openal/DETAILS b/audio-libs/openal/DETAILS
index 44f1ac6..635a335 100755
--- a/audio-libs/openal/DETAILS
+++ b/audio-libs/openal/DETAILS
@@ -1,17 +1,21 @@
SPELL=openal
-if [[ "$OPENAL_CVS" == "n" ]] ; then
- VERSION=20050601
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://download.sourcemage.org/mirror/${SOURCE}
- MD5[0]=4cc8dfdbb137ab6e41a143ffc7f4b4db
-else
- VERSION=`date +%Y%m%d`
- SOURCE=${SPELL}_cvs-src.tar.bz2
+if [[ "$OPENAL_CVS" == "y" ]] ; then
+ if [[ "$OPENAL_CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=${SPELL}_cvs-src.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_cvs-src

SOURCE_URL[0]=cvs://:pserver:guest:guest AT opensource.creative.com:/usr/local/cvs-repository:openal
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
+else
+ VERSION=20050601
+ SOURCE=${SPELL}-cvs.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+ SOURCE_URL[0]=http://download.sourcemage.org/mirror/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
WEB_SITE=http://www.openal.org/
LICENSE[0]=LGPL
diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY
index 9b090a9..2cd1a13 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,11 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * CONFIGURE,PREPARE: Renamed CONFIGURE to PREPARE (PREPARE is sourced
before
+ DETAILS)
+ * DETAILS: Default to stable release, not CVS if query hasn't been
answered
+ Do proper CVS auto-update checks
+ Updated md5sum to sha512sum (md5sum matched the tarball I generated
the
+ sha512sum from)
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile

diff --git a/audio-libs/openal/PREPARE b/audio-libs/openal/PREPARE
new file mode 100755
index 0000000..4ef6e19
--- /dev/null
+++ b/audio-libs/openal/PREPARE
@@ -0,0 +1,5 @@
+config_query OPENAL_CVS "Would you like to have the latest cvs?" n
+
+if [[ "$OPENAL_CVS" == "y" ]]; then
+ config_query OPENAL_CVS_AUTOUPDATE "Would you like to have $SPELL
updated on every system-update?" n
+fi
diff --git a/audio-libs/openal/openal-20050601.tar.bz2.sig
b/audio-libs/openal/openal-20050601.tar.bz2.sig
new file mode 100644
index 0000000..f877f3e
Binary files /dev/null and b/audio-libs/openal/openal-20050601.tar.bz2.sig
differ
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index e6b5f85..d95952a 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,5 +1,5 @@
-2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * DEPENDS: java is in z-rejected
+2006-07-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * PREPARE: should default to NO

2006-02-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated release to DrCox
diff --git a/audio-players/xmms2/PREPARE b/audio-players/xmms2/PREPARE
index 368e3b1..73a2e5c 100755
--- a/audio-players/xmms2/PREPARE
+++ b/audio-players/xmms2/PREPARE
@@ -1 +1,9 @@
-config_query XMMS2_SNAPSHOT "Do you want to build a snapshot version?" y
+config_query XMMS2_SNAPSHOT "Do you want to build a snapshot version?" n
&&
+if [[ $XMMS2_SNAPSHOT == "y" ]]
+ then
+config_query XMMS2_SNAPSHOT_AUTO "Do you want to autoupdate on
system-update/queue" n &&
+config_query_list XMMS2_TREE "Which tree do you want to use:" \
+ stable devel anders eleusis jlt juhovh nano theefer
tilman tru &&
+config_query_string XMMS2_TREE_REV "Enter the revision you want to checkout \
+(git hash) or HEAD(default) if you want the latest." "HEAD"
+fi
diff --git a/chat-im/gaim-xmms-remote/DEPENDS
b/chat-im/gaim-xmms-remote/DEPENDS
index 18417fe..63b167b 100755
--- a/chat-im/gaim-xmms-remote/DEPENDS
+++ b/chat-im/gaim-xmms-remote/DEPENDS
@@ -1 +1,2 @@
-depends gaim
+depends gaim &&
+depends xmms
diff --git a/chat-im/gaim-xmms-remote/HISTORY
b/chat-im/gaim-xmms-remote/HISTORY
index a882dab..8c6bc7e 100644
--- a/chat-im/gaim-xmms-remote/HISTORY
+++ b/chat-im/gaim-xmms-remote/HISTORY
@@ -1,3 +1,6 @@
+2006-05-28 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Added depends xmms. Bug 12218.
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/chat-irc/ircd-hybrid/DETAILS b/chat-irc/ircd-hybrid/DETAILS
index 28a2468..911c694 100755
--- a/chat-irc/ircd-hybrid/DETAILS
+++ b/chat-irc/ircd-hybrid/DETAILS
@@ -1,5 +1,5 @@
SPELL=ircd-hybrid
- VERSION=7.2.0
+ VERSION=7.2.2
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-irc/ircd-hybrid/HISTORY b/chat-irc/ircd-hybrid/HISTORY
index 12db00b..68393f4 100644
--- a/chat-irc/ircd-hybrid/HISTORY
+++ b/chat-irc/ircd-hybrid/HISTORY
@@ -1,3 +1,6 @@
+2006-07-28 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 7.2.2
+
2005-12-10 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 7.2.0, Removed BUILD_API=2

diff --git a/chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig
b/chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig
new file mode 100644
index 0000000..67d540f
Binary files /dev/null and b/chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig
differ
diff --git a/collab/HORDE_PREPARE b/collab/HORDE_PREPARE
index 762bf1a..1830239 100755
--- a/collab/HORDE_PREPARE
+++ b/collab/HORDE_PREPARE
@@ -1 +1,5 @@
-config_query HORDE_DEVEL "Would you like to use latest development code?"
n
+config_query HORDE_DEVEL "Would you like to use latest development code?"
n &&
+
+if [[ "$HORDE_DEVEL" == "y" ]]; then
+ config_query HORDE_DEVEL_AUTOUPDATE "Would you like $SPELL to autoupdate
on every system-update?" n
+fi
diff --git a/collab/chora/DETAILS b/collab/chora/DETAILS
index a36dd07..9f3f7ff 100755
--- a/collab/chora/DETAILS
+++ b/collab/chora/DETAILS
@@ -1,7 +1,11 @@
SPELL=chora
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
diff --git a/collab/chora/HISTORY b/collab/chora/HISTORY
index df53d8a..b6caa60 100644
--- a/collab/chora/HISTORY
+++ b/collab/chora/HISTORY
@@ -1,3 +1,6 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Check for auto-update on system-update and set VERSION
+
2005-10-16 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 2.0.1.

diff --git a/collab/drupal/CONFIGURE b/collab/drupal/CONFIGURE
index ef2ff16..93ccf42 100755
--- a/collab/drupal/CONFIGURE
+++ b/collab/drupal/CONFIGURE
@@ -3,24 +3,60 @@ config_query_string DRUPAL_INSTALL_PATH
"What path do you wish to use for installation (the
spell name will be added at the end)?" \
"usr/share/www"
&&

-config_query_list DRUPAL_DATABASE
\
- "Which database would you like to use?"
\
+config_query_list DRUPAL_DATABASE_ENGINE
\
+ "Which database engine would you like to use?"
\
mysql
\
postgresql
&&

-message "${MESSAGE_COLOR}The MySQL daemon needs to be running to create the
database${DEFAULT_COLOR}" &&
-config_query DRUPAL_CREATEDB "Create drupal database?" n
&&
+persistent_add DRUPAL_INSTALLED
&&
+if spell_ok ${SPELL}
+then
+ DRUPAL_INSTALLED="y"
+else
+ DRUPAL_INSTALLED="n"
+fi
&&

-if [ "$DRUPAL_CREATEDB" == "y" ]; then
- if [ "${DRUPAL_DATABASE}" == "mysql"]; then
- peristent_add DRUPAL_MYSQL &&
- DRUPAL_MYSQL="y"
- persistent_add DRUPAL_PGSQL &&
- DRUPAL_PGSQL="n"
+if [ "${DRUPAL_INSTALLED}" == "n" ]
+then
+ persistent_add DRUPAL_CREATEDB DRUPAL_CONFIGURE MYSQL_PASSWORD
&&
+
+ message "${MESSAGE_COLOR}The MySQL daemon needs to be running to create
the database${DEFAULT_COLOR}" &&
+ if query "Create the Drupal database?" n
+ then
+ DRUPAL_CREATEDB="y"
&&
+ if query "Do you need a password to create a database w/MySQL?" y
+ then
+ query_string MYSQL_PASSWORD "What is the MySQL password for root
(needed to create the database)? If there is no password, just press enter. "
""
+ fi
+ else
+ DRUPAL_CREATEDB="n"
+ fi
&&
+
+ if query "Update the Drupal configuration file?" n
+ then
+ DRUPAL_CONFIGURE="y"
else
- peristent_add DRUPAL_MYSQL &&
- DRUPAL_MYSQL="n"
- persistent_add DRUPAL_PGSQL &&
- DRUPAL_PGSQL="y"
+ DRUPAL_CONFIGURE="n"
+ fi
&&
+
+ if [ "${DRUPAL_CREATEDB}" == "y" ] || [ "${DRUPAL_CONFIGURE}" ==
"y" ]; then
+ config_query_string DRUPAL_DATABASE_NAME
\
+ "What database name do you wish to use for the
database?" \
+ "drupal"
&&
+
+ config_query_string DRUPAL_DATABASE_USER
\
+ "What user name do you wish to use for the
database?" \
+ "nobody"
&&
+
+ config_query_string DRUPAL_DATABASE_HOST
\
+ "What host name do you wish to use for the
database?" \
+ "localhost"
&&
+
+ config_query_string DRUPAL_DATABASE_PASSWORD
\
+ "What password do you wish to use for the database?
+ Allowed characters include letters, digits, and any of the following:
+ -_!#$%^&*()+={}[]|<>;:?,.~
+ "
\
+ "password"
fi
fi
diff --git a/collab/drupal/DEPENDS b/collab/drupal/DEPENDS
index 423996a..499b70b 100755
--- a/collab/drupal/DEPENDS
+++ b/collab/drupal/DEPENDS
@@ -1,5 +1,4 @@
-depends ${DRUPAL_DATABASE} &&
-depends MAIL-TRANSPORT-AGENT &&
-message "${MESSAGE_COLOR}${SPELL_COLOR}apache2${MESSAGE_COLOR} is" \
- " recommended${DEFAULT_COLOR}" &&
+depends ${DRUPAL_DATABASE_ENGINE}
&&
+optional_depends MAIL-TRANSPORT-AGENT
&&
+message "${MESSAGE_COLOR}${SPELL_COLOR}apache2${MESSAGE_COLOR} is
recommended${DEFAULT_COLOR}" &&
depends PHP
diff --git a/collab/drupal/DETAILS b/collab/drupal/DETAILS
index dbdcf59..50dd76b 100755
--- a/collab/drupal/DETAILS
+++ b/collab/drupal/DETAILS
@@ -1,16 +1,22 @@
SPELL=drupal
- VERSION=4.6.5
- SECURITY_PATCH=1
+if [[ "${DRUPAL_VER}" == "older" ]]
+ then
+ VERSION=4.6.9
+ else
+ VERSION=4.7.3
+fi
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://drupal.org/files/projects/$SOURCE
WEB_SITE=http://www.drupal.org/
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
BUILD_API=2
DOCS="*.txt"
ENTERED=20040928
UPDATED=20040928
+ KEYWORDS="collab"
SHORT="Open source content management platform"
cat << EOF
A dynamic web site platform which allows an individual or community of users
to publish, manage and organize a variety of content, Drupal integrates many
popular features of content management systems, weblogs, collaborative tools
and discussion-based community software into one easy-to-use package.
diff --git a/collab/drupal/FINAL b/collab/drupal/FINAL
new file mode 100755
index 0000000..a1ee215
--- /dev/null
+++ b/collab/drupal/FINAL
@@ -0,0 +1,13 @@
+if [ "${DRUPAL_CONFIGURE}" == "y" ] && [ "${DRUPAL_VER}" ==
"older" ]; then
+ message ""
+ message "This spell makes an assumption, which may not be accurate in
your"
+ message "case, and sets the '\$base_url' variable in "
+ message
"${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php"
+ message "to 'http://localhost/${SPELL}'."
+ message ""
+ message "If that is not correct for your situation, you will need to
change"
+ message "that variable in that file."
+ message ""
+fi
&&
+
+persistent_remove MYSQL_PASSWORD
diff --git a/collab/drupal/HISTORY b/collab/drupal/HISTORY
index 0cf6856..640e069 100644
--- a/collab/drupal/HISTORY
+++ b/collab/drupal/HISTORY
@@ -1,3 +1,55 @@
+2006-08-25 Jason Flatt <jflatt AT sourcemage.org>
+ * DETAILS: Version bumps for security fixes. Details are here:
+ http://drupal.org/files/sa-2006-011/advisory.txt
+
+2006-06-13 Jason Flatt <jflatt AT sourcemage.org>
+ * CONFIGURE: Added check for existing install that was in PREPARE.
+ Added a query for MySQL's root password (and a check if it's needed
+ or not).
+ * FINAL: Added check for Drupal version before displaying message.
+ Added persistent_remove to not keep the MySQL password lying around.
+ * INSTALL: Modified the parts that create the database and modify the
+ settings.php file to take into account the two Drupal versions and
+ the two possible database choices.
+ Added the password to the MySQL database activities.
+ * PREPARE: Changed the order for version install so that the more
+ current version is the default.
+ Removed warning and automatic exit so spell will complete it's cast
+ (for bug # 11266).
+ Removed check for existing install.
+
+2006-06-08 John Harding <johnh AT kuberaconsulting.com>
+ * DETAILS: Security update, added if statement to allow choice between
+ 4.6.8 and 4.7.2 versions. Changed to SOURCE_HASH because I couldn't
get
+ my sig to work.
+ * DEPENDS: Made depends on MTA optional.
+ * PREPARE: Added query on which version to install.
+
+2006-04-20 Jason Flatt <jflatt AT sourcemage.org>
+ * DETAILS: Re-added SOURCE_GPG as I was wrong about the previous
+ change.
+ * PREPARE, CONFIGURE, INSTALL: Added a check to see if Drupal is
+ already installed and to not ask first time configuration
+ questions if it is.
+ * PREPARE: Moved the backup warning to within the spell check.
+
+2006-03-14 Jason Flatt <jflatt AT sourcemage.org>
+ * DETAILS: Security update to 4.6.6 (http://drupal.org/security).
+ Changed SOURCE_GPG to SOURCE_IGNORE, as the tarball is updated
+ daily.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-26 Jason Flatt <jflatt AT sourcemage.org>
+ * CONFIGURE, INSTALL: Added user options and variables for database
+ name, user, host and password.
+ Removed persistant_add'ed variables in CONFIGURE in favor of using
+ existing variables for INSTALL.
+ Added the option for automatically updating the Drupal configuration
+ file (sites/default/settings/php).
+ * DEPENDS: Changed the message to be on one line.
+
2006-01-02 Jason Flatt <jflatt AT sourcemage.org>
* DEPENDS: Changed php4 back to PHP, as I discovered that Drupal can
work w/PHP 5+.
diff --git a/collab/drupal/INSTALL b/collab/drupal/INSTALL
index 9d1be14..21b52fa 100755
--- a/collab/drupal/INSTALL
+++ b/collab/drupal/INSTALL
@@ -1,30 +1,71 @@
-install_www_files ./ ${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL}
&&
+install_www_files ./ ${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL}
&&

-if [ "$DRUPAL_CREATEDB" == "y" ]; then
- if [ "$DRUPAL_MYSQL" == "y" ]; then
- message "${MESSAGE_COLOR}Creating MySQL database...${DEFAULT_COLOR}"
- mysqladmin create drupal &&
- echo "GRANT ALL PRIVILEGES ON drupal.* \
- TO nobody@localhost IDENTIFIED BY 'password'; \
- flush privileges; \
- \q " | mysql drupal &&
- mysql drupal < database/database.mysql || true
- #
- # Return true as this will fail if the database already exists
- #
- fi &&
+if [ "${DRUPAL_INSTALLED}" == "n" ]; then
+ if [ "${DRUPAL_CREATEDB}" == "y" ]; then
+ case "${DRUPAL_DATABASE_ENGINE}" in
+ mysql)
+ message "${MESSAGE_COLOR}Creating and updating MySQL
database...${DEFAULT_COLOR}"
+ mysqladmin --password=${MYSQL_PASSWORD} create
${DRUPAL_DATABASE_NAME} &&
+ echo "GRANT ALL PRIVILEGES ON ${DRUPAL_DATABASE_NAME}.*
\
+ TO ${DRUPAL_DATABASE_USER}@${DRUPAL_DATABASE_HOST} IDENTIFIED
BY '${DRUPAL_DATABASE_PASSWORD}'; \
+ flush privileges;
\
+ \q " | mysql --password=${MYSQL_PASSWORD}
--database=${DRUPAL_DATABASE_NAME} &&
+ #
+ # Return true as this will fail if the database already exists
+ #
+ if [ "${DRUPAL_VER}" == "newer" ]; then
+ if [ "`mysql -V | cut -d" " -f6 | cut -d"." -f1`" > "4" ]
||
+ [ "`mysql -V | cut -d" " -f6 | cut -d"." -f1`" == "4" ]
&&
+ [ "`mysql -V | cut -d" " -f6 | cut -d"." -f2`" > "0" ];
then
+ mysql --password=${MYSQL_PASSWORD} ${DRUPAL_DATABASE_NAME} <
database/database.4.1.mysql || true
+ else
+ mysql --password=${MYSQL_PASSWORD} ${DRUPAL_DATABASE_NAME} <
database/database.4.0.mysql || true
+ fi
+ else
+ mysql --password=${MYSQL_PASSWORD} ${DRUPAL_DATABASE_NAME} <
database/database.mysql || true
+ fi
+ ;;

- if [ "$DRUPAL_PGSQL" == "y" ]; then
- message "${MESSAGE_COLOR}Creating PostgreSQL
database...${DEFAULT_COLOR}"
- source /etc/sysconfig/postgresql &&
- su $USER -c "createdb drupal" &&
- echo "GRANT ALL PRIVILEGES ON drupal.* \
- TO nobody@localhost IDENTIFIED BY 'password'; \
- flush privileges; \
- \q " | su $USER -c "psql drupal" &&
- su $USER -c "psql drupal -f database/database.pgsql" || true
- #
- # Return true as this will fail if the database already exists
- #
- fi
+ postgresql)
+ message "${MESSAGE_COLOR}Creating PostgreSQL
database...${DEFAULT_COLOR}"
+ source /etc/sysconfig/postgresql
&&
+ su ${USER} -c "createdb ${DRUPAL_DATABASE_NAME}"
&&
+ echo "GRANT ALL PRIVILEGES ON ${DRUPAL_DATABASE_NAME}.*
\
+ TO ${DRUPAL_DATABASE_USER}@${DRUPAL_DATABASE_HOST} IDENTIFIED
BY '${DRUPAL_DATABASE_PASSWORD}'; \
+ flush privileges;
\
+ \q " | su ${USER} -c "psql ${DRUPAL_DATABASE_NAME}"
&&
+ #
+ # Return true as this will fail if the database already exists
+ #
+ su ${USER} -c "psql ${DRUPAL_DATABASE_NAME} -f
database/database.pgsql" || true
+ ;;
+ esac
+ fi
&&
+
+ if [ "${DRUPAL_CONFIGURE}" == "y" ]; then
+ # Update the sites/default/settings.php configuration file
+ # The database connection string
+ if [ "${DRUPAL_VER}" == "newer" ]; then
+ if [ "${DRUPAL_DATABASE_ENGINE}" == "mysql" ]; then
+ sedit "s|\$db_url =
'mysql://username:password@localhost/databasename';|\$db_url =
'mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ else
+ sedit "s|\$db_url =
'mysql://username:password@localhost/databasename';|\$db_url =
'pgsql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ fi
+ else
+ if [ "${DRUPAL_DATABASE_ENGINE}" == "mysql" ]; then
+ sedit "s|\$db_url =
'mysql://username:password@localhost/database';|\$db_url =
'mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ else
+ sedit "s|\$db_url =
'mysql://username:password@localhost/database';|\$db_url =
'pgsql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ fi
+ fi
&&
+
+ # The base URL string (this part can be removed when support for 4.6 is
removed)
+ if [ "${DRUPAL_VER}" == "older" ]; then
+ sedit "s|http://localhost|http://localhost/${SPELL}|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ fi
&&
+
+ mkdir ${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/files
+ fi
&&
+
+ chown -R www-data:www-data
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}
fi
diff --git a/collab/drupal/PREPARE b/collab/drupal/PREPARE
index 5f07c71..1a9cb24 100755
--- a/collab/drupal/PREPARE
+++ b/collab/drupal/PREPARE
@@ -1,10 +1,4 @@
-message ""
-message "Please make sure you have backed up your data and configuration
files before continuing with this installation."
-message ""
-message "Consider this to be your official warning.${DEFAULT_COLOR}"
-message ""
-
-if ! query "Are you comfortable with continuing the install?" n
-then
- return 1
-fi
+config_query_list DRUPAL_VER
\
+ "Do you wish to install the newer (4.7) or older (4.6)
version of Drupal (both are considered stable)?" \
+ "newer"
\
+ "older"
diff --git a/collab/drupal/drupal-4.6.5.tar.gz.sig
b/collab/drupal/drupal-4.6.5.tar.gz.sig
deleted file mode 100644
index a044f5c..0000000
Binary files a/collab/drupal/drupal-4.6.5.tar.gz.sig and /dev/null differ
diff --git a/collab/drupal/drupal-4.6.9.tar.gz.sig
b/collab/drupal/drupal-4.6.9.tar.gz.sig
new file mode 100644
index 0000000..24f1d5a
Binary files /dev/null and b/collab/drupal/drupal-4.6.9.tar.gz.sig differ
diff --git a/collab/drupal/drupal-4.7.3.tar.gz.sig
b/collab/drupal/drupal-4.7.3.tar.gz.sig
new file mode 100644
index 0000000..1a49a89
Binary files /dev/null and b/collab/drupal/drupal-4.7.3.tar.gz.sig differ
diff --git a/collab/gollem/DETAILS b/collab/gollem/DETAILS
index 7f709e6..2cba5dc 100755
--- a/collab/gollem/DETAILS
+++ b/collab/gollem/DETAILS
@@ -1,7 +1,11 @@
SPELL=gollem
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
diff --git a/collab/gollem/HISTORY b/collab/gollem/HISTORY
index 0a7e8a5..ca4c510 100644
--- a/collab/gollem/HISTORY
+++ b/collab/gollem/HISTORY
@@ -1,3 +1,6 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Check for auto-update on system-update and set VERSION
+
2006-01-15 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 1.0.2-rc1.

@@ -6,3 +9,4 @@

2005-10-03 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: spell created.
+
diff --git a/collab/horde/DETAILS b/collab/horde/DETAILS
index 7f30e41..58d3b0e 100755
--- a/collab/horde/DETAILS
+++ b/collab/horde/DETAILS
@@ -1,14 +1,19 @@
SPELL=horde
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=3.1-rc3
-
SOURCE_HASH='sha512:ab4d588b80adfdb83f63ce5f039a6e2df0180a91214884a85059fa83941a0686ebb0c0058c031a2d5f158bc6e12f5d9c933c733a2c164d35deb998c7b2e93611'
+ VERSION=3.1.3
+
#SOURCE_HASH='sha512:c11e9b95f9793be6fa38033147aeb5ba4d12e75af492ab9b2b7cdb5842472a4babfce5a21266fdea5f0fdc9edaed030ac3eec4b58c728b120cf15a18c2fc6886'
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/collab/horde/HISTORY b/collab/horde/HISTORY
index 661c23b..7864b5e 100644
--- a/collab/horde/HISTORY
+++ b/collab/horde/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 3.1.3
+ Check for auto-update on system-update and set VERSION
+
2006-02-13 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 3.1-rc3.

diff --git a/collab/horde/horde-3.1.3.tar.gz.sig
b/collab/horde/horde-3.1.3.tar.gz.sig
new file mode 100644
index 0000000..795b4a6
Binary files /dev/null and b/collab/horde/horde-3.1.3.tar.gz.sig differ
diff --git a/collab/imp/DETAILS b/collab/imp/DETAILS
index e9d78ee..d947e41 100755
--- a/collab/imp/DETAILS
+++ b/collab/imp/DETAILS
@@ -1,15 +1,20 @@
SPELL=imp
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=4.1-rc3
-
SOURCE_HASH='sha512:7ae835d7b356405164f8986c6fb62afff0b752e1d2bf821126a76c550622f8d67b9d766c8b8642ac54ff48bbd8e3d3097fc6b7e874a8389fb0dd527e1d8476d6'
+ VERSION=4.1.3
+
#SOURCE_HASH='sha512:7ae835d7b356405164f8986c6fb62afff0b752e1d2bf821126a76c550622f8d67b9d766c8b8642ac54ff48bbd8e3d3097fc6b7e874a8389fb0dd527e1d8476d6'
SOURCE=$SPELL-h3-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
diff --git a/collab/imp/HISTORY b/collab/imp/HISTORY
index ac680ba..3b6850f 100644
--- a/collab/imp/HISTORY
+++ b/collab/imp/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 4.1.3
+ Check for auto-update on system-update and set VERSION
+
2006-02-13 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 4.1-rc3.

diff --git a/collab/imp/imp-h3-4.1.3.tar.gz.sig
b/collab/imp/imp-h3-4.1.3.tar.gz.sig
new file mode 100644
index 0000000..8577723
Binary files /dev/null and b/collab/imp/imp-h3-4.1.3.tar.gz.sig differ
diff --git a/collab/ingo/DETAILS b/collab/ingo/DETAILS
index 854ed6c..cccc222 100755
--- a/collab/ingo/DETAILS
+++ b/collab/ingo/DETAILS
@@ -1,15 +1,20 @@
SPELL=ingo
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=1.1-rc1
-
SOURCE_HASH='sha512:eaddcf575a5b67dc5c0072476b5e47f02c4dbfbcf48c8256cdc99693182dfd6df38c833de9048c79ba4396c0bc874e833a4c9dd44d69b1cd4ffe8c0e4eb6e7ef'
+ VERSION=1.1.1
+
#SOURCE_HASH='sha512:eaddcf575a5b67dc5c0072476b5e47f02c4dbfbcf48c8256cdc99693182dfd6df38c833de9048c79ba4396c0bc874e833a4c9dd44d69b1cd4ffe8c0e4eb6e7ef'
SOURCE=$SPELL-h3-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
diff --git a/collab/ingo/HISTORY b/collab/ingo/HISTORY
index 1de9f4b..d085e25 100644
--- a/collab/ingo/HISTORY
+++ b/collab/ingo/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 1.1.1
+ Check for auto-update on system-update and set VERSION
+
2006-01-15 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 1.1-rc1.

@@ -6,3 +10,4 @@

2005-10-03 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: spell created.
+
diff --git a/collab/ingo/ingo-h3-1.1.1.tar.gz.sig
b/collab/ingo/ingo-h3-1.1.1.tar.gz.sig
new file mode 100644
index 0000000..ae95057
Binary files /dev/null and b/collab/ingo/ingo-h3-1.1.1.tar.gz.sig differ
diff --git a/collab/kronolith/DETAILS b/collab/kronolith/DETAILS
index 30c2adb..31f4d65 100755
--- a/collab/kronolith/DETAILS
+++ b/collab/kronolith/DETAILS
@@ -1,15 +1,20 @@
SPELL=kronolith
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.1-rc3
-
SOURCE_HASH='sha512:fe10d4d169b6ac657a742d8637fc1890e910599ef3832ce5d58cb59fe40550401055d97fb584c8657f773402a5f59960af14b4897cdb7ada534efdc2f73f35c8'
+ VERSION=2.1.2
+
#SOURCE_HASH='sha512:fe10d4d169b6ac657a742d8637fc1890e910599ef3832ce5d58cb59fe40550401055d97fb584c8657f773402a5f59960af14b4897cdb7ada534efdc2f73f35c8'
SOURCE=$SPELL-h3-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
diff --git a/collab/kronolith/HISTORY b/collab/kronolith/HISTORY
index 71bcf8f..656f593 100644
--- a/collab/kronolith/HISTORY
+++ b/collab/kronolith/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.1.2
+ Check for auto-update on system-update and set VERSION
+
2006-02-14 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 2.1-rc3.

diff --git a/collab/kronolith/kronolith-h3-2.1.2.tar.gz.sig
b/collab/kronolith/kronolith-h3-2.1.2.tar.gz.sig
new file mode 100644
index 0000000..7774f5f
Binary files /dev/null and b/collab/kronolith/kronolith-h3-2.1.2.tar.gz.sig
differ
diff --git a/collab/mimp/DETAILS b/collab/mimp/DETAILS
index c7c65db..765e855 100755
--- a/collab/mimp/DETAILS
+++ b/collab/mimp/DETAILS
@@ -1,7 +1,11 @@
SPELL=mimp
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
diff --git a/collab/mimp/HISTORY b/collab/mimp/HISTORY
index 80f8d60..827a4dd 100644
--- a/collab/mimp/HISTORY
+++ b/collab/mimp/HISTORY
@@ -1,5 +1,9 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Check for auto-update on system-update and set VERSION
+
2006-02-12 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 1.0-beta.

2005-10-28 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: spell created.
+
diff --git a/collab/mnemo/DETAILS b/collab/mnemo/DETAILS
index a43adf9..183dda4 100755
--- a/collab/mnemo/DETAILS
+++ b/collab/mnemo/DETAILS
@@ -1,15 +1,20 @@
SPELL=mnemo
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.1-rc1
-
SOURCE_HASH='sha512:e01e367e16d42eb58e0fe327e7d608597760cff4a79078007b4e38503f5cff053551f4a10c5ad5cb1a27985d62753038ddb572975eeab486454e2cbe1b47fa75'
+ VERSION=2.1
+
#SOURCE_HASH='sha512:e01e367e16d42eb58e0fe327e7d608597760cff4a79078007b4e38503f5cff053551f4a10c5ad5cb1a27985d62753038ddb572975eeab486454e2cbe1b47fa75'
SOURCE=$SPELL-h3-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
diff --git a/collab/mnemo/HISTORY b/collab/mnemo/HISTORY
index e154913..2c54e45 100644
--- a/collab/mnemo/HISTORY
+++ b/collab/mnemo/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.1
+ Check for auto-update on system-update and set VERSION
+
2006-01-15 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 2.1-rc1.

diff --git a/collab/mnemo/mnemo-h3-2.1.tar.gz.sig
b/collab/mnemo/mnemo-h3-2.1.tar.gz.sig
new file mode 100644
index 0000000..34927a5
Binary files /dev/null and b/collab/mnemo/mnemo-h3-2.1.tar.gz.sig differ
diff --git a/collab/nag/DETAILS b/collab/nag/DETAILS
index 3a26043..21cf882 100755
--- a/collab/nag/DETAILS
+++ b/collab/nag/DETAILS
@@ -1,15 +1,20 @@
SPELL=nag
if [[ "$HORDE_DEVEL" == "y" ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.1-rc1
-
SOURCE_HASH='sha512:b3930142ac29b969d6ad58cc5e44245f7aa207f440b3c19eb0501daa4bd2f806d73b0375b22daa6ad4db15d001f8c10cf5cdd5569d2b1d344d37ebc0f5c856c7'
+ VERSION=2.1.1
+
#SOURCE_HASH='sha512:b3930142ac29b969d6ad58cc5e44245f7aa207f440b3c19eb0501daa4bd2f806d73b0375b22daa6ad4db15d001f8c10cf5cdd5569d2b1d344d37ebc0f5c856c7'
SOURCE=$SPELL-h3-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
diff --git a/collab/nag/HISTORY b/collab/nag/HISTORY
index 21b035a..d6f27fa 100644
--- a/collab/nag/HISTORY
+++ b/collab/nag/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.1.1
+ Check for auto-update on system-update and set VERSION
+
2006-01-15 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 2.1-rc1.

diff --git a/collab/nag/nag-h3-2.1.1.tar.gz.sig
b/collab/nag/nag-h3-2.1.1.tar.gz.sig
new file mode 100644
index 0000000..e515dbf
Binary files /dev/null and b/collab/nag/nag-h3-2.1.1.tar.gz.sig differ
diff --git a/collab/passwd/DETAILS b/collab/passwd/DETAILS
index 295ba29..7265532 100755
--- a/collab/passwd/DETAILS
+++ b/collab/passwd/DETAILS
@@ -1,7 +1,11 @@
SPELL=passwd
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
diff --git a/collab/passwd/HISTORY b/collab/passwd/HISTORY
index 253b015..57cf34d 100644
--- a/collab/passwd/HISTORY
+++ b/collab/passwd/HISTORY
@@ -1,5 +1,9 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Check for auto-update on system-update and set VERSION
+
2005-10-16 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 3.0.

2005-10-03 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: spell created.
+
diff --git a/collab/turba/DETAILS b/collab/turba/DETAILS
index 82bf412..710cefe 100755
--- a/collab/turba/DETAILS
+++ b/collab/turba/DETAILS
@@ -1,15 +1,20 @@
SPELL=turba
if [[ "$HORDE_DEVEL" == 'y' ]]; then
+ if [[ "$HORDE_DEVEL_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=cvs://:pserver:cvsread:horde AT anoncvs.horde.org:/repository:$SPELL:HEAD
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.1-rc2
-
SOURCE_HASH='sha512:1bdf2f65647881043a68800ce8567f8cd2d238106e6886e380e2669683f283dbb1102ae2f9f8550c4c13f4dae09620a9df481b23018361dd71bac070a2731eaa'
+ VERSION=2.1.2
+
#SOURCE_HASH='sha512:1bdf2f65647881043a68800ce8567f8cd2d238106e6886e380e2669683f283dbb1102ae2f9f8550c4c13f4dae09620a9df481b23018361dd71bac070a2731eaa'
SOURCE=$SPELL-h3-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
SOURCE_URL[0]=ftp://ftp.horde.org/pub/$SPELL/$SOURCE
fi
diff --git a/collab/turba/HISTORY b/collab/turba/HISTORY
index 6bd0263..235e130 100644
--- a/collab/turba/HISTORY
+++ b/collab/turba/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.1.2
+ Check for auto-update on system-update and set VERSION
+
2006-02-14 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 2.1-rc2.

diff --git a/collab/turba/turba-h3-2.1.2.tar.gz.sig
b/collab/turba/turba-h3-2.1.2.tar.gz.sig
new file mode 100644
index 0000000..6466673
Binary files /dev/null and b/collab/turba/turba-h3-2.1.2.tar.gz.sig differ
diff --git a/crypto/opencdk/DETAILS b/crypto/opencdk/DETAILS
index 232f514..1f61551 100755
--- a/crypto/opencdk/DETAILS
+++ b/crypto/opencdk/DETAILS
@@ -4,11 +4,9 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnutls.org/pub/gnutls/$SPELL/$SOURCE
WEB_SITE=http://www.gnu.org/software/gnutls/
- SOURCE_HASH=sha1:a8a5d9d2a27acccdd8cf92d385c637f78ff0f55f
+
SOURCE_HASH=sha512:dec72e934598a43255fe13b6521cb71741450c33cb85d37274d5c3694ba1a555c2993e07d73311dbe9e0ef96ba7bd6e86d2939da9fde10bf641cad0fbf98bb1f
LICENSE[0]=GPL
ENTERED=20030829
- UPDATED=20030829
- MAINTAINER=v.merkatz AT gmx.net
SHORT="OpenCDK - Open Crypto Development Kit"
cat << EOF
OpenCDK - Open Crypto Development Kit
diff --git a/crypto/opencdk/HISTORY b/crypto/opencdk/HISTORY
index d676d69..ee7ee1d 100644
--- a/crypto/opencdk/HISTORY
+++ b/crypto/opencdk/HISTORY
@@ -1,3 +1,6 @@
+2006-08-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: sha1 -> sha512 [Bug 12942], removed UPDATED and MAINTAINER
+
2005-10-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.8, md5 -> sha1

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 4715056..3c1079d 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,5 +1,5 @@
SPELL=openssl
- VERSION=0.9.8a
+ VERSION=0.9.8c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
@@ -7,12 +7,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_URL[2]=ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.mirror.ac.uk/sites/ftp.openssl.org/source/$SOURCE
SOURCE_URL[4]=ftp://sunsite.uio.no/pub/security/openssl/source/$SOURCE
-
SOURCE_HASH=sha512:ef4e4c7ea5274f494c9472a491effa22bfff2de955508f77f8701db66ed06a10e6e989c2ba80d9758dd2a3fc81ed646950b35e96650df7f6279ca0af0802acdb
+
SOURCE_HASH=sha512:e1f5d9d1d6800cbc4aac6158295cf12576c7ec8ed3f2a7a99cd2398b01b2ae69292e4ff770904742427766f9298b470970ba639c5838a0ce0cb4b71bb96ebfaf
WEB_SITE=http://www.openssl.org
ENTERED=20010922
- UPDATED=20040317
+ SECURITY_PATCH=1

LICENSE[0]=http://www.cgicentral.net/400CS/Docs/openssl/LICENSE.openssl.html
- BUILD_API=2
+ KEYWORDS="crypto"
SHORT="A library for providing encrypted transport layers"
cat << EOF
OpenSSL
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 073cc80..cefc76f 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,8 @@
+2006-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to version 0.9.8c (fixes
+ http://www.openssl.org/news/secadv_20060905.txt),
+ removed UPDATED and BUILD_API, added SECURITY_PATCH
+
2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665

diff --git a/database/mdbtools/DETAILS b/database/mdbtools/DETAILS
index 01ee41d..46c21ef 100755
--- a/database/mdbtools/DETAILS
+++ b/database/mdbtools/DETAILS
@@ -1,17 +1,21 @@
SPELL=mdbtools
-if [[ "$MDBTOOLS_CVS" == "n" ]] ; then
+if [[ "$MDBTOOLS_CVS" == "y" ]] ; then
+ if [[ "$MDBTOOLS_CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=${SPELL}-cvs.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT mdbtools.cvs.sourceforge.net:/cvsroot/mdbtools:mdbtools
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+else
VERSION=0.6pre1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/mdbtools/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-else
- VERSION=`date +%Y%m%d`
- SOURCE=${SPELL}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/mdbtools:mdbtools
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=1
fi
WEB_SITE=http://mdbtools.sourceforge.net/
ENTERED=20040913
diff --git a/database/mdbtools/HISTORY b/database/mdbtools/HISTORY
index 94954d0..7bc4039 100644
--- a/database/mdbtools/HISTORY
+++ b/database/mdbtools/HISTORY
@@ -1,3 +1,9 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for auto-update if building CVS
+ * DETAILS: Default to non-CVS version
+ Added proper CVS update/auto-update checks
+ CVS tarball uses -cvs suffix
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile

diff --git a/database/mdbtools/PREPARE b/database/mdbtools/PREPARE
index 1673446..e300f56 100755
--- a/database/mdbtools/PREPARE
+++ b/database/mdbtools/PREPARE
@@ -1 +1,5 @@
-config_query MDBTOOLS_CVS "Would you like to have the latest cvs? (say yes
if the normal version fails to compile for you)" n
+config_query MDBTOOLS_CVS "Would you like to have the latest cvs? (say yes
if the normal version fails to compile for you)" n &&
+
+if [[ "$MDBTOOLS_CVS" == "y" ]]; then
+ config_query MDBTOOLS_CVS_AUTOUPDATE "Automatically update $SPELL on
every system-update?" n
+fi
diff --git a/doc/tetex-texmf/DETAILS b/doc/tetex-texmf/DETAILS
index 4d28da2..1e0c251 100755
--- a/doc/tetex-texmf/DETAILS
+++ b/doc/tetex-texmf/DETAILS
@@ -4,7 +4,7 @@

SOURCE_DIRECTORY=$BUILD_DIRECTORY/texmf
SOURCE_URL[0]=$CTAN_URL/systems/unix/teTeX/current/distrib/$SOURCE
-
SOURCE_HASH=sha512:7480ede55865f9bc3410ad1733085c6474484e975f0e836c9aad546ebbd4f4546d4455903f8a4c85f74fd82911c7945d297c6e9b9acc18b855b672a1f7bb1563
+
SOURCE_HASH=sha512:5c1881a9ed165e48cc32c2e05b6a11542ee2355a514e2f7b4bbcbd5f79592352af5deb6483a734a51c65704ad1b93ca8365ec1352642c97cc0bebe8ed3e75dd3

if [ "$CSTEX" = "y" ]; then
SOURCE2=csfonts.tar.gz
diff --git a/doc/tetex-texmf/HISTORY b/doc/tetex-texmf/HISTORY
index d47a935..db4c4c3 100644
--- a/doc/tetex-texmf/HISTORY
+++ b/doc/tetex-texmf/HISTORY
@@ -1,3 +1,7 @@
+2006-06-23 Eric Sandall <eric AT sandall.us>
+ * DETAILS: sha512sum changed without VERSION change
+ Changes include license cleanups and documentation changes
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/ftp/dctc/DEPENDS b/ftp/dctc/DEPENDS
index da6ba05..8bed970 100755
--- a/ftp/dctc/DEPENDS
+++ b/ftp/dctc/DEPENDS
@@ -1,12 +1,3 @@
-depends glib2
-if [[ "x${DCTC_MD4}" == "xopenssl" ]]; then
- depends openssl
-elif [[ "x${DCTC_MD4}" == "xlibgcrypt" ]]; then
- depends libgcrypt
-else
- depends openssl &&
- depends libgcrypt
-fi &&
depends gcc34 &&
depends glib2 &&
depends libxml2
diff --git a/ftp/dctc/DETAILS b/ftp/dctc/DETAILS
index 696a9d2..bc556b5 100755
--- a/ftp/dctc/DETAILS
+++ b/ftp/dctc/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20020106
UPDATED=20020421
BUILD_API=2
+ GCC_VERSION=3.4
SHORT="DCTC is a Direct Connect clone"
cat << EOF
DCTC is a Direct Connect clone, a windoz client allowing users to share
diff --git a/ftp/dctc/HISTORY b/ftp/dctc/HISTORY
index fc1bb49..efd4b4b 100644
--- a/ftp/dctc/HISTORY
+++ b/ftp/dctc/HISTORY
@@ -1,6 +1,6 @@
-2006-11-20 Mathieu Lonjaret <lejatorn AT sourcemage.org>
- * DEPENDS, CONFIGURE: fixed bug 12219: depend on openssl or
- * libgcrypt for md4.
+2006-07-27 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD (added): fix bug 12917
+ * DEPENDS: fix bug 11600

2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
diff --git a/ftp/dctc/PRE_BUILD b/ftp/dctc/PRE_BUILD
new file mode 100755
index 0000000..864d9eb
--- /dev/null
+++ b/ftp/dctc/PRE_BUILD
@@ -0,0 +1 @@
+invoke_gcc
diff --git a/ftp/fags/BUILD b/ftp/fags/BUILD
deleted file mode 100755
index 16929c6..0000000
--- a/ftp/fags/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
- sedit "s:-O2:$CFLAGS:" Makefile.in
-
- ./configure --build=$BUILD \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make
diff --git a/ftp/fags/FINAL b/ftp/fags/FINAL
deleted file mode 100755
index a459586..0000000
--- a/ftp/fags/FINAL
+++ /dev/null
@@ -1 +0,0 @@
- message "Edit ${MESSAGE_COLOR}/etc/fags/config${DEFAULT_COLOR} before
starting FAGS."
diff --git a/ftp/fags/HISTORY b/ftp/fags/HISTORY
index bd12243..d3c83d4 100644
--- a/ftp/fags/HISTORY
+++ b/ftp/fags/HISTORY
@@ -1,3 +1,7 @@
+2006-11-30 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * removed BUILD, INSTALL, FINAL and init.d because init install was
+ * broken and was of no use anyway.
+
2005-11-22 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated for BUILD_API=2, SOURCE_HASH. Removed MAINTAINER
* BUILD: Updated for BUILD_API=2
diff --git a/ftp/fags/INSTALL b/ftp/fags/INSTALL
deleted file mode 100755
index 6ea8e9f..0000000
--- a/ftp/fags/INSTALL
+++ /dev/null
@@ -1,29 +0,0 @@
-fags_boot_install () {
-
- # add own user & dirs
- mkdir -p /var/spool/fags/download
- groupadd fags 2>/dev/null
- useradd -g fags -d /var/spool/fags fags 2>/dev/null
- chown -R fags.fags /var/spool/fags
-
- # create config dir and move it /etc/fags
- if [ ! -d /etc/fags ]; then
- rm -rf /etc/fags
- rm -rf /var/spool/fags/.fags
- su fags -c "fags" # create default cfg
- sedit "s:/pub/music/:/var/spool/fags/:" /var/spool/fags/.fags/config
- mv /var/spool/fags/.fags /etc/fags
- ln -sf /etc/fags /var/spool/fags/.fags
- chown root.fags /etc/fags/config
- chmod 0640 /etc/fags/config
- fi
-
-}
-
-
- make install &&
- case $FAGS_BOOT in
- y|Y|j|J) fags_boot_install
- ;;
- *) ;;
- esac
diff --git a/ftp/fags/init.d/fags b/ftp/fags/init.d/fags
deleted file mode 100644
index c58bbed..0000000
--- a/ftp/fags/init.d/fags
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PROGRAM=/usr/bin/fags
-ARGS="-b"
-RUNLEVEL=3
-NEEDS="+network"
-
-. /etc/int.d/smgl_init
diff --git a/graphics/blender_cvs/DETAILS b/graphics/blender_cvs/DETAILS
index e987c64..f27e0d9 100755
--- a/graphics/blender_cvs/DETAILS
+++ b/graphics/blender_cvs/DETAILS
@@ -1,5 +1,9 @@
SPELL=blender_cvs
- VERSION=`date +%Y%m%d`
+if [[ "$BLENDER_CVS_CVS_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=cvs
+fi
SOURCE=${SPELL}-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-src

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.blender.org:/cvsroot/bf-blender:blender
diff --git a/graphics/blender_cvs/HISTORY b/graphics/blender_cvs/HISTORY
index bd00c27..1231bc7 100644
--- a/graphics/blender_cvs/HISTORY
+++ b/graphics/blender_cvs/HISTORY
@@ -1,3 +1,8 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for auto-updating CVS version
+ The variable BLENDER_CVS_CVS_AUTOUPDATE is intentional
+ * DETAILS: Check for auto-updating CVS version
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile

diff --git a/graphics/blender_cvs/PREPARE b/graphics/blender_cvs/PREPARE
new file mode 100755
index 0000000..91e94f0
--- /dev/null
+++ b/graphics/blender_cvs/PREPARE
@@ -0,0 +1 @@
+config_query BLENDER_CVS_CVS_AUTOUPDATE "Auto-update $SPELL on every
system-update?" n
diff --git a/http/mozilla-nightly/DETAILS b/http/mozilla-nightly/DETAILS
index 47741de..b2f360a 100755
--- a/http/mozilla-nightly/DETAILS
+++ b/http/mozilla-nightly/DETAILS
@@ -1,5 +1,9 @@
SPELL=mozilla-nightly
- VERSION=`date +%Y%m%d`
+if [[ "$MOZILLA_NIGHTLY_CVS_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=cvs
+fi
SOURCE=mozilla-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/$SOURCE
@@ -13,9 +17,9 @@ Mozilla is a Web browser that is being d
Community with the cooperation and support of Netscape. Initially,
its development was based on an early version of Netscape Communicator 5.0.
But most of it was disposed of halfway, and the current Mozilla is
-a completely new software based on the "NGLayout" layout engine
-developed for Netscape Communicator 6. "Netscape 6" (the Web browser
-from Netscape) and "Beonex Communicator" are based on Mozilla. Many
+a completely new software based on the "NGLayout" layout engine
+developed for Netscape Communicator 6. "Netscape 6" (the Web browser
+from Netscape) and "Beonex Communicator" are based on Mozilla. Many
other projects use/embed Mozilla's rendering engine.

Note that this spell is based on a nightly snapshot of a work-in-progress.
diff --git a/http/mozilla-nightly/HISTORY b/http/mozilla-nightly/HISTORY
index aae7655..b45d631 100644
--- a/http/mozilla-nightly/HISTORY
+++ b/http/mozilla-nightly/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for CVS auto-update
+ * DETAILS: Check for CVS auto-update
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH unversioned

diff --git a/http/mozilla-nightly/PREPARE b/http/mozilla-nightly/PREPARE
new file mode 100755
index 0000000..c53d2d2
--- /dev/null
+++ b/http/mozilla-nightly/PREPARE
@@ -0,0 +1 @@
+config_query MOZILLA_NIGHTLY_CVS_AUTOUPDATE "Automatically update $SPELL
on system-update?" n
diff --git a/kde-look/slicker/DETAILS b/kde-look/slicker/DETAILS
index 302fd13..cd3e235 100755
--- a/kde-look/slicker/DETAILS
+++ b/kde-look/slicker/DETAILS
@@ -1,5 +1,9 @@
SPELL=slicker
+if [[ "$SLICKER_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
+else
+ VERSION=cvs
+fi
SOURCE=${SPELL}_cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/slicker:slicker
diff --git a/kde-look/slicker/HISTORY b/kde-look/slicker/HISTORY
index 6dafb87..1ad7bc2 100644
--- a/kde-look/slicker/HISTORY
+++ b/kde-look/slicker/HISTORY
@@ -1,3 +1,7 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for CVS auto-update
+ * DETAILS: Check for CVS auto-update
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile

diff --git a/kde-look/slicker/PREPARE b/kde-look/slicker/PREPARE
new file mode 100755
index 0000000..b65d73b
--- /dev/null
+++ b/kde-look/slicker/PREPARE
@@ -0,0 +1 @@
+config_query SLICKER_CVS_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
diff --git a/libs/apr-util0/DETAILS b/libs/apr-util0/DETAILS
index 98a9da7..5d07ddf 100755
--- a/libs/apr-util0/DETAILS
+++ b/libs/apr-util0/DETAILS
@@ -12,7 +12,7 @@ if [[ "$APR_LATEST" == y ]]; then
fi
SOURCE=apr-util-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-util-$VERSION
- SOURCE_URL[0]=${SOURCE_URL[0]:-http://www.apache.org/dist/apr/$SOURCE}
+ SOURCE_URL[0]=http://archive.apache.org/dist/apr/$SOURCE
WEB_SITE=http://apr.apache.org/
LICENSE[0]=APACHE
BUILD_API=2
diff --git a/libs/apr-util0/HISTORY b/libs/apr-util0/HISTORY
index fa71690..94e5c67 100644
--- a/libs/apr-util0/HISTORY
+++ b/libs/apr-util0/HISTORY
@@ -1,7 +1,5 @@
-2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
- * TRIGGERS: Substituted broken conditional with
- is_depends_enabled, changed 'on_cast db cast_self' to
- check_self, added PATCHLEVEL=1, removed UPDATED.
+2006-05-25 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * DETAILS: s/www.apache.org/archive.apache.org/ in the SOURCE_URL.

2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 30e0a23..9982804 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -48,7 +48,12 @@ unset LD_LIBRARY_PATH &&
#
persistent_add GLIBC_ARCH &&
if [[ $(uname -m) = *86_64 ]]; then
- GLIBC_ARCH=x86_64
+ # handle 32-bit mode on 64-bit (*86_64) processors correctly #11904
+ if grep -q -- "-m64" <<< "$CFLAGS"; then
+ GLIBC_ARCH=x86_64
+ else
+ GLIBC_ARCH=i386
+ fi
elif [[ $(uname -m) = ppc ]]; then
GLIBC_ARCH=ppc
elif [[ $(uname -m) = *86 ]]; then
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index b409cec..b2816f2 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,5 +1,5 @@
-2006-06-20 David Brown <dmlb2000 AT gmail.com>
- * DETAILS: turned off staged install for this spell
+2006-06-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: handle 32-bit mode on 64-bit processors correctly #11904

2006-02-08 Eric Sandall <eric AT sandall.us>
* DEPENDS: Depends on smgl-fhs (for directory structure)
diff --git a/mail/qwikmail/DETAILS b/mail/qwikmail/DETAILS
index c9c1e10..19fa324 100755
--- a/mail/qwikmail/DETAILS
+++ b/mail/qwikmail/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwik-s
ENTERED=20020820
UPDATED=20020820
LICENSE[0]=GPL
+ URL=http://qwikmail.sourceforge.net/smtpd/
MAINTAINER=m.l AT compaqnet.fr
SHORT="qwikmail is lightweight, simple MTA."
cat << EOF
diff --git a/mail/qwikmail/HISTORY b/mail/qwikmail/HISTORY
index fa9ac99..832c1be 100644
--- a/mail/qwikmail/HISTORY
+++ b/mail/qwikmail/HISTORY
@@ -1,3 +1,6 @@
+2006-12-20 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Added URL (Bug #12725)
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/net/ifplugd/DETAILS b/net/ifplugd/DETAILS
index 018776b..07df558 100755
--- a/net/ifplugd/DETAILS
+++ b/net/ifplugd/DETAILS
@@ -7,8 +7,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://0pointer.de/lennart/projects/ifplugd/
ENTERED=20031017
UPDATED=20040826
+ PATCHLEVEL=3
LICENSE[0]=GPL
BUILD_API=2
+ KEYWORDS="net link connection cable plugged"
SHORT="Start/stop network based on cable in/out"
cat << EOF
ifplugd is a Linux daemon which will automatically configure your ethernet
diff --git a/net/ifplugd/HISTORY b/net/ifplugd/HISTORY
index 35eb20d..3936d58 100644
--- a/net/ifplugd/HISTORY
+++ b/net/ifplugd/HISTORY
@@ -1,3 +1,30 @@
+2006-06-14 Juuso Alasuutari <iuso AT sourcemage.org>
+ * init.d/ifplugd: Bashified init script to make it faster.
+ * DETAILS: Updated PATCHLEVEL.
+
+2006-06-13 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Hacked $SOURCE_DIRECTORY/conf/Makefile.in to not
+ install ifplugd.conf, we'll do that ourselves to prevent it
+ from being overwritten. Also pruned existing code a little.
+ * conf/ifplugd.conf: Added.
+ * INSTALL: Added, install ifplugd.conf with install_config_file.
+
+2006-04-27 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Added a few keywords, updated PATCHLEVEL
+ * init.d/ifplugd: Fixed return value handling
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-03-09 Juuso Alasuutari <iuso AT sourcemage.org>
+ * init.d/ifplugd: Fixed invalid start, stop & status functions.
+ Added force-reload function. Start function now drops a file
+ called /var/tmp/ifplugd which contains relevant variables.
+ Stop and status functions can source it to operate normally
+ even if config file is changed when daemon is up. Also other
+ minor improvements made.
+ * DETAILS: PATCHLEVEL
+
2006-02-10 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
* DETAILS: updated to 0.28

diff --git a/net/ifplugd/INSTALL b/net/ifplugd/INSTALL
new file mode 100755
index 0000000..c07cfee
--- /dev/null
+++ b/net/ifplugd/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+
+# Install this separately, otherwise the existing one is overwritten
+install_config_file $SCRIPT_DIRECTORY/conf/ifplugd.conf \
+ /etc/ifplugd/ifplugd.conf
diff --git a/net/ifplugd/PRE_BUILD b/net/ifplugd/PRE_BUILD
index cb40008..3d08da0 100755
--- a/net/ifplugd/PRE_BUILD
+++ b/net/ifplugd/PRE_BUILD
@@ -1,3 +1,5 @@
-default_pre_build &&
+default_pre_build &&

-sedit 's/^[^I]*INSTALL[^i]*ifplugd\.init.*ifplugd$/# hack to prevent
ifplugd.init install/' $SOURCE_DIRECTORY/conf/Makefile.in
+# Prevent install of init script and config file
+sedit 's/^.*INSTALL.*ifplugd\.init.*$//' $SOURCE_DIRECTORY/conf/Makefile.in
&&
+sedit 's/^.*INSTALL.*ifplugd\.conf.*$//' $SOURCE_DIRECTORY/conf/Makefile.in
diff --git a/net/ifplugd/conf/ifplugd.conf b/net/ifplugd/conf/ifplugd.conf
new file mode 100644
index 0000000..1e0f83a
--- /dev/null
+++ b/net/ifplugd/conf/ifplugd.conf
@@ -0,0 +1,42 @@
+# -*-sh-*-
+# $Id: ifplugd.conf 43 2003-09-13 11:25:11Z lennart $
+
+# This file is part of ifplugd.
+#
+# ifplugd is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# ifplugd is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ifplugd; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# ifplugd configuration file
+
+# Please note that this is a bourne shell fragment sourced by the
+# init script of ifplugd.
+
+# Specify the interfaces to control here, separated by spaces.
+# Ifplugd processes will be started for each of these interfaces when
+# the ifplugd init script is called with the "start" argument. You may
+# use the magic string "auto" to make the init script start or stop
+# ifplugd processes for ALL eth and wlan interfaces that are available
+# according to /proc/net/dev. Note that the list of interfaces
+# appearing in /proc/net/dev may depend on which kernel modules you
+# have loaded.
+INTERFACES="eth0"
+
+# Additional parameters for ifplugd.
+# (Run "ifplugd -h" for further information.)
+ARGS="-fwI -u0 -d10"
+
+# Additional parameters for ifplugd for the specified interface. Note
+# that $ARGS is ignored, when a variable like this is set for an
+# interface
+#ARGS_wlan0="-MwI -u5 -d5"
diff --git a/net/ifplugd/init.d/ifplugd b/net/ifplugd/init.d/ifplugd
index f7c6250..aae5549 100755
--- a/net/ifplugd/init.d/ifplugd
+++ b/net/ifplugd/init.d/ifplugd
@@ -3,50 +3,64 @@
RUNLEVEL=3
NEEDS="+network +remote_fs"
PROGRAM=/usr/sbin/ifplugd
-ARGS="-w"

-ifplugdconf=/etc/ifplugd/ifplugd.conf
-if [ -e $ifplugdconf ]; then
- . $ifplugdconf
-fi
+CONFFILE=/etc/ifplugd/ifplugd.conf
+DROPFILE=/var/tmp/ifplugd.drop

+[[ ! -f $CONFFILE ]] && echo "No config file: $CONFFILE" && exit 1
+. $CONFFILE
. /etc/init.d/smgl_init

required_executable /usr/sbin/ifplugd

-if [ $# -gt 1 ]; then
- INTERFACES="$(builtin echo $@ | sed s/$1//)"
-fi
-
-if [ "x$INTERFACES" = "xauto" ]; then
- INTERFACES="`cat /proc/net/dev | awk '{ print $1 }' | egrep '^(eth|wlan)'
| cut -d: -f1`"
-fi
+(($#>1)) && INTERFACES="${@/$1}"
+[[ $INTERFACES == auto ]] && INTERFACES="$(cat /proc/net/dev | awk '{ print
$1 }' | egrep '^(eth|wlan)' | cut -d: -f1)"

start()
{
+ local STATE
for IF in $INTERFACES; do
- echo "Starting ifplugd on interface $IF..."
- A="`eval builtin echo \$\{ARGS_${IF}\}`"
- [ -z "$A" ] && A="$ARGS"
- $PROGRAM $ARGS -i $IF $A
+ echo "Starting daemon on interface $IF..."
+ A="$(eval builtin echo \$\{ARGS_${IF}\})"
+ [[ -z $A ]] && A="$ARGS"
+ $PROGRAM -i $IF $A
+ STATE=$?
+ if ((STATE==2)); then
+ echo "Link up."
+ unset STATE
+ elif ((STATE==3)); then
+ echo "Link down."
+ STATE=
+ fi
+ (exit $STATE)
evaluate_retval
done
+ /bin/echo "INTERFACES=\"$INTERFACES\"" > $DROPFILE
}

stop()
{
+ [[ -f $DROPFILE ]] && . $DROPFILE && rm $DROPFILE
for IF in $INTERFACES; do
- echo "Stopping ifplugd on interface $IF..."
- $PROGRAM $ARGS -k -i -W $IF
+ echo "Stopping daemon on interface $IF..."
+ $PROGRAM -k -i $IF -W
evaluate_retval
done
}

status()
{
+ [[ -f $DROPFILE ]] && . $DROPFILE
for IF in $INTERFACES; do
- echo "Status of ifplugd on interface $IF..."
- $PROGRAM $ARGS -c -i -W $IF
+ echo "Status on interface $IF:"
+ $PROGRAM -c -i $IF
evaluate_retval
done
}
+
+force-reload()
+{
+ stop
+ sleep 3
+ start
+}
diff --git a/net/nagios/CONFIGURE b/net/nagios/CONFIGURE
index a795efe..9307735 100755
--- a/net/nagios/CONFIGURE
+++ b/net/nagios/CONFIGURE
@@ -7,4 +7,11 @@ config_query_option NAGIOS_PERL
"--enable-embedded-perl --with-perlcache" \
"--disable-embedded-perl --without-per/cache" &&

+
+config_query_list NAIGOS_IPSNMPPATCH \
+ "Apply which patches?" \
+ "Neither" "Secondary IP Address" \
+ "Host SNMP Community" "Both" &&
+
+config_query NAIGOS_STATUSPATCH "Apply Service Status patch?" n &&
config_query NAGIOS_HTML "Install html and cgi files?" y
diff --git a/net/nagios/DEPENDS b/net/nagios/DEPENDS
index acacecb..1fae388 100755
--- a/net/nagios/DEPENDS
+++ b/net/nagios/DEPENDS
@@ -3,7 +3,7 @@ if [ "$NAGIOS_HTML" == "y" ]; then
depends gd
fi

-optional_depends MAIL_TRANSPORT_AGENT \
+optional_depends MAIL-TRANSPORT-AGENT \
"--with-mail" \
"--without-mail" \
"Enable mail support?"
diff --git a/net/nagios/DETAILS b/net/nagios/DETAILS
index c5a3834..a682e17 100755
--- a/net/nagios/DETAILS
+++ b/net/nagios/DETAILS
@@ -1,14 +1,16 @@
SPELL=nagios
- VERSION=2.0
+ VERSION=2.1
+
SOURCE_HASH='sha512:248cb065a78a9b2d8134c712253593c6c6357bbe7d6ee42a5fedc10a1453a41fa5eb5425707f841bc0efa773e8009f04d98ccf0ebcb71a32a137eec0a207bbb7'
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE=GPL
PATCHLEVEL=1
WEB_SITE=http://www.nagios.org/
ENTERED_DATE=20051129
UPDATED_DATE=20051129
+ KEYWORDS="net"
SHORT="A host/network monitoring program."
cat << EOF
Nagios is a host and service monitor designed to inform you of network
diff --git a/net/nagios/HISTORY b/net/nagios/HISTORY
index f301b3c..66aedeb 100644
--- a/net/nagios/HISTORY
+++ b/net/nagios/HISTORY
@@ -1,8 +1,21 @@
+2006-03-29 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 2.1.
+
+2005-03-20 Matthew Clark <MatthewClark AT InLesserTerms.net>
+ * DEPENDS: Corrected bug 10725
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-03-08 Robin Cook <rcook AT wyrms.net>
+ * CONFIGURE: added queries about patches
+ * PER_BUILD: added to apply patches
+
2006-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.0
* BUILD: changed lock file to match pid location

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

optional_depends "linux-pam" \
"--enable-pam" \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 3bf558a..49dfb52 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,6 +1,5 @@
-2006-06-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * PRE_BUILD: replaced fast_up_depends with show_up_depends,
- bug #12665
+2006-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added g++ #12871

2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: replaced 'gaze depends' call with
diff --git a/utils/lshw/CONFIGURE b/utils/lshw/CONFIGURE
index e12d715..252ae31 100755
--- a/utils/lshw/CONFIGURE
+++ b/utils/lshw/CONFIGURE
@@ -1 +1,5 @@
-config_query LSHWGUI "Enable GUI support?" y
+# replace the logic with a plain optional_depends call, once
is_depends_enabled
+# is available. It will allow for better dispel handling.
+local default=n
+spell_ok gtk+2 && default=y
+config_query LSHWGUI "Enable GUI support?" $default
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index bc87f60..e9554a9 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,21 @@
+2006-07-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: use smarter query logic #12791
+
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
+2006-05-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: B.02.08.01
+
+2006-05-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: new WEB_SITE
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-03-05 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to B.02.07.
+
2005-10-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: B.02.06, md5 -> sha512

diff --git a/video-libs/qc-usb/BUILD b/video-libs/qc-usb/BUILD
index bee6666..5d2e42f 100755
--- a/video-libs/qc-usb/BUILD
+++ b/video-libs/qc-usb/BUILD
@@ -1 +1 @@
-make all
+make MODULE_DIR=$INSTALL_ROOT/lib/modules/$(get_kernel_version) all
diff --git a/video-libs/qc-usb/DETAILS b/video-libs/qc-usb/DETAILS
index 55c3d17..6c32bc0 100755
--- a/video-libs/qc-usb/DETAILS
+++ b/video-libs/qc-usb/DETAILS
@@ -1,10 +1,10 @@
SPELL=qc-usb
BUILD_API=2
- VERSION=0.6.2
+ VERSION=0.6.4
SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/qce-ga/${SOURCE}
-
SOURCE_HASH=sha512:a07ac544ec3ddb6a67dc1cbc0d90e6b6dd447442ab327a82292e304c73f5a898e250c4f279ffeefddb7b7f1de428c16cc6bfd8be0bfe031a843ddea158bd1680
WEB_SITE=http://qce-ga.sourceforge.net
MAINTAINER=qce-ga-discussion AT lists.sourceforge.net
ENTERED=20040813
diff --git a/video-libs/qc-usb/HISTORY b/video-libs/qc-usb/HISTORY
index 5f1c33f..64a18b1 100644
--- a/video-libs/qc-usb/HISTORY
+++ b/video-libs/qc-usb/HISTORY
@@ -1,7 +1,10 @@
-2006-10-22 Juuso Alasuutari <iuso AT sourcemage.org>
- * qc-usb_gcc4.patch: Added, fix compile for gcc4 (bug #13171).
- * PRE_BUILD: Added, apply patch.
- * INSTALL: Added $INSTALL_ROOT to PREFIX.
+2006-05-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.4
+ * BUILD, INSTALL: set MODULE_DIR and PREFIX to correct values
+ * TRIGGERS: trigger cast_self on linux cast
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS

2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
diff --git a/video-libs/qc-usb/INSTALL b/video-libs/qc-usb/INSTALL
index c24820c..b168e46 100755
--- a/video-libs/qc-usb/INSTALL
+++ b/video-libs/qc-usb/INSTALL
@@ -1 +1 @@
-make PREFIX=$INSTALL_ROOT/usr
MODULE_DIR=$INSTALL_ROOT/lib/modules/$(get_kernel_version) install
+make PREFIX=/usr MODULE_DIR=$INSTALL_ROOT/lib/modules/$(get_kernel_version)
install
diff --git a/video-libs/qc-usb/TRIGGERS b/video-libs/qc-usb/TRIGGERS
new file mode 100755
index 0000000..5c92593
--- /dev/null
+++ b/video-libs/qc-usb/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/video-libs/qc-usb/qc-usb-0.6.4.tar.gz.sig
b/video-libs/qc-usb/qc-usb-0.6.4.tar.gz.sig
new file mode 100644
index 0000000..f951dfa
Binary files /dev/null and b/video-libs/qc-usb/qc-usb-0.6.4.tar.gz.sig differ
diff --git a/video/transcode/DETAILS b/video/transcode/DETAILS
index 8f43226..b1b7339 100755
--- a/video/transcode/DETAILS
+++ b/video/transcode/DETAILS
@@ -3,7 +3,7 @@

SOURCE_HASH=sha512:79424ae83ad244553c9d283bd9d8f57535e3bf2b36919f861a2cea9c00d31d8d46e6a00cab5fdc24ecaf2001af5338babd51fac30f18dbdc13dfb44c6ff45834
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.jakemsr.com/transcode/$SOURCE
+ SOURCE_URL[0]=http://download.sourcemage.org/mirror/$SOURCE
WEB_SITE=http://inferno.slug.org/cgi-bin/transcode
LICENSE[0]=GPL
ENTERED=20020430
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index a18e076..6fbf952 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,8 @@
+2006-09-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed download location to
+ download.sourcemage.org/mirror, as the official download locations
+ are gone, bug #13120
+
2005-11-26 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 1.0.2

diff --git a/windowmanagers/sawfish/DETAILS b/windowmanagers/sawfish/DETAILS
index 699ead7..bb63c64 100755
--- a/windowmanagers/sawfish/DETAILS
+++ b/windowmanagers/sawfish/DETAILS
@@ -1,7 +1,10 @@
SPELL=sawfish
-
-if [ "${SAWFISH_CVS}"=="y" ] ; then
+if [[ "${SAWFISH_CVS}" == "y" ]] ; then
+ if [[ "$SAWFISH_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
SOURCE_IGNORE=volatile
SOURCE=sawfish-cvs.tar.bz2

SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.gnome.org:/cvs/gnome:sawfish
@@ -16,22 +19,20 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_URL[1]=http://mirror.aarnet.edu.au/pub/gnome/sources/${SPELL}/${VERSION}/${SOURCE}

SOURCE_HASH=sha512:7b0e35e781319a0ea3398efa7c53c541576ef36675bae70e15b9a42cb70309b374972f90e79c1490baf484ff3198658cbd5b2433f702c771c7191d6267c1c24b
fi
-
BUILD_API=2
WEB_SITE=http://sawmill.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20010922
UPDATED=20011130
- MAINTAINER=jon-sven AT frisurf.no
SHORT="Sawfish is an extensible X11 window manager"
cat << EOF
-Sawfish is an extensible window manager using a Lisp-based scripting
-language --all window decorations are configurable and all user-interface
-policy is controlled through the extension language. This is no layer on
+Sawfish is an extensible window manager using a Lisp-based scripting
+language --all window decorations are configurable and all user-interface
+policy is controlled through the extension language. This is no layer on
top of twm, but a wholly new architecture.
-Despite this extensibility its policy is very minimal compared to most
-window managers. Its aim is simply to manage windows in the most flexible
-and attractive manner possible. As such it does not implement desktop
-backgrounds, applications docks, or other things that may be achieved
+Despite this extensibility its policy is very minimal compared to most
+window managers. Its aim is simply to manage windows in the most flexible
+and attractive manner possible. As such it does not implement desktop
+backgrounds, applications docks, or other things that may be achieved
through separate applications.
EOF
diff --git a/windowmanagers/sawfish/HISTORY b/windowmanagers/sawfish/HISTORY
index 681a0c6..249dbd6 100644
--- a/windowmanagers/sawfish/HISTORY
+++ b/windowmanagers/sawfish/HISTORY
@@ -1,3 +1,8 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for CVS auto-update
+ * DETAILS: Check for CVS auto-update
+ Removed MAINTAINER
+
2005-12-02 Seth Woolley <seth AT tautology.org>
* DETAILS: .gz -> .bz2, libsummon wants this for repackaging
* DETAILS: MD5 -> SHA512
diff --git a/windowmanagers/sawfish/PREPARE b/windowmanagers/sawfish/PREPARE
index e7f89b5..60c69a4 100755
--- a/windowmanagers/sawfish/PREPARE
+++ b/windowmanagers/sawfish/PREPARE
@@ -1 +1,5 @@
-config_query SAWFISH_CVS "Build the CVS version?" n
+config_query SAWFISH_CVS "Build the CVS version?" n &&
+
+if [[ "$SAWFISH_CVS" == "y" ]]; then
+ config_query SAWFISH_CVS_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
+fi
diff --git a/windowmanagers/tinywm/HISTORY b/windowmanagers/tinywm/HISTORY
index 5ee871c..9a6429e 100644
--- a/windowmanagers/tinywm/HISTORY
+++ b/windowmanagers/tinywm/HISTORY
@@ -1,3 +1,6 @@
+2006-07-31 Pieter Lenaerts <e-type AT sourcemage.org>
+ * added PRE_BUILD: fixing install_root prefix
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/windowmanagers/tinywm/PRE_BUILD b/windowmanagers/tinywm/PRE_BUILD
new file mode 100755
index 0000000..1655386
--- /dev/null
+++ b/windowmanagers/tinywm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+sedit "s/\/usr\/X11R6/${INSTALL_ROOT}\/usr\/X11R6/g" \
+ ${SOURCE_DIRECTORY}/Makefile
diff --git a/windowmanagers/wm2/DETAILS b/windowmanagers/wm2/DETAILS
index 0f3967a..a0728d3 100755
--- a/windowmanagers/wm2/DETAILS
+++ b/windowmanagers/wm2/DETAILS
@@ -1,6 +1,9 @@
SPELL=wm2
- BUILD_API=2
+if [[ "$WM2_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
+else
+ VERSION=cvs
+fi
SOURCE=$SPELL-cvsroot.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/wm2:wm2
diff --git a/windowmanagers/wm2/HISTORY b/windowmanagers/wm2/HISTORY
index 75cc57b..dcf003a 100644
--- a/windowmanagers/wm2/HISTORY
+++ b/windowmanagers/wm2/HISTORY
@@ -1,3 +1,8 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for CVS auto-update
+ * DETAILS: Check for CVS auto-update
+ Removed BUILD_API=2 (grimoire-wide)
+
2006-02-03 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: set SOURCE_IGNORE to volatile for this cvs spell

diff --git a/windowmanagers/wm2/PREPARE b/windowmanagers/wm2/PREPARE
new file mode 100755
index 0000000..91d3331
--- /dev/null
+++ b/windowmanagers/wm2/PREPARE
@@ -0,0 +1 @@
+config_query WM2_CVS_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
diff --git a/x11/tomboy/DETAILS b/x11/tomboy/DETAILS
index eee48fd..a89f9dd 100755
--- a/x11/tomboy/DETAILS
+++ b/x11/tomboy/DETAILS
@@ -8,7 +8,11 @@ if [ "$TOMBOY_CVS" == "n" ] ; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

else
+ if [[ "$TOMBOW_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.gnome.org:/cvs/gnome:tomboy
SOURCE_IGNORE=volatile
diff --git a/x11/tomboy/HISTORY b/x11/tomboy/HISTORY
index fd262c4..a220f08 100644
--- a/x11/tomboy/HISTORY
+++ b/x11/tomboy/HISTORY
@@ -1,3 +1,9 @@
+2006-08-28 Eric Sandall <eric AT sandall.us>
+ * PREPARE: Query for CVS auto-update
+ * DETAILS: Check for CVS auto-update
+ Not setting stable version to default as, according to CONFIGURE,
+ only CVS builds right now.
+
2005-12-05 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added galago-sharp and gmime as optional cvs depends

@@ -32,3 +38,4 @@

2004-09-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/x11/tomboy/PREPARE b/x11/tomboy/PREPARE
new file mode 100755
index 0000000..1d4b681
--- /dev/null
+++ b/x11/tomboy/PREPARE
@@ -0,0 +1 @@
+config_query TOMBOY_CVS_AUTOUPDATE "Automatically update $SPELL on
system-update?" n



  • [SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (b9e5fec1941d6c8d02a6a9b96237eb270229510d), Eric Sandall, 12/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page