diff --git a/cups-str3440.patch b/cups-str3440.patch new file mode 100644 index 0000000..9dfd56b --- /dev/null +++ b/cups-str3440.patch @@ -0,0 +1,104 @@ +diff -up cups-1.4.2/cgi-bin/admin.c.str3440 cups-1.4.2/cgi-bin/admin.c +--- cups-1.4.2/cgi-bin/admin.c.str3440 2009-12-08 10:10:05.529157178 +0000 ++++ cups-1.4.2/cgi-bin/admin.c 2009-12-08 10:10:12.571033051 +0000 +@@ -3436,6 +3436,16 @@ do_set_options(http_t *http, /* I - HTT + { + cgiSetArray("ckeyword", k, option->keyword); + cgiSetArray("ckeytext", k, option->text); ++ ++ for (m = 0; m < option->num_choices; m ++) ++ { ++ if (option->choices[m].marked) ++ { ++ cgiSetArray("cchoice", k, option->choices[m].text); ++ break; ++ } ++ } ++ + k ++; + } + +diff -up cups-1.4.2/templates/de/option-conflict.tmpl.str3440 cups-1.4.2/templates/de/option-conflict.tmpl +--- cups-1.4.2/templates/de/option-conflict.tmpl.str3440 2009-04-03 16:55:28.000000000 +0100 ++++ cups-1.4.2/templates/de/option-conflict.tmpl 2009-12-08 10:10:12.567157789 +0000 +@@ -1,7 +1,7 @@ +

Error: The following options are conflicting:

+ + + +

Bitte ändern sie eine oder mehrere Einstellungen um die Konflikte zu lösen.

+diff -up cups-1.4.2/templates/es/option-conflict.tmpl.str3440 cups-1.4.2/templates/es/option-conflict.tmpl +--- cups-1.4.2/templates/es/option-conflict.tmpl.str3440 2008-12-08 21:20:06.000000000 +0000 ++++ cups-1.4.2/templates/es/option-conflict.tmpl 2009-12-08 10:10:12.568157603 +0000 +@@ -1,7 +1,7 @@ +

Error: Las siguientes opciones están en conflicto:

+ + + +

Cambie una o más de las opciones para resolver el problema.

+diff -up cups-1.4.2/templates/eu/option-conflict.tmpl.str3440 cups-1.4.2/templates/eu/option-conflict.tmpl +--- cups-1.4.2/templates/eu/option-conflict.tmpl.str3440 2009-07-07 17:52:34.000000000 +0100 ++++ cups-1.4.2/templates/eu/option-conflict.tmpl 2009-12-08 10:10:12.569157261 +0000 +@@ -1,7 +1,7 @@ +

Errorea: honako aukerak gatazkan daude:

+ + + +

Aldatu aukera bat edo gehiago gatazkak ebazteko.

+diff -up cups-1.4.2/templates/ja/option-conflict.tmpl.str3440 cups-1.4.2/templates/ja/option-conflict.tmpl +--- cups-1.4.2/templates/ja/option-conflict.tmpl.str3440 2009-02-17 19:04:25.000000000 +0000 ++++ cups-1.4.2/templates/ja/option-conflict.tmpl 2009-12-08 10:10:12.566157419 +0000 +@@ -1,7 +1,7 @@ +

エラー: 以下のオプションは競合します:

+ + + +

競合を解決するために、1 つ以上のオプションを変更してください。

+diff -up cups-1.4.2/templates/option-conflict.tmpl.str3440 cups-1.4.2/templates/option-conflict.tmpl +--- cups-1.4.2/templates/option-conflict.tmpl.str3440 2005-08-24 20:25:49.000000000 +0100 ++++ cups-1.4.2/templates/option-conflict.tmpl 2009-12-08 10:10:12.566157419 +0000 +@@ -1,7 +1,7 @@ +

Error: The following options are conflicting:

+ + + +

Please change one or more of the options to resolve the conflicts.

+diff -up cups-1.4.2/templates/pl/option-conflict.tmpl.str3440 cups-1.4.2/templates/pl/option-conflict.tmpl +--- cups-1.4.2/templates/pl/option-conflict.tmpl.str3440 2009-02-25 16:48:35.000000000 +0000 ++++ cups-1.4.2/templates/pl/option-conflict.tmpl 2009-12-08 10:10:12.567157789 +0000 +@@ -1,7 +1,7 @@ +

Błąd: następujące opcje są w konflikcie ze sobą:

+ + + +

Proszę zmienić jedną lub więcej opcji, aby rozwiązać konflikt.

+diff -up cups-1.4.2/templates/ru/option-conflict.tmpl.str3440 cups-1.4.2/templates/ru/option-conflict.tmpl +--- cups-1.4.2/templates/ru/option-conflict.tmpl.str3440 2009-02-17 19:04:25.000000000 +0000 ++++ cups-1.4.2/templates/ru/option-conflict.tmpl 2009-12-08 10:10:12.567157789 +0000 +@@ -1,7 +1,7 @@ +

Ошибка: следующие параметры конфликтуют:

+ + + +

Измените один или несколько параметров для того, чтобы избежать конфликта.

diff --git a/cups.spec b/cups.spec index 948ec30..e1cb5bc 100644 --- a/cups.spec +++ b/cups.spec @@ -9,7 +9,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -63,6 +63,7 @@ Patch49: cups-CVE-2009-3553.patch Patch50: cups-str3422.patch Patch51: cups-str3413.patch Patch52: cups-str3439.patch +Patch53: cups-str3440.patch Patch100: cups-lspp.patch Epoch: 1 @@ -230,6 +231,7 @@ module. %patch50 -p1 -b .str3422 %patch51 -p1 -b .str3413 %patch52 -p1 -b .str3439 +%patch53 -p1 -b .str3440 %if %lspp %patch100 -p1 -b .lspp @@ -521,9 +523,12 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog -* Tue Dec 8 2009 Tim Waugh - 1:1.4.2-13 +* Tue Dec 8 2009 Tim Waugh - 1:1.4.2-14 +- Show conflicting option values in web UI (bug #544326, STR #3440). - Use upstream fix for adjustment of conflicting options (bug #533426, STR #3439). + +* Tue Dec 8 2009 Tim Waugh - 1:1.4.2-13 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348). * Fri Dec 4 2009 Tim Waugh - 1:1.4.2-12