tags 636009 patch
tags 646469 patch
thanks
Dear maintainer,
I've prepared an NMU for torcs (versioned as 1.3.1-6.1) to
fix #636009 and #646469.
Thanks for your work!
diff -u torcs-1.3.1/debian/changelog torcs-1.3.1/debian/changelog
--- torcs-1.3.1/debian/changelog
+++ torcs-1.3.1/debian/changelog
@@ -1,3 +1,13 @@
+torcs (1.3.1-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 06-add-format-argument.patch: add format argument to
+ avoid format-security error while building. (Closes: #646469)
+ * 07-update-to-libpng15.patch: libpng transition. Thanks to Nobuhiro Iwamatsu!
+ (Closes: #636009)
+
+ -- Mònica Ramírez Arceda <mon...@probeta.net> Sun, 04 Dec 2011 11:34:02 +0100
+
torcs (1.3.1-6) unstable; urgency=low
* Fixed .desktop file to be valid. Thanks Pino Toscano. Closes: #638957
only in patch2:
unchanged:
--- torcs-1.3.1.orig/debian/patches/07-update-to-libpng15.patch
+++ torcs-1.3.1/debian/patches/07-update-to-libpng15.patch
@@ -0,0 +1,28 @@
+--- src/libs/tgfclient/img.cpp 2011-06-08 23:21:37.000000000 +0900
++++ src/libs/tgfclient/img.cpp 2011-06-08 23:22:21.000000000 +0900
+@@ -97,8 +97,11 @@
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ return (unsigned char *)NULL;
+ }
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ if (setjmp(png_jmpbuf(png_ptr)))
++#else
+ if (setjmp(png_ptr->jmpbuf))
++#endif
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -229,7 +232,11 @@
+ return -1;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ if (setjmp(png_jmpbuf(png_ptr))) {
++#else
++ if (setjmp(png_ptr->jmpbuf)) {
++#endif
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return -1;
only in patch2:
unchanged:
--- torcs-1.3.1.orig/debian/patches/06-add-format-argument.patch
+++ torcs-1.3.1/debian/patches/06-add-format-argument.patch
@@ -0,0 +1,11 @@
+--- src/tools/texmapper/maintexmapper.cpp.old 2008-12-15 00:35:29.000000000 +0100
++++ src/tools/texmapper/maintexmapper.cpp 2011-12-04 04:28:35.089715355 +0100
+@@ -103,7 +103,7 @@
+ {
+ int i, j;
+
+- printf(title);
++ printf("%s", title);
+ for (j = 0; j < 4; j ++){
+ for (i = 0; i < 4; i ++) {
+ printf("%.6f ", m[i][j]);
