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

2 files changed, 26 insertions, 0 deletions

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
--- /dev/null
+++ b/packages/cups/cups-1.1.23/.mtn2git_empty
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);