[Pkg-voip-commits] r3185 - in openser/trunk/debian: . patches

[Julien Blache]

Author: jblache
Date: 2007-03-03 10:55:49 +0000 (Sat, 03 Mar 2007)
New Revision: 3185

Removed:
   openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch
Modified:
   openser/trunk/debian/changelog
   openser/trunk/debian/patches/00list
Log:
Remove 22_OpenPKG-SA-2006.042.dpatch, fixed upstream with a different fix.


Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog	2007-03-01 10:51:04 UTC (rev 3184)
+++ openser/trunk/debian/changelog	2007-03-03 10:55:49 UTC (rev 3185)
@@ -7,8 +7,10 @@
     + Removed; no longer needed.
   * debian/patches/12_fail_on_build_failure.dpatch:
     + Removed; merged upstream.
+  * debian/patches/22_OpenPKG-SA-2006.042.dpatch:
+    + Removed; fixed upstream (different fix).
 
- -- Julien BLACHE <jblache at debian.org>  Sat, 24 Feb 2007 16:31:22 +0100
+ -- Julien BLACHE <jblache at debian.org>  Sat,  3 Mar 2007 11:55:01 +0100
 
 openser (1.1.1-1) unstable; urgency=low
 

Modified: openser/trunk/debian/patches/00list
===================================================================
--- openser/trunk/debian/patches/00list	2007-03-01 10:51:04 UTC (rev 3184)
+++ openser/trunk/debian/patches/00list	2007-03-03 10:55:49 UTC (rev 3185)
@@ -1,4 +1,3 @@
 10_no_lib64_on_64_bits
 11_always_smp
-22_OpenPKG-SA-2006.042
 

Deleted: openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch
===================================================================
--- openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch	2007-03-01 10:51:04 UTC (rev 3184)
+++ openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch	2007-03-03 10:55:49 UTC (rev 3185)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_OpenPKG-SA-2006.042.dpatch by  <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Security fix for OpenPKG-SA-2006.042
-
- at DPATCH@
-diff -urNad openser-1.2.0~/modules/permissions/parse_config.c openser-1.2.0/modules/permissions/parse_config.c
---- openser-1.2.0~/modules/permissions/parse_config.c	2007-01-12 15:23:41.000000000 +0100
-+++ openser-1.2.0/modules/permissions/parse_config.c	2007-02-24 16:32:13.901543118 +0100
-@@ -114,8 +114,11 @@
- 	except = strstr(str, " EXCEPT ");
- 	if (except) {
- 		/* exception found */
--		strncpy(str2, str, except-str);
--		str2[except-str] = '\0';
-+		int l = except - str;
-+		if (l > sizeof(str2) - 1)
-+			l = sizeof(str2) - 1;
-+		strncpy(str2, str, l);
-+		str2[l] = '\0';
- 		/* except+8 points to the exception */
- 		if (parse_expression_list(except+8, e_exceptions)) {
- 			/* error */
-@@ -124,7 +127,8 @@
- 		}
- 	} else {
- 		/* no exception */
--		strcpy(str2, str);
-+		strncpy(str2, str, sizeof(str2)-1);
-+		str2[sizeof(str2)-1] = '\0';
- 		*e_exceptions = NULL;
- 	}
-