[Pkg-voip-commits] r7455 - in /asterisk/trunk/debian: asterisk.init changelog patches/astgenkey-security

paravoid at alioth.debian.org paravoid at alioth.debian.org
Mon Jul 27 18:57:48 UTC 2009


Author: paravoid
Date: Mon Jul 27 18:57:47 2009
New Revision: 7455

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7455
Log:
* Fix astgenkey to respect system's umask. Thanks Jonas Smedegaard.
  (Closes: #531730) 
* Create /var/log/asterisk/* directories if non-existent, for /var/log on
  tmpfs scenarios. Thanks martin f krafft! (Closes: #524015)

Modified:
    asterisk/trunk/debian/asterisk.init
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/astgenkey-security

Modified: asterisk/trunk/debian/asterisk.init
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.init?rev=7455&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.init (original)
+++ asterisk/trunk/debian/asterisk.init Mon Jul 27 18:57:47 2009
@@ -30,7 +30,6 @@
 DESC="Asterisk PBX"
 PIDFILE="/var/run/asterisk/asterisk.pid"
 ASTSAFE_PIDFILE="/var/run/asterisk/asterisk_safe.pid"
-PIDFILE_DIR="/var/run"
 UMASK=007 # by default
 #MAXFILES=1024 # (the system default)
 
@@ -94,10 +93,9 @@
 
 test -x $DAEMON || exit 0
 
-if [ ! -d "$PIDFILE_DIR" ];then
-	mkdir "$PIDFILE_DIR"
-	chown $USER:$GROUP "$PIDFILE_DIR"
-fi
+for dir in /var/run/asterisk /var/log/asterisk /var/log/asterisk/cdr-csv /var/log/asterisk/cdr-custom; do
+	[ -d $dir ] || install -d -o $USER -g $GROUP $dir
+done
 
 set -e
 

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7455&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Jul 27 18:57:47 2009
@@ -21,6 +21,10 @@
     by the init script (thanks lintian).
   * Remove asterisk-progdocs: it is of very limited use but a) is enormous in
     size and b) takes too long to build.
+  * Fix astgenkey to respect system's umask. Thanks Jonas Smedegaard.
+    (Closes: #531730) 
+  * Create /var/log/asterisk/* directories if non-existent, for /var/log on
+    tmpfs scenarios. Thanks martin f krafft! (Closes: #524015)
 
   [ Tzafrir Cohen ]
   * New upstream release.

Modified: asterisk/trunk/debian/patches/astgenkey-security
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astgenkey-security?rev=7455&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astgenkey-security (original)
+++ asterisk/trunk/debian/patches/astgenkey-security Mon Jul 27 18:57:47 2009
@@ -9,14 +9,15 @@
 
 --- a/contrib/scripts/astgenkey
 +++ b/contrib/scripts/astgenkey
-@@ -47,7 +47,10 @@ done
+@@ -47,7 +47,11 @@ done
  rm -f ${KEY}.key ${KEY}.pub
  
  echo "Generating SSL key '$KEY': "
++oldumask="`umask`"
 +umask 0077
  openssl genrsa -out ${KEY}.key ${DES3} 1024
 +[ "$(id -u)" = 0 ] && chown asterisk: ${KEY}.key
-+umask 0022
++umask $oldumask
  openssl rsa -in ${KEY}.key -pubout -out ${KEY}.pub
  
  if [ -f "${KEY}.key" ] && [ -f "${KEY}.pub" ]; then




More information about the Pkg-voip-commits mailing list