diff --git a/cups-str4223.patch b/cups-str4223.patch index 2e481fb..d96a2a6 100644 --- a/cups-str4223.patch +++ b/cups-str4223.patch @@ -1,6 +1,6 @@ diff -up cups-1.5.4/conf/cupsd.conf.in.str4223 cups-1.5.4/conf/cupsd.conf.in --- cups-1.5.4/conf/cupsd.conf.in.str4223 2010-12-09 21:24:51.000000000 +0000 -+++ cups-1.5.4/conf/cupsd.conf.in 2012-12-06 12:54:29.533187325 +0000 ++++ cups-1.5.4/conf/cupsd.conf.in 2013-01-04 16:17:54.940629434 +0000 @@ -9,10 +9,6 @@ # for troubleshooting... LogLevel @CUPS_LOG_LEVEL@ @@ -13,8 +13,8 @@ diff -up cups-1.5.4/conf/cupsd.conf.in.str4223 cups-1.5.4/conf/cupsd.conf.in Listen localhost:@DEFAULT_IPP_PORT@ @CUPS_LISTEN_DOMAINSOCKET@ diff -up cups-1.5.4/conf/cups-files.conf.in.str4223 cups-1.5.4/conf/cups-files.conf.in ---- cups-1.5.4/conf/cups-files.conf.in.str4223 2012-12-06 12:54:29.533187325 +0000 -+++ cups-1.5.4/conf/cups-files.conf.in 2012-12-06 12:54:29.533187325 +0000 +--- cups-1.5.4/conf/cups-files.conf.in.str4223 2013-01-04 16:17:54.941629438 +0000 ++++ cups-1.5.4/conf/cups-files.conf.in 2013-01-04 16:17:54.941629438 +0000 @@ -0,0 +1,98 @@ +# +# "$Id$" @@ -116,7 +116,7 @@ diff -up cups-1.5.4/conf/cups-files.conf.in.str4223 cups-1.5.4/conf/cups-files.c +# diff -up cups-1.5.4/config-scripts/cups-defaults.m4.str4223 cups-1.5.4/config-scripts/cups-defaults.m4 --- cups-1.5.4/config-scripts/cups-defaults.m4.str4223 2011-05-06 23:53:53.000000000 +0100 -+++ cups-1.5.4/config-scripts/cups-defaults.m4 2012-12-06 12:54:29.533187325 +0000 ++++ cups-1.5.4/config-scripts/cups-defaults.m4 2013-01-04 16:17:54.942629443 +0000 @@ -367,6 +367,7 @@ else fi @@ -134,8 +134,8 @@ diff -up cups-1.5.4/config-scripts/cups-defaults.m4.str4223 cups-1.5.4/config-sc dnl Default MaxCopies value... AC_ARG_WITH(max-copies, [ --with-max-copies set default max copies value, default=9999 ], diff -up cups-1.5.4/config-scripts/cups-ssl.m4.str4223 cups-1.5.4/config-scripts/cups-ssl.m4 ---- cups-1.5.4/config-scripts/cups-ssl.m4.str4223 2012-12-06 12:54:29.436187036 +0000 -+++ cups-1.5.4/config-scripts/cups-ssl.m4 2012-12-06 12:54:29.533187325 +0000 +--- cups-1.5.4/config-scripts/cups-ssl.m4.str4223 2013-01-04 16:17:54.776628678 +0000 ++++ cups-1.5.4/config-scripts/cups-ssl.m4 2013-01-04 16:17:54.943629448 +0000 @@ -27,6 +27,8 @@ AC_ARG_WITH(openssl-includes, [ --with- SSLFLAGS="" SSLLIBS="" @@ -183,8 +183,8 @@ diff -up cups-1.5.4/config-scripts/cups-ssl.m4.str4223 cups-1.5.4/config-scripts AC_SUBST(SSLFLAGS) AC_SUBST(SSLLIBS) diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in ---- cups-1.5.4/configure.in.str4223 2012-12-06 12:54:29.501187230 +0000 -+++ cups-1.5.4/configure.in 2012-12-06 12:54:29.533187325 +0000 +--- cups-1.5.4/configure.in.str4223 2013-01-04 16:17:54.908629287 +0000 ++++ cups-1.5.4/configure.in 2013-01-04 16:17:54.943629448 +0000 @@ -66,6 +66,7 @@ AC_SUBST(INSTALL_LANGUAGES) AC_SUBST(UNINSTALL_LANGUAGES) @@ -202,8 +202,8 @@ diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in man/cupsaddsmb.man man/cupsd.conf.man diff -up cups-1.5.4/conf/Makefile.str4223 cups-1.5.4/conf/Makefile ---- cups-1.5.4/conf/Makefile.str4223 2012-12-06 12:54:29.423186997 +0000 -+++ cups-1.5.4/conf/Makefile 2012-12-06 12:54:29.533187325 +0000 +--- cups-1.5.4/conf/Makefile.str4223 2013-01-04 16:17:54.761628608 +0000 ++++ cups-1.5.4/conf/Makefile 2013-01-04 16:17:54.944629453 +0000 @@ -19,7 +19,7 @@ include ../Makedefs # Config files... # @@ -215,7 +215,7 @@ diff -up cups-1.5.4/conf/Makefile.str4223 cups-1.5.4/conf/Makefile diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/ref-cupsd-conf.html.in --- cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 2012-01-30 21:40:21.000000000 +0000 -+++ cups-1.5.4/doc/help/ref-cupsd-conf.html.in 2012-12-06 12:54:29.534187327 +0000 ++++ cups-1.5.4/doc/help/ref-cupsd-conf.html.in 2013-01-04 16:17:54.945629457 +0000 @@ -191,82 +191,6 @@ HREF="#Location">LocationLimit section.

@@ -584,8 +584,8 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/

Examples

diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/help/ref-cups-files-conf.html.in ---- cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 2012-12-06 12:54:29.535187330 +0000 -+++ cups-1.5.4/doc/help/ref-cups-files-conf.html.in 2012-12-06 12:54:29.535187330 +0000 +--- cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 2013-01-04 16:17:54.945629457 +0000 ++++ cups-1.5.4/doc/help/ref-cups-files-conf.html.in 2013-01-04 16:17:54.945629457 +0000 @@ -0,0 +1,531 @@ + + @@ -1120,7 +1120,7 @@ diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/ + diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile --- cups-1.5.4/doc/Makefile.str4223 2011-01-17 05:40:28.000000000 +0000 -+++ cups-1.5.4/doc/Makefile 2012-12-06 12:54:29.535187330 +0000 ++++ cups-1.5.4/doc/Makefile 2013-01-04 16:17:54.945629457 +0000 @@ -3,7 +3,7 @@ # # Documentation makefile for CUPS. @@ -1132,7 +1132,7 @@ diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile # These coded instructions, statements, and computer programs are the diff -up cups-1.5.4/locale/cups_da.po.str4223 cups-1.5.4/locale/cups_da.po --- cups-1.5.4/locale/cups_da.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_da.po 2012-12-06 12:54:46.490229669 +0000 ++++ cups-1.5.4/locale/cups_da.po 2013-01-04 16:17:54.946629461 +0000 @@ -2759,7 +2759,7 @@ msgstr "Arkivmappe - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1157,7 +1157,7 @@ diff -up cups-1.5.4/locale/cups_da.po.str4223 cups-1.5.4/locale/cups_da.po #~ msgstr "Fixertemperatur høj!" diff -up cups-1.5.4/locale/cups_de.po.str4223 cups-1.5.4/locale/cups_de.po --- cups-1.5.4/locale/cups_de.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_de.po 2012-12-06 12:54:46.504229711 +0000 ++++ cups-1.5.4/locale/cups_de.po 2013-01-04 16:17:54.947629466 +0000 @@ -2760,7 +2760,7 @@ msgstr "Dateiordner – 9/16 x 3 7/16 Zo #, c-format msgid "" @@ -1182,7 +1182,7 @@ diff -up cups-1.5.4/locale/cups_de.po.str4223 cups-1.5.4/locale/cups_de.po #~ msgstr "Die Temperatur des Fixierers ist zu hoch!" diff -up cups-1.5.4/locale/cups_es.po.str4223 cups-1.5.4/locale/cups_es.po --- cups-1.5.4/locale/cups_es.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_es.po 2012-12-06 12:54:46.513229738 +0000 ++++ cups-1.5.4/locale/cups_es.po 2013-01-04 16:17:54.948629471 +0000 @@ -2991,10 +2991,10 @@ msgstr "Carpeta de archivosr - 9/16 x 3 #, c-format msgid "" @@ -1198,7 +1198,7 @@ diff -up cups-1.5.4/locale/cups_es.po.str4223 cups-1.5.4/locale/cups_es.po msgid "Finished page %d." diff -up cups-1.5.4/locale/cups_eu.po.str4223 cups-1.5.4/locale/cups_eu.po --- cups-1.5.4/locale/cups_eu.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_eu.po 2012-12-06 12:54:46.527229780 +0000 ++++ cups-1.5.4/locale/cups_eu.po 2013-01-04 16:17:54.949629475 +0000 @@ -2793,7 +2793,7 @@ msgstr "Fitxategien karpeta - 9/16 x 3 7 #, c-format msgid "" @@ -1223,7 +1223,7 @@ diff -up cups-1.5.4/locale/cups_eu.po.str4223 cups-1.5.4/locale/cups_eu.po #~ msgstr "Fuser-aren tenperatura altua." diff -up cups-1.5.4/locale/cups_fi.po.str4223 cups-1.5.4/locale/cups_fi.po --- cups-1.5.4/locale/cups_fi.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_fi.po 2012-12-06 12:54:46.541229820 +0000 ++++ cups-1.5.4/locale/cups_fi.po 2013-01-04 16:17:54.950629480 +0000 @@ -2759,7 +2759,7 @@ msgstr "Arkistokansio - 9/16 x 3 7/16 \" #, c-format msgid "" @@ -1248,7 +1248,7 @@ diff -up cups-1.5.4/locale/cups_fi.po.str4223 cups-1.5.4/locale/cups_fi.po #~ msgstr "Lämpövastuksen lämpötila on korkea!" diff -up cups-1.5.4/locale/cups_fr.po.str4223 cups-1.5.4/locale/cups_fr.po --- cups-1.5.4/locale/cups_fr.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_fr.po 2012-12-06 12:54:46.555229864 +0000 ++++ cups-1.5.4/locale/cups_fr.po 2013-01-04 16:17:54.951629485 +0000 @@ -2760,7 +2760,7 @@ msgstr "Dossier de fichier - 9/16 x 3 7/ #, c-format msgid "" @@ -1273,7 +1273,7 @@ diff -up cups-1.5.4/locale/cups_fr.po.str4223 cups-1.5.4/locale/cups_fr.po #~ msgstr "Température de l’unité-fusible élevée." diff -up cups-1.5.4/locale/cups_hu.po.str4223 cups-1.5.4/locale/cups_hu.po --- cups-1.5.4/locale/cups_hu.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_hu.po 2012-12-06 12:54:46.564229890 +0000 ++++ cups-1.5.4/locale/cups_hu.po 2013-01-04 16:17:54.951629485 +0000 @@ -2963,10 +2963,10 @@ msgstr "Fájlmappa - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1289,7 +1289,7 @@ diff -up cups-1.5.4/locale/cups_hu.po.str4223 cups-1.5.4/locale/cups_hu.po msgid "Finished page %d." diff -up cups-1.5.4/locale/cups_id.po.str4223 cups-1.5.4/locale/cups_id.po --- cups-1.5.4/locale/cups_id.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_id.po 2012-12-06 12:54:46.577229929 +0000 ++++ cups-1.5.4/locale/cups_id.po 2013-01-04 16:17:54.952629490 +0000 @@ -2791,7 +2791,7 @@ msgstr "Map - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1314,7 +1314,7 @@ diff -up cups-1.5.4/locale/cups_id.po.str4223 cups-1.5.4/locale/cups_id.po #~ msgstr "Suhu fusi tinggi!" diff -up cups-1.5.4/locale/cups_it.po.str4223 cups-1.5.4/locale/cups_it.po --- cups-1.5.4/locale/cups_it.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_it.po 2012-12-06 12:54:46.591229971 +0000 ++++ cups-1.5.4/locale/cups_it.po 2013-01-04 16:17:54.953629494 +0000 @@ -2761,7 +2761,7 @@ msgstr "Cartella documento: 9/16 x 3 7/1 #, c-format msgid "" @@ -1339,7 +1339,7 @@ diff -up cups-1.5.4/locale/cups_it.po.str4223 cups-1.5.4/locale/cups_it.po #~ msgstr "Temperatura del fusibile elevata!" diff -up cups-1.5.4/locale/cups_ja.po.str4223 cups-1.5.4/locale/cups_ja.po --- cups-1.5.4/locale/cups_ja.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_ja.po 2012-12-06 12:54:46.605230013 +0000 ++++ cups-1.5.4/locale/cups_ja.po 2013-01-04 16:17:54.954629498 +0000 @@ -2788,7 +2788,7 @@ msgstr "ファイルフォルダー - 9/ #, c-format msgid "" @@ -1363,7 +1363,7 @@ diff -up cups-1.5.4/locale/cups_ja.po.str4223 cups-1.5.4/locale/cups_ja.po #~ msgid "Fuser temperature high!" diff -up cups-1.5.4/locale/cups_ko.po.str4223 cups-1.5.4/locale/cups_ko.po --- cups-1.5.4/locale/cups_ko.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_ko.po 2012-12-06 12:54:46.619230055 +0000 ++++ cups-1.5.4/locale/cups_ko.po 2013-01-04 16:17:54.955629503 +0000 @@ -2759,7 +2759,7 @@ msgstr "파일 폴더 - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1387,7 +1387,7 @@ diff -up cups-1.5.4/locale/cups_ko.po.str4223 cups-1.5.4/locale/cups_ko.po #~ msgid "Fuser temperature high!" diff -up cups-1.5.4/locale/cups_nl.po.str4223 cups-1.5.4/locale/cups_nl.po --- cups-1.5.4/locale/cups_nl.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_nl.po 2012-12-06 12:54:46.632230094 +0000 ++++ cups-1.5.4/locale/cups_nl.po 2013-01-04 16:17:54.956629508 +0000 @@ -2760,7 +2760,7 @@ msgstr "Dossiermap - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1412,7 +1412,7 @@ diff -up cups-1.5.4/locale/cups_nl.po.str4223 cups-1.5.4/locale/cups_nl.po #~ msgstr "Fusertemperatuur te hoog!" diff -up cups-1.5.4/locale/cups_no.po.str4223 cups-1.5.4/locale/cups_no.po --- cups-1.5.4/locale/cups_no.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_no.po 2012-12-06 12:54:46.646230135 +0000 ++++ cups-1.5.4/locale/cups_no.po 2013-01-04 16:17:54.957629513 +0000 @@ -2759,7 +2759,7 @@ msgstr "Filmappe – 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1437,7 +1437,7 @@ diff -up cups-1.5.4/locale/cups_no.po.str4223 cups-1.5.4/locale/cups_no.po #~ msgstr "Fikseringsenhetens temperatur er høy!" diff -up cups-1.5.4/locale/cups_pl.po.str4223 cups-1.5.4/locale/cups_pl.po --- cups-1.5.4/locale/cups_pl.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_pl.po 2012-12-06 12:54:46.660230177 +0000 ++++ cups-1.5.4/locale/cups_pl.po 2013-01-04 16:17:54.958629517 +0000 @@ -2759,7 +2759,7 @@ msgstr "Folder - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1462,7 +1462,7 @@ diff -up cups-1.5.4/locale/cups_pl.po.str4223 cups-1.5.4/locale/cups_pl.po #~ msgstr "Wysoka temperatura wygrzewacza!" diff -up cups-1.5.4/locale/cups_pt_BR.po.str4223 cups-1.5.4/locale/cups_pt_BR.po --- cups-1.5.4/locale/cups_pt_BR.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_pt_BR.po 2012-12-06 12:54:46.673230216 +0000 ++++ cups-1.5.4/locale/cups_pt_BR.po 2013-01-04 16:17:54.959629521 +0000 @@ -2759,7 +2759,7 @@ msgstr "Pasta de Arquivo - 9/16 x 3 7/16 #, c-format msgid "" @@ -1487,7 +1487,7 @@ diff -up cups-1.5.4/locale/cups_pt_BR.po.str4223 cups-1.5.4/locale/cups_pt_BR.po #~ msgstr "Temperatura do fuser alta!" diff -up cups-1.5.4/locale/cups_pt.po.str4223 cups-1.5.4/locale/cups_pt.po --- cups-1.5.4/locale/cups_pt.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_pt.po 2012-12-06 12:54:46.687230258 +0000 ++++ cups-1.5.4/locale/cups_pt.po 2013-01-04 16:17:54.960629526 +0000 @@ -2759,7 +2759,7 @@ msgstr "Pasta de ficheiros - 9/16 x 3 7/ #, c-format msgid "" @@ -1512,7 +1512,7 @@ diff -up cups-1.5.4/locale/cups_pt.po.str4223 cups-1.5.4/locale/cups_pt.po #~ msgstr "Temperatura do fusor elevada!" diff -up cups-1.5.4/locale/cups_ru.po.str4223 cups-1.5.4/locale/cups_ru.po --- cups-1.5.4/locale/cups_ru.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_ru.po 2012-12-06 12:54:46.700230295 +0000 ++++ cups-1.5.4/locale/cups_ru.po 2013-01-04 16:17:54.961629531 +0000 @@ -2759,7 +2759,7 @@ msgstr "Каталог файла - 9 16 #, c-format msgid "" @@ -1537,7 +1537,7 @@ diff -up cups-1.5.4/locale/cups_ru.po.str4223 cups-1.5.4/locale/cups_ru.po #~ msgstr "Высокая температура термофиксатора!" diff -up cups-1.5.4/locale/cups_sv.po.str4223 cups-1.5.4/locale/cups_sv.po --- cups-1.5.4/locale/cups_sv.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_sv.po 2012-12-06 12:54:46.714230339 +0000 ++++ cups-1.5.4/locale/cups_sv.po 2013-01-04 16:17:54.962629536 +0000 @@ -2759,7 +2759,7 @@ msgstr "Filmapp - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1562,7 +1562,7 @@ diff -up cups-1.5.4/locale/cups_sv.po.str4223 cups-1.5.4/locale/cups_sv.po #~ msgstr "Hög fixeringstemperatur!" diff -up cups-1.5.4/locale/cups_zh.po.str4223 cups-1.5.4/locale/cups_zh.po --- cups-1.5.4/locale/cups_zh.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_zh.po 2012-12-06 12:54:46.728230380 +0000 ++++ cups-1.5.4/locale/cups_zh.po 2013-01-04 16:17:54.963629540 +0000 @@ -2758,7 +2758,7 @@ msgstr "文件夹 - 9/16 x 3 7/16 英寸 #, c-format msgid "" @@ -1586,7 +1586,7 @@ diff -up cups-1.5.4/locale/cups_zh.po.str4223 cups-1.5.4/locale/cups_zh.po #~ msgstr "加热鼓温度过高！" diff -up cups-1.5.4/locale/cups_zh_TW.po.str4223 cups-1.5.4/locale/cups_zh_TW.po --- cups-1.5.4/locale/cups_zh_TW.po.str4223 2012-03-07 21:38:28.000000000 +0000 -+++ cups-1.5.4/locale/cups_zh_TW.po 2012-12-06 12:54:46.742230423 +0000 ++++ cups-1.5.4/locale/cups_zh_TW.po 2013-01-04 16:17:54.964629544 +0000 @@ -2758,7 +2758,7 @@ msgstr "檔案夾 - 9/16 x 3 7/16\"" #, c-format msgid "" @@ -1610,7 +1610,7 @@ diff -up cups-1.5.4/locale/cups_zh_TW.po.str4223 cups-1.5.4/locale/cups_zh_TW.po #~ msgstr "加熱器溫度高！" diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man.in --- cups-1.5.4/man/cupsd.conf.man.in.str4223 2011-05-18 22:33:35.000000000 +0100 -+++ cups-1.5.4/man/cupsd.conf.man.in 2012-12-06 12:54:29.535187330 +0000 ++++ cups-1.5.4/man/cupsd.conf.man.in 2013-01-04 16:17:54.964629544 +0000 @@ -12,12 +12,15 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". @@ -1875,8 +1875,8 @@ diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man. .br http://localhost:631/help diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files.conf.man.in ---- cups-1.5.4/man/cups-files.conf.man.in.str4223 2012-12-06 12:54:29.536187334 +0000 -+++ cups-1.5.4/man/cups-files.conf.man.in 2012-12-06 12:54:29.536187334 +0000 +--- cups-1.5.4/man/cups-files.conf.man.in.str4223 2013-01-04 16:17:54.965629549 +0000 ++++ cups-1.5.4/man/cups-files.conf.man.in 2013-01-04 16:17:54.965629549 +0000 @@ -0,0 +1,146 @@ +.\" +.\" "$Id$" @@ -2026,7 +2026,7 @@ diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files +.\" diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile --- cups-1.5.4/man/Makefile.str4223 2010-06-22 22:21:37.000000000 +0100 -+++ cups-1.5.4/man/Makefile 2012-12-06 12:54:29.536187334 +0000 ++++ cups-1.5.4/man/Makefile 2013-01-04 16:17:54.965629549 +0000 @@ -39,6 +39,7 @@ MAN1 = cancel.$(MAN1EXT) \ ppdpo.$(MAN1EXT) MAN5 = classes.conf.$(MAN5EXT) \ @@ -2037,7 +2037,7 @@ diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile ipptoolfile.$(MAN5EXT) \ diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.list.in --- cups-1.5.4/packaging/cups.list.in.str4223 2012-04-24 00:49:19.000000000 +0100 -+++ cups-1.5.4/packaging/cups.list.in 2012-12-06 12:54:29.536187334 +0000 ++++ cups-1.5.4/packaging/cups.list.in 2013-01-04 16:17:54.965629549 +0000 @@ -588,6 +588,7 @@ d 0755 root $CUPS_GROUP $SERVERROOT/inte d 0755 root $CUPS_GROUP $SERVERROOT/ppd - d 0700 root $CUPS_GROUP $SERVERROOT/ssl - @@ -2048,7 +2048,7 @@ diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.lis %if PAMDIR diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spec.in --- cups-1.5.4/packaging/cups.spec.in.str4223 2012-04-23 18:46:53.000000000 +0100 -+++ cups-1.5.4/packaging/cups.spec.in 2012-12-06 12:54:29.536187334 +0000 ++++ cups-1.5.4/packaging/cups.spec.in 2013-01-04 16:17:54.965629549 +0000 @@ -152,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /etc/cups @@ -2058,8 +2058,8 @@ diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spe %dir /etc/cups/interfaces %dir /etc/cups/ppd diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c ---- cups-1.5.4/scheduler/client.c.str4223 2012-12-06 12:54:29.488187190 +0000 -+++ cups-1.5.4/scheduler/client.c 2012-12-06 12:54:29.537187338 +0000 +--- cups-1.5.4/scheduler/client.c.str4223 2013-01-04 16:17:54.895629226 +0000 ++++ cups-1.5.4/scheduler/client.c 2013-01-04 16:17:54.966629554 +0000 @@ -35,7 +35,7 @@ * data_ready() - Check whether data is available from a client. * encrypt_client() - Enable encryption for the client... @@ -2159,8 +2159,8 @@ diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c /* diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c ---- cups-1.5.4/scheduler/conf.c.str4223 2012-12-06 12:54:29.489187194 +0000 -+++ cups-1.5.4/scheduler/conf.c 2012-12-06 12:54:29.538187341 +0000 +--- cups-1.5.4/scheduler/conf.c.str4223 2013-01-04 16:17:54.896629231 +0000 ++++ cups-1.5.4/scheduler/conf.c 2013-01-04 16:20:49.996314384 +0000 @@ -27,7 +27,8 @@ * parse_fatal_errors() - Parse FatalErrors values in a string. * parse_groups() - Parse system group names in a string. @@ -2292,7 +2292,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c static int read_location(cups_file_t *fp, char *name, int linenum); static int read_policy(cups_file_t *fp, char *name, int linenum); static void set_policy_defaults(cupsd_policy_t *pol); -@@ -708,22 +716,48 @@ cupsdReadConfiguration(void) +@@ -708,21 +716,59 @@ cupsdReadConfiguration(void) cupsdInitEnv(); /* @@ -2307,7 +2307,13 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c + cupsFileClose(fp); + + if (!status) ++ { ++ if (TestConfigFile) ++ printf("%s contains errors\n", CupsFilesFile); ++ else ++ cupsdLogMessage(CUPSD_LOG_CRIT, "Unable to read %s", CupsFilesFile); + return (0); ++ } + } + else if (errno == ENOENT) + cupsdLogMessage(CUPSD_LOG_INFO, "No %s, using defaults.", CupsFilesFile); @@ -2338,15 +2344,20 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c cupsFileClose(fp); if (!status) ++ { ++ if (TestConfigFile) ++ printf("%s contains error\n", ConfigurationFile); ++ else ++ cupsdLogMessage(CUPSD_LOG_CRIT, "Unable to read %s", ConfigurationFile); return (0); - +- - if (!ErrorLog) - cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log"); -- ++ } + RunUser = getuid(); - cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", -@@ -842,6 +876,13 @@ cupsdReadConfiguration(void) +@@ -842,6 +888,13 @@ cupsdReadConfiguration(void) BrowseACL = cupsdFindLocation("CUPS_INTERNAL_BROWSE_ACL"); /* @@ -2360,15 +2371,16 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c * Open the system log for cupsd if necessary... */ -@@ -2512,13 +2553,174 @@ parse_protocols(const char *s) /* I - S +@@ -2512,13 +2565,174 @@ parse_protocols(const char *s) /* I - S /* - * 'read_configuration()' - Read a configuration file. + * 'parse_variable()' - Parse a variable line. -+ */ -+ -+static int /* O - 1 on success, 0 on failure */ + */ + + static int /* O - 1 on success, 0 on failure */ +-read_configuration(cups_file_t *fp) /* I - File to read from */ +parse_variable( + const char *filename, /* I - Name of configuration file */ + int linenum, /* I - Line in configuration file */ @@ -2528,17 +2540,16 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c + +/* + * 'read_cupsd_conf()' - Read the cupsd.conf configuration file. - */ - - static int /* O - 1 on success, 0 on failure */ --read_configuration(cups_file_t *fp) /* I - File to read from */ ++ */ ++ ++static int /* O - 1 on success, 0 on failure */ +read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ { - int i; /* Looping var */ int linenum; /* Current line number */ char line[HTTP_MAX_BUFFER], /* Line from file */ -@@ -2528,7 +2730,6 @@ read_configuration(cups_file_t *fp) /* I +@@ -2528,7 +2742,6 @@ read_configuration(cups_file_t *fp) /* I *value, /* Pointer to value */ *valueptr; /* Pointer into value */ int valuelen; /* Length of value */ @@ -2546,7 +2557,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c http_addrlist_t *addrlist, /* Address list */ *addr; /* Current address */ unsigned ip[4], /* Address value */ -@@ -2538,7 +2739,6 @@ read_configuration(cups_file_t *fp) /* I +@@ -2538,7 +2751,6 @@ read_configuration(cups_file_t *fp) /* I cupsd_location_t *location; /* Browse location */ cups_file_t *incfile; /* Include file */ char incname[1024]; /* Include filename */ @@ -2554,7 +2565,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c /* -@@ -2570,7 +2770,7 @@ read_configuration(cups_file_t *fp) /* I +@@ -2570,7 +2782,7 @@ read_configuration(cups_file_t *fp) /* I incname, strerror(errno)); else { @@ -2563,7 +2574,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c cupsFileClose(incfile); } } -@@ -2594,8 +2794,6 @@ read_configuration(cups_file_t *fp) /* I +@@ -2594,8 +2806,6 @@ read_configuration(cups_file_t *fp) /* I if (linenum == 0) return (0); } @@ -2572,7 +2583,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c else if (!_cups_strcasecmp(line, "FaxRetryInterval") && value) { JobRetryInterval = atoi(value); -@@ -3254,81 +3452,6 @@ read_configuration(cups_file_t *fp) /* I +@@ -3254,81 +3464,6 @@ read_configuration(cups_file_t *fp) /* I } } #endif /* HAVE_SSL */ @@ -2654,7 +2665,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c else if (!_cups_strcasecmp(line, "HostNameLookups") && value) { /* -@@ -3407,22 +3530,6 @@ read_configuration(cups_file_t *fp) /* I +@@ -3407,22 +3542,6 @@ read_configuration(cups_file_t *fp) /* I cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogTimeFormat %s on line %d.", value, linenum); } @@ -2677,7 +2688,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c else if (!_cups_strcasecmp(line, "ServerTokens") && value) { /* -@@ -3548,117 +3655,193 @@ read_configuration(cups_file_t *fp) /* I +@@ -3548,117 +3667,193 @@ read_configuration(cups_file_t *fp) /* I "line %d.", value, linenum); } #endif /* HAVE_SSL */ @@ -2965,8 +2976,8 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c return (1); diff -up cups-1.5.4/scheduler/conf.h.str4223 cups-1.5.4/scheduler/conf.h ---- cups-1.5.4/scheduler/conf.h.str4223 2012-12-06 12:54:29.431187020 +0000 -+++ cups-1.5.4/scheduler/conf.h 2012-12-06 12:54:29.538187341 +0000 +--- cups-1.5.4/scheduler/conf.h.str4223 2013-01-04 16:17:54.769628645 +0000 ++++ cups-1.5.4/scheduler/conf.h 2013-01-04 16:17:54.967629558 +0000 @@ -96,7 +96,9 @@ typedef struct */ @@ -2979,8 +2990,8 @@ diff -up cups-1.5.4/scheduler/conf.h.str4223 cups-1.5.4/scheduler/conf.h /* FQDN for server */ *ServerAdmin VALUE(NULL), diff -up cups-1.5.4/scheduler/ipp.c.str4223 cups-1.5.4/scheduler/ipp.c ---- cups-1.5.4/scheduler/ipp.c.str4223 2012-12-06 12:54:29.519187282 +0000 -+++ cups-1.5.4/scheduler/ipp.c 2012-12-06 12:54:29.539187343 +0000 +--- cups-1.5.4/scheduler/ipp.c.str4223 2013-01-04 16:17:54.916629324 +0000 ++++ cups-1.5.4/scheduler/ipp.c 2013-01-04 16:17:54.968629563 +0000 @@ -2568,7 +2568,7 @@ add_printer(cupsd_client_t *con, /* I - send_ipp_status(con, IPP_NOT_POSSIBLE, _("File device URIs have been disabled. " @@ -2991,8 +3002,8 @@ diff -up cups-1.5.4/scheduler/ipp.c.str4223 cups-1.5.4/scheduler/ipp.c return; } diff -up cups-1.5.4/scheduler/main.c.str4223 cups-1.5.4/scheduler/main.c ---- cups-1.5.4/scheduler/main.c.str4223 2012-12-06 12:54:29.507187246 +0000 -+++ cups-1.5.4/scheduler/main.c 2012-12-06 12:54:29.540187345 +0000 +--- cups-1.5.4/scheduler/main.c.str4223 2013-01-04 16:17:54.910629295 +0000 ++++ cups-1.5.4/scheduler/main.c 2013-01-04 16:21:30.261470296 +0000 @@ -225,7 +225,6 @@ main(int argc, /* I - Number of comm char *current; /* Current directory */ @@ -3067,9 +3078,23 @@ diff -up cups-1.5.4/scheduler/main.c.str4223 cups-1.5.4/scheduler/main.c /* * If the user hasn't specified "-f", run in the background... */ +@@ -512,11 +563,8 @@ main(int argc, /* I - Number of comm + + if (!cupsdReadConfiguration()) + { +- if (TestConfigFile) +- printf("%s contains errors\n", ConfigurationFile); +- else +- syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!", +- ConfigurationFile); ++ if (!TestConfigFile) ++ syslog(LOG_LPR, "Unable to read configuration file - exiting!"); + return (1); + } + else if (TestConfigFile) diff -up cups-1.5.4/test/run-stp-tests.sh.str4223 cups-1.5.4/test/run-stp-tests.sh --- cups-1.5.4/test/run-stp-tests.sh.str4223 2012-05-15 15:04:18.000000000 +0100 -+++ cups-1.5.4/test/run-stp-tests.sh 2012-12-06 12:54:29.540187345 +0000 ++++ cups-1.5.4/test/run-stp-tests.sh 2013-01-04 16:17:54.969629568 +0000 @@ -337,25 +337,10 @@ fi cat >/tmp/cups-$user/cupsd.conf < 1:1.5.4-18 +- Avoid misleading error message when configuration cannot be read. + * Thu Dec 6 2012 Tim Waugh 1:1.5.4-17 - Additional fix relating to CVE-2012-5519 to avoid misleading error message about actions to take to enable file device URIs.