[pkg-ggz-commits] r396 - in branches/ggz-client-libs/0.0.14.1-lenny/debian: . patches

[josef-guest at alioth.debian.org]

Author: josef-guest
Date: 2009-01-05 22:29:58 +0000 (Mon, 05 Jan 2009)
New Revision: 396

Added:
   branches/ggz-client-libs/0.0.14.1-lenny/debian/patches/sprintf.diff
Modified:
   branches/ggz-client-libs/0.0.14.1-lenny/debian/changelog
   branches/ggz-client-libs/0.0.14.1-lenny/debian/svn-deblayout
Log:
- preparation for a package updated in the to-be-released-with-lenny version of ggz-client-libs
- see http://lists.debian.org/debian-devel/2009/01/msg00062.html



Modified: branches/ggz-client-libs/0.0.14.1-lenny/debian/changelog
===================================================================
--- branches/ggz-client-libs/0.0.14.1-lenny/debian/changelog	2008-11-30 07:54:46 UTC (rev 395)
+++ branches/ggz-client-libs/0.0.14.1-lenny/debian/changelog	2009-01-05 22:29:58 UTC (rev 396)
@@ -1,3 +1,9 @@
+ggz-client-libs (0.0.14.1-2) UNRELEASED; urgency=low
+
+  * Fix sprintf buffer dependency issue discovered by Kees Cook
+
+ -- Josef Spillner <josef at ggzgamingzone.org>  Mon, 05 Jan 2009 23:25:04 +0100
+
 ggz-client-libs (0.0.14.1-1) unstable; urgency=low
 
   * New upstream release

Added: branches/ggz-client-libs/0.0.14.1-lenny/debian/patches/sprintf.diff
===================================================================
--- branches/ggz-client-libs/0.0.14.1-lenny/debian/patches/sprintf.diff	                        (rev 0)
+++ branches/ggz-client-libs/0.0.14.1-lenny/debian/patches/sprintf.diff	2009-01-05 22:29:58 UTC (rev 396)
@@ -0,0 +1,37 @@
+Index: ggz-config.c
+===================================================================
+--- ggz-client-libs-0.0.14.orig/ggz-config/ggz-config.c	(Revision 10819)
++++ ggz-client-libs-0.0.14/ggz-config/ggz-config.c	(Revision 10820)
+@@ -455,17 +455,19 @@
+ 			     + strlen(copydir)
+ 			     + strlen(modname)
+ 			     + strlen(suffix) + 3];
++	char dir_pathname[(moddest ? strlen(destdir) : 0)
++			     + strlen(copydir) + 2];
+ 	char fixedmodname[strlen(modname) + 1];
+ 	unsigned int i;
+ 
+ 	if(moddest)
+-		sprintf(global_pathname, "%s/%s", destdir, copydir);
++		sprintf(dir_pathname, "%s/%s", destdir, copydir);
+ 	else
+-		sprintf(global_pathname, "%s", copydir);
++		sprintf(dir_pathname, "%s", copydir);
+ 
+-	if (ggz_make_path(global_pathname) != 0) {
++	if (ggz_make_path(dir_pathname) != 0) {
+ 		fprintf(stderr, _("Directory cannot be created (%s)\n"),
+-			global_pathname);
++			dir_pathname);
+ 		return -1;
+ 	}
+ 
+@@ -473,7 +475,7 @@
+ 	for(i = 0; i < strlen(fixedmodname); i++) {
+ 		if(fixedmodname[i] == '/') fixedmodname[i] = '_';
+ 	}
+-	sprintf(global_pathname, "%s/%s%s", global_pathname, fixedmodname, suffix);
++	sprintf(global_pathname, "%s/%s%s", dir_pathname, fixedmodname, suffix);
+ 
+ 	printf(_("Preserving %s as %s...\n"), modfile, global_pathname);
+ 	return filecopy(modfile, global_pathname);

Modified: branches/ggz-client-libs/0.0.14.1-lenny/debian/svn-deblayout
===================================================================
--- branches/ggz-client-libs/0.0.14.1-lenny/debian/svn-deblayout	2008-11-30 07:54:46 UTC (rev 395)
+++ branches/ggz-client-libs/0.0.14.1-lenny/debian/svn-deblayout	2009-01-05 22:29:58 UTC (rev 396)
@@ -1 +1 @@
-origDir=../../upstream
+origDir=../../../upstream