From 85b5d1dfa791308c7de8ca4195f8ccda256b92c3 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 1 Jul 2009 16:36:51 +0000 Subject: [PATCH] Merge fixes from CUPS 1.4.0 (r8739). git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1586 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 3 ++- CREDITS.txt | 3 ++- Makefile | 1 + backend/usb-darwin.c | 2 +- cgi-bin/makedocset.c | 16 ++++++++++++---- cups/http.c | 14 ++++++++++++-- desktop/cups.desktop.in | 2 ++ templates/de/option-boolean.tmpl | 2 +- templates/de/option-pickmany.tmpl | 2 +- templates/de/option-pickone.tmpl | 2 +- templates/es/option-boolean.tmpl | 2 +- templates/es/option-pickmany.tmpl | 2 +- templates/es/option-pickone.tmpl | 2 +- templates/ja/option-boolean.tmpl | 2 +- templates/ja/option-pickmany.tmpl | 2 +- templates/ja/option-pickone.tmpl | 2 +- templates/option-boolean.tmpl | 2 +- templates/option-pickmany.tmpl | 2 +- templates/option-pickone.tmpl | 2 +- templates/pl/option-boolean.tmpl | 2 +- templates/pl/option-pickmany.tmpl | 2 +- templates/pl/option-pickone.tmpl | 2 +- templates/ru/option-boolean.tmpl | 2 +- templates/ru/option-pickmany.tmpl | 2 +- templates/ru/option-pickone.tmpl | 2 +- 25 files changed, 50 insertions(+), 27 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3a4064985..7704d0ab3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,10 +1,11 @@ -CHANGES.txt - 2009-06-26 +CHANGES.txt - 2009-07-01 ------------------------ CHANGES IN CUPS V1.4.0 - Localization updates (STR #3223) - Documentation updates (STR #3225, STR #3230) + - The web interface didn't show the default options (STR #3244) - The IPP and LPD backends needed print data before they would do an SNMP query. - Fixed a GNU TLS compatibility issue (STR #3231) diff --git a/CREDITS.txt b/CREDITS.txt index c7dbdfad3..2fefcb458 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1,4 +1,4 @@ -CREDITS.txt - 2008-12-08 +CREDITS.txt - 2009-07-01 ------------------------ Few projects are completed by one person, and CUPS is no exception. We'd @@ -28,6 +28,7 @@ like to thank the following individuals for their contributions: Jason McMullan - Original CUPS RPM distributions. Wes Morgan - *BSD fixes. Daniel Nylander - Swedish localization. + Niklas 'Nille' kerstršm - Swedish localization. Giulio Orsero - Bug fixes and testing. Michal Osowiecki - Polish localization. Citra Paska - Indonesian localization. diff --git a/Makefile b/Makefile index e1929711c..586c9e6cd 100644 --- a/Makefile +++ b/Makefile @@ -392,6 +392,7 @@ docset: apihelp echo Indexing docset... /Developer/usr/bin/docsetutil index org.cups.docset echo Generating docset archive and feed... + $(RM) org.cups.docset.atom /Developer/usr/bin/docsetutil package --output org.cups.docset.xar \ --atom org.cups.docset.atom \ --download-url http://www.cups.org/org.cups.docset.xar \ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 7bc37f75c..21c8edec5 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1165,7 +1165,7 @@ static Boolean list_device_cb(void *refcon, snprintf(optionsstr, sizeof(optionsstr), "?location=%x", (unsigned)deviceLocation); httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr); - strncat(uristr, optionsstr, sizeof(uristr)); + strlcat(uristr, optionsstr, sizeof(uristr)); cupsBackendReport("direct", uristr, make_modelstr, make_modelstr, idstr, NULL); diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 501b1f499..7d90c8073 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -357,7 +357,7 @@ write_index(const char *path, /* I - File to write */ static void write_info(const char *path, /* I - File to write */ - const char *revision) /* I - Version number */ + const char *revision) /* I - Subversion revision number */ { cups_file_t *fp; /* File */ @@ -379,14 +379,22 @@ write_info(const char *path, /* I - File to write */ "\tCFBundleName\n" "\tCUPS Documentation\n" "\tCFBundleVersion\n" - "\t1.4.%s\n" + "\t%d.%d.%s\n" + "\tCFBundleShortVersionString\n" + "\t%d.%d.%d\n" "\tDocSetFeedName\n" "\tcups.org\n" "\tDocSetFeedURL\n" - "\thttp://www.cups.org/org.cups.docset.xar" + "\thttp://www.cups.org/org.cups.docset.atom" "\n" + "\tDocSetPublisherIdentifier\n" + "\torg.cups\n" + "\tDocSetPublisherName\n" + "\tCUPS\n" "\n" - "\n", revision); + "\n", + CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision, + CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH); cupsFileClose(fp); } diff --git a/cups/http.c b/cups/http.c index a607581a4..f2f37a731 100644 --- a/cups/http.c +++ b/cups/http.c @@ -3004,6 +3004,11 @@ http_setup_ssl(http_t *http) /* I - Connection to server */ http->error = errno; http->status = HTTP_ERROR; + gnutls_deinit(conn->session); + gnutls_certificate_free_credentials(*credentials); + free(credentials); + free(conn); + return (-1); } @@ -3138,6 +3143,13 @@ http_upgrade(http_t *http) /* I - Connection to server */ DEBUG_printf(("7http_upgrade(%p)", http)); + /* + * Flush the connection to make sure any previous "Upgrade" message + * has been read. + */ + + httpFlush(http); + /* * Copy the HTTP data to a local variable so we can do the OPTIONS * request without interfering with the existing request data... @@ -3165,8 +3177,6 @@ http_upgrade(http_t *http) /* I - Connection to server */ while (httpUpdate(http) == HTTP_CONTINUE); } - httpFlush(http); - /* * Restore the HTTP request data... */ diff --git a/desktop/cups.desktop.in b/desktop/cups.desktop.in index 4609b737b..947a6852d 100644 --- a/desktop/cups.desktop.in +++ b/desktop/cups.desktop.in @@ -29,6 +29,8 @@ Name[pl.UTF-8]=Zarządzanie drukowaniem Comment[pl.UTF-8]=Interfejs WWW CUPS Name[ru.UTF-8]=Настройка печати Comment[ru.UTF-8]=Настройка CUPS +Name[sv.UTF-8]=Hantera skrivare +Comment[sv.UTF-8]=CUPS webb-gränssnitt Name[zh.UTF-8]=打印机管理 Comment[zh.UTF-8]=CUPS网页界面 Name[zh_TW.UTF-8]=印表管理 diff --git a/templates/de/option-boolean.tmpl b/templates/de/option-boolean.tmpl index 2d0dd551a..1b352bb1f 100644 --- a/templates/de/option-boolean.tmpl +++ b/templates/de/option-boolean.tmpl @@ -1,6 +1,6 @@ {keytext}: -{[choices]{text}} +{[choices]{text}} diff --git a/templates/de/option-pickmany.tmpl b/templates/de/option-pickmany.tmpl index 067075aec..0da75e5d2 100644 --- a/templates/de/option-pickmany.tmpl +++ b/templates/de/option-pickmany.tmpl @@ -1,6 +1,6 @@ {keytext}: diff --git a/templates/de/option-pickone.tmpl b/templates/de/option-pickone.tmpl index e467d5fd5..c88fe0599 100644 --- a/templates/de/option-pickone.tmpl +++ b/templates/de/option-pickone.tmpl @@ -1,7 +1,7 @@ {keytext}: {iscustom=1?{[params] diff --git a/templates/es/option-boolean.tmpl b/templates/es/option-boolean.tmpl index 2d0dd551a..1b352bb1f 100644 --- a/templates/es/option-boolean.tmpl +++ b/templates/es/option-boolean.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/es/option-pickmany.tmpl b/templates/es/option-pickmany.tmpl index 067075aec..0da75e5d2 100644 --- a/templates/es/option-pickmany.tmpl +++ b/templates/es/option-pickmany.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/es/option-pickone.tmpl b/templates/es/option-pickone.tmpl index 618ee9d99..8690af054 100644 --- a/templates/es/option-pickone.tmpl +++ b/templates/es/option-pickone.tmpl @@ -1,7 +1,7 @@
{paramtext}:
{keytext}: -{[choices]{text}} +{[choices]{text}}
{keytext}:
{keytext}: {iscustom=1?{[params] diff --git a/templates/ja/option-boolean.tmpl b/templates/ja/option-boolean.tmpl index 2d0dd551a..1b352bb1f 100644 --- a/templates/ja/option-boolean.tmpl +++ b/templates/ja/option-boolean.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/ja/option-pickmany.tmpl b/templates/ja/option-pickmany.tmpl index 067075aec..0da75e5d2 100644 --- a/templates/ja/option-pickmany.tmpl +++ b/templates/ja/option-pickmany.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/ja/option-pickone.tmpl b/templates/ja/option-pickone.tmpl index 8b0a60d0f..e927e7ca8 100644 --- a/templates/ja/option-pickone.tmpl +++ b/templates/ja/option-pickone.tmpl @@ -1,7 +1,7 @@
{paramtext}:
{keytext}: -{[choices]{text}} +{[choices]{text}}
{keytext}:
{keytext}: {iscustom=1?{[params] diff --git a/templates/option-boolean.tmpl b/templates/option-boolean.tmpl index 2d0dd551a..1b352bb1f 100644 --- a/templates/option-boolean.tmpl +++ b/templates/option-boolean.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/option-pickmany.tmpl b/templates/option-pickmany.tmpl index 067075aec..0da75e5d2 100644 --- a/templates/option-pickmany.tmpl +++ b/templates/option-pickmany.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/option-pickone.tmpl b/templates/option-pickone.tmpl index 05b83ee8a..5030c4637 100644 --- a/templates/option-pickone.tmpl +++ b/templates/option-pickone.tmpl @@ -1,7 +1,7 @@
{paramtext}:
{keytext}: -{[choices]{text}} +{[choices]{text}}
{keytext}:
{keytext}: {iscustom=1?{[params] diff --git a/templates/pl/option-boolean.tmpl b/templates/pl/option-boolean.tmpl index 2d0dd551a..1b352bb1f 100644 --- a/templates/pl/option-boolean.tmpl +++ b/templates/pl/option-boolean.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/pl/option-pickmany.tmpl b/templates/pl/option-pickmany.tmpl index 067075aec..0da75e5d2 100644 --- a/templates/pl/option-pickmany.tmpl +++ b/templates/pl/option-pickmany.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/pl/option-pickone.tmpl b/templates/pl/option-pickone.tmpl index 93100729c..db40015ea 100644 --- a/templates/pl/option-pickone.tmpl +++ b/templates/pl/option-pickone.tmpl @@ -1,7 +1,7 @@
{paramtext}:
{keytext}: -{[choices]{text}} +{[choices]{text}}
{keytext}:
{keytext}: {iscustom=1?{[params] diff --git a/templates/ru/option-boolean.tmpl b/templates/ru/option-boolean.tmpl index 2d0dd551a..1b352bb1f 100644 --- a/templates/ru/option-boolean.tmpl +++ b/templates/ru/option-boolean.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/ru/option-pickmany.tmpl b/templates/ru/option-pickmany.tmpl index 067075aec..0da75e5d2 100644 --- a/templates/ru/option-pickmany.tmpl +++ b/templates/ru/option-pickmany.tmpl @@ -1,6 +1,6 @@ diff --git a/templates/ru/option-pickone.tmpl b/templates/ru/option-pickone.tmpl index b511ec946..f2dbb5eb7 100644 --- a/templates/ru/option-pickone.tmpl +++ b/templates/ru/option-pickone.tmpl @@ -1,7 +1,7 @@
{paramtext}:
{keytext}: -{[choices]{text}} +{[choices]{text}}
{keytext}:
{keytext}: {iscustom=1?{[params] -- 2.39.2
{paramtext}: