rpms/cups/devel cups-str2121.patch, NONE, 1.1 cups.spec, 1.304, 1.305 cups-translate-prompt.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 7 13:49:57 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20429
Modified Files:
cups.spec
Added Files:
cups-str2121.patch
Removed Files:
cups-translate-prompt.patch
Log Message:
* Thu Dec 7 2006 Tim Waugh <twaugh at redhat.com>
- Use upstream patch for STR #2121.
cups-str2121.patch:
auth.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
--- NEW FILE cups-str2121.patch ---
--- cups-1.2.7/cups/auth.c.str2121 2006-09-16 20:08:36.000000000 +0100
+++ cups-1.2.7/cups/auth.c 2006-12-07 13:15:15.000000000 +0000
@@ -75,6 +75,7 @@
realm[HTTP_MAX_VALUE], /* realm="xyz" string */
nonce[HTTP_MAX_VALUE], /* nonce="xyz" string */
encode[512]; /* Encoded username:password */
+ _cups_globals_t *cg; /* Global data */
DEBUG_printf(("cupsDoAuthentication(http=%p, method=\"%s\", resource=\"%s\")\n",
@@ -114,8 +115,15 @@
* Nope - get a new password from the user...
*/
- snprintf(prompt, sizeof(prompt), _("Password for %s on %s? "), cupsUser(),
- http->hostname[0] == '/' ? "localhost" : http->hostname);
+ cg = _cupsGlobals();
+
+ if (!cg->lang_default)
+ cg->lang_default = cupsLangDefault();
+
+ snprintf(prompt, sizeof(prompt),
+ _cupsLangString(cg->lang_default, _("Password for %s on %s? ")),
+ cupsUser(),
+ http->hostname[0] == '/' ? "localhost" : http->hostname);
http->digest_tries = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Digest", 5) != 0;
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- cups.spec 29 Nov 2006 13:50:22 -0000 1.304
+++ cups.spec 7 Dec 2006 13:49:55 -0000 1.305
@@ -45,7 +45,7 @@
Patch19: cups-eggcups.patch
Patch20: cups-getpass.patch
Patch21: cups-driverd-timeout.patch
-Patch22: cups-translate-prompt.patch
+Patch22: cups-str2121.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -149,7 +149,7 @@
%patch19 -p1 -b .eggcups
%patch20 -p1 -b .getpass
%patch21 -p1 -b .driverd-timeout
-%patch22 -p1 -b .translate-prompt
+%patch22 -p1 -b .str2121
%if %lspp
%patch100 -p1 -b .lspp
@@ -432,6 +432,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Thu Dec 7 2006 Tim Waugh <twaugh at redhat.com>
+- Use upstream patch for STR #2121.
+
* Mon Nov 27 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.7-5
- Better LSPP fix for bug #216855.
--- cups-translate-prompt.patch DELETED ---
More information about the fedora-cvs-commits
mailing list