Version bump, upstream bugfix release. New & improved parallel make fixes by Federico "Freddy" Santulli and Diego E. "FlameEyes" Pettenò close bug #300832. Warn about SIP (NAT) connection tracking as suggested by Jaco Kroon in bug #300644. Thanks also to Kerin "kerframil" Miller for bug triage.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 479 insertions, 2 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 2a0b28170ed7..a5cf6b5cc938 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,16 @@
 # 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.240 2010/01/05 03:59:58 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.241 2010/01/19 13:12:46 chainsaw Exp $
+
+*asterisk-1.6.2.1 (19 Jan 2010)
+
+  19 Jan 2010; <chainsaw@gentoo.org> +asterisk-1.6.2.1.ebuild,
+  +files/1.6.2/asterisk-1.6.2.1-parallel-make.patch:
+  Version bump, upstream bugfix release. New & improved parallel make fixes
+  by Federico "Freddy" Santulli and Diego E. "FlameEyes" Pettenò close bug
+  #300832. Warn about SIP (NAT) connection tracking as suggested by Jaco
+  Kroon in bug #300644. Thanks also to Kerin "kerframil" Miller for bug
+  triage.
 
   05 Jan 2010; Joseph Jezak <josejx@gentoo.org> -asterisk-1.2.35.ebuild,
   asterisk-1.2.37.ebuild:
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 01bed96f9777..2f752bce43d5 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f SHA1 5f7819a1e5f5b8f035146d5506bab83f4ecb6ae0 SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890
 AUX 1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317 RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 SHA1 fc0f4d990e386d39d43bac073f353421063186c9 SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc
 AUX 1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff 1098 RMD160 c39cee5a6f420e6e63e30ac5e83aa9b78c1b12c8 SHA1 93087ecdcde11bd983d25acaac3723450abbc111 SHA256 86d0c8cd754754916c45d77d9c745d1688b3b7b54181ecb1d42a1934bdea7deb
@@ -23,14 +26,24 @@ AUX 1.6.1/asterisk.initd 5897 RMD160 8a5d8ed9138a043008c0628985c74e6989bbbb62 SH
 AUX 1.6.1/asterisk.initd2 6199 RMD160 b70c78b8f4921ae543077acf82957a0a6b6973db SHA1 3252d06b63cfdc19782cee8a7d102dd6286db1ff SHA256 bd58c5ed46ef8f413d2f65e292db0c2cd4c413feb9bc6fe006f50fe3a3b70861
 AUX 1.6.1/asterisk.rc6 5896 RMD160 da94968d2dd315977a1ddfbac020ebe0ea2fbfeb SHA1 d65dd46e052066ea02bd613c8068b3a471ace157 SHA256 511da355d94afc6e81504f2f1a95f4c30346920d582ea9b00e27df8866c16515
 AUX 1.6.2/asterisk-1.6.2.0-bt-line-test.patch 1754 RMD160 c63c9631da619932700c1a93b923fd88c5e9f6f1 SHA1 72bfa40709bc1e47370df228ab96c1a0c316190f SHA256 7ef5d976f41d26e6752bc3474be368ca7c67c601e581ad31bf50fc5cb066a21d
+AUX 1.6.2/asterisk-1.6.2.1-parallel-make.patch 3797 RMD160 bb13234b020daa96a3b32baf38ebaa4bddd7f468 SHA1 561cfc994d36f346eee238ae4b2f8ebec6ae47bb SHA256 390f40a34f2c8deb0efbc7f84c4a52018f9ebdc6d431f2cf309d07d767c64506
 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.6.1.12.tar.gz 23438391 RMD160 fa2440974605ea3098cd99d697bab2bea534b827 SHA1 b7c9cdfd6b7401be2eabac537f6f6cebee10b48c SHA256 b67752bc27a36cfd9a5b7488ebfa427846f26452cbe7a3dcc0e4936a5cdf733e
 DIST asterisk-1.6.2.0.tar.gz 23195395 RMD160 710e23e974da23a644947244e6944def3d852520 SHA1 ed53ff39219826342f6a6948ec3ea891c522da11 SHA256 f40a910b328d0b620f6eee060081e645442ac2547882b7a7b0b938d219699877
+DIST asterisk-1.6.2.1.tar.gz 23186322 RMD160 a2b1b6d4502b0d13f9bae429f7b4a9b71dc0a221 SHA1 160c565ad1890841afca595eccf4b96d2a650d1a SHA256 7de3996a855736a0bf231534b84e2aaa208795db73e30a96986e9fb26a2c1ae9
 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.6.1.12-r1.ebuild 11045 RMD160 e316facf21a655a55c7f944da8a23a10dbe46d0c SHA1 ed592dc3b338852c0dda826af6ebb57847b58898 SHA256 e0a0cfdda8e4b3d52df58454da54a15a5aeaa29e08a80c2f6df9edd7a48b1c81
 EBUILD asterisk-1.6.2.0.ebuild 11089 RMD160 db1480bddaafc198a3ed60c26d92445caa89a93a SHA1 2c3dbe596c2c90f73a6de6ea13a600d52dc37985 SHA256 f6508fc6b4ec9baf0b9fa61fc6a9b389442a45940c423cb72f6fbafad105c39f
-MISC ChangeLog 52772 RMD160 7cafeecdb39a886ebd6aee4fe290c255d5c6c4fe SHA1 637c359130c8642ea0b2851187678a558084fbea SHA256 b80f422bf9cfbf7ad470934b71cb4e6ddbaee6623d2e7526d84873125d70a7b6
+EBUILD asterisk-1.6.2.1.ebuild 9497 RMD160 7148781a2da51387f6ef5d5ed7edd4dc3dfccb07 SHA1 3eddf8887c638f297031c7c738d31a3d93f42300 SHA256 8df6bb3eaa45b4068276955a8ff0dba5124a6f1ff40bbb8658307e7bb203e06b
+MISC ChangeLog 53231 RMD160 64a05758b669a99f55e0386d9915c9a7c952422a SHA1 0b2e5179790665c908257650065e0fc31d3a72a1 SHA256 3877ffd1d45c8cb4efa96e03395106c6aa1135545735de2eed7ed458e2710507
 MISC metadata.xml 1103 RMD160 9be6c713684efa268e58cfc111fae4716e97f9dd SHA1 5af1f100c97f1bca1834867e06c3fb9111ed1fde SHA256 a83ca9d4cfd8da10b8dbb9583e1b6fa5fc0f30968a0681e4bc931673a00e1c99
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktVr2sACgkQp5vW4rUFj5otLACeIcpADQsFjnp35RQcxGdbW+kA
+IE8AoIxSQO9XLvTd7MeU98eQTdLfx04D
+=wvnp
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.2.1.ebuild b/net-misc/asterisk/asterisk-1.6.2.1.ebuild
new file mode 100644
index 000000000000..a787979c4cf4
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.6.2.1.ebuild
@@ -0,0 +1,355 @@
+# 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.1.ebuild,v 1.1 2010/01/19 13:12:46 chainsaw Exp $
+
+EAPI=1
+inherit eutils autotools 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/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 nosamples 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}"
+
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#
+	# fix gsm codec cflags (e.g. i586 core epias) and disable
+	# assembler optimizations
+	#
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-gsm-pic.patch || die "patch failed"
+
+	#
+	# add missing LIBS for uclibc
+	#
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-uclibc.patch  || die "patch failed"
+
+	#
+	# make sure FXO ports are usable immediately, without requiring an inbound call first
+	# https://issues.asterisk.org/view.php?id=14577
+	#
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1.6-fxsks-hookstate.patch || die "patch failed"
+
+	#
+	# do not ignore alarm-cleared event while V23 caller ID detection is in progress
+	# otherwise automated British Telecom line test causes permanent red alarm
+	# https://issues.asterisk.org/view.php?id=14163
+	#
+	epatch "${FILESDIR}"/1.6.2/${PN}-1.6.2.0-bt-line-test.patch || die "patch failed"
+
+	#
+	# sprinkle some plus signs in strategic locations for maximum parallel make happiness
+	# https://issues.asterisk.org/view.php?id=16489
+	#
+	epatch "${FILESDIR}"/1.6.2/${P}-parallel-make.patch || die "patch failed"
+
+	AT_M4DIR=autoconf eautoreconf
+
+	# 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_compile() {
+	#
+	# start with 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
+
+	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"
+	emake DESTDIR="${D}" samples || die "emake samples failed"
+
+	# remove installed sample files if nosamples flag is set
+	if use nosamples; then
+		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/*
+	else
+		einfo "Sample files have been installed"
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default
+
+	einfo "Configuration samples have been moved to: "${ROOT}"/usr/share/doc/${PF}/conf"
+	insinto /usr/share/doc/${PF}/conf
+	doins "${D}"etc/asterisk/*.conf*
+
+	cd "${D}"
+	for conffile in etc/asterisk/*.*
+	do
+		fowners asterisk:asterisk $conffile
+		fperms 0660 $conffile
+	done
+	cd "${S}"
+
+	# 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.initd2 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.1-parallel-make.patch b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.1-parallel-make.patch
new file mode 100644
index 000000000000..2d216e8bdf0a
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.1-parallel-make.patch
@@ -0,0 +1,99 @@
+diff -uNr asterisk-1.6.2.0/Makefile asterisk-1.6.2.0-r1/Makefile
+--- asterisk-1.6.2.0/Makefile	2010-01-16 18:55:43.738059027 +0100
++++ asterisk-1.6.2.0-r1/Makefile	2010-01-16 19:32:06.898555681 +0100
+@@ -589,7 +589,7 @@
+ 	fi
+ 
+ $(SUBDIRS_INSTALL):
+-	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
++	@+DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
+ 
+ NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
+ OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
+@@ -848,7 +848,7 @@
+ # last clean count we had
+ 
+ cleantest:
+-	@cmp -s .cleancount .lastclean || $(MAKE) clean
++	@+cmp -s .cleancount .lastclean || $(MAKE) clean
+ 
+ $(SUBDIRS_UNINSTALL):
+ 	@$(SUBMAKE) -C $(@:-uninstall=) uninstall
+@@ -897,7 +897,7 @@
+ nmenuconfig: nmenuselect
+ 
+ menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
+-	@if [ -x menuselect/nmenuselect ]; then \
++	@+if [ -x menuselect/nmenuselect ]; then \
+ 		$(MAKE) nmenuselect; \
+ 	elif [ -x menuselect/cmenuselect ]; then \
+ 		$(MAKE) cmenuselect; \
+diff -uNr asterisk-1.6.2.0/channels/Makefile asterisk-1.6.2.0-r1/channels/Makefile
+--- asterisk-1.6.2.0/channels/Makefile	2010-01-16 18:55:43.733055737 +0100
++++ asterisk-1.6.2.0-r1/channels/Makefile	2010-01-16 18:57:51.589055800 +0100
+@@ -100,7 +100,7 @@
+ chan_usbradio.so: _ASTCFLAGS+=-DNDEBUG
+ 
+ h323/Makefile.ast:
+-	$(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
++	+$(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
+ 
+ h323/libchanh323.a: h323/Makefile.ast
+-	$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
++	+$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
+diff -uNr asterisk-1.6.2.0/codecs/gsm/Makefile asterisk-1.6.2.0-r1/codecs/gsm/Makefile
+--- asterisk-1.6.2.0/codecs/gsm/Makefile	2010-01-16 18:55:43.733055737 +0100
++++ asterisk-1.6.2.0-r1/codecs/gsm/Makefile	2010-01-16 18:58:31.557055848 +0100
+@@ -358,12 +358,12 @@
+ # Installation
+ 
+ gsminstall:
+-		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
++		-+if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
+ 			$(MAKE) $(GSM_INSTALL_TARGETS) ;	\
+ 		fi
+ 
+ toastinstall:
+-		-if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then	\
++		-+if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then	\
+ 			$(MAKE) $(TOAST_INSTALL_TARGETS);	\
+ 		fi
+ 
+diff -uNr asterisk-1.6.2.0/main/Makefile asterisk-1.6.2.0-r1/main/Makefile
+--- asterisk-1.6.2.0/main/Makefile	2010-01-16 18:55:43.738059027 +0100
++++ asterisk-1.6.2.0-r1/main/Makefile	2010-01-16 19:26:43.334555789 +0100
+@@ -177,7 +177,7 @@
+ clean::
+ 	rm -f asterisk
+ 	rm -f db1-ast/.*.d
+-	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
++	@+if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
+ 	@$(MAKE) -C db1-ast clean
+ 	@$(MAKE) -C stdtime clean
+ 	rm -f libresample/src/*.o
+diff -uNr asterisk-1.6.2.0/menuselect/Makefile asterisk-1.6.2.0-r1/menuselect/Makefile
+--- asterisk-1.6.2.0/menuselect/Makefile	2010-01-16 18:55:43.738059027 +0100
++++ asterisk-1.6.2.0-r1/menuselect/Makefile	2010-01-16 19:03:34.381055693 +0100
+@@ -96,7 +96,7 @@
+ 	$(CC) -o $@ $^ $(M_LIBS)
+ 
+ mxml/libmxml.a:
+-	@if test ! -f mxml/Makefile ; then cd mxml && ./configure ; fi
++	@+if test ! -f mxml/Makefile ; then cd mxml && ./configure ; fi
+ 	@$(MAKE) -C mxml libmxml.a
+ 
+ test: menuselect
+@@ -113,11 +113,11 @@
+ 
+ clean:
+ 	rm -f menuselect cmenuselect gmenuselect nmenuselect $(OBJS) $(M_OBJS) $(C_OBJS) $(G_OBJS) $(N_OBJS)
+-	@if test -f mxml/Makefile ; then $(MAKE) -C mxml clean ; fi
++	@+if test -f mxml/Makefile ; then $(MAKE) -C mxml clean ; fi
+ 
+ dist-clean: distclean
+ 
+ distclean: clean
+-	@if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
++	@+if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
+ 	rm -f autoconfig.h config.status config.log makeopts
+ 	rm -rf autom4te.cache