[Pkg-voip-commits] r4833 - in /asterisk/trunk/debian: changelog patches/bristuff/bristuff-notice patches/bristuff/xagi patches/bristuff/zapata-bri+euroisdn patches/tos-libcap

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sat Nov 17 15:32:04 2007
New Revision: 4833

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4833
Log:
* New upstream release.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/bristuff/bristuff-notice
    asterisk/trunk/debian/patches/bristuff/xagi
    asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
    asterisk/trunk/debian/patches/tos-libcap

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=4833&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sat Nov 17 15:32:04 2007
@@ -1,9 +1,7 @@
 asterisk (1:1.4.14~dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET.
- 
-  * New Upstream Release
-    - regular maintenance release 
+  * New upstream release.
 
   [ Tzafrir Cohen ]
   * Add some sample/reference config files as documentation.
@@ -27,7 +25,7 @@
   [ Mark Purcell ]
   * Use fresh.t-systems-sfr.com for debian/watch
 
- -- Mark Purcell <msp at debian.org>  Wed, 07 Nov 2007 22:37:05 +0000
+ -- Faidon Liambotis <paravoid at debian.org>  Sat, 17 Nov 2007 17:31:11 +0200
 
 asterisk (1:1.4.13~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/bristuff/bristuff-notice
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/bristuff-notice?rev=4833&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/bristuff-notice (original)
+++ asterisk/trunk/debian/patches/bristuff/bristuff-notice Sat Nov 17 15:32:04 2007
@@ -12,8 +12,8 @@
 --- asterisk-1.4.12.orig/.version
 +++ asterisk-1.4.12/.version
 @@ -1 +1 @@
--1.4.13
-+1.4.13-BRIstuffed-0.4.0-test4
+-1.4.14
++1.4.14-BRIstuffed-0.4.0-test4
 --- asterisk-1.4.12.orig/LICENSE
 +++ asterisk-1.4.12/LICENSE
 @@ -1,7 +1,7 @@

Modified: asterisk/trunk/debian/patches/bristuff/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/xagi?rev=4833&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi (original)
+++ asterisk/trunk/debian/patches/bristuff/xagi Sat Nov 17 15:32:04 2007
@@ -587,6 +587,6 @@
  clean:
 -	rm -f *.so *.o look eagi-test eagi-sphinx-test
 +	rm -f *.so *.o look eagi-test eagi-sphinx-test xagi-test
- 	rm -f .*.o.d .*.oo.d
+ 	rm -f .*.o.d .*.oo.d *.s *.i
  	rm -f strcompat.c
  

Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=4833&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Sat Nov 17 15:32:04 2007
@@ -2410,7 +2410,7 @@
 + 		}
 + 		
 +
- 		myfd = open(argv[4], O_CREAT|O_WRONLY);
+ 		myfd = open(argv[4], O_CREAT|O_WRONLY, 0600);
  		if (myfd < 0) {
 -			ast_cli(fd, "Unable to open '%s' for writing\n", argv[4]);
 -			return RESULT_SUCCESS;

Modified: asterisk/trunk/debian/patches/tos-libcap
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/tos-libcap?rev=4833&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/tos-libcap (original)
+++ asterisk/trunk/debian/patches/tos-libcap Sat Nov 17 15:32:04 2007
@@ -655,10 +655,10 @@
  #if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
  #include <netdb.h>
  #if defined(SOLARIS)
-@@ -2727,12 +2726,21 @@ int main(int argc, char *argv[])
+@@ -2734,12 +2806,21 @@ int main(int argc, char *argv[])
  	}
  
- 	if (!is_child_of_nonroot && runuser) {
+ 	if (runuser && !ast_test_flag(&ast_options, AST_OPT_FLAG_REMOTE)) {
 +#ifdef HAVE_CAP
 +		int has_cap = 1;
 +#endif /* HAVE_CAP */
@@ -674,11 +674,11 @@
 +			has_cap = 0;
 +		}
 +#endif /* HAVE_CAP */
- 		if (!rungroup) {
- 			if (setgid(pw->pw_gid)) {
- 				ast_log(LOG_WARNING, "Unable to setgid to %d!\n", (int)pw->pw_gid);
-@@ -2750,6 +2758,19 @@ int main(int argc, char *argv[])
- 		setenv("ASTERISK_ALREADY_NONROOT", "yes", 1);
+ 		if (!isroot && pw->pw_uid != geteuid()) {
+ 			ast_log(LOG_ERROR, "Asterisk started as nonroot, but runuser '%s' requested.\n", runuser);
+ 			exit(1);
+@@ -2760,6 +2841,19 @@ int main(int argc, char *argv[])
+ 		}
  		if (option_verbose)
  			ast_verbose("Running as user '%s'\n", runuser);
 +#ifdef HAVE_CAP