diff options
author | Stefan Knoblich <stkn@gentoo.org> | 2005-05-11 23:27:57 +0000 |
---|---|---|
committer | Stefan Knoblich <stkn@gentoo.org> | 2005-05-11 23:27:57 +0000 |
commit | 95e2165a737e5f3f64bc0a7a1da961a61eaa5b28 (patch) | |
tree | 72d91f37d62224756e2d50ecc44c5bdfbf645d57 /net-misc | |
parent | Stable on alpha + ia64, bug 92035. (diff) | |
download | historical-95e2165a737e5f3f64bc0a7a1da961a61eaa5b28.tar.gz historical-95e2165a737e5f3f64bc0a7a1da961a61eaa5b28.tar.bz2 historical-95e2165a737e5f3f64bc0a7a1da961a61eaa5b28.zip |
More non-root fixes (this time for addmailbox and astgenkey), bristuff update and other minor changes
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/asterisk/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/asterisk/Manifest | 7 | ||||
-rw-r--r-- | net-misc/asterisk/asterisk-1.0.7-r1.ebuild | 92 | ||||
-rw-r--r-- | net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff | 43 | ||||
-rw-r--r-- | net-misc/asterisk/files/digest-asterisk-1.0.7-r1 | 2 |
5 files changed, 104 insertions, 47 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index de45f749bfef..cb544f272476 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,6 +1,11 @@ # 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.52 2005/05/11 12:47:06 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.53 2005/05/11 23:27:57 stkn Exp $ + + 12 May 2005; Stefan Knoblich <stkn@gentoo.org> + +files/1.0.0/asterisk-1.0.7-scripts.diff, asterisk-1.0.7-r1.ebuild: + Added non-root changes to addmailbox and astgenkey, fixed warning + countdown and bristuff update. 11 May 2005; Stefan Knoblich <stkn@gentoo.org> files/1.0.0/asterisk.confd.sec: diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 7613dfdeef35..8b4a3572082a 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,4 +1,4 @@ -MD5 4aa438cb88c136524bbb1aa8eab483ed asterisk-1.0.7-r1.ebuild 13090 +MD5 1ea090ea65964e37a832a7a31c8c48e3 asterisk-1.0.7-r1.ebuild 13188 MD5 c870e11d5cfc72f46a1290e769a491cc asterisk-1.0.1.ebuild 5576 MD5 443437a5d15fe53ff78a0f93004a04f4 asterisk-1.0.7.ebuild 9725 MD5 c7b911a01a3bd822055a9ec010dfbae1 asterisk-1.0.5.ebuild 6314 @@ -7,14 +7,14 @@ MD5 9af7f719e9db949d2d7870e01cd6faa1 asterisk-1.0.3.ebuild 5845 MD5 867bae5d74f56337feec21310c14ecca asterisk-1.0.5-r1.ebuild 7170 MD5 0a9506b97103f05fdd15df48db9b3506 asterisk-1.0.3-r1.ebuild 5865 MD5 6201814863e121c6cae9a8209b0b9a27 asterisk-1.0.0.ebuild 3394 -MD5 d791b9c3575967e5f76b9923e611cf83 ChangeLog 9415 +MD5 0e212aad308e32fa1762909de26a2981 ChangeLog 9636 MD5 b551ce4bb8eb4a03cb0e551c279ab02c asterisk-0.9.0.ebuild 3161 MD5 465f444622b40abb34bbb311b571ed24 asterisk-1.0.2.ebuild 5585 MD5 1f0cf9681436a84a7be9a324e8375ef3 asterisk-1.0.6.ebuild 8622 MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3-r1 213 MD5 1bb1cf45f134eeae6adcc7dc17b6b5db files/digest-asterisk-1.0.0 141 MD5 0243bdde80a5b8433cf93c306458dfd8 files/digest-asterisk-0.9.0 67 -MD5 3236c099c9cacb8a02292dd7216a38d6 files/digest-asterisk-1.0.7-r1 210 +MD5 cafa114e45cae0cc2dd505d1deaa7184 files/digest-asterisk-1.0.7-r1 210 MD5 b97c969a083704e6f8c8c9b07d56db3b files/digest-asterisk-1.0.1 213 MD5 d7a0d59fff2e991e7b091341893ec554 files/digest-asterisk-1.0.7 210 MD5 5474694f8ec88752718f88d84e587468 files/digest-asterisk-1.0.2 213 @@ -31,6 +31,7 @@ MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517 MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474 MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 MD5 edf12407ea851d46ced85276149aedf1 files/1.0.0/asterisk.rc6.sec 760 +MD5 78b01073a94beded6a86a2b45409df43 files/1.0.0/asterisk-1.0.7-scripts.diff 1629 MD5 e82caefb3c418cc276a2f5c253852b10 files/1.0.0/asterisk.confd.sec 419 MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214 MD5 5b7ebf09c4c7988bd16cadaaad08d8f6 files/0.9.0/asterisk.confd 290 diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild index b54df9e2f31d..c2a380cbb114 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.3 2005/05/11 11:57:33 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.4 2005/05/11 23:27:57 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-RC8c" +BRI_VERSION="0.2.0-RC8d" DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="http://www.asterisk.org/" @@ -43,6 +43,46 @@ DEPEND="dev-libs/newt >=net-misc/zaptel-1.0.7-r1 )" 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/astrisk" + 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 + eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + eerror "! NEW PERMISSIONS WILL BE AUTOMATICALLY SET DURING INSTALLATION !" + eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo + einfo "Press Ctrl+C to abort" + echo + ebeep + + n=20 + 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... @@ -75,40 +115,6 @@ pkg_setup() { die "Libpri without bri support detected" fi fi - - # - # Warning about security changes... - # - ewarn "****************** Important changes warning! *********************" - echo - ewarn "- Asterisk runs as user asterisk, group asterisk by default" - echo - ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk" - ewarn " 750 (directories) / 640 (files)" - echo - ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed" - ewarn " to asterisk:asterisk 750 (directories) / 640 (files)" - echo - ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk" - echo - ewarn "- More information at the end of this emerge" - echo - ewarn " http://bugs.gentoo.org/show_bug.cgi?id=88732" - ewarn " http://www.voip-info.org/wiki-Asterisk+non-root" - echo - eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - eerror "! NEW PERMISSIONS WILL BE AUTOMATICALLY SET DURING INSTALLATION !" - eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - echo - einfo "Press Ctrl+C to abort" - echo - - n=30 - while [[ $n -lt 0 ]]; do - echo -en " Waiting $n seconds...\r" - sleep 1 - (( $n-- )) - done } src_unpack() { @@ -258,6 +264,8 @@ src_unpack() { cd ${S} sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \ Makefile + + epatch ${FILESDIR}/1.0.0/${P}-scripts.diff } src_compile() { @@ -396,25 +404,25 @@ pkg_postinst() { # Warning about security changes... # ewarn "*********************** Important changes **************************" - echo + ewarn ewarn "- Asterisk runs as user asterisk, group asterisk by default" ewarn " Use usermod -G to make the asterisk user a member of additional" ewarn " groups if necessary." - echo + ewarn ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk" ewarn " 750 (rwxr-x--- directories) / 640 (rw-r----- files)" - echo + ewarn ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed" ewarn " to asterisk:asterisk 750 / 640" - echo + ewarn ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk" - echo + 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)" - echo + 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" diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff new file mode 100644 index 000000000000..c002294c0e6b --- /dev/null +++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff @@ -0,0 +1,43 @@ +--- asterisk-1.0.7/contrib/scripts/addmailbox.orig 2005-05-11 23:17:10.000000000 +0200 ++++ asterisk-1.0.7/contrib/scripts/addmailbox 2005-05-11 23:21:57.000000000 +0200 +@@ -21,14 +21,14 @@ + echo + echo "New Voicemail context.." + echo "Creating Voicemail context directory..." +- mkdir -p ${VMHOME}/${context} ++ mkdir -m 750 -p ${VMHOME}/${context} + fi + + echo + echo "Creating Voicemail directory..." +-mkdir -p ${VMHOME}/${context}/${mailbox} ++mkdir -m 750 -p ${VMHOME}/${context}/${mailbox} + echo "Creating INBOX..." +-mkdir -p ${VMHOME}/${context}/${mailbox}/INBOX ++mkdir -m 750 -p ${VMHOME}/${context}/${mailbox}/INBOX + echo "Creating Default greetings..." + cat ${SNDHOME}/vm-theperson.gsm > ${VMHOME}/${context}/${mailbox}/unavail.gsm + cat ${SNDHOME}/vm-theperson.gsm > ${VMHOME}/${context}/${mailbox}/busy.gsm +@@ -41,5 +41,8 @@ + done + cat ${SNDHOME}/vm-isunavail.gsm >> ${VMHOME}/${context}/${mailbox}/unavail.gsm + cat ${SNDHOME}/vm-isonphone.gsm >> ${VMHOME}/${context}/${mailbox}/busy.gsm ++echo "Changing permissions..." ++chmod -R asterisk:asterisk ${VMHOME}/${context} ++chmod u=rwX,g=rX,o= ${VMHOME}/${context}/${mailbox}/*.gsm + echo "Complete." + +--- asterisk-1.0.7/contrib/scripts/astgenkey.orig 2005-05-11 23:28:37.000000000 +0200 ++++ asterisk-1.0.7/contrib/scripts/astgenkey 2005-05-11 23:30:12.000000000 +0200 +@@ -55,7 +55,11 @@ + echo "Key creation successful." + echo "Public key: ${KEY}.pub" + echo "Private key: ${KEY}.key" ++ echo "Changing permissions..." + fi ++ chown root:asterisk ${KEY}.pub ${KEY}.key ++ chmod u=rw,g=r,o= ${KEY}.pub ${KEY}.key + else + echo "Unknown error creating keys." + 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 d5bb8c0a31c2..5c27f77b16f1 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 9142faa67742b1af6cfc2c72f26d4d52 bristuff-0.2.0-RC8c.tar.gz 137557 +MD5 d1c1511b436a994fc95022fe6e9703d4 bristuff-0.2.0-RC8d.tar.gz 137500 |