Security revbump for #111836 (fixes security hole in vmail.cgi)
authorStefan Knoblich <stkn@gentoo.org>
Tue, 8 Nov 2005 15:35:21 +0000 (15:35 +0000)
committerStefan Knoblich <stkn@gentoo.org>
Tue, 8 Nov 2005 15:35:21 +0000 (15:35 +0000)
Package-Manager: portage-2.0.51.22-r2

17 files changed:
net-misc/asterisk/ChangeLog
net-misc/asterisk/Manifest
net-misc/asterisk/asterisk-1.0.5-r3.ebuild [moved from net-misc/asterisk/asterisk-1.0.5-r2.ebuild with 98% similarity]
net-misc/asterisk/asterisk-1.0.6-r2.ebuild [moved from net-misc/asterisk/asterisk-1.0.6-r1.ebuild with 99% similarity]
net-misc/asterisk/asterisk-1.0.7-r2.ebuild [moved from net-misc/asterisk/asterisk-1.0.7-r1.ebuild with 99% similarity]
net-misc/asterisk/asterisk-1.0.8-r1.ebuild [moved from net-misc/asterisk/asterisk-1.0.8.ebuild with 99% similarity]
net-misc/asterisk/asterisk-1.0.9-r2.ebuild [moved from net-misc/asterisk/asterisk-1.0.9-r1.ebuild with 99% similarity]
net-misc/asterisk/asterisk-1.0.9.ebuild [deleted file]
net-misc/asterisk/asterisk-1.2.0_beta1-r1.ebuild [moved from net-misc/asterisk/asterisk-1.2.0_beta1.ebuild with 98% similarity]
net-misc/asterisk/files/1.0.0/asterisk-1.0.9-vmail.cgi.patch [new file with mode: 0644]
net-misc/asterisk/files/digest-asterisk-1.0.5-r3 [moved from net-misc/asterisk/files/digest-asterisk-1.0.5-r2 with 100% similarity]
net-misc/asterisk/files/digest-asterisk-1.0.6-r2 [moved from net-misc/asterisk/files/digest-asterisk-1.0.6-r1 with 100% similarity]
net-misc/asterisk/files/digest-asterisk-1.0.7-r2 [moved from net-misc/asterisk/files/digest-asterisk-1.0.7-r1 with 100% similarity]
net-misc/asterisk/files/digest-asterisk-1.0.8-r1 [moved from net-misc/asterisk/files/digest-asterisk-1.0.8 with 100% similarity]
net-misc/asterisk/files/digest-asterisk-1.0.9 [deleted file]
net-misc/asterisk/files/digest-asterisk-1.0.9-r2 [moved from net-misc/asterisk/files/digest-asterisk-1.0.9-r1 with 100% similarity]
net-misc/asterisk/files/digest-asterisk-1.2.0_beta1-r1 [moved from net-misc/asterisk/files/digest-asterisk-1.2.0_beta1 with 100% similarity]

index 623b33393272cb68b2d126a24b2f2eee1d9474df..25ec9d1f9cbe52edd2afe6d5b0610d53a4cdd248 100644 (file)
@@ -1,6 +1,24 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.87 2005/10/29 02:53:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.88 2005/11/08 15:35:21 stkn Exp $
+
+*asterisk-1.2.0_beta1-r1 (08 Nov 2005)
+*asterisk-1.0.9-r2 (08 Nov 2005)
+*asterisk-1.0.8-r1 (08 Nov 2005)
+*asterisk-1.0.7-r2 (08 Nov 2005)
+*asterisk-1.0.6-r2 (08 Nov 2005)
+*asterisk-1.0.5-r3 (08 Nov 2005)
+
+  08 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.9-vmail.cgi.patch, -asterisk-1.0.5-r2.ebuild,
+  +asterisk-1.0.5-r3.ebuild, -asterisk-1.0.6-r1.ebuild,
+  +asterisk-1.0.6-r2.ebuild, -asterisk-1.0.7-r1.ebuild,
+  +asterisk-1.0.7-r2.ebuild, -asterisk-1.0.8.ebuild,
+  +asterisk-1.0.8-r1.ebuild, -asterisk-1.0.9.ebuild,
+  -asterisk-1.0.9-r1.ebuild, +asterisk-1.0.9-r2.ebuild,
+  -asterisk-1.2.0_beta1.ebuild, +asterisk-1.2.0_beta1-r1.ebuild:
+  Security revbump, fixes #11836. Removed old insecure versions. Thanks to
+  Rajiv Manglani <rajiv@gentoo.org> for reporting this one.
 
   29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
   files/1.0.0/asterisk-1.0.9-freetds.diff:
index 8a4e53d0e494951a07e13c9512a84c850800ad05..60d48f5c562a77376c404e7ae78f1eb908a6ced2 100644 (file)
@@ -1,19 +1,17 @@
-MD5 e44a8d4f5569272ba0363c8087a049bd asterisk-1.0.6-r1.ebuild 13980
-MD5 ec8483391ba7074dddc1c1d672210547 asterisk-1.0.5-r2.ebuild 12208
-MD5 55918f28237f56f35f1e93fa52343229 asterisk-1.0.8.ebuild 13713
-MD5 5f61c8dea95f42658467d6eb55f07424 asterisk-1.0.9.ebuild 13604
+MD5 5c1538698e815baf526a47c2e0708962 asterisk-1.0.7-r2.ebuild 13675
+MD5 4efc9a44ca6dd277e13fafbe0965d759 asterisk-1.0.8-r1.ebuild 13798
+MD5 e6a6e09e3a4074c7eb81a173b182cda0 asterisk-1.0.5-r3.ebuild 12290
+MD5 72c321efd01343f66cc8f0e8d4cba25a asterisk-1.0.9-r2.ebuild 13817
+MD5 7f0f66b9fdad604ce8a945bc560ab97c asterisk-1.0.6-r2.ebuild 14062
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 55d356073a20188373a1515f33e80b24 ChangeLog 17304
-MD5 20ec1478dbd5296efcd57d09438a4b66 asterisk-1.0.7-r1.ebuild 13593
-MD5 9dcb9995fca71c36e4a06b5ee05592d0 asterisk-1.2.0_beta1.ebuild 7987
-MD5 4879fda93d76f4505aec84e0ea65d02f asterisk-1.0.9-r1.ebuild 13734
-MD5 5d8a088b5a0b3ea1681f4f085ff36299 files/digest-asterisk-1.2.0_beta1 156
-MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r2 139
-MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8 210
-MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r1 210
-MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r1 210
-MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r1 210
-MD5 19916e691993701d9707674f9f046bd6 files/digest-asterisk-1.0.9 210
+MD5 c777d621d81a4175c7b34f8529bc3e92 ChangeLog 18107
+MD5 0e526fefc0545ed7007add0ec8cd1294 asterisk-1.2.0_beta1-r1.ebuild 8069
+MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r2 210
+MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r2 210
+MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r3 139
+MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8-r1 210
+MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r2 210
+MD5 5d8a088b5a0b3ea1681f4f085ff36299 files/digest-asterisk-1.2.0_beta1-r1 156
 MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
 MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
 MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
@@ -27,6 +25,7 @@ MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.d
 MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
 MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
 MD5 e993bfc45e54507214329e00b3a66966 files/1.0.0/asterisk-1.0.9-freetds.diff 854
+MD5 c25cdb98ebd69a740014cd45bea1c9ba files/1.0.0/asterisk-1.0.9-vmail.cgi.patch 770
 MD5 517587756c674978b1b24891c34564fc files/1.0.0/asterisk-1.0.8-ptr64fix.diff 485
 MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
 MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
similarity index 98%
rename from net-misc/asterisk/asterisk-1.0.5-r2.ebuild
rename to net-misc/asterisk/asterisk-1.0.5-r3.ebuild
index d2ab7a2c36a6b85ed1c72a9bfeeb56d480cb8dda..ee13e673a879350ad12618c2ab982e7f145f0894 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r2.ebuild,v 1.10 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r3.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -221,6 +221,9 @@ src_unpack() {
 
        # fix segfault on amd64 and possibly other 64bit systems (#105762)
        epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+       # security fix, bug #11836
+       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
similarity index 99%
rename from net-misc/asterisk/asterisk-1.0.6-r1.ebuild
rename to net-misc/asterisk/asterisk-1.0.6-r2.ebuild
index 1d4d1589e88b697e0d71efaa9dec33ded1323f47..83a61ea61b95d65c236806514f8773f50a48ce79 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r1.ebuild,v 1.12 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -278,6 +278,9 @@ src_unpack() {
 
        # fix segfault on amd64 and possibly other 64bit systems (#105762)
        epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+       # security fix, bug #11836
+       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
similarity index 99%
rename from net-misc/asterisk/asterisk-1.0.7-r1.ebuild
rename to net-misc/asterisk/asterisk-1.0.7-r2.ebuild
index 2789cbae4dc7a1ea541f8f69616ba1f260d2a998..480572676f13c83520a33222158eb02b2565d248 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.20 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -275,6 +275,9 @@ src_unpack() {
 
        # fix segfault on amd64 and possibly other 64bit systems (#105762)
        epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+       # security fix, bug #11836
+       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
similarity index 99%
rename from net-misc/asterisk/asterisk-1.0.8.ebuild
rename to net-misc/asterisk/asterisk-1.0.8-r1.ebuild
index 59cd155128696731d657cce3cdecd272f797da45..416657a8d497bec398ee8c9ea0e5eaeaf924c2ce 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.16 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8-r1.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -279,6 +279,9 @@ src_unpack() {
 
        # fix segfault on amd64 and possibly other 64bit systems (#105762)
        epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+       # security fix, bug #11836
+       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
similarity index 99%
rename from net-misc/asterisk/asterisk-1.0.9-r1.ebuild
rename to net-misc/asterisk/asterisk-1.0.9-r2.ebuild
index e93fbb9ee4207f05700c28c74461a7a90a3bec9e..ae3b717fdce69f249926fed1cf368084513fdc99 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.6 2005/10/28 23:06:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -281,6 +281,9 @@ src_unpack() {
        if has_version ">=dev-db/freetds-0.6.3"; then
                epatch ${FILESDIR}/1.0.0/${P}-freetds.diff
        fi
+
+       # security fix, bug #11836
+       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.9.ebuild b/net-misc/asterisk/asterisk-1.0.9.ebuild
deleted file mode 100644 (file)
index 7462cb4..0000000
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9.ebuild,v 1.7 2005/09/15 02:40:34 stkn Exp $
-
-inherit eutils perl-module
-
-ADDONS_VERSION="1.0.9"
-BRI_VERSION="0.2.0-RC8l"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/${PN}/${P}.tar.gz
-        ftp://ftp.digium.com/pub/telephony/${PN}/${PN}-addons-${ADDONS_VERSION}.tar.gz
-        bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
-
-S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
-
-IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~amd64 ~ppc"
-
-DEPEND="dev-libs/newt
-       dev-libs/openssl
-       media-sound/mpg123
-       media-sound/sox
-       doc? ( app-doc/doxygen )
-       gtk? ( =x11-libs/gtk+-1.2* )
-       pri? ( >=net-libs/libpri-1.0.9 )
-       bri? ( >=net-libs/libpri-1.0.9
-               >=net-misc/zaptel-1.0.9 )
-       alsa? ( media-libs/alsa-lib )
-       mysql? ( dev-db/mysql )
-       speex? ( media-libs/speex )
-       zaptel? ( >=net-misc/zaptel-1.0.9 )
-       postgres? ( dev-db/postgresql )
-       vmdbmysql? ( dev-db/mysql )
-       vmdbpostgres? ( dev-db/postgresql )
-       resperl? ( dev-lang/perl
-                  >=net-misc/zaptel-1.0.9 )"
-
-pkg_setup() {
-       local n
-
-       #
-       # Warning about security changes...
-       #
-       ewarn "****************** Important changes warning! *********************"
-       ewarn
-       ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-       ewarn
-       ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-       ewarn "  750 (directories) / 640 (files)"
-       ewarn
-       ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-       ewarn "  to asterisk:asterisk 750 (directories) / 640 (files)"
-       ewarn
-       ewarn "- Asterisk's unix socket and pidfile are now in /var/run/asterisk"
-       ewarn
-       ewarn "- More information at the end of this emerge"
-       ewarn
-       ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-       ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-       ewarn
-       einfo "Press Ctrl+C to abort"
-       echo
-       ebeep
-
-       n=15
-       while [[ $n -gt 0 ]]; do
-               echo -en "  Waiting $n seconds...\r"
-               sleep 1
-               (( n-- ))
-       done
-
-       #
-       # Regular checks
-       #
-       einfo "Running some pre-flight checks..."
-       if use resperl; then
-               # res_perl pre-flight check...
-               if ! $(perl -V | grep -q "usemultiplicity=define") ||\
-                  ! built_with_use dev-lang/perl ithreads || ! built_with_use sys-devel/libperl ithreads
-               then
-                       eerror "Embedded perl add-on needs Perl and libperl with built-in threads support"
-                       eerror "(rebuild perl and libperl with ithreads use-flag enabled)"
-                       die "Perl w/o threads support..."
-               fi
-               einfo "Perl with ithreads support found"
-       fi
-
-
-       # mysql and postgres voicemail support are mutually exclusive..
-       if use vmdbmysql && use vmdbpostgres; then
-               eerror "MySQL and PostgreSQL Voicemail support are mutually exclusive... choose one!"
-               die "Conflicting use-flags"
-       fi
-
-       # check if zaptel and libpri have been built with bri enabled
-       if use bri; then
-               if ! built_with_use net-misc/zaptel bri; then
-                       eerror "Re-emerge zaptel with bri use-flag enabled!"
-                       die "Zaptel without bri support detected"
-               fi
-
-               if ! built_with_use net-libs/libpri bri; then
-                       eerror "Re-emerge libpri with bri use-flag enabled!"
-                       die "Libpri without bri support detected"
-               fi
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       # set cflags & mmx optimization
-       sed -i  -e "s:^\(OPTIMIZE+=\).*:\1 ${CFLAGS}:" \
-               -e "s:^\(CFLAGS+=\$(shell if \$(CC)\):#\1:" \
-               Makefile
-
-       # hppa patch for gsm codec
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-hppa.patch
-
-       # mark adsi functions as weak references, things will blow
-       # on hardened otherwise (bug #100697 and #85655)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-weak-references.diff
-
-       # gsm codec still uses -fomit-frame-pointer, and other codecs have their
-       # own flags. We only change the arch.
-       sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE=${CFLAGS}:" \
-               -e "s:^CFLAGS[\t ]\++=:CFLAGS =:" \
-               codecs/gsm/Makefile
-
-       if use mmx; then
-               if ! use hardened; then
-                       einfo "Enabling mmx optimization"
-                       sed -i  -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" \
-                               codecs/gsm/Makefile
-               else
-                       ewarn "Hardened use-flag is set, not enabling mmx optimization for codec_gsm!"
-
-               fi
-       fi
-       if ! use mmx || use hardened; then
-               # don't build + link asm mmx object file
-               # without this codec_gsm.so will include text relocations
-               sed -i  -e "/k6opt\.\(s\|o\)/ d" \
-                       codecs/gsm/Makefile
-       fi
-
-       if ! use debug; then
-               einfo "Disabling debugging"
-               sed -i -e "s:^\(DEBUG=\):#\1:" Makefile
-       fi
-
-       # change image path in voicemail cgi
-       sed -i -e "s:^\(\$astpath = \).*:\1 \"/asterisk\";:" contrib/scripts/vmail.cgi
-
-       #
-       # embedded perl
-       #
-       if use resperl; then
-               einfo "Patching asterisk for embedded perl support..."
-               epatch ${S_ADDONS}/res_perl/astmake.diff
-
-               # create necessary .c file
-               /usr/bin/perl -MExtUtils::Embed -e xsinit || die "Could not create perlxsi.c"
-
-               cd ${S_ADDONS}
-
-               # fix perl path, source location and remove res_musiconhold
-               sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:" \
-                       res_perl/Makefile \
-                       ${S}/Makefile \
-                       res_perl/INC/*.pm
-               sed -i -e "s:^ASTSRC.*:ASTSRC = ${S}:" \
-                       -e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
-                       res_perl/Makefile
-
-               if use bri; then
-                       epatch ${FILESDIR}/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
-               fi
-
-               cd ${S}
-       fi
-
-       #
-       # uclibc patch
-       #
-       if use elibc_uclibc; then
-               einfo "Patching asterisk for uclibc..."
-               epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
-       fi
-
-       #
-       # other patches
-       #
-
-       # fix lpc10 Makefile, remove the
-       # CFLAGS+=-march=$(shell uname -m) part
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
-
-       # asterisk-config
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
-
-       #
-       # database voicemail support
-       #
-       if use postgres; then
-               sed -i  -e "s:^#\(APPS+=app_sql_postgres.so\):\1:" \
-                       -e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-                       -e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-                       apps/Makefile
-       fi
-
-       if use vmdbpostgres; then
-               einfo "Enabling PostgreSQL voicemail support"
-               sed -i  -e "s:^\(USE_POSTGRES_VM_INTERFACE\).*:\1=1:" \
-                       -e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-                       -e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-                       apps/Makefile
-
-               # patch app_voicemail.c
-               sed -i -e "s:^#include <postgresql/libpq-fe\.h>:#include \"libpq-fe\.h\":" \
-                       apps/app_voicemail.c
-
-       elif use vmdbmysql; then
-               einfo "Enabling MySQL voicemail support"
-               sed -i  -e "s:^\(USE_MYSQL_VM_INTERFACE\).*:\1=1:" \
-                       -e "s:^\(CFLAGS+=-DUSEMYSQLVM\):\1 -I${S_ADDONS}:" \
-                       apps/Makefile
-       fi
-
-       #
-       # asterisk add-ons
-       #
-       cd ${S_ADDONS}
-       sed -i -e "s:-I../asterisk:-I${S} -I${S}/include:" Makefile
-       sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" \
-               -e "s:^\(CFLAGS=\)\(.*\):\1-I${S}/include -fPIC \2:" \
-               format_mp3/Makefile
-
-
-       #
-       # BRI patches
-       #
-       if use bri; then
-               cd ${S}
-               einfo "Patching asterisk w/ BRI stuff"
-
-               epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
-       fi
-
-       #
-       # Revived snmp plugin support
-       #
-#      if use snmp; then
-#              cd ${S}
-#              einfo "Patching snmp plugin helper functions"
-#              epatch ${FILESDIR}/1.0.0/ast-ax-snmp-1.0.6.diff
-#      fi
-
-       # fix path for non-root
-       cd ${S}
-       sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \
-               Makefile
-
-       # fix contrib scripts for non-root
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-scripts.diff
-
-       # add initgroups support to asterisk, this is needed
-       # to support supplementary groups for the asterisk
-       # user (start-stop-daemons --chguid breaks realtime priority support)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-initgroups.diff
-
-       # fix segfault on amd64 and possibly other 64bit systems (#105762)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
-}
-
-src_compile() {
-       # build asterisk first...
-       einfo "Building Asterisk..."
-       cd ${S}
-       emake -j1 || die "Make failed"
-
-       # create api docs
-       use doc && \
-               emake -j1 progdocs
-
-       #
-       # add-ons
-       #
-       einfo "Building additional stuff..."
-       cd ${S_ADDONS}
-       emake -j1 || die "Make failed"
-
-       if use resperl; then
-               cd ${S_ADDONS}/res_perl
-               emake -j1 || die "Building embedded perl failed"
-       fi
-}
-
-src_install() {
-       make DESTDIR=${D} install || die "Make install failed"
-       make DESTDIR=${D} samples || die "Make install samples failed"
-
-       # install astconf.h, a lot of external modules need this
-       insinto /usr/include/asterisk
-       doins   astconf.h
-
-       # install addmailbox and astgenkey
-       dosbin contrib/scripts/addmailbox
-       dosbin contrib/scripts/astgenkey
-
-       newinitd ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
-       newconfd ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
-
-       # don't delete these, even if they are empty
-       keepdir /var/spool/asterisk/voicemail/default/1234/INBOX
-       keepdir /var/spool/asterisk/tmp
-       keepdir /var/log/asterisk/cdr-csv
-       keepdir /var/run/asterisk
-
-       # install standard docs...
-       dodoc BUGS CREDITS LICENSE ChangeLog HARDWARE README README.fpm
-       dodoc SECURITY doc/CODING-GUIDELINES doc/linkedlists.README
-       dodoc doc/README.*
-       dodoc doc/*.txt
-
-       docinto scripts
-       dodoc contrib/scripts/*
-       docinto firmware/iax
-       dodoc contrib/firmware/iax/*
-
-       # install api docs
-       if use doc; then
-               insinto /usr/share/doc/${PF}/api/html
-               doins doc/api/html/*
-       fi
-
-       insinto /usr/share/doc/${PF}/cgi
-       doins contrib/scripts/vmail.cgi
-       doins images/*.gif
-
-       #
-       # add-ons
-       #
-
-       # install additional modules...
-       einfo "Installing additional modules..."
-       cd ${S_ADDONS}
-       make INSTALL_PREFIX=${D} install || die "Make install failed"
-
-       if use resperl; then
-               perlinfo
-
-               cd ${S_ADDONS}/res_perl
-               make INSTALL_PREFIX=${D} install || die "Installation of perl AST_API failed"
-
-               # move AstApiBase.so to a proper place
-               dodir ${VENDOR_LIB}/auto/AstAPIBase
-               mv ${D}/etc/asterisk/perl/AstAPIBase.so ${D}${VENDOR_LIB}/auto/AstAPIBase
-
-               # move *.pm files to other location
-               dodir ${VENDOR_LIB}/AstAPI
-               dodir ${VENDOR_LIB}/AstAPIBase
-               for x in AstAPI.pm AstConfig.pm LoadFile.pm PerlSwitch.pm WebServer.pm; do
-                       mv ${D}/etc/asterisk/perl/${x} ${D}${VENDOR_LIB}/AstAPI
-                       dosed "s/^use[\t ]\+${x/.pm/};/use AstAPI::${x/.pm/};/" /etc/asterisk/perl/asterisk_init.pm
-               done
-               mv ${D}/etc/asterisk/perl/AstAPIBase.pm ${D}${VENDOR_LIB}/AstAPIBase
-               dosed "s/^use[\t ]\+AstAPI;/use AstAPI::AstAPI;/" /etc/asterisk/perl/asterisk_init.pm
-               dosed "s/^use[\t ]\+AstAPIBase;/use AstAPIBase::AstAPIBase;/" ${VENDOR_LIB}/AstAPI/AstAPI.pm
-
-               # move apps + htdocs to a proper place
-               dodir /var/lib/asterisk/perl
-               mv ${D}/etc/asterisk/perl/{apps,htdocs} ${D}/var/lib/asterisk/perl
-
-               # fix locations
-               sed -i -e "s:/etc/asterisk/perl:/var/lib/asterisk/perl:" \
-                       ${D}${VENDOR_LIB}/AstAPI/LoadFile.pm ${D}${VENDOR_LIB}/AstAPI/WebServer.pm
-       fi
-}
-
-pkg_preinst() {
-       einfo "Adding asterisk user and group"
-       enewgroup asterisk
-       enewuser asterisk -1 -1 /var/lib/asterisk asterisk
-}
-
-pkg_postinst() {
-       #
-       # Change permissions and ownerships of asterisk
-       # directories and files
-       #
-       einfo "Fixing permissions and ownerships"
-       # fix permissions in /var/...
-       for x in spool run lib log; do
-               chown -R asterisk:asterisk ${ROOT}var/${x}/asterisk
-               chmod -R u=rwX,g=rX,o=     ${ROOT}var/${x}/asterisk
-       done
-
-       chown -R root:asterisk ${ROOT}etc/asterisk
-       chmod -R u=rwX,g=rX,o= ${ROOT}etc/asterisk
-
-       #
-       # Fix locations for old installations (pre-non-root versions)
-       #
-       if [[ -z "$(grep "/var/run/asterisk" ${ROOT}etc/asterisk/asterisk.conf)" ]]
-       then
-               einfo "Fixing astrundir in ${ROOT}etc/asterisk/asterisk.conf"
-               mv -f ${ROOT}etc/asterisk/asterisk.conf \
-                       ${ROOT}etc/asterisk/asterisk.conf.bak
-               sed -e "s:^\(astrundir[\t ]=>\).*:\1 /var/run/asterisk:" \
-                       ${ROOT}etc/asterisk/asterisk.conf.bak >\
-                       ${ROOT}etc/asterisk/asterisk.conf
-               einfo "Backup has been saved as ${ROOT}etc/asterisk/asterisk.conf.bak"
-       fi
-
-       #
-       # Some messages
-       #
-       einfo "Asterisk has been installed"
-       einfo ""
-       einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
-       einfo ""
-       einfo "If you want to know more about asterisk, visit these sites:"
-       einfo "http://www.asteriskdocs.org/"
-       einfo "http://www.voip-info.org/wiki-Asterisk"
-       echo
-       einfo "http://asterisk.xvoip.com/"
-       einfo "http://junghanns.net/asterisk/"
-       einfo "http://www.automated.it/guidetoasterisk.htm"
-       echo
-       einfo "Gentoo VoIP IRC Channel:"
-       einfo "#gentoo-voip @ irc.freenode.net"
-
-       #
-       # Warning about security changes...
-       #
-       ewarn "*********************** Important changes **************************"
-       ewarn
-       ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-       ewarn
-       ewarn "- Make sure the asterisk user is a member of the proper groups if you want it"
-       ewarn "  to have access to hardware devices, e.g. \"audio\" for Alsa and OSS sound or"
-       ewarn "  \"dialout\" for zaptel!"
-       ewarn
-       ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-       ewarn "  750 (rwxr-x--- directories) / 640 (rw-r----- files)"
-       ewarn
-       ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-       ewarn "  to asterisk:asterisk 750 / 640"
-       ewarn
-       ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk"
-       ewarn
-       ewarn "- Asterisk cannot set the IP ToS bits when run as user,"
-       ewarn "  use something like this to make iptables set them for you:"
-       ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28\""
-       ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28\""
-       ewarn "  (taken from voip-info.org comments (see below), thanks andrewid)"
-       ewarn
-       ewarn "For more details:"
-       ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-       ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-}
similarity index 98%
rename from net-misc/asterisk/asterisk-1.2.0_beta1.ebuild
rename to net-misc/asterisk/asterisk-1.2.0_beta1-r1.ebuild
index 65ca865904d4ae9c150375626330e734da2c65c1..7227800d9e66f523add5c271fd508da5bce11db9 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild,v 1.7 2005/09/11 15:58:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0_beta1-r1.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils
 
@@ -122,6 +122,9 @@ src_unpack() {
 #              einfo "Patching asterisk w/ BRI stuff"
 #              epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
 #      fi
+
+       # security fix, bug #11836
+       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-vmail.cgi.patch b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-vmail.cgi.patch
new file mode 100644 (file)
index 0000000..7c6cb09
--- /dev/null
@@ -0,0 +1,23 @@
+--- asterisk/contrib/scripts/vmail.cgi 2005/07/07 23:34:59     1.15
++++ asterisk/contrib/scripts/vmail.cgi 2005/10/30 16:30:35     1.16
+@@ -545,14 +545,16 @@ _EOH
+ sub message_audio()
+ {
+       my ($forcedownload) = @_;
+-      my $folder = param('folder');
+-      my $msgid = param('msgid');
+-      my $mailbox = param('mailbox');
+-      my $context = param('context');
++      my $folder = &untaint(param('folder'));
++      my $msgid = &untaint(param('msgid'));
++      my $mailbox = &untaint(param('mailbox'));
++      my $context = &untaint(param('context'));
+       my $format = param('format');
+       if (!$format) {
+               $format = &getcookie('format');
+       }
++      &untaint($format);
++
+       my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder/msg${msgid}.$format";
+ 
+       $msgid =~ /^\d\d\d\d$/ || die("Msgid Liar ($msgid)!");
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.9 b/net-misc/asterisk/files/digest-asterisk-1.0.9
deleted file mode 100644 (file)
index d3b9cef..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d7f1c680ae53a739f26a069ef8b580a asterisk-1.0.9.tar.gz 9604582
-MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
-MD5 1ec812a912de461b6847c64a88b70d1e bristuff-0.2.0-RC8l.tar.gz 141245