Changed the ebuild to fix permissions on live-fs in pkg_postinst to force sane values

(Portage version: 2.0.51.19)

3 files changed, 17 insertions, 48 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index f1e0ead62434..87f7b6bb672c 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.50 2005/05/10 11:53:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.51 2005/05/11 11:57:33 stkn Exp $
+
+  11 May 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7-r1.ebuild:
+  Changed ebuild to fix permissions on live-filesystem during pkg_postinst,
+  not the nicest way to do this but the best one to force sane defaults.
 
   10 May 2005; David Holm <dholm@gentoo.org> asterisk-1.0.7.ebuild:
   Added to ~ppc.
diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
index c8f8c7dbe4c1..b54df9e2f31d 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2005/05/09 16:57:09 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.3 2005/05/11 11:57:33 stkn Exp $
 
 IUSE="alsa doc gtk mmx mysql pri zaptel uclibc debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
 
 inherit eutils perl-module
 
 ADDONS_VERSION="1.0.7"
-BRI_VERSION="0.2.0-RC8a"
+BRI_VERSION="0.2.0-RC8c"
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
@@ -96,9 +96,11 @@ pkg_setup() {
 	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
 	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
 	echo
-	einfo "! New permissions will be automatically used for new installations, !"
-	einfo "! use \"ebuild /usr/portage/net-misc/${PN}/${PF}.ebuild config\" to !"
-	einfo "! fix permissions if you are upgrading                              !"
+	eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	eerror "! NEW PERMISSIONS WILL BE AUTOMATICALLY SET DURING INSTALLATION !"
+	eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	echo
+	einfo "Press Ctrl+C to abort"
 	echo
 
 	n=30
@@ -240,12 +242,6 @@ src_unpack() {
 		cd ${S}
 		einfo "Patching asterisk w/ BRI stuff"
 
-		# fix patch for new asterisk version...
-		# and fix a watchdog bug
-		sed -i 	-e "s:^\([+-]\)1.0.6:\1${PV}:" \
-			-e "s:woof->fd, \"+\", 1);:woof->fd, \"PING\\\\n\", 1);:" \
-			${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
-
 		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
 	fi
 
@@ -295,16 +291,14 @@ src_install() {
 	dosbin contrib/scripts/addmailbox
 	dosbin contrib/scripts/astgenkey
 
-	exeinto /etc/init.d
-	newexe  ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
-
-	insinto /etc/conf.d
-	newins  ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
+	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
@@ -325,9 +319,7 @@ src_install() {
 
 	insinto /usr/share/doc/${PF}/cgi
 	doins contrib/scripts/vmail.cgi
-	for i in "images/*.gif"; do
-		doins $i
-	done
+	doins images/*.gif
 
 	#
 	# add-ons
@@ -428,26 +420,11 @@ pkg_postinst() {
 	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
 	echo
 	echo
-	einfo "! New permissions will be automatically used for new installations, !"
-	einfo "! use \"ebuild /usr/portage/net-misc/${PN}/${PF}.ebuild config\" to !"
-	einfo "! fix permissions if you are upgrading                              !"
-}
 
-pkg_config() {
 	#
 	# Change permissions and ownerships of asterisk
 	# directories and files
 	#
-	if [[ ! -d ${ROOT}/var/run/asterisk ]]; then
-		mkdir -p ${ROOT}/var/run/asterisk
-	fi
-
-	if [[ -z "$(egetent passwd asterisk)" ]]; then
-		einfo "Adding asterisk user and group"
-		enewgroup asterisk
-		enewuser asterisk -1 /bin/false /var/lib/asterisk asterisk
-	fi
-
 	einfo "Fixing permissions and ownerships"
 	# fix permissions
 	for x in spool run lib log; do
@@ -468,17 +445,5 @@ pkg_config() {
 			${ROOT}/etc/asterisk/asterisk.conf
 		einfo "Backup has been saved as ${ROOT}/etc/asterisk/asterisk.conf.bak"
 	fi
-
-	if [[ -f ${ROOT}/usr/bin/asterisk-config ]] && \
-	   [[ -z "$(grep "/var/run/asterisk" ${ROOT}/usr/bin/asterisk-config)" ]]
-	then
-		einfo "Fixing ASTVARRUNDIR in ${ROOT}/usr/bin/asterisk-config"
-		mv -f ${ROOT}/usr/bin/asterisk-config \
-			${ROOT}/usr/bin/asterisk-config.bak
-		sed -e "s:/var/run:/var/run/asterisk:" \
-			${ROOT}/usr/bin/asterisk-config.bak >\
-			${ROOT}/usr/bin/asterisk-config
-		einfo "Backup has been saved as ${ROOT}/usr/bin/asterisk-config.bak"
-	fi
 }
 
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.7-r1 b/net-misc/asterisk/files/digest-asterisk-1.0.7-r1
index ac1f0a860719..d5bb8c0a31c2 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.0.7-r1
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.7-r1
@@ -1,3 +1,3 @@
 MD5 4cc3c1e4a1b12e0e4c748326ad153291 asterisk-1.0.7.tar.gz 9591705
 MD5 e2a94a7c2e97de18b3cdc4dd42709c11 asterisk-addons-1.0.7.tar.gz 73646
-MD5 8029d465ffc1ae8fb076a6b7198da03c bristuff-0.2.0-RC8a.tar.gz 133171
+MD5 9142faa67742b1af6cfc2c72f26d4d52 bristuff-0.2.0-RC8c.tar.gz 137557