Bugfix release from upstream, closes bug #318535 by Thomas Stein. Many thanks to...
authorTony Vroon <chainsaw@gentoo.org>
Thu, 13 May 2010 14:52:34 +0000 (14:52 +0000)
committerTony Vroon <chainsaw@gentoo.org>
Thu, 13 May 2010 14:52:34 +0000 (14:52 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

net-misc/asterisk/ChangeLog
net-misc/asterisk/Manifest
net-misc/asterisk/asterisk-1.6.2.7.ebuild [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch [new file with mode: 0644]
net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch [new file with mode: 0644]
net-misc/asterisk/metadata.xml

index 86f486635929f398878ceb3f727a4b0827d41e49..4356c7942ec5242592b25927e94602d6a8b89ed4 100644 (file)
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.254 2010/04/06 08:14:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.255 2010/05/13 14:52:34 chainsaw Exp $
+
+*asterisk-1.6.2.7 (13 May 2010)
+
+  13 May 2010; <chainsaw@gentoo.org> +asterisk-1.6.2.7.ebuild,
+  +files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch,
+  +files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch, metadata.xml:
+  Bugfix release from upstream, closes bug #318535 by Thomas Stein. Many
+  thanks to Oliver Jaksch for his patch rediffing & scavenging activities.
+  /etc/asterisk will no longer be polluted with any sample files if the
+  samples USE-flag is unset, closes bug #286574 by Jeremy Johnson and bug
+  #305313 by Michael Higgins.
 
   06 Apr 2010; <chainsaw@gentoo.org> -asterisk-1.6.1.17.ebuild,
   -asterisk-1.6.2.5.ebuild:
index 5ab42781e9b429eb55e8411012e08726a45fe9a7..da53df962f7c4ac10f486caf85b3f4c162fbcee3 100644 (file)
@@ -33,23 +33,27 @@ AUX 1.6.2/asterisk-1.6.2.1-parallel-make.patch 3797 RMD160 bb13234b020daa96a3b32
 AUX 1.6.2/asterisk-1.6.2.2-graceful-restart-segfault.patch 2723 RMD160 4589e724beebd959b7bc296526b8cf291c25aa4b SHA1 95c2eb7136a42690f3cf25405ad4ad2e36e2e533 SHA256 6f09cac44946a20e301f972e2c9f57fc3cba6324e0502fb0d7b1b9c3970f17cf
 AUX 1.6.2/asterisk-1.6.2.2-nv-faxdetect.patch 21042 RMD160 fa31dbfa3828f60073d59d0262166436ef37c516 SHA1 50f6b7a917dac981df1adf0713b373410af4ec68 SHA256 9919af0de073fc6c68a926daf84164df3b506d8fe4687177e8f9d636111707af
 AUX 1.6.2/asterisk-1.6.2.2-parallel-make.patch 842 RMD160 e62c458de2508c8698502936f25605a51b3e93af SHA1 d780c5322c388fbc2742766b741f269ab6083d71 SHA256 8bf747832b7e090b31fdcb4de563e8529ad697af10e97e3a14378bbcad3b99d9
+AUX 1.6.2/asterisk-1.6.2.7-gsm-pic.patch 2252 RMD160 4937581fc7b1c13ea9c79b78e5b4ee5db88a7726 SHA1 ca7794d229fff2e4cf612b76b1a3adfcc1ecf282 SHA256 9e5ec93a3c5adf36567e6e2f8f3b02b24eee598ba3c209ca076048b748c84039
+AUX 1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch 547 RMD160 e45a2804c3d23deef066e4aece3fb332feb2a940 SHA1 b6331ef76abfebd29cc08904e58eb59d9fc539c2 SHA256 39df21e12b59be537200d522fa32f7dfdfb6026f2abb3c11d22aabcb6c6d97cd
 DIST asterisk-1.2.27-patches-1.0.tar.bz2 6653 RMD160 18f1d7fc4497466050ed4f517ff5732eb448ff2e SHA1 2aecd3e91cde38dbb0fd591e8a49db221f44b94e SHA256 a4da0570fca2df3c508f072be62722879956fe8c454027fbb8dafb7a6095384c
 DIST asterisk-1.2.36.tar.gz 29897926 RMD160 47b8c0e58c43cac6aa415482182aea15b1489ccc SHA1 b6f60404ba0ca802cfa5cd43685a36b467441c5c SHA256 69f48a0e49f3a37196b65f11e8babf5c28e33700903b9f304e984def6c35dbf0
 DIST asterisk-1.2.37.tar.gz 29899629 RMD160 1de7ff96d3b1fd8d89f3ef7b3bb9e35bedccfb33 SHA1 c9a3c4684e021f62b4d19f6e0c8fc11f64db19d6 SHA256 9f3ec67efe0e4d45434621cd358e8e7d64e1b05df04d66e2390c9420acd2aeaa
 DIST asterisk-1.2.40.tar.gz 29903514 RMD160 dc3da60756c82c98a055e49b068eb6760a01948e SHA1 4b4b794e858a3436bc35bdd2f4edf824c2885b68 SHA256 61dc745b12f6dc2998404e77747a964db56df8efae84a666c4ccddf016c9c06d
 DIST asterisk-1.6.1.18.tar.gz 23585542 RMD160 ca6647cce5a176526ba1cb9dcb0e1e227986b268 SHA1 99871bc2257185437c22b7f0e44a09c356ffe027 SHA256 f3dab39190c7c938099e8961eb9917d5cf15570180dc0e613e7bb2562a621e5b
 DIST asterisk-1.6.2.6.tar.gz 23265995 RMD160 35c724b968a00abdc5bbb07e63ec9004872cdef8 SHA1 93c25c30fbe2003955362d9ce173367ecc6e5b49 SHA256 2c724a53c40d12fc37100c1daa8312fd99eee26920907e3094c7c2b7d0e7eb61
+DIST asterisk-1.6.2.7.tar.gz 23283195 RMD160 d3298a22679c93e565e9f8f371d4abb158a0ee73 SHA1 da14520b918ae7ab5a8b47d8f3a4e7fd95f66ab3 SHA256 217f5fecd2a032c39f401ccdeb8fcdc31a94b44a504d1c567807a527bfacf117
 EBUILD asterisk-1.2.36.ebuild 10640 RMD160 de9118d48d7122200847783aec84e89724f33475 SHA1 8839099437bb0fa20ab7ba4c4aabeef33be353d5 SHA256 73421c18cf2aec1412ef1f86cb6a810765cf7c78fdb056b2e84224430368a1ca
 EBUILD asterisk-1.2.37.ebuild 10640 RMD160 82f1d14082b607402146bd8f7950ea32ee2558f3 SHA1 5718e0411fff8bc14c4c57562a9df281c33abdc5 SHA256 2f2290922b09f9b71b06cb73e99fc7916b4a994960375e0e48b6bb39fd802e0c
 EBUILD asterisk-1.2.40.ebuild 10647 RMD160 7b267ebc801d87ad4a1433454cf64b36227647b4 SHA1 949f14d1e7fce52b8a09af12aa5283aafe479450 SHA256 2d96cf3daddf083c3094780a97e6699869e7ad9fc8c82f1a4fb17cee520b96c6
 EBUILD asterisk-1.6.1.18.ebuild 10481 RMD160 67b58c7c3cef4861bb0e1b9664b77a35e28a9fb4 SHA1 12c06fec5595d4d14783ec47dce166c4a97d385f SHA256 80b633d3361a2cb00b3dd2849d15f41f8e9fd5c0c5ebaa579745ffff3ed9fb52
 EBUILD asterisk-1.6.2.6.ebuild 9213 RMD160 e2b7a225465c40aa6918c49ec70cbeace348c0cf SHA1 05779eb142f09aad35f246a3f5476ad06bf5d4fe SHA256 e7f7581cfc7fe4bd1093f2372e3689a96d7db1b82d6a9d0c44a769e4a1a62cdf
-MISC ChangeLog 56819 RMD160 d185c3b53aaf2a7b5643fcaf529561009a2de9b1 SHA1 fb58b2a5e2ac698a811735bc3e4c11aa9648388c SHA256 ac21d33b872e4ee1843e859620fac53f1b9b6dd33f2f62d03954eba0d6c1da9b
-MISC metadata.xml 1103 RMD160 9be6c713684efa268e58cfc111fae4716e97f9dd SHA1 5af1f100c97f1bca1834867e06c3fb9111ed1fde SHA256 a83ca9d4cfd8da10b8dbb9583e1b6fa5fc0f30968a0681e4bc931673a00e1c99
+EBUILD asterisk-1.6.2.7.ebuild 8533 RMD160 a492f050c1d83b2c73ba14a8ec66802235523e6f SHA1 548eb8beb4036524dbdbce912165546d6df41dd4 SHA256 bedc535776fd541fe8a18293db2e0177fb6fac91bfa578624ae5c96bfafa44c5
+MISC ChangeLog 57360 RMD160 918f6217eee2017a79470db9ac62621da9e7b182 SHA1 6d9f36e572c822b72ea9ee3552ee9cbb7545220a SHA256 fbb13fd0cb63c8d6468316156f6945aa640163146d757e29eb8a4c70d4453d5a
+MISC metadata.xml 1194 RMD160 eb5bd4c2f4ca0a72b9c8240ca8b418b571a9fbc6 SHA1 9879daac2d99f61402611c074189d40e7b7686eb SHA256 5cc63816f6f4cbb85c45ceee1621eab11fc2f2b40be963af0c7d834dcbb7959d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAku67ewACgkQp5vW4rUFj5p/tQCgsNctnYFkts1ATgMesDD+HjGi
-F5YAn3C1L65Vk8lc7mv06zQeeiymxPFj
-=+FQP
+iEYEARECAAYFAkvsEjwACgkQp5vW4rUFj5pSmwCfUQadn33bT7THuGCcw438ngzv
+J04Amwbo7YB/VhJ3i62rRHJxAZBUJX9J
+=U7Tt
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.2.7.ebuild b/net-misc/asterisk/asterisk-1.6.2.7.ebuild
new file mode 100644 (file)
index 0000000..d046009
--- /dev/null
@@ -0,0 +1,323 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.7.ebuild,v 1.1 2010/05/13 14:52:34 chainsaw Exp $
+
+EAPI=3
+inherit autotools base eutils linux-info
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.digium.com/pub/telephony/asterisk/releases/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa +caps curl dahdi debug freetds iconv jabber ldap keepsrc misdn newt +samples oss postgres radius snmp span speex ssl sqlite static vorbis"
+
+RDEPEND="sys-libs/ncurses
+       dev-libs/popt
+       sys-libs/zlib
+       alsa? ( media-libs/alsa-lib )
+       caps? ( sys-libs/libcap )
+       curl? ( net-misc/curl )
+       dahdi? ( >=net-libs/libpri-1.4.7
+               net-misc/dahdi-tools )
+       freetds? ( dev-db/freetds )
+       iconv? ( virtual/libiconv )
+       jabber? ( dev-libs/iksemel )
+       ldap?   ( net-nds/openldap )
+       misdn? ( net-dialup/misdnuser )
+       newt? ( dev-libs/newt )
+       postgres? ( virtual/postgresql-base )
+       radius? ( net-dialup/radiusclient-ng )
+       snmp? ( net-analyzer/net-snmp )
+       span? ( media-libs/spandsp )
+       speex? ( media-libs/speex )
+       sqlite? ( dev-db/sqlite )
+       ssl? ( dev-libs/openssl )
+       vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+       !<net-misc/asterisk-addons-1.6
+       !net-misc/asterisk-chan_unistim
+       !net-misc/zaptel"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+       "${FILESDIR}/1.6.2/${P}-gsm-pic.patch"
+       "${FILESDIR}/1.6.2/${P}-pri-missing-keyword.patch"
+       "${FILESDIR}/1.6.1/${PN}-1.6.1-uclibc.patch"
+       "${FILESDIR}/1.6.1/${PN}-1.6.1.6-fxsks-hookstate.patch"
+       "${FILESDIR}/1.6.2/${PN}-1.6.2.2-nv-faxdetect.patch"
+)
+
+get_available_modules() {
+       local modules mod x
+
+       # build list of available modules...
+       for x in app cdr codec format func pbx res; do
+
+               for mod in $(find "${S}" -type f -name "${x}_*.c*" -print)
+               do
+                       modules="${modules} $(basename ${mod/%.c*})"
+               done
+       done
+
+       echo "${modules}"
+}
+
+pkg_setup() {
+       if [[ -n "${ASTERISK_MODULES}" ]] ; then
+               ewarn "You are overriding ASTERISK_MODULES. We will assume you know what you are doing. There is no support for this option, try without if you see breakage."
+       fi
+       CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+       local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is a module written for a single SIP client talking to a
+       remote server. It is not able to track multiple remote SIP clients registering with
+       a local server. Critical SIP packets may be dropped."
+       check_extra_config
+
+       # parse modules list
+       if [[ -n "${ASTERISK_MODULES}" ]]; then
+               local x modules="$(get_available_modules)"
+
+               einfo "Custom list of modules specified, checking..."
+
+               use debug && {
+                       einfo "Available modules: ${modules}"
+                       einfo " Selected modules: ${ASTERISK_MODULES}"
+               }
+
+               for x in ${ASTERISK_MODULES}; do
+                       if [[ "${x}" = "-*" ]]; then
+                               MODULES_LIST=""
+                       else
+                               if has ${x} ${modules}
+                               then
+                                       MODULES_LIST="${MODULES_LIST} ${x}"
+                               else
+                                       eerror "Unknown module: ${x}"
+                               fi
+                       fi
+               done
+
+               export MODULES_LIST
+       fi
+}
+
+src_prepare() {
+       base_src_prepare
+       AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+       econf \
+               --libdir="/usr/$(get_libdir)" \
+               --localstatedir="/var" \
+               --with-gsm=internal \
+               --with-popt \
+               --with-z \
+               $(use_with alsa asound) \
+               $(use_with caps cap) \
+               $(use_with curl) \
+               $(use_with dahdi pri) \
+               $(use_with dahdi tonezone) \
+               $(use_with dahdi) \
+               $(use_with freetds tds) \
+               $(use_with iconv) \
+               $(use_with jabber iksemel) \
+               $(use_with misdn isdnnet) \
+               $(use_with misdn suppserv) \
+               $(use_with misdn) \
+               $(use_with newt) \
+               $(use_with oss) \
+               $(use_with postgres) \
+               $(use_with radius) \
+               $(use_with snmp netsnmp) \
+               $(use_with span spandsp) \
+               $(use_with speex) \
+               $(use_with speex speexdsp) \
+               $(use_with sqlite sqlite3) \
+               $(use_with ssl crypto) \
+               $(use_with ssl) \
+               $(use_with vorbis ogg) \
+               $(use_with vorbis) || die "econf failed"
+
+       #
+       # custom module filter
+       # run menuselect to evaluate the list of modules
+       # and rewrite the list afterwards
+       #
+       if [[ -n "${MODULES_LIST}" ]]
+       then
+               local mod category tmp_list failed_list
+
+               ###
+               # run menuselect
+
+               emake menuselect.makeopts || die "emake menuselect.makeopts failed"
+
+               ###
+               # get list of modules with failed dependencies
+
+               failed_list="$(awk -F= '/^MENUSELECT_DEPSFAILED=/{ print $3 }' menuselect.makeopts)"
+
+               ###
+               # traverse our list of modules
+
+               for category in app cdr codec format func pbx res; do
+                       tmp_list=""
+
+                       # search list of modules for matching ones first...
+                       for mod in ${MODULES_LIST}; do
+                               # module is from current category?
+                               if [[ "${mod/%_*}" = "${category}" ]]
+                               then
+                                       # check menuselect thinks the dependencies are met
+                                       if has ${mod} ${failed_list}
+                                       then
+                                               eerror "${mod}: dependencies required to build this module are not met, NOT BUILDING!"
+                                       else
+                                               tmp_list="${tmp_list} ${mod}"
+                                       fi
+                               fi
+                       done
+
+                       use debug && echo "${category} tmp: ${tmp_list}"
+
+                       # replace the module list for $category with our custom one
+                       if [[ -n "${tmp_list}" ]]
+                       then
+                               category="$(echo ${category} | tr '[:lower:]' '[:upper:]')"
+                               sed -i -e "s:^\(MENUSELECT_${category}S?\):\1=${tmp_list}:" \
+                                       menuselect.makeopts || die "failed to set list of ${category} applications"
+                       fi
+               done
+       fi
+}
+
+src_compile() {
+       ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed"
+}
+
+src_install() {
+       # setup directory structure
+       #
+       mkdir -p "${D}"usr/lib/pkgconfig
+
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       if use samples; then
+               emake DESTDIR="${D}" samples || die "emake samples failed"
+               for conffile in "${D}"etc/asterisk/*.*
+               do
+                       fowners asterisk:asterisk $conffile
+                       fperms 0660 $conffile
+               done
+               einfo "Sample files have been installed"
+       else
+               einfo "Skipping installation of sample files..."
+               rm -f  "${D}"var/lib/asterisk/mohmp3/*
+               rm -f  "${D}"var/lib/asterisk/sounds/demo-*
+               rm -f  "${D}"var/lib/asterisk/agi-bin/*
+               rm -f  "${D}"etc/asterisk/*
+       fi
+       rm -rf "${D}"var/spool/asterisk/voicemail/default
+
+       # keep directories
+       diropts -m 0770 -o asterisk -g asterisk
+       keepdir /etc/asterisk
+       keepdir /var/lib/asterisk
+       keepdir /var/run/asterisk
+       keepdir /var/spool/asterisk
+       keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+       diropts -m 0750 -o asterisk -g asterisk
+       keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+       newinitd "${FILESDIR}"/1.6.1/asterisk.initd3 asterisk
+       newconfd "${FILESDIR}"/1.6.0/asterisk.confd asterisk
+
+       # some people like to keep the sources around for custom patching
+       # copy the whole source tree to /usr/src/asterisk-${PVF} and run make clean there
+       if use keepsrc
+       then
+               dodir /usr/src
+
+               ebegin "Copying sources into /usr/src"
+               cp -dPR "${S}" "${D}"/usr/src/${PF} || die "Unable to copy sources"
+               eend $?
+
+               ebegin "Cleaning source tree"
+               emake -C "${D}"/usr/src/${PF} clean &>/dev/null || die "Unable to clean sources"
+               eend $?
+
+               einfo "Clean sources are available in "${ROOT}"usr/src/${PF}"
+       fi
+
+       # install the upgrade documentation
+       #
+       dodoc README UPGRADE* BUGS CREDITS
+
+       # install snmp mib files
+       #
+       if use snmp
+       then
+               insinto /usr/share/snmp/mibs/
+               doins doc/digium-mib.txt doc/asterisk-mib.txt
+       fi
+}
+
+pkg_preinst() {
+       enewgroup asterisk
+       enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+pkg_postinst() {
+       #
+       # Announcements, warnings, reminders...
+       #
+       einfo "Asterisk has been installed"
+       echo
+       elog "If you want to know more about asterisk, visit these sites:"
+       elog "http://www.asteriskdocs.org/"
+       elog "http://www.voip-info.org/wiki-Asterisk"
+       echo
+       elog "http://www.automated.it/guidetoasterisk.htm"
+       echo
+       elog "Gentoo VoIP IRC Channel:"
+       elog "#gentoo-voip @ irc.freenode.net"
+       echo
+       echo
+       elog "1.6.1 -> 1.6.2 changes that you may care about:"
+       elog "canreinvite -> directmedia (sip.conf)"
+       elog "extensive T.38 (fax) changes"
+       elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+       elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+       einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+       read tmp
+       tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+       if [[ "$tmp" = "y" ]] ||\
+               [[ "$tmp" = "yes" ]]
+       then
+               einfo "Resetting permissions to defaults..."
+
+               for x in spool run lib log; do
+                       chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+                       chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+               done
+
+               chown -R root:asterisk  "${ROOT}"etc/asterisk
+               chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+               einfo "done"
+       else
+               einfo "skipping"
+       fi
+}
diff --git a/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-gsm-pic.patch
new file mode 100644 (file)
index 0000000..20613d4
--- /dev/null
@@ -0,0 +1,60 @@
+diff -uNr asterisk-1.6.2.7.ORIG/codecs/gsm/Makefile asterisk-1.6.2.7/codecs/gsm/Makefile
+--- asterisk-1.6.2.7.ORIG/codecs/gsm/Makefile  2010-03-09 21:39:20.000000000 +0100
++++ asterisk-1.6.2.7/codecs/gsm/Makefile               2010-03-09 21:39:20.000000000 +0100
+@@ -37,28 +37,6 @@
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
+-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
+-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+-ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+-# Wow... Snow Leopard is BROKEN!
+-OPTIMIZE+=-mtune=native
+-else
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
+-endif
+-
+-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-#This works for even old (2.96) versions of gcc and provides a small boost either way.
+-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
+-#So we go lowest common available by gcc and go a step down, still a step up from
+-#the default as we now have a better instruction set to work with. - Belgarath
+-ifeq ($(PROC),ultrasparc)
+-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
+-endif
+-
+ PG =
+ #PG = -g -pg
+ ######### Profiling flags.  If you don't know what that means, leave it blank.
+@@ -213,12 +191,10 @@
+ # XXX Keep a space after each findstring argument
+ # XXX should merge with GSM_OBJECTS
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
++ifneq ($(K6OPT),)
+ GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+-endif
+ 
+ TOAST_SOURCES = $(SRC)/toast.c                \
+               $(SRC)/toast_lin.c      \
+@@ -265,12 +241,10 @@
+               $(SRC)/table.o
+ 
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
++ifneq ($(K6OPT),)
+ GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+-endif
+ 
+ TOAST_OBJECTS =       $(SRC)/toast.o          \
+               $(SRC)/toast_lin.o      \
diff --git a/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.7-pri-missing-keyword.patch
new file mode 100644 (file)
index 0000000..d3775d6
--- /dev/null
@@ -0,0 +1,12 @@
+diff -uNr asterisk-1.6.2.6.ORIG/include/asterisk/autoconfig.h.in       asterisk-1.6.2.6/include/asterisk/autoconfig.h.in
+--- asterisk-1.6.2.6.ORIG/include/asterisk/autoconfig.h.in     2009-09-29 09:53:36.000000000 +0200
++++ asterisk-1.6.2.6/include/asterisk/autoconfig.h.in  2009-09-29   2009-09-29 09:53:36.000000000 +0200
+@@ -616,6 +616,8 @@
+ /* Define to 1 if you have the ISDN PRI library. */
+ #undef HAVE_PRI
+ 
++#undef HAVE_PRI_PROG_W_CAUSE
++
+ /* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
+ #undef HAVE_PRI_INBANDDISCONNECT
+ 
index c924bb86f74c0392c4395de69fc304d5813bce96..76d5ef978c54177ba60b3f7a08a981b6b64dd5b7 100644 (file)
@@ -17,5 +17,6 @@
     <flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
     <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
     <flag name="span">Enable support for the spandsp codec</flag>
+    <flag name="samples">Install sample sound and configuration files (default: on)</flag>
   </use>
 </pkgmetadata>