From: Cliff Brake <cbrake@bec-systems.com>
Date: Sat, 27 May 2006 15:13:05 +0000 (+0000)
Subject: cups 1.1.23: fix strftime seg fault issue
X-Git-Tag: Release-2010-05/1~9453^2~1585
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b1b04024f907869bd32090e70b4423c384bd65;p=openembedded.git

cups 1.1.23: fix strftime seg fault issue
  - when strftime is called w/ a NULL format string, it is segfaulting
    in glibc
  - integrate code from latest cups svn to fix
---

diff --git a/packages/cups/cups-1.1.23/.mtn2git_empty b/packages/cups/cups-1.1.23/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/cups/cups-1.1.23/strftime_fix.patch b/packages/cups/cups-1.1.23/strftime_fix.patch
new file mode 100644
index 0000000000..81f224fa2e
--- /dev/null
+++ b/packages/cups/cups-1.1.23/strftime_fix.patch
@@ -0,0 +1,26 @@
+Index: cups-1.1.23/scheduler/classes.c
+===================================================================
+--- cups-1.1.23.orig/scheduler/classes.c
++++ cups-1.1.23/scheduler/classes.c
+@@ -622,7 +622,7 @@ SaveAllClasses(void)
+ 
+   curtime = time(NULL);
+   curdate = localtime(&curtime);
+-  strftime(temp, sizeof(temp) - 1, CUPS_STRFTIME_FORMAT, curdate);
++  strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+   cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+Index: cups-1.1.23/scheduler/printers.c
+===================================================================
+--- cups-1.1.23.orig/scheduler/printers.c
++++ cups-1.1.23/scheduler/printers.c
+@@ -1066,7 +1066,7 @@ SaveAllPrinters(void)
+ 
+   curtime = time(NULL);
+   curdate = localtime(&curtime);
+-  strftime(temp, sizeof(temp) - 1, CUPS_STRFTIME_FORMAT, curdate);
++  strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+   cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb
index 2fa5178cac..936b92bcea 100644
--- a/packages/cups/cups_1.1.23.bb
+++ b/packages/cups/cups_1.1.23.bb
@@ -3,7 +3,10 @@ DESCRIPTION = "An Internet printing system for Unix."
 SECTION = "console/utils"
 LICENSE = "GPL LGPL"
 
-SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
+           file://strftime_fix.patch;patch=1"
 
 inherit autotools binconfig