Dear maintainer,

I've prepared an NMU for alpine (versioned as 2.02-3.1). The diff
is attached to this message.

Regards.

diff -Nru alpine-2.02/debian/changelog alpine-2.02/debian/changelog
--- alpine-2.02/debian/changelog	2010-11-02 06:59:27.000000000 +0100
+++ alpine-2.02/debian/changelog	2011-12-02 15:16:13.000000000 +0100
@@ -1,3 +1,13 @@
+alpine (2.02-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from Eric Alexander to solve the format not a string or
+    literal compiler error (Closes: #643349)
+    (Added as debian/patches/60_fix_string_error.patch)
+  * Set urgency to medium due to rc bug fix
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org>  Fri, 02 Dec 2011 15:14:18 +0100
+
 alpine (2.02-3) unstable; urgency=low
 
   * Explicitly list libraries needed by c-client.a to a patch.
diff -Nru alpine-2.02/debian/patches/60_fix_string_error.patch alpine-2.02/debian/patches/60_fix_string_error.patch
--- alpine-2.02/debian/patches/60_fix_string_error.patch	1970-01-01 01:00:00.000000000 +0100
+++ alpine-2.02/debian/patches/60_fix_string_error.patch	2011-12-02 15:15:46.000000000 +0100
@@ -0,0 +1,39 @@
+Index: alpine-2.02/imap/src/osdep/unix/flocklnx.c
+===================================================================
+--- alpine-2.02.orig/imap/src/osdep/unix/flocklnx.c	2010-10-02 04:37:57.000000000 -0400
++++ alpine-2.02/imap/src/osdep/unix/flocklnx.c	2011-11-11 08:58:18.297338885 -0500
+@@ -57,7 +57,7 @@
+     case ENOLCK:		/* lock table is full */
+       sprintf (tmp,"File locking failure: %s",strerror (errno));
+       mm_log (tmp,WARN);	/* give the user a warning of what happened */
+-      if (!logged++) syslog (LOG_ERR,tmp);
++      if (!logged++) syslog (LOG_ERR, "%s", tmp);
+ 				/* return failure if non-blocking lock */
+       if (op & LOCK_NB) return -1;
+       sleep (5);		/* slow down in case it loops */
+Index: alpine-2.02/alpine/mailcmd.c
+===================================================================
+--- alpine-2.02.orig/alpine/mailcmd.c	2010-10-02 04:37:57.000000000 -0400
++++ alpine-2.02/alpine/mailcmd.c	2011-11-11 09:02:29.357346728 -0500
+@@ -7879,7 +7879,7 @@
+ 
+ 	      case 13 :			/* Match my addresses */
+ 		me++;
+-		snprintf(sstring, sizeof(sstring), not ? _(dont_match_me) : _(match_me));
++		snprintf(sstring, sizeof(sstring), "%s", not ? _(dont_match_me) : _(match_me));
+ 		continue;
+ 
+ 	      case 14 :			/* Subject: default */
+Index: alpine-2.02/pith/ldap.c
+===================================================================
+--- alpine-2.02.orig/pith/ldap.c	2010-10-02 04:37:57.000000000 -0400
++++ alpine-2.02/pith/ldap.c	2011-11-11 09:02:03.401345919 -0500
+@@ -777,7 +777,7 @@
+ 	 */
+ 	switch(args){
+ 	  case 0:
+-	    snprintf(filter, sizeof(filter), filt_format);
++	    snprintf(filter, sizeof(filter), "%s", filt_format);
+ 	    break;
+ 	  case 1:
+ 	    snprintf(filter, sizeof(filter), filt_format, scp);
diff -Nru alpine-2.02/debian/patches/series alpine-2.02/debian/patches/series
--- alpine-2.02/debian/patches/series	2010-11-02 02:29:27.000000000 +0100
+++ alpine-2.02/debian/patches/series	2011-12-02 15:15:46.000000000 +0100
@@ -7,3 +7,4 @@
 40_fix_tech_notes_hardcoded_paths.patch
 40_fix_filter_hardcoded_paths.patch
 50_danchev_malloc_once.patch
+60_fix_string_error.patch

Reply via email to