sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (7f6d1115200e397381fbbb8865e9b3fc48561adc)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (7f6d1115200e397381fbbb8865e9b3fc48561adc)
- Date: Thu, 24 Dec 2009 12:07:38 -0600
GIT changes to devel-gcc grimoire by Eric Sandall <sandalle AT sourcemage.org>:
devel/vala/DETAILS | 4 -
devel/vala/HISTORY | 3 +
graphics/geeqie/DEPENDS | 8 +--
graphics/geeqie/DETAILS | 4 -
graphics/geeqie/HISTORY | 4 +
http/newsbeuter/DETAILS | 4 -
http/newsbeuter/HISTORY | 3 +
kde4-apps/digikam4/DETAILS | 4 -
kde4-apps/digikam4/HISTORY | 3 +
libs/libvirt/DEPENDS | 4 +
libs/libvirt/HISTORY | 5 +
libs/libvirt/init.d/libvirtd | 4 +
libs/libvirt/init.d/libvirtd.conf | 2
libs/redland/DEPENDS | 5 +
libs/redland/HISTORY | 3 +
telephony/asterisk.gpg |binary
telephony/asterisk/CONFIGURE | 6 +-
telephony/asterisk/DEPENDS | 96
+++++++++++++++++++++++++++++++++----
telephony/asterisk/DETAILS | 10 +--
telephony/asterisk/HISTORY | 13 +++++
telephony/asterisk/INSTALL | 9 ++-
telephony/asterisk/PRE_BUILD | 5 -
telephony/asterisk/init.d/asterisk | 18 ++----
utils/pinot/DETAILS | 4 -
utils/pinot/HISTORY | 3 +
x11/tint2/DETAILS | 4 -
x11/tint2/HISTORY | 3 +
27 files changed, 179 insertions(+), 52 deletions(-)
New commits:
commit 20f52bd2a9f35fe5cddb1abbe6e0b172df4814fb
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
telephony/asterisk.gpg: add up-to-date keys
Add up-to-date keys for the asterisk developers.
WARNING: THESE KEYS COULD NOT BE PROPERLY VERIFIED!
The most recent release of asterisk was both signed and hashed (sha1),
and I was able to verify the download using both the signatures (using
the keys in this commit) and the sha1. However, I did not have any
channels available for key verification other than downloading from the
public keyserver (pgp.mit.edu).
I am committing these keys now because I have time constraints that will
prevent me from properly verifying these keys within a reasonable time
frame, so hopefully someone else can complete this task sooner. Also, I
am leaving the top-level asterisk.gpg keyring intact in case anyone is
still using it with the other asterisk spells (which should either be
updated or deprecated, accordingly).
If it is found that this commit is in error, then of course it can be
reverted, corrected, and recommitted.
commit fdbeb8c32123382e56fbf70d740c50e33fbd9d72
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
telephony/asterisk: update to 1.6.1.11
This is a big jump forward update that resulted in a lot of changes. It
works for me, but the spell could still use some improving. For example,
I wanted to get custom build tweaking via make menuconfig working in
BUILD, but I had issues of getting the input/output properly passed back
and forth. I don't have a lot of spare time to work on this, so I'm
pushing it out for other devs to pick up where I've left off. However,
it does work for me, so it's at least usable even if not perfect. :)
I'm pushing the gpg key update as a separate commit, since the asterisk
developers seem to deem publishing their key fingerprints (or even just
the IDs) unnecessary. As a result, I can't properly verify the
trustworthiness of the keys the release was signed with. However, there
was a sha1 hash of the release in the same location as the source and
gpg signature, and I did verify the downloaded source against both the
gpg signature with not-so-trustworthy keys and the sha1 hash.
commit a65d9c33bce9308b4e6cf2316543f7b429a657a1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
digikam4: => 1.0.0
commit 5dbfe623019c734f4ac4405b20be9eed5ce57184
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
redland - add optional virtuoso
commit 36fc6d18a4ea02b097319fb69973aab48eb1b8f7
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
tint2: => 0.8
commit 80bebd74102ef38ee52939eee08a2cb655d0671a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
newsbeuter: => 2.1
commit a1f75d34eb0fb3809a7748fc05742234e9977d27
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
vala: 0.7.9
commit c8d0efe743d7b896f1f50a942af815357a161c4d
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
pinot: => 0.95
commit 221e38657b5f268fe516954b133939b6c6014a64
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libvirt: Pass parameter from sysconfig/libvirtd
Allow enabling listening on TCP in sysconfig/libvirtd
commit 0b0243f103dbdc2d0e29692de517046479535144
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libvirt: Suggest bridge-utils and iproute2
commit f2a56bb18e6d08ae0151684a91cc64508c53d54f
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>
qeeqie: Updated to version 1.0beta2. Fixed config options
in DEPENDS
diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 2fceadb..f8ae38f 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,6 +1,6 @@
SPELL=vala
- VERSION=0.7.8
-
SOURCE_HASH=sha512:2dad9470742ae59bb7e2e2f088c401798ebc26b67e4f7260b4bbea624219a1a1592cf1f846209d8a84a16bdf2dd361ec6e47b94638058011629541e968dcd69f
+ VERSION=0.7.9
+
SOURCE_HASH=sha512:097b169438c86f3b0e462399b55d10cb10e1f7f24788066220dba6d8cc11bad0a1356305955211cd79586e93164c756d21be399018b7cb3d7b61016cbfe047c3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index ea6e856..47c8e31 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2009-12-21 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.7.9
+
2009-11-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.8
diff --git a/graphics/geeqie/DEPENDS b/graphics/geeqie/DEPENDS
index 2b2bd6a..edfddaa 100755
--- a/graphics/geeqie/DEPENDS
+++ b/graphics/geeqie/DEPENDS
@@ -1,11 +1,11 @@
depends gtk+2 &&
optional_depends exiv2 \
- "--with-exiv2" \
- "--without-exiv2" \
+ "--enable-exiv2" \
+ "--disable-exiv2" \
"exiv2 support" &&
optional_depends lcms \
- "--with-lcms" \
- "--without-lcms" \
+ "--enable-lcms" \
+ "--disable-lcms" \
"lcms support" &&
optional_depends libchamplain \
"" \
diff --git a/graphics/geeqie/DETAILS b/graphics/geeqie/DETAILS
index aa17696..7f042e0 100755
--- a/graphics/geeqie/DETAILS
+++ b/graphics/geeqie/DETAILS
@@ -11,10 +11,10 @@ if [[ "${GEEQIE_SVN}" == "y" ]] ; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/geeqie-svn
FORCE_DOWNLOAD=on
else
- VERSION=1.0beta1
+ VERSION=1.0beta2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:ef802093f25f75c71a67b2b17b90b64b9729bd84396e120690cfd2efc2c882e1d106223a6e17c4cea2cb97a75f1250290fbd3e1e5a18bed5bef905842bd694ba
+
SOURCE_HASH=sha512:4e0eca5d0cc1f927c158771e59713418705f88182c308be950b063a081c093a234eec4ede57b99c74add206a716be353fc1ab5e31959a13e9299f3a3546db33c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
WEB_SITE="http://geeqie.sourceforge.net/";
diff --git a/graphics/geeqie/HISTORY b/graphics/geeqie/HISTORY
index 49ca2b1..d1387aa 100644
--- a/graphics/geeqie/HISTORY
+++ b/graphics/geeqie/HISTORY
@@ -1,3 +1,7 @@
+2009-12-20 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.0beta2
+ * DEPENDS: Updated config options for exiv2 and lcms
+
2009-10-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added optional dependency on libchamplain
diff --git a/http/newsbeuter/DETAILS b/http/newsbeuter/DETAILS
index fcae457..df14e5c 100755
--- a/http/newsbeuter/DETAILS
+++ b/http/newsbeuter/DETAILS
@@ -1,8 +1,8 @@
SPELL=newsbeuter
- VERSION=2.0
+ VERSION=2.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.${SPELL}.org/downloads/${SOURCE}
-
SOURCE_HASH=sha512:13794c8fc2a54e3309eb196eb57bd1156af5cd30b4bcf47efffbdd0ac0f27c2b2c208c6a205b4e0c2c62aa4394e7a2e366d8df0a7a2167d8dc2c5c4d745affe0
+
SOURCE_HASH=sha512:cb0085eba4ff47765683697065c9139a6df8c29e9db5580ade70813fdbe4a05db7670f09c77f811a3f0f187d18d6177f727c808877ba62ad2a7f0588fc22d3ef
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.newsbeuter.org/";
LICENSE[0]="MIT/X"
diff --git a/http/newsbeuter/HISTORY b/http/newsbeuter/HISTORY
index 08c6ee1..5f31889 100644
--- a/http/newsbeuter/HISTORY
+++ b/http/newsbeuter/HISTORY
@@ -1,3 +1,6 @@
+2009-12-21 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.1
+
2009-06-29 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS, DETAILS, BUILD, INSTALL, PRE_BUILD: spell created
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index 43d43eb..03c6dfd 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
else
- VERSION=1.0.0-rc
-
SOURCE_HASH=sha512:436e31755188b8d0578902c21cf0e8f5056891405822c38fd834f1475fa64c885c3abdf1a1221fdf8e25b1b79d747671563a548acb3ed72a04b3853b94b80e66
+ VERSION=1.0.0
+
SOURCE_HASH=sha512:0b7d166c2a31f577567ec54ba15155fe149da905811c87d28d47dc28022b1f20299034544c9a053671842847fd7581b74eb80226076f997c058174cbc09aa8e0
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index b375c0d..b5e58e9 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2009-12-21 Treeve Jelbert <treevesourcemage.org>
+ * DETAILS: version 1.0.0
+
2009-11-30 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 1.0.0-rc
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index a1f9164..d17f1a5 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -67,5 +67,7 @@ optional_depends libssh2 \
'--without-libssh2' \
'SSH2 support' &&
-suggest_depends nc '' '' 'for remote SSH tunneling'
+suggest_depends nc '' '' 'for remote SSH tunneling' &&
+suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' &&
+suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces'
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 6d7943f..123c17a 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,8 @@
+2009-12-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest bridge-utils and iproute2
+ * init.d/libvirtd: Pass parameter from sysconfig/libvirtd
+ * init.d/libvirtd.conf: Allow enabling listening on TCP
+
2009-12-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.7.4
* DEPENDS: Requires full build of lvm
diff --git a/libs/libvirt/init.d/libvirtd b/libs/libvirt/init.d/libvirtd
index 979dc9b..907b95f 100644
--- a/libs/libvirt/init.d/libvirtd
+++ b/libs/libvirt/init.d/libvirtd
@@ -1,8 +1,10 @@
#!/bin/bash
+. /etc/sysconfig/libvirtd
+
PIDFILE=/var/run/libvirtd.pid
PROGRAM=/usr/sbin/libvirtd
-ARGS="-d"
+ARGS="-d $LISTEN"
RUNLEVEL=3
[[ ! -d /var/run/libvirt ]] && mkdir -p /var/run/libvirt
diff --git a/libs/libvirt/init.d/libvirtd.conf
b/libs/libvirt/init.d/libvirtd.conf
new file mode 100644
index 0000000..5d948da
--- /dev/null
+++ b/libs/libvirt/init.d/libvirtd.conf
@@ -0,0 +1,2 @@
+# Flag listening for secure TLS connections on the public TCP/IP port.
+LISTEN="--listen"
diff --git a/libs/redland/DEPENDS b/libs/redland/DEPENDS
index 455326f..a1691c4 100755
--- a/libs/redland/DEPENDS
+++ b/libs/redland/DEPENDS
@@ -23,6 +23,11 @@ optional_depends mysql \
"--with-mysql=no" \
"Enable Mysql store" &&
+optional_depends virtuoso \
+ "--with-virtuoso=yes" \
+ "--with-virtuoso=no" \
+ 'enable Virtuoso store' &&
+
optional_depends w3c-libwww \
"--with-libwww" \
"--without-libwww" \
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index 47b7fe9..90baf6d 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,6 @@
+2009-12-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional virtuoso
+
2009-12-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.10
* PRE_BUILD, redland-1.0.9-librdf_storage_register_factory.patch:
deleted
diff --git a/telephony/asterisk.gpg b/telephony/asterisk.gpg
new file mode 100644
index 0000000..0430ac8
Binary files /dev/null and b/telephony/asterisk.gpg differ
diff --git a/telephony/asterisk/CONFIGURE b/telephony/asterisk/CONFIGURE
index 65bb2b6..8081870 100755
--- a/telephony/asterisk/CONFIGURE
+++ b/telephony/asterisk/CONFIGURE
@@ -1,3 +1,7 @@
config_query ASTERISK_DOXYGEN \
"Build doxygen source code documentation (takes a long time)?" \
- "n"
+ "n" &&
+
+config_query ASTERISK_CONFIGS \
+ "Install sample configs (will be placed in a configs/ dir)?" \
+ "y"
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index 1d8f976..c04e00d 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -1,34 +1,86 @@
depends "g++" &&
-depends "ncurses" &&
depends "openssl" &&
depends "zlib" &&
-depends "mpg123" &&
if [[ ${ASTERISK_DOXYGEN} == "y" ]]
then
depends "doxygen"
fi &&
-optional_depends "asterisk-sounds" \
- "" \
- "" \
- "for additional sounds" &&
+optional_depends "curl" \
+ "--with-curl" \
+ "--without-curl" \
+ "enable curl support" &&
+
+optional_depends "lua" \
+ "--with-lua" \
+ "--without-lua" \
+ "enable lua support" &&
+
+optional_depends "libusb" \
+ "--with-usb" \
+ "--without-usb" \
+ "enable libusb support" &&
+
+optional_depends "sdl" \
+ "--with-sdl" \
+ "--without-sdl" \
+ "enable sdl support" &&
+
+optional_depends "sdl_image" \
+ "--with-SDL_image" \
+ "--without-SDL_image" \
+ "enable sdl_image support" &&
+
+optional_depends "popt" \
+ "--with-popt" \
+ "--without-popt" \
+ "enable popt (command-line parsing) support" &&
+
+
+message "Sound Driver Options (calls from console):" &&
optional_depends "alsa-lib" \
"--with-asound" \
"--without-asound" \
- "for making calls from the asterisk console" &&
+ "use alsa for console calls" &&
+
+optional_depends "oss" \
+ "--with-oss" \
+ "--without-oss" \
+ "use oss for console calls" &&
+
+optional_depends "jack" \
+ "--with-jack" \
+ "--without-jack" \
+ "use jack for console calls" &&
+
+
+message "Codex and Format Options:" &&
optional_depends "speex" \
"--with-speex" \
"--without-speex" \
"support for the speex codec" &&
+optional_depends "libogg" \
+ "--with-ogg" \
+ "--without-ogg" \
+ "support for the ogg container format" &&
+
optional_depends "libvorbis" \
"--with-vorbis" \
"--without-vorbis" \
"support for the ogg-vorbis codec" &&
+
+message "Storage Backend (database) Options:" &&
+
+optional_depends "ODBC-MGR" \
+ "--with-odbc" \
+ "--without-odbc" \
+ "for ODBC interface as database backend" &&
+
optional_depends "postgresql" \
"--with-postgres" \
"--without-postgres" \
@@ -39,6 +91,19 @@ optional_depends "sqlite"
\
"--without-sqlite" \
"for sqlite as database backend" &&
+optional_depends "openldap" \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for openldap as database backend" &&
+
+optional_depends "C-CLIENT" \
+ "--with-imap" \
+ "--without-imap" \
+ "for imap storage of voicemail" &&
+
+
+message "Core Driver Options:" &&
+
optional_depends "net-snmp" \
"--with-netsnmp" \
"--without-netsnmp" \
@@ -57,9 +122,22 @@ optional_depends "zaptel"
\
optional_depends "iksemel" \
"--with-iksemel" \
"--without-iksemel" \
- "to build the VERY EXPERIMENTAL Asterisk Jabber Interface"
&&
+ "to build the Asterisk Jabber/XMPP Interface" &&
+
+
+message "Interface Options:" &&
+
+optional_depends "gtk+2" \
+ "--with-gtk2" \
+ "--without-gtk2" \
+ "enable gtk+2 support" &&
+
+optional_depends "ncurses" \
+ "--with-ncurses" \
+ "--without-ncurses" \
+ "to build the management console" &&
optional_depends "newt" \
"--with-newt" \
"--without-newt" \
- "to build the manger interface client \"astman\""
+ "to build the manager interface client \"astman\""
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index 4a1acb5..0c2735d 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,12 +1,12 @@
SPELL=asterisk
- VERSION=1.4.21.2
+ VERSION=1.6.1.11
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+
SOURCE_URL[0]=http://downloads.asterisk.org/pub/telephony/${SPELL}/releases/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SOURCE_URL[1]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
- SOURCE2_URL[1]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE2}
+ SOURCE_URL[1]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE2_URL[1]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE2}
SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
DOCS="README* CHAN* doc* LICENSE COPYING configs"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 5d7f034..4031265 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,16 @@
+2009-12-21 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.1.11, updated source urls
+ * DEPENDS: removed mpg123 (support for it was dropped upstream) and
+ added missing depends
+ * CONFIGURE: ask to install sample configs (but put them in a custom
+ directory instead of overwriting any installed configs)
+ * PRE_BUILD: removed, not needed
+ * INSTALL: optionally install (via cp) sample configs
+ * init.d/asterisk: streamlined the code, and made the lock file paths
+ more robust (/var/lock/subsys is not guaranteed to exist, but
+ /var/lock is via smgl-fhs, so make the lock file /var/lock/asterisk
+ instead)
+
2008-07-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.21.2
SECURITY_PATCH++, fixes bug 14604 (CVE-2008-3263, CVE-2008-3264)
diff --git a/telephony/asterisk/INSTALL b/telephony/asterisk/INSTALL
index e13825e..f8a907a 100755
--- a/telephony/asterisk/INSTALL
+++ b/telephony/asterisk/INSTALL
@@ -1,3 +1,8 @@
-make_single &&
make install &&
-make_normal
+mkdir -p "$INSTALL_ROOT"/var/lib/asterisk/firmware/iax &&
+
+if [[ "$ASTERISK_CONFIGS" == y ]]
+then
+ mkdir -p "$INSTALL_ROOT"/etc/asterisk/samples &&
+ cp configs/* "$INSTALL_ROOT"/etc/asterisk/samples/
+fi
diff --git a/telephony/asterisk/PRE_BUILD b/telephony/asterisk/PRE_BUILD
deleted file mode 100755
index 785fa29..0000000
--- a/telephony/asterisk/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-sed -i -e "s|/usr/bin/awk|/bin/awk|" main/editline/makelist &&
-sed -i -e "s/OVERWRITE=y/OVERWRITE=n/" Makefile
-
diff --git a/telephony/asterisk/init.d/asterisk
b/telephony/asterisk/init.d/asterisk
index 6778090..563361d 100755
--- a/telephony/asterisk/init.d/asterisk
+++ b/telephony/asterisk/init.d/asterisk
@@ -1,27 +1,21 @@
#!/bin/bash
-PROGRAM=/bin/false
+PROGRAM=/usr/sbin/asterisk
RUNLEVEL=3
. /etc/init.d/smgl_init
-required_executable /usr/sbin/asterisk
-
start()
{
echo "Starting Asterisk"
/usr/sbin/asterisk
- evaluate_retval
- x=$?
- [ ${x} -eq 0 ] && touch /var/lock/subsys/asterisk
+ evaluate_retval && touch /var/lock/asterisk
}
stop()
{
echo "Shutting down Asterisk"
- killproc asterisk
- x=$?
- [ ${x} -eq 0 ] && rm -f /var/lock/subsys/asterisk
+ killproc asterisk && rm -f /var/lock/asterisk
}
restart()
@@ -33,14 +27,14 @@ restart()
reload()
{
echo "reloading Asterisk"
- /usr/sbin/asterisk -rx 'reload' > /dev/null 2> /dev/null
+ /usr/sbin/asterisk -rx 'reload' > /dev/null 2>&1
evaluate_retval
}
status()
{
- if [[ -f /var/lock/subsys/asterisk ]]; then
- statusproc asterisk
+ if [[ -f /var/lock/asterisk ]]; then
+ statusproc asterisk
else
echo "Asterisk is not loaded"
fi
diff --git a/utils/pinot/DETAILS b/utils/pinot/DETAILS
index ffd9e48..c48a12f 100755
--- a/utils/pinot/DETAILS
+++ b/utils/pinot/DETAILS
@@ -1,9 +1,9 @@
SPELL=pinot
- VERSION=0.94
+ VERSION=0.95
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
SOURCE_URL[1]=http://download2.berlios.de/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:0c7bac982186ec6c2c24d8ce77513919f2c68fb30be45e6e1b122ddb974de831d1a25f1bb6d8dbf79ac92f5f3a9dc283bdf940d78fcc9ed31839c6bc1057659b
+
SOURCE_HASH=sha512:1db01ab08a14e04e31596e63f7a925d7e53b168256b2d18f17f509a229a30fd588289748be672642e17ba7dcdd94de4985216a6d31367d4f212de1f72d59330a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://pinot.berlios.de/ "
LICENSE[0]=GPL
diff --git a/utils/pinot/HISTORY b/utils/pinot/HISTORY
index f1ae6c0..da14f20 100644
--- a/utils/pinot/HISTORY
+++ b/utils/pinot/HISTORY
@@ -1,3 +1,6 @@
+2009-12-21 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.95
+
2009-10-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.94
diff --git a/x11/tint2/DETAILS b/x11/tint2/DETAILS
index 9a59d10..5e87e8f 100755
--- a/x11/tint2/DETAILS
+++ b/x11/tint2/DETAILS
@@ -1,6 +1,6 @@
SPELL=tint2
- VERSION=0.7_beta3
-
SOURCE_HASH=478867ad6aae659cdbf1a1637a96afd48399c15f02f0e26ef7eecf47cb39678bf0e5bbbd9495ebfd2565ebb34c6401cdd2e2bccb222a6e67c06887636805485d
+ VERSION=0.8
+
SOURCE_HASH=sha512:bd9c1321080e9f20cbb0b0e152a15049ce8f923805eb1869d018c8aa78e2a28c5bd9f218d34c6be4796096b75a15cc40368657fbcdbf27324f49f53b54b01d86
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/tint2/
diff --git a/x11/tint2/HISTORY b/x11/tint2/HISTORY
index b51b917..337871c 100644
--- a/x11/tint2/HISTORY
+++ b/x11/tint2/HISTORY
@@ -1,2 +1,5 @@
+2009-12-21 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.8
+
2009-08-30 Donald Johnson <ltdonny AT gmail.com>
* all: created
- [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (7f6d1115200e397381fbbb8865e9b3fc48561adc), Eric Sandall, 12/24/2009
Archive powered by MHonArc 2.6.24.