rpms/cups/FC-5 cups-svn.patch,NONE,1.1 cups.spec,1.165,1.166
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 25 22:32:42 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4593
Modified Files:
cups.spec
Added Files:
cups-svn.patch
Log Message:
- Sync from svn5460 to svn5462.
cups-svn.patch:
0 files changed
--- NEW FILE cups-svn.patch ---
only in patch2:
--- backend/snmp.c (revision 5460)
+++ backend/snmp.c (working copy)
@@ -1436 +1436 @@
- printf("network %s \"%s\" \"%s\" \"%s\"\n",
+ printf("network %s \"%s\" \"%s %s\" \"%s\"\n",
@@ -1438,0 +1439 @@
+ cache->make_and_model ? cache->make_and_model : "Unknown",
only in patch2:
--- CHANGES.txt (revision 5460)
+++ CHANGES.txt (working copy)
@@ -1 +1 @@
-CHANGES.txt - 2006-04-24
+CHANGES.txt - 2006-04-25
@@ -3,0 +4,9 @@
+CHANGES IN CUPS V1.2
+
+ - Printer names containing "+" were not quoted properly in
+ the web interface (STR #1600)
+ - The SNMP backend now reports the make and model in the
+ information string so that the auto-generated printer
+ name is more useful than just an IP address.
+
+
only in patch2:
--- templates/ja/classes.tmpl (revision 5460)
+++ templates/ja/classes.tmpl (working copy)
@@ -22 +22 @@
-<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=start-class&printer_name={%printer_name}&is_class=Y">
@@ -25 +25 @@
-<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&printer_name={%printer_name}&is_class=Y">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}&is_class=Y">
@@ -32 +32 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}&is_class=Y">
@@ -35 +35 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}&is_class=Y">
@@ -38 +38 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1&is_class=Y">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0&is_class=Y">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=modify-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=delete-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&printer_name={%printer_name}">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}&is_class=Y">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}&is_class=Y">
only in patch2:
--- templates/ja/printers.tmpl (revision 5460)
+++ templates/ja/printers.tmpl (working copy)
@@ -22 +22 @@
-<A HREF="{admin_uri}?op=start-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&printer_name={%printer_name}">
@@ -25 +25 @@
-<A HREF="{admin_uri}?op=stop-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}">
@@ -32 +32 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}">
@@ -35 +35 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={%printer_name}">
@@ -37 +37 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}">
@@ -40 +40 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1">
@@ -43 +43 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=modify-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&printer_name={%printer_name}">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-printer-options&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&printer_name={%printer_name}">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=delete-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
only in patch2:
--- templates/classes.tmpl (revision 5460)
+++ templates/classes.tmpl (working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=start-class&printer_name={%printer_name}&is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&printer_name={%printer_name}&is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}&is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}&is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}&is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1&is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0&is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}&is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}&is_class=Y">
only in patch2:
--- templates/printers.tmpl (revision 5460)
+++ templates/printers.tmpl (working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
only in patch2:
--- templates/sv/classes.tmpl (revision 5460)
+++ templates/sv/classes.tmpl (working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=start-class&printer_name={%printer_name}&is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&printer_name={%printer_name}&is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}&is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}&is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}&is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1&is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0&is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}&is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}&is_class=Y">
only in patch2:
--- templates/sv/printers.tmpl (revision 5460)
+++ templates/sv/printers.tmpl (working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
only in patch2:
--- templates/pl/classes.tmpl (revision 5460)
+++ templates/pl/classes.tmpl (working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=start-class&printer_name={%printer_name}&is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&printer_name={%printer_name}&is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}&is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}&is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}&is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1&is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0&is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}&is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}&is_class=Y">
only in patch2:
--- templates/pl/printers.tmpl (revision 5460)
+++ templates/pl/printers.tmpl (working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
only in patch2:
--- templates/es/classes.tmpl (revision 5460)
+++ templates/es/classes.tmpl (working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=start-class&printer_name={%printer_name}&is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&printer_name={%printer_name}&is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}&is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}&is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}&is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1&is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0&is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0&is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}&is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}&is_class=Y">
only in patch2:
--- templates/es/printers.tmpl (revision 5460)
+++ templates/es/printers.tmpl (working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0">
+<A HREF="{admin_uri}?op=set-sharing&printer_name={%printer_name}&shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
only in patch2:
--- cgi-bin/template.c (revision 5460)
+++ cgi-bin/template.c (working copy)
@@ -46,0 +47 @@
+static void cgi_puturi(const char *s, FILE *out);
@@ -237,0 +239 @@
+ int uriencode; /* Encode as URI */
@@ -255,0 +258,2 @@
+ uriencode = 0;
+
@@ -258,0 +263,2 @@
+ else if (s == name && ch == '%')
+ uriencode = 1;
@@ -402 +408,6 @@
- cgi_puts(outptr, out);
+ {
+ if (uriencode)
+ cgi_puturi(outptr, out);
+ else
+ cgi_puts(outptr, out);
+ }
@@ -640,0 +652,20 @@
+ * 'cgi_puturi()' - Put a URI string to the output file, quoting as needed...
+ */
+
+static void
+cgi_puturi(const char *s, /* I - String to output */
+ FILE *out) /* I - Output file */
+{
+ while (*s)
+ {
+ if (strchr("%&+ <>#=", *s) || *s & 128)
+ fprintf(out, "%%%02X", *s & 255);
+ else
+ putc(*s, out);
+
+ s ++;
+ }
+}
+
+
+/*
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- cups.spec 25 Apr 2006 14:11:48 -0000 1.165
+++ cups.spec 25 Apr 2006 22:32:28 -0000 1.166
@@ -22,6 +22,7 @@
Source11: cups.conf
Source12: cups.cron
Source13: pdftops.conf
+Patch0: cups-svn.patch
Patch1: cups-1.1.15-initscript.patch
Patch2: cups-no-gzip-man.patch
Patch3: cups-1.1.16-system-auth.patch
@@ -115,6 +116,7 @@
%prep
%setup -q -n %{name}-%{version}%{beta}
+%patch0 -p0 -b .svn
%patch1 -p1 -b .noinit
%patch2 -p1 -b .no-gzip-man
%patch3 -p1 -b .system-auth
@@ -396,6 +398,7 @@
- Own /var/run/cups (bug #189561).
- Patch pdftops to understand 'includeifexists', and use that in the
pdftops.conf file (bug #189809).
+- Sync from svn5460 to svn5462.
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
- 1.2rc3.
More information about the fedora-cvs-commits
mailing list