wellton/cups
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Merge changes from CUPS 1.4svn-r7961.

Ver Código-Fonte 
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be
Esse commit está contido em:
msweet
2008-09-17 19:54:07 +00:00
pai 49d8745278
commit b19ccc9e27
194 arquivos alterados com 2667 adições e 2323 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
CHANGES-1.3.txt
+11 -1
Ver Arquivo
@@ -3,7 +3,17 @@ CHANGES-1.3.txt
CHANGES IN CUPS V1.3.9
- Documentation updates (STR #2904)
- Documentation updates (STR #2904, STR #2944)
- The scheduler incorrectly resolved the client connection
address when HostNameLookups was set to Off (STR #2946)
- The IPP backend incorrectly stopped the local queue if
the remote server reported the "paused" state.
- The cupsGetDests() function did not catch all types of
request errors.
- The scheduler did not always log "job queued" messages
(STR #2943)
- The scheduler did not support destination filtering using
the printer-location attribute properly (STR #2945)
- The scheduler did not send the server-started,
server-restarted, or server-stopped events (STR #2927)
- The scheduler no longer enforces configuration file
CHANGES.txt
+5
Ver Arquivo
@@ -3,6 +3,11 @@ CHANGES.txt - 2008-09-10
CHANGES IN CUPS V1.4b1
- Documentation updates (STR #2567)
- Added support for printer filtering by the cupsfilter
command (STR #2562)
- Added a SSLOptions directive to allow Windows clients to
talk to CUPS in FIPS mode (STR #2827)
- Renamed the accept and reject commands to cupsaccept and
cupsreject; the old names are still available (STR #2936)
- The locale/translate utility needed an update to work with
Makedefs.in
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
#
# Common makefile definitions for the Common UNIX Printing System (CUPS).
#
@@ -286,5 +286,5 @@ DBUSDIR = @DBUSDIR@
#
# End of "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
#
Makefile
+3 -3
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7613 2008-05-22 23:27:52Z mike $"
# "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $"
#
# Top-level Makefile for the Common UNIX Printing System (CUPS).
#
@@ -115,7 +115,7 @@ distclean: clean
$(RM) man/client.conf.man
$(RM) man/cups-deviced.man man/cups-driverd.man
$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
$(RM) man/cupsd.conf.man man/lpoptions.man
$(RM) man/cupsd.conf.man man/drv.man man/lpoptions.man
$(RM) packaging/cups.list
$(RM) templates/header.tmpl
$(RM) desktop/cups.desktop
@@ -374,5 +374,5 @@ dist: all
#
# End of "$Id: Makefile 7613 2008-05-22 23:27:52Z mike $".
# End of "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $".
#
backend/Makefile
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7687 2008-06-24 01:28:36Z mike $"
# "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $"
#
# Backend makefile for the Common UNIX Printing System (CUPS).
#
@@ -277,5 +277,5 @@ include Dependencies
#
# End of "$Id: Makefile 7687 2008-06-24 01:28:36Z mike $".
# End of "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $".
#
backend/backend-private.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: backend-private.h 7586 2008-05-16 23:39:39Z mike $"
* "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $"
*
* Backend support definitions for the Common UNIX Printing System (CUPS).
*
@@ -275,5 +275,5 @@ extern int backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
/*
* End of "$Id: backend-private.h 7586 2008-05-16 23:39:39Z mike $".
* End of "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $".
*/
backend/ipp.c
+3 -3
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: ipp.c 7583 2008-05-16 17:47:16Z mike $"
* "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
@@ -1633,7 +1633,7 @@ report_printer_state(ipp_t *ipp, /* I - IPP response */
{
reason = reasons->values[i].string.text;
if (job_id == 0 || strcmp(reason, "paused"))
if (strcmp(reason, "paused"))
{
strlcat(state, prefix, sizeof(state));
strlcat(state, reason, sizeof(state));
@@ -1956,5 +1956,5 @@ sigterm_handler(int sig) /* I - Signal */
/*
* End of "$Id: ipp.c 7583 2008-05-16 17:47:16Z mike $".
* End of "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $".
*/
backend/lpd.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: lpd.c 7583 2008-05-16 17:47:16Z mike $"
* "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $"
*
* Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
*
@@ -1384,5 +1384,5 @@ sigterm_handler(int sig) /* I - Signal */
/*
* End of "$Id: lpd.c 7583 2008-05-16 17:47:16Z mike $".
* End of "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $".
*/
backend/pap.c
+1 -1
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: pap.c 7318 2008-02-15 23:24:41Z mike $"
* "$Id: pap.c 7720 2008-07-11 22:46:21Z mike $"
*
* Copyright 2004-2008 Apple Inc. All rights reserved.
*
backend/parallel.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: parallel.c 7343 2008-02-25 19:02:09Z mike $"
* "$Id: parallel.c 7810 2008-07-29 01:11:15Z mike $"
*
* Parallel port backend for the Common UNIX Printing System (CUPS).
*
@@ -684,5 +684,5 @@ side_cb(int print_fd, /* I - Print file */
/*
* End of "$Id: parallel.c 7343 2008-02-25 19:02:09Z mike $".
* End of "$Id: parallel.c 7810 2008-07-29 01:11:15Z mike $".
*/
backend/runloop.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: runloop.c 7647 2008-06-16 17:39:40Z mike $"
* "$Id: runloop.c 7895 2008-09-02 19:19:43Z mike $"
*
* Common run loop APIs for the Common UNIX Printing System (CUPS).
*
@@ -404,5 +404,5 @@ backendRunLoop(
/*
* End of "$Id: runloop.c 7647 2008-06-16 17:39:40Z mike $".
* End of "$Id: runloop.c 7895 2008-09-02 19:19:43Z mike $".
*/
backend/snmp.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: snmp.c 7506 2008-04-29 04:38:47Z mike $"
* "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $"
*
* SNMP discovery backend for the Common UNIX Printing System (CUPS).
*
@@ -1335,5 +1335,5 @@ update_cache(snmp_cache_t *device, /* I - Device */
/*
* End of "$Id: snmp.c 7506 2008-04-29 04:38:47Z mike $".
* End of "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $".
*/
backend/socket.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: socket.c 7583 2008-05-16 17:47:16Z mike $"
* "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $"
*
* AppSocket backend for the Common UNIX Printing System (CUPS).
*
@@ -512,5 +512,5 @@ wait_bc(int device_fd, /* I - Socket */
/*
* End of "$Id: socket.c 7583 2008-05-16 17:47:16Z mike $".
* End of "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $".
*/
backend/usb-darwin.c
+4 -4
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: usb-darwin.c 7460 2008-04-16 02:19:54Z mike $"
* "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $"
*
* Copyright 2005-2008 Apple Inc. All rights reserved.
*
@@ -1811,8 +1811,8 @@ static void run_legacy_backend(int argc,
if (!posix_spawnattr_init(&attrs))
{
posix_spawnattr_setsigdefault(attrs, &oldmask);
if (posix_spawnattr_setbinpref_np(attrs, 1, &cpu, &ocount) || ocount != 1)
posix_spawnattr_setsigdefault(&attrs, &oldmask);
if (posix_spawnattr_setbinpref_np(&attrs, 1, &cpu, &ocount) || ocount != 1)
{
# ifdef __x86_64__
perror("DEBUG: Unable to set binary preference to i386");
@@ -2068,5 +2068,5 @@ static void get_device_id(cups_sc_status_t *status,
/*
* End of "$Id: usb-darwin.c 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $".
*/
backend/usb-unix.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: usb-unix.c 7687 2008-06-24 01:28:36Z mike $"
* "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $"
*
* USB port backend for the Common UNIX Printing System (CUPS).
*
@@ -611,5 +611,5 @@ side_cb(int print_fd, /* I - Print file */
/*
* End of "$Id: usb-unix.c 7687 2008-06-24 01:28:36Z mike $".
* End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $".
*/
berkeley/Makefile
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
#
# Berkeley commands makefile for the Common UNIX Printing System (CUPS).
#
@@ -161,5 +161,5 @@ include Dependencies
#
# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
#
berkeley/lpr.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: lpr.c 7170 2008-01-04 02:21:30Z mike $"
* "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $"
*
* "lpr" command for the Common UNIX Printing System (CUPS).
*
@@ -427,5 +427,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
* End of "$Id: lpr.c 7170 2008-01-04 02:21:30Z mike $".
* End of "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $".
*/
cgi-bin/Makefile
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
#
# CGI makefile for the Common UNIX Printing System (CUPS).
#
@@ -419,5 +419,5 @@ include Dependencies
#
# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
#
cgi-bin/admin.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: admin.c 7438 2008-04-09 03:27:37Z mike $"
* "$Id: admin.c 7888 2008-08-29 21:16:56Z mike $"
*
* Administration CGI for the Common UNIX Printing System (CUPS).
*
@@ -3849,5 +3849,5 @@ match_string(const char *a, /* I - First string */
/*
* End of "$Id: admin.c 7438 2008-04-09 03:27:37Z mike $".
* End of "$Id: admin.c 7888 2008-08-29 21:16:56Z mike $".
*/
cgi-bin/cgi-private.h
+3 -3
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: cgi-private.h 6649 2007-07-11 21:46:42Z mike $"
* "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $"
*
* Private CGI definitions for the Common UNIX Printing System (CUPS).
*
@@ -27,9 +27,9 @@
* Limits...
*/
#define CUPS_PAGE_MAX 10 /* Maximum items per page */
#define CUPS_PAGE_MAX 100 /* Maximum items per page */
/*
* End of "$Id: cgi-private.h 6649 2007-07-11 21:46:42Z mike $".
* End of "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $".
*/
cgi-bin/classes.c
+6 -6
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: classes.c 7301 2008-02-13 00:27:52Z mike $"
* "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $"
*
* Class status CGI for the Common UNIX Printing System (CUPS).
*
@@ -303,12 +303,12 @@ show_all_classes(http_t *http, /* I - Connection to server */
cgiCopyTemplateLang("classes-header.tmpl");
if (count > 0)
if (count > CUPS_PAGE_MAX)
cgiCopyTemplateLang("pager.tmpl");
cgiCopyTemplateLang("classes.tmpl");
if (count > 0)
if (count > CUPS_PAGE_MAX)
cgiCopyTemplateLang("pager.tmpl");
/*
@@ -362,7 +362,7 @@ show_class(http_t *http, /* I - Connection to server */
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
uri);
cgiGetAttributes(request, "classes.tmpl");
cgiGetAttributes(request, "class.tmpl");
/*
* Do the request and get back a response...
@@ -408,7 +408,7 @@ show_class(http_t *http, /* I - Connection to server */
*/
cgiSetVariable("_SINGLE_DEST", "1");
cgiCopyTemplateLang("classes.tmpl");
cgiCopyTemplateLang("class.tmpl");
/*
* Show jobs for the specified class...
@@ -432,5 +432,5 @@ show_class(http_t *http, /* I - Connection to server */
/*
* End of "$Id: classes.c 7301 2008-02-13 00:27:52Z mike $".
* End of "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $".
*/
cgi-bin/help-index.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: help-index.c 7615 2008-05-25 07:17:07Z mike $"
* "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $"
*
* Online help index routines for the Common UNIX Printing System (CUPS).
*
@@ -1327,5 +1327,5 @@ help_sort_words(help_word_t *w1, /* I - Second word */
/*
* End of "$Id: help-index.c 7615 2008-05-25 07:17:07Z mike $".
* End of "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $".
*/
cgi-bin/help.c
+4 -1
Ver Arquivo
@@ -3,7 +3,7 @@
*
* Online help CGI for the Common UNIX Printing System (CUPS).
*
* Copyright 2007 by Apple Inc.
* Copyright 2007-2008 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -359,7 +359,10 @@ main(int argc, /* I - Number of command-line arguments */
*/
if (!printable)
{
cgiCopyTemplateLang("help-trailer.tmpl");
cgiEndHTML();
}
else
puts("</BODY>\n</HTML>");
cgi-bin/ipp-var.c
+4 -4
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: ipp-var.c 7541 2008-05-05 21:22:58Z mike $"
* "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $"
*
* CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
*
@@ -1351,12 +1351,12 @@ cgiShowJobs(http_t *http, /* I - Connection to server */
cgiCopyTemplateLang("jobs-header.tmpl");
if (count > 0)
if (count > CUPS_PAGE_MAX)
cgiCopyTemplateLang("pager.tmpl");
cgiCopyTemplateLang("jobs.tmpl");
if (count > 0)
if (count > CUPS_PAGE_MAX)
cgiCopyTemplateLang("pager.tmpl");
cupsArrayDelete(jobs);
@@ -1384,5 +1384,5 @@ cgiText(const char *message) /* I - Message */
/*
* End of "$Id: ipp-var.c 7541 2008-05-05 21:22:58Z mike $".
* End of "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $".
*/
cgi-bin/printers.c
+6 -6
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: printers.c 7301 2008-02-13 00:27:52Z mike $"
* "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $"
*
* Printer status CGI for the Common UNIX Printing System (CUPS).
*
@@ -472,12 +472,12 @@ show_all_printers(http_t *http, /* I - Connection to server */
cgiCopyTemplateLang("printers-header.tmpl");
if (count > 0)
if (count > CUPS_PAGE_MAX)
cgiCopyTemplateLang("pager.tmpl");
cgiCopyTemplateLang("printers.tmpl");
if (count > 0)
if (count > CUPS_PAGE_MAX)
cgiCopyTemplateLang("pager.tmpl");
/*
@@ -534,7 +534,7 @@ show_printer(http_t *http, /* I - Connection to server */
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
uri);
cgiGetAttributes(request, "printers.tmpl");
cgiGetAttributes(request, "printer.tmpl");
/*
* Do the request and get back a response...
@@ -588,7 +588,7 @@ show_printer(http_t *http, /* I - Connection to server */
*/
cgiSetVariable("_SINGLE_DEST", "1");
cgiCopyTemplateLang("printers.tmpl");
cgiCopyTemplateLang("printer.tmpl");
/*
* Show jobs for the specified printer...
@@ -612,5 +612,5 @@ show_printer(http_t *http, /* I - Connection to server */
/*
* End of "$Id: printers.c 7301 2008-02-13 00:27:52Z mike $".
* End of "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $".
*/
cgi-bin/search.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: search.c 7420 2008-04-01 20:32:00Z mike $"
* "$Id: search.c 7720 2008-07-11 22:46:21Z mike $"
*
* Search routines for the Common UNIX Printing System (CUPS).
*
@@ -377,5 +377,5 @@ cgiFreeSearch(void *search) /* I - Search context */
/*
* End of "$Id: search.c 7420 2008-04-01 20:32:00Z mike $".
* End of "$Id: search.c 7720 2008-07-11 22:46:21Z mike $".
*/
conf/Makefile
+2 -3
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $"
# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $"
#
# Configuration file makefile for the Common UNIX Printing System (CUPS).
#
@@ -70,7 +70,6 @@ install: all install-data install-headers install-libs install-exec
#
install-data:
$(INSTALL_DIR) -m 755 $(SERVERROOT)
for file in $(KEEP); do \
if test -r $(SERVERROOT)/$$file ; then \
$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
@@ -143,5 +142,5 @@ uninstall:
#
# End of "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $".
# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $".
#
conf/cupsd.conf.in
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $"
# "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $"
#
# Sample configuration file for the Common UNIX Printing System (CUPS)
# scheduler. See "man cupsd.conf" for a complete description of this
@@ -120,5 +120,5 @@ DefaultAuthType Basic
</Policy>
#
# End of "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $".
# End of "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $".
#
conf/pam.opendirectory
+5
Ver Arquivo
@@ -0,0 +1,5 @@
# cups: auth account password session
auth required pam_opendirectory.so
account required pam_permit.so
password required pam_deny.so
session required pam_permit.so
conf/pam.darwin → conf/pam.securityserver
Ver Arquivo
config-scripts/cups-common.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-common.m4 7695 2008-06-26 00:46:24Z mike $"
dnl "$Id: cups-common.m4 7900 2008-09-03 13:47:57Z mike $"
dnl
dnl Common configuration stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -349,5 +349,5 @@ AC_SUBST(FONTS)
AC_SUBST(LEGACY_BACKENDS)
dnl
dnl End of "$Id: cups-common.m4 7695 2008-06-26 00:46:24Z mike $".
dnl End of "$Id: cups-common.m4 7900 2008-09-03 13:47:57Z mike $".
dnl
config-scripts/cups-compiler.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-compiler.m4 7644 2008-06-16 17:15:47Z mike $"
dnl "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $"
dnl
dnl Compiler stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -558,5 +558,5 @@ case $uname in
esac
dnl
dnl End of "$Id: cups-compiler.m4 7644 2008-06-16 17:15:47Z mike $".
dnl End of "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $".
dnl
config-scripts/cups-defaults.m4
+3 -3
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-defaults.m4 7649 2008-06-16 17:46:57Z mike $"
dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $"
dnl
dnl Default cupsd configuration settings for the Common UNIX Printing System
dnl (CUPS).
@@ -40,7 +40,7 @@ AC_SUBST(CUPS_LOG_FILE_PERM)
AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
dnl Default FatalErrors
AC_ARG_WITH(fatal_errors, [ --with-fatal-errors set default FatalErrors value, default=config],
AC_ARG_WITH(fatal_errors, [ --with-fatal-errors set default FatalErrors value, default=config],
CUPS_FATAL_ERRORS="$withval",
CUPS_FATAL_ERRORS="config")
AC_SUBST(CUPS_FATAL_ERRORS)
@@ -413,5 +413,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
dnl
dnl End of "$Id: cups-defaults.m4 7649 2008-06-16 17:46:57Z mike $".
dnl End of "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $".
dnl
config-scripts/cups-directories.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-directories.m4 6975 2007-09-18 20:37:09Z mike $"
dnl "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $"
dnl
dnl Directory stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -414,5 +414,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
AC_SUBST(CUPS_STATEDIR)
dnl
dnl End of "$Id: cups-directories.m4 6975 2007-09-18 20:37:09Z mike $".
dnl End of "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $".
dnl
config-scripts/cups-dnssd.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-dnssd.m4 7585 2008-05-16 23:13:47Z mike $"
dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $"
dnl
dnl DNS Service Discovery (aka Bonjour) stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -52,5 +52,5 @@ AC_SUBST(DNSSDLIBS)
AC_SUBST(DNSSD_BACKEND)
dnl
dnl End of "$Id: cups-dnssd.m4 7585 2008-05-16 23:13:47Z mike $".
dnl End of "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $".
dnl
config-scripts/cups-ldap.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-ldap.m4 7241 2008-01-22 22:34:52Z mike $"
dnl "$Id: cups-ldap.m4 7800 2008-07-25 21:01:34Z mike $"
dnl
dnl LDAP configuration stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -48,5 +48,5 @@ AC_SUBST(LIBLDAP)
dnl
dnl End of "$Id: cups-ldap.m4 7241 2008-01-22 22:34:52Z mike $".
dnl End of "$Id: cups-ldap.m4 7800 2008-07-25 21:01:34Z mike $".
dnl
config-scripts/cups-network.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-network.m4 7127 2007-12-17 18:05:32Z mike $"
dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $"
dnl
dnl Networking stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -70,5 +70,5 @@ AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
[#include <netat/appletalk.h>])
dnl
dnl End of "$Id: cups-network.m4 7127 2007-12-17 18:05:32Z mike $".
dnl End of "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $".
dnl
config-scripts/cups-pam.m4
+23 -10
Ver Arquivo
@@ -1,9 +1,9 @@
dnl
dnl "$Id: cups-pam.m4 7149 2007-12-19 19:38:37Z mike $"
dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $"
dnl
dnl PAM stuff for the Common UNIX Printing System (CUPS).
dnl
dnl Copyright 2007 by Apple Inc.
dnl Copyright 2007-2008 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
@@ -14,6 +14,7 @@ dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(pam, [ --enable-pam turn on PAM support, default=yes])
AC_ARG_WITH(pam_module, [ --with-pam-module specify the PAM module to use, default=auto])
dnl Don't use PAM with AIX...
if test $uname = AIX; then
@@ -60,21 +61,33 @@ if test x$enable_pam != xno; then
case "$uname" in
Darwin*)
# Darwin, MacOS X
PAMFILE="pam.darwin"
if test "x$with_pam_module" != x; then
PAMFILE="pam.$with_pam_module"
elif test -f /usr/lib/pam/pam_opendirectory.so; then
PAMFILE="pam.opendirectory"
else
PAMFILE="pam.securityserver"
fi
;;
IRIX)
# SGI IRIX
PAMFILE="pam.irix"
;;
*)
# All others; this test might need to be updated
# as Linux distributors move things around...
for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
if test -f /lib/security/$mod; then
PAMMOD="$mod"
break;
fi
done
if test "x$with_pam_module" != x; then
PAMMOD="pam_${with_pam_module}.so"
else
for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
if test -f /lib/security/$mod; then
PAMMOD="$mod"
break;
fi
done
fi
PAMFILE="pam.std"
;;
@@ -87,5 +100,5 @@ AC_SUBST(PAMLIBS)
AC_SUBST(PAMMOD)
dnl
dnl End of "$Id: cups-pam.m4 7149 2007-12-19 19:38:37Z mike $".
dnl End of "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $".
dnl
config-scripts/cups-scripting.m4
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $"
dnl "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $"
dnl
dnl Scripting configuration stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -96,5 +96,5 @@ if test "x$CUPS_PYTHON" != x; then
fi
dnl
dnl End of "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $".
dnl End of "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $".
dnl
config.h.in
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $"
* "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $"
*
* Configuration file for the Common UNIX Printing System (CUPS).
*
@@ -622,5 +622,5 @@
#endif /* !_CUPS_CONFIG_H_ */
/*
* End of "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $".
* End of "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $".
*/
configure.in
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
dnl
dnl "$Id: configure.in 7600 2008-05-20 21:06:23Z mike $"
dnl "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $"
dnl
dnl Configuration script for the Common UNIX Printing System (CUPS).
dnl
@@ -76,5 +76,5 @@ AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
chmod +x cups-config
dnl
dnl End of "$Id: configure.in 7600 2008-05-20 21:06:23Z mike $".
dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $".
dnl
cups/Makefile
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $"
# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
#
# API library Makefile for the Common UNIX Printing System (CUPS).
#
@@ -622,5 +622,5 @@ include Dependencies
#
# End of "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $".
# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
#
cups/adminutil.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: adminutil.c 7576 2008-05-15 21:05:14Z mike $"
* "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $"
*
* Administration utility API definitions for the Common UNIX Printing
* System (CUPS).
@@ -2430,5 +2430,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */
/*
* End of "$Id: adminutil.c 7576 2008-05-15 21:05:14Z mike $".
* End of "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $".
*/
cups/auth.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: auth.c 7460 2008-04-16 02:19:54Z mike $"
* "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $"
*
* Authentication functions for the Common UNIX Printing System (CUPS).
*
@@ -678,5 +678,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
/*
* End of "$Id: auth.c 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $".
*/
cups/backend.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: backend.h 7282 2008-01-31 08:37:11Z mike $"
* "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $"
*
* Backend definitions for the Common UNIX Printing System (CUPS).
*
@@ -60,5 +60,5 @@ extern void cupsBackendReport(const char *device_scheme,
#endif /* !_CUPS_BACKEND_H_ */
/*
* End of "$Id: backend.h 7282 2008-01-31 08:37:11Z mike $".
* End of "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $".
*/
cups/cups.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: cups.h 7616 2008-05-28 00:34:13Z mike $"
* "$Id: cups.h 7847 2008-08-19 04:22:14Z mike $"
*
* API definitions for the Common UNIX Printing System (CUPS).
*
@@ -314,5 +314,5 @@ extern http_status_t cupsWriteRequestData(http_t *http, const char *buffer,
#endif /* !_CUPS_CUPS_H_ */
/*
* End of "$Id: cups.h 7616 2008-05-28 00:34:13Z mike $".
* End of "$Id: cups.h 7847 2008-08-19 04:22:14Z mike $".
*/
cups/debug.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: debug.h 7460 2008-04-16 02:19:54Z mike $"
* "$Id: debug.h 7701 2008-06-27 22:37:23Z mike $"
*
* Debugging macros for the Common UNIX Printing System (CUPS).
*
@@ -54,5 +54,5 @@ extern void _cups_debug_puts(const char *s);
#endif /* !_CUPS_DEBUG_H_ */
/*
* End of "$Id: debug.h 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: debug.h 7701 2008-06-27 22:37:23Z mike $".
*/
cups/dest.c
+11 -3
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: dest.c 7460 2008-04-16 02:19:54Z mike $"
* "$Id: dest.c 7946 2008-09-16 23:27:54Z mike $"
*
* User-defined destination (and option) support for the Common UNIX
* Printing System (CUPS).
@@ -348,7 +348,15 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
*/
num_dests = cups_get_sdests(http, CUPS_GET_PRINTERS, NULL, num_dests, dests);
num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, NULL, num_dests, dests);
if (cupsLastError() < IPP_REDIRECTION_OTHER_SITE)
num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, NULL, num_dests, dests);
if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
{
cupsFreeDests(num_dests, *dests);
*dests = (cups_dest_t *)0;
return (0);
}
/*
* Make a copy of the "real" queues for a later sanity check...
@@ -1839,5 +1847,5 @@ cups_get_sdests(http_t *http, /* I - Connection to server or CUPS_HTTP_DEFA
/*
* End of "$Id: dest.c 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: dest.c 7946 2008-09-16 23:27:54Z mike $".
*/
cups/emit.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: emit.c 7493 2008-04-24 00:10:34Z mike $"
* "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $"
*
* PPD code emission routines for the Common UNIX Printing System (CUPS).
*
@@ -1149,5 +1149,5 @@ ppd_handle_media(ppd_file_t *ppd) /* I - PPD file */
/*
* End of "$Id: emit.c 7493 2008-04-24 00:10:34Z mike $".
* End of "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $".
*/
cups/globals.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: globals.c 7460 2008-04-16 02:19:54Z mike $"
* "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $"
*
* Global variable access routines for the Common UNIX Printing System (CUPS).
*
@@ -205,5 +205,5 @@ _cupsGlobals(void)
/*
* End of "$Id: globals.c 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $".
*/
cups/globals.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $"
* "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $"
*
* Global variable definitions for the Common UNIX Printing System (CUPS).
*
@@ -152,5 +152,5 @@ extern void _cupsSetHTTPError(http_status_t status);
#endif /* !_CUPS_GLOBALS_H_ */
/*
* End of "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $".
* End of "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $".
*/
cups/http-addr.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $"
* "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $"
*
* HTTP address routines for the Common UNIX Printing System (CUPS).
*
@@ -614,5 +614,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */
/*
* End of "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $".
* End of "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $".
*/
cups/http-addrlist.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: http-addrlist.c 7460 2008-04-16 02:19:54Z mike $"
* "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $"
*
* HTTP address list routines for the Common UNIX Printing System (CUPS).
*
@@ -656,5 +656,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p
/*
* End of "$Id: http-addrlist.c 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $".
*/
cups/http-private.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: http-private.h 7583 2008-05-16 17:47:16Z mike $"
* "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $"
*
* Private HTTP definitions for the Common UNIX Printing System (CUPS).
*
@@ -271,5 +271,5 @@ extern const char *_httpResolveURI(const char *uri, char *resolved_uri,
#endif /* !_CUPS_HTTP_PRIVATE_H_ */
/*
* End of "$Id: http-private.h 7583 2008-05-16 17:47:16Z mike $".
* End of "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $".
*/
cups/http-support.c
+11 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: http-support.c 7583 2008-05-16 17:47:16Z mike $"
* "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $"
*
* HTTP support routines for the Common UNIX Printing System (CUPS) scheduler.
*
@@ -1298,7 +1298,9 @@ _httpResolveURI(
hostname[1024],
resource[1024];
int port;
#ifdef DEBUG
http_uri_status_t status; /* URI decode status */
#endif /* DEBUG */
DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, "
@@ -1309,10 +1311,17 @@ _httpResolveURI(
* Get the device URI...
*/
#ifdef DEBUG
if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme,
sizeof(scheme), userpass, sizeof(userpass),
hostname, sizeof(hostname), &port, resource,
sizeof(resource))) < HTTP_URI_OK)
#else
if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme,
sizeof(scheme), userpass, sizeof(userpass),
hostname, sizeof(hostname), &port, resource,
sizeof(resource)) < HTTP_URI_OK)
#endif /* DEBUG */
{
if (log)
_cupsLangPrintf(stderr, _("Bad device URI \"%s\"!\n"), uri);
@@ -1614,5 +1623,5 @@ resolve_callback(
/*
* End of "$Id: http-support.c 7583 2008-05-16 17:47:16Z mike $".
* End of "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $".
*/
cups/http.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: http.c 7661 2008-06-16 21:46:51Z mike $"
* "$Id: http.c 7850 2008-08-20 00:07:25Z mike $"
*
* HTTP routines for the Common UNIX Printing System (CUPS).
*
@@ -3281,5 +3281,5 @@ http_write_ssl(http_t *http, /* I - Connection to server */
/*
* End of "$Id: http.c 7661 2008-06-16 21:46:51Z mike $".
* End of "$Id: http.c 7850 2008-08-20 00:07:25Z mike $".
*/
cups/ipp.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: ipp.c 7463 2008-04-17 00:24:25Z mike $"
* "$Id: ipp.c 7847 2008-08-19 04:22:14Z mike $"
*
* Internet Printing Protocol support functions for the Common UNIX
* Printing System (CUPS).
@@ -3002,5 +3002,5 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */
/*
* End of "$Id: ipp.c 7463 2008-04-17 00:24:25Z mike $".
* End of "$Id: ipp.c 7847 2008-08-19 04:22:14Z mike $".
*/
cups/ipp.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: ipp.h 7257 2008-01-25 02:42:47Z mike $"
* "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $"
*
* Internet Printing Protocol definitions for the Common UNIX Printing
* System (CUPS).
@@ -498,5 +498,5 @@ extern ipp_tag_t ippTagValue(const char *name) _CUPS_API_1_4;
#endif /* !_CUPS_IPP_H_ */
/*
* End of "$Id: ipp.h 7257 2008-01-25 02:42:47Z mike $".
* End of "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $".
*/
cups/langprintf.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: langprintf.c 7193 2008-01-07 23:01:40Z mike $"
* "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $"
*
* Localized printf/puts functions for the Common UNIX Printing
* System (CUPS).
@@ -273,5 +273,5 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */
/*
* End of "$Id: langprintf.c 7193 2008-01-07 23:01:40Z mike $".
* End of "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $".
*/
cups/mark.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: mark.c 7757 2008-07-18 16:43:43Z mike $"
* "$Id: mark.c 7819 2008-08-01 00:27:24Z mike $"
*
* Option marking routines for the Common UNIX Printing System (CUPS).
*
@@ -1047,5 +1047,5 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */
/*
* End of "$Id: mark.c 7757 2008-07-18 16:43:43Z mike $".
* End of "$Id: mark.c 7819 2008-08-01 00:27:24Z mike $".
*/
cups/options.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: options.c 7589 2008-05-19 00:13:23Z mike $"
* "$Id: options.c 7819 2008-08-01 00:27:24Z mike $"
*
* Option routines for the Common UNIX Printing System (CUPS).
*
@@ -463,5 +463,5 @@ cupsRemoveOption(
/*
* End of "$Id: options.c 7589 2008-05-19 00:13:23Z mike $".
* End of "$Id: options.c 7819 2008-08-01 00:27:24Z mike $".
*/
cups/page.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: page.c 6649 2007-07-11 21:46:42Z mike $"
* "$Id: page.c 7791 2008-07-24 00:55:30Z mike $"
*
* Page size functions for the Common UNIX Printing System (CUPS).
*
@@ -370,5 +370,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */
/*
* End of "$Id: page.c 6649 2007-07-11 21:46:42Z mike $".
* End of "$Id: page.c 7791 2008-07-24 00:55:30Z mike $".
*/
cups/ppd.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: ppd.c 7552 2008-05-12 17:42:15Z mike $"
* "$Id: ppd.c 7906 2008-09-03 20:19:43Z mike $"
*
* PPD file routines for the Common UNIX Printing System (CUPS).
*
@@ -3118,5 +3118,5 @@ ppd_read(cups_file_t *fp, /* I - File to read from */
/*
* End of "$Id: ppd.c 7552 2008-05-12 17:42:15Z mike $".
* End of "$Id: ppd.c 7906 2008-09-03 20:19:43Z mike $".
*/
cups/ppd.h
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: ppd.h 7679 2008-06-19 23:37:45Z mike $"
* "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $"
*
* PostScript Printer Description definitions for the Common UNIX Printing
* System (CUPS).
@@ -424,5 +424,5 @@ extern int ppdPageSizeLimits(ppd_file_t *ppd,
#endif /* !_CUPS_PPD_H_ */
/*
* End of "$Id: ppd.h 7679 2008-06-19 23:37:45Z mike $".
* End of "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $".
*/
cups/request.c
+23 -8
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: request.c 7460 2008-04-16 02:19:54Z mike $"
* "$Id: request.c 7946 2008-09-16 23:27:54Z mike $"
*
* IPP utilities for the Common UNIX Printing System (CUPS).
*
@@ -209,7 +209,7 @@ cupsDoIORequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
while (response == NULL)
{
DEBUG_puts("cupsDoFileRequest: setup...");
DEBUG_puts("cupsDoIORequest: setup...");
/*
* Send the request...
@@ -217,11 +217,11 @@ cupsDoIORequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
status = cupsSendRequest(http, request, resource, length);
DEBUG_printf(("cupsDoFileRequest: status=%d\n", status));
DEBUG_printf(("cupsDoIORequest: status=%d\n", status));
if (status == HTTP_CONTINUE && request->state == IPP_DATA && infile >= 0)
{
DEBUG_puts("cupsDoFileRequest: file write...");
DEBUG_puts("cupsDoIORequest: file write...");
/*
* Send the file with the request...
@@ -313,7 +313,7 @@ cupsDoRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
request ? ippOpString(request->request.op.operation_id) : "?",
resource ? resource : "(null)"));
return (cupsDoFileRequest(http, request, resource, NULL));
return (cupsDoIORequest(http, request, resource, -1, -1));
}
@@ -571,7 +571,10 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
if (ippFindAttribute(request, "auth-info", IPP_TAG_TEXT) &&
!httpAddrLocalhost(http->hostaddr) && !http->tls &&
httpEncryption(http, HTTP_ENCRYPT_REQUIRED))
{
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
return (HTTP_SERVICE_UNAVAILABLE);
}
#endif /* HAVE_SSL */
/*
@@ -580,7 +583,10 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
if (!strcasecmp(http->fields[HTTP_FIELD_CONNECTION], "close"))
if (httpReconnect(http))
{
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
return (HTTP_SERVICE_UNAVAILABLE);
}
/*
* Loop until we can send the request without authorization problems.
@@ -613,7 +619,10 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
if (httpPost(http, resource))
{
if (httpReconnect(http))
{
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
return (HTTP_SERVICE_UNAVAILABLE);
}
else
continue;
}
@@ -671,7 +680,10 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
case HTTP_UNAUTHORIZED :
if (!cupsDoAuthentication(http, "POST", resource))
if (httpReconnect(http))
return (HTTP_ERROR);
{
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
return (HTTP_SERVICE_UNAVAILABLE);
}
return (status);
@@ -683,7 +695,10 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP
*/
if (httpReconnect(http))
return (HTTP_ERROR);
{
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
return (HTTP_SERVICE_UNAVAILABLE);
}
httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
@@ -860,5 +875,5 @@ _cupsSetHTTPError(http_status_t status) /* I - HTTP status code */
/*
* End of "$Id: request.c 7460 2008-04-16 02:19:54Z mike $".
* End of "$Id: request.c 7946 2008-09-16 23:27:54Z mike $".
*/
cups/sidechannel.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: sidechannel.c 7594 2008-05-19 23:16:03Z mike $"
* "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $"
*
* Side-channel API code for the Common UNIX Printing System (CUPS).
*
@@ -552,5 +552,5 @@ cupsSideChannelWrite(
/*
* End of "$Id: sidechannel.c 7594 2008-05-19 23:16:03Z mike $".
* End of "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $".
*/
cups/test.ppd
+2 -2
Ver Arquivo
@@ -1,6 +1,6 @@
*PPD-Adobe: "4.3"
*%
*% "$Id: test.ppd 7582 2008-05-16 03:13:18Z mike $"
*% "$Id: test.ppd 7819 2008-08-01 00:27:24Z mike $"
*%
*% Test PPD file for the Common UNIX Printing System (CUPS).
*%
@@ -227,5 +227,5 @@ help:anchor='foo'%20bookID=Vendor%20Help
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
*% End of "$Id: test.ppd 7582 2008-05-16 03:13:18Z mike $".
*% End of "$Id: test.ppd 7819 2008-08-01 00:27:24Z mike $".
*%
cups/test2.ppd
+2 -2
Ver Arquivo
@@ -1,6 +1,6 @@
*PPD-Adobe: "4.3"
*%
*% "$Id$"
*% "$Id: test2.ppd 7791 2008-07-24 00:55:30Z mike $"
*%
*% Test PPD file #2 for the Common UNIX Printing System (CUPS).
*%
@@ -251,5 +251,5 @@ help:anchor='foo'%20bookID=Vendor%20Help
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
*% End of "$Id$".
*% End of "$Id: test2.ppd 7791 2008-07-24 00:55:30Z mike $".
*%
cups/testadmin.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: testadmin.c 6649 2007-07-11 21:46:42Z mike $"
* "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $"
*
* Admin function test program for the Common UNIX Printing System (CUPS).
*
@@ -116,5 +116,5 @@ show_settings(
/*
* End of "$Id: testadmin.c 6649 2007-07-11 21:46:42Z mike $".
* End of "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $".
*/
cups/testfile.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: testfile.c 7560 2008-05-13 06:34:04Z mike $"
* "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $"
*
* File test program for the Common UNIX Printing System (CUPS).
*
@@ -815,5 +815,5 @@ read_write_tests(int compression) /* I - Use compression? */
/*
* End of "$Id: testfile.c 7560 2008-05-13 06:34:04Z mike $".
* End of "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $".
*/
cups/testhttp.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: testhttp.c 7685 2008-06-23 16:49:18Z mike $"
* "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $"
*
* HTTP test program for the Common UNIX Printing System (CUPS).
*
@@ -549,5 +549,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
* End of "$Id: testhttp.c 7685 2008-06-23 16:49:18Z mike $".
* End of "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $".
*/
cups/testppd.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: testppd.c 7633 2008-06-10 23:07:29Z mike $"
* "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $"
*
* PPD test program for the Common UNIX Printing System (CUPS).
*
@@ -821,5 +821,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
* End of "$Id: testppd.c 7633 2008-06-10 23:07:29Z mike $".
* End of "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $".
*/
cups/util.c
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
/*
* "$Id: util.c 7634 2008-06-10 23:22:28Z mike $"
* "$Id: util.c 7850 2008-08-20 00:07:25Z mike $"
*
* Printing utilities for the Common UNIX Printing System (CUPS).
*
@@ -1775,5 +1775,5 @@ cups_get_printer_uri(
/*
* End of "$Id: util.c 7634 2008-06-10 23:22:28Z mike $".
* End of "$Id: util.c 7850 2008-08-20 00:07:25Z mike $".
*/
data/Makefile
+2 -2
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
#
# Datafile makefile for the Common UNIX Printing System (CUPS).
#
@@ -208,5 +208,5 @@ uninstall:
#
# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
#
desktop/cups-128.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 9.9 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 16 KiB

desktop/cups-16.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 742 B

Depois

Largura:  |  Altura:  |  Tamanho: 872 B

desktop/cups-256.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 22 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 40 KiB

desktop/cups-32.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 1.7 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 2.2 KiB

desktop/cups-512.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 54 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 105 KiB

desktop/cups-64.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 4.1 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 6.1 KiB

desktop/cups.icns
BIN
Ver Arquivo
Arquivo binário não exibido.
desktop/cups.svg
+326 -163
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 16 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 35 KiB

doc/Makefile
+2 -5
Ver Arquivo
@@ -1,5 +1,5 @@
#
# "$Id: Makefile 7601 2008-05-20 21:08:08Z mike $"
# "$Id: Makefile 7941 2008-09-16 00:46:13Z mike $"
#
# Documentation makefile for the Common UNIX Printing System (CUPS).
#
@@ -26,14 +26,10 @@ WEBPAGES = \
index.html \
robots.txt
WEBIMAGES = \
images/classes.png \
images/cups.png \
images/cups-block-diagram.gif \
images/cups-icon.png \
images/left.gif \
images/printer-idle.png \
images/printer-processing.png \
images/printer-stopped.png \
images/raster.png \
images/right.gif \
images/sel.gif \
@@ -105,6 +101,7 @@ HELPFILES = \
help/ref-snmp-conf.html \
help/ref-subscriptions-conf.html \
help/security.html \
help/spec-browsing.html \
help/spec-cmp.html \
help/spec-command.html \
help/spec-design.html \
doc/cups.css
+46 -4
Ver Arquivo
@@ -66,7 +66,7 @@ A:link:hover IMG {
}
A:link, A:visited {
font-weight: normal;
font-weight: inherit;
text-decoration: none;
color: #000099;
}
@@ -144,7 +144,8 @@ SUB, SUP {
}
TR.data, TD.data, TR.data TD {
padding: 5;
margin-top: 10pt;
padding: 5pt;
border-bottom: solid 1pt #999999;
}
@@ -230,13 +231,50 @@ H2 SPAN.info, H3 SPAN.info, H4 SPAN.info {
}
.conflict {
color: red;
background: red;
color: white;
}
H2.title, H3.title {
border-bottom: solid 1pt #999999;
}
DIV.indent, TABLE.indent {
margin-top: 2em;
margin-left: auto;
margin-right: auto;
width: 90%;
}
TABLE.indent {
border-collapse: collapse;
}
TABLE.indent TD, TABLE.indent TH {
padding: 0;
}
TABLE.list {
border-collapse: collapse;
margin-left: auto;
margin-right: auto;
width: 90%;
}
TABLE.list TH {
border-bottom: solid 1pt #999999;
padding-top: 10pt;
padding-left: 5pt;
text-align: left;
white-space: nowrap;
}
TABLE.list TD {
border-bottom: solid thin #eeeeee;
padding-top: 5pt;
padding-left: 5pt;
}
DIV.sidebar {
float: right;
min-width: 25%;
@@ -271,7 +309,11 @@ DIV.sidebar P.l2 {
TABLE.inset {
background: #f0f0f0;
border: thin solid #e0e0e0;
margin-left: auto;
margin-right: auto;
margin-top: 1em;
padding: 0;
width: 90%;
/* These are not implemented by all browsers, but that's OK */
border-radius: 5px;
-moz-border-radius: 5px;
@@ -287,7 +329,7 @@ TABLE.inset CAPTION {
}
TABLE.inset TD {
padding: 5px;
padding: 2px;
}
DT {
doc/favicon.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 1.7 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 2.2 KiB

doc/help/ref-cupsd-conf.html.in
+40 -6
Ver Arquivo
@@ -794,6 +794,22 @@ Otherwise printers and classes will disappear from client systems
between updates.</P>
<H2 CLASS="title"><A NAME="BrowseWebIF">BrowseWebIF</A></H2>
<H3>Examples</H3>
<PRE CLASS="command">
BrowseWebIF On
BrowseWebIF Off
</PRE>
<H3>Description</H3>
<P>The <CODE>BrowseWebIF</CODE> directive controls whether the CUPS web
interface is advertised via DNS-SD. The default setting is
<CODE>Off</CODE>.</P>
<H2 CLASS="title"><A NAME="Browsing">Browsing</A></H2>
<H3>Examples</H3>
@@ -2826,27 +2842,45 @@ SetEnv MY_ENV_VAR foo
variable that should be passed to child processes.</P>
<H2 CLASS="title"><A NAME="SSLListen">SSLListen</A></H2>
<H2 CLASS="title"><A NAME="SSLOptions">SSLOptions</A></H2>
<H3>Examples</H3>
<PRE CLASS="command">
SSLListen 127.0.0.1:443
SSLListen 192.0.2.1:443
SSLOptions 127.0.0.1:443
SSLOptions 192.0.2.1:443
</PRE>
<H3>Description</H3>
<P>The <CODE>SSLListen</CODE> directive specifies a network
<P>The <CODE>SSLOptions</CODE> directive specifies a network
address and port to listen for secure connections. Multiple
<CODE>SSLListen</CODE> directives can be provided to listen on
<CODE>SSLOptions</CODE> directives can be provided to listen on
multiple addresses.</P>
<P>The <CODE>SSLListen</CODE> directive is similar to the <A
<P>The <CODE>SSLOptions</CODE> directive is similar to the <A
HREF="#SSLPort"><CODE>SSLPort</CODE></A> directive but allows you
to restrict access to specific interfaces or networks.</P>
<H2 CLASS="title"><A NAME="SSLOptions">SSLOptions</A></H2>
<H3>Examples</H3>
<PRE CLASS="command">
SSLOptions None
SSLOptions NoEmptyFragments
</PRE>
<H3>Description</H3>
<P>The <CODE>SSLOptions</CODE> directive specifies additional SSL/TLS
protocol options to use for encrypted connected. Currently only two
options are supported - <code>None</code> (the default) for the most
secure mode and <code>NoEmptyFragments</code> to allow CUPS to work with
Microsoft Windows with the FIPS conformance mode enabled.</p>
<H2 CLASS="title"><A NAME="SSLPort">SSLPort</A></H2>
<H3>Examples</H3>
doc/help/spec-browsing.html
+109
Ver Arquivo
@@ -0,0 +1,109 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<!-- SECTION: Specifications -->
<head>
<title>CUPS Browse Protocol</title>
<meta name='keywords' content='Programming'>
</head>
<body>
<!--
"$Id$"
CUPS Browse Protocol specification for the Common UNIX Printing System (CUPS).
Copyright 2008 by Apple Inc.
Copyright 1997-2005 by Easy Software Products.
These coded instructions, statements, and computer programs are the
property of Apple Inc. and are protected by Federal copyright
law. Distribution and use rights are outlined in the file "LICENSE.txt"
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/".
-->
<h2><a name='INTRO'>Introduction</a></h2>
<p>This specification describes the CUPS browsing protocol which is used for
printer sharing. The protocol is a UDP/IP-based broadcast service that
operates on IP service port 631 by default. Each broadcast packet describes
a single printer or class being shared.</p>
<p>For simple networks with a single subnet, a CUPS system sharing a printer
(the <em>server</em>) will periodically broadcast that printer's availability
and status information to the subnet. Every other CUPS system on the subnet
(the <em>clients</em>) will receive the broadcast and make that printer
available to local users. If a client stops receiving broadcasts from the
server, or if the server sends a special "deleted" broadcast message, the
client will remove its copy of the printer.</p>
<p>For larger networks with multiple subnets, a relay configuration can be used
where one or more client systems poll the server and then broadcast the
availability and status information for the server's shared printers to the
clients' local subnets.</p>
<p>A key feature of CUPS printer sharing is support for <em>implicit
classes</em>, which are automatically-created classes for printers that are
shared by multiple servers. These implicit classes provide automatic load
balancing and fail-safe printing functionality transparently to the user.</p>
<h2><a name='SECURITY'>Security Considerations</a></h2>
<p>Like most discovery protocols, CUPS browse packets are not encrypted or
signed, so it is possible for malicious systems on a network to advertise
or remove printers on that network to cause denial of service or information
disclosure. In order to combat this, CUPS logs incoming browse packets and
provides access controls to limit browse packet reception to known hosts.</p>
<h2><a name='FORMAT'>Browse Packet Format</a></h2>
<p>Each broadcast packet is an ASCII text string of up to 1450 bytes ending
with a line feed (0x0a). The general format is:</p>
<p class='summary'>
printer-type printer-state printer-uri "printer-location" "printer-info"
"printer-make-and-model" name=value name2=value2 ...
</p>
<p>Each of the fields contains the value of the corresponding IPP attribute.
The trailing "name=value" information is used to convey default job template
attribute values (job-sheets-default, media-default, etc.), authentication
requirements (auth-info-required), and additional IPP URI options that are
requested by the server (ipp-options).</p>
<h3>ABNF Definition</h3>
<p>The following ABNF definition [RFC4234, RFC3986] defines the format of each
browse packet:</p>
<pre class='command'>
PACKET = TYPE WSP STATE WSP URI WSP LOCATION WSP INFO WSP
MAKE-AND-MODEL WSP *[ WSP ATTR-NAME "=" ATTR-VALUE ] LF
TYPE = 1*HEXDIG
STATE = "3" / "4" / "5"
URI = "ipp://" ( 1*NAMECHAR / IP-literal / IPv4address )
[ ":" 1*DIGIT ] ( "/printers/" / "/classes/" ) 1*NAMECHAR
NAMECHAR = %x21.22.24.26-2E.30-7E / %x25 HEXDIG HEXDIG
IP-literal = See RFC 3986
IPv4address = See RFC 3986
LOCATION = QUOTED-STRING
INFO = QUOTED-STRING
MAKE-AND-MODEL = QUOTED-STRING
ATTR-NAME = 1*( ALPHA / DIGIT / "-" / "." )
ATTR-VALUE = QUOTED-STRING / 1*UNQUOTE-CHAR
QUOTED-STRING = DQUOTE *QUOTED-CHAR DQUOTE
QUOTED-CHAR = %x20.21.23-5B.5D-7E / UTF8-CHAR / %x5C %x5C / %x5C %x22
UNQUOTE-CHAR = %x21.23-26.28-5B.5D-7E / UTF8-CHAR
UTF8-CHAR = %xC0.DF %x80.BF / %xE0.EF %x80.BF %x80.BF /
%xF0.F7 %x80.BF %x80.BF %x80.BF
</pre>
</body>
</html>
doc/help/spec-ipp.html
+21 -10
Ver Arquivo
@@ -912,16 +912,16 @@ CUPS-Get-Printers request:
attributes as described in section 3.1.4.1 of the IPP Model and
Semantics document.
<dt>"first-printer-name" (name(127)):<span class='info'>CUPS 1.2</span>
<dd>The client OPTIONALLY supplies this attribute to
select the first printer that is returned.
<dt>"limit" (integer (1:MAX)):
<dd>The client OPTIONALLY supplies this attribute limiting the
number of printers that are returned.
<dt>"printer-info" (text(127)):<span class='info'>CUPS 1.1</span>
<dd>The client OPTIONALLY supplies this attribute to
select which printers are returned.
<dt>"printer-location" (text(127)): <span class='info'>CUPS 1.1.7</span>
<dd>The client OPTIONALLY supplies this attribute to
@@ -946,6 +946,11 @@ CUPS-Get-Printers request:
responds as if this attribute had been supplied with a value of
'all'.
<dt>"requested-user-name" (name(127)) : <span class='info'>CUPS 1.2</span>
<dd>The client OPTIONALLY supplies a user name that is used to filter
the returned printers.
</dl>
<h4>CUPS-Get-Printers Response</h4>
@@ -1171,15 +1176,16 @@ CUPS-Get-Classes request:
attributes as described in section 3.1.4.1 of the IPP Model and
Semantics document.
<dt>"first-printer-name" (name(127)):<span class='info'>CUPS 1.2</span>
<dd>The client OPTIONALLY supplies this attribute to
select the first printer that is returned.
<dt>"limit" (integer (1:MAX)):
<dd>The client OPTIONALLY supplies this attribute limiting the
number of printer classes that are returned.
<dt>"printer-info" (text(127)): <span class='info'>CUPS 1.1.7</span>
<dd>The client OPTIONALLY supplies this attribute to
select which printer classes are returned.
<dt>"printer-location" (text(127)): <span class='info'>CUPS 1.1.7</span>
<dd>The client OPTIONALLY supplies this attribute to
select which printer classes are returned.
@@ -1200,6 +1206,11 @@ CUPS-Get-Classes request:
interested. If the client omits this attribute, the server responds as
if this attribute had been supplied with a value of 'all'.
<dt>"requested-user-name" (name(127)) : <span class='info'>CUPS 1.2</span>
<dd>The client OPTIONALLY supplies a user name that is used to filter
the returned printers.
</dl>
<h4>CUPS-Get-Classes Response</h4>
@@ -2710,7 +2721,7 @@ summary='Printer Type Bits'>
<td>Is the a default printer on the network.</td>
</tr>
<tr>
<td>0x00040000<td>
<td>0x00040000</td>
<td>Is a facsimile device.</td>
</tr>
<tr>
doc/help/spec-ppd.html
+4 -4
Ver Arquivo
@@ -8,7 +8,7 @@
</head>
<body>
<!--
"$Id: spec-ppd.html 7677 2008-06-19 23:22:19Z mike $"
"$Id: spec-ppd.html 7937 2008-09-11 16:16:41Z mike $"
CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
@@ -38,7 +38,7 @@ filtering.</p>
<p>The PPD format is text-based and uses lines of up to 255
characters terminated by a carriage return, linefeed, or
combination of carriage return and line feed. The following ABNF
definition [RFC2234] defines the general format of lines in a PPD
definition [RFC4234] defines the general format of lines in a PPD
file:</p>
<pre class='command'>
@@ -57,9 +57,9 @@ VALUE = 1*TCHAR / DQUOTE 1*SCHAR DQUOTE
KCHAR = ALPHA / DIGIT / "_" / "." / "-"
SCHAR = LINE-END / WSP / %x21 / %x23-7E / %xA0-FF
SCHAR = LINE-END / WSP / %x21.23-7E.A0-FF
TCHAR = %x20-7E / %xA0-FF
TCHAR = %x20-7E.A0-FF
LINE-END = CR / LF / CR LF
</pre>
doc/images/classes.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado

Antes

Largura:  |  Altura:  |  Tamanho: 5.7 KiB

doc/images/classes.svg
-511
Ver Arquivo
@@ -1,511 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
viewBox="0 0 50 50"
xml:space="preserve"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docname="classes.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
version="1.0"
inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/classes.png"
inkscape:export-xdpi="115.2"
inkscape:export-ydpi="115.2"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS class icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
id="defs37"><linearGradient
inkscape:collect="always"
id="linearGradient3454"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3456" /><stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3458" /></linearGradient><linearGradient
id="linearGradient3422"><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="0"
id="stop3424" /><stop
style="stop-color:#3f3f3f;stop-opacity:1;"
offset="1"
id="stop3426" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient3378"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3380" /><stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3382" /></linearGradient><linearGradient
id="linearGradient3261"><stop
style="stop-color:#999999;stop-opacity:1;"
offset="0"
id="stop3263" /><stop
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1"
id="stop3265" /></linearGradient><linearGradient
id="linearGradient3409"><stop
style="stop-color:#ffffff;stop-opacity:0.49803922;"
offset="0"
id="stop3411" /><stop
style="stop-color:#ffffff;stop-opacity:0.25098041;"
offset="1"
id="stop3413" /></linearGradient><linearGradient
id="linearGradient3392"><stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3394" /><stop
style="stop-color:#f0f0f0;stop-opacity:1;"
offset="1"
id="stop3396" /></linearGradient><linearGradient
id="linearGradient3262"><stop
style="stop-color:#d0d0d0;stop-opacity:1;"
offset="0"
id="stop3264" /><stop
style="stop-color:#e8e8e8;stop-opacity:1;"
offset="1"
id="stop3266" /></linearGradient><linearGradient
id="linearGradient3254"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3256" /><stop
style="stop-color:#000000;stop-opacity:0.74901962;"
offset="1"
id="stop3258" /></linearGradient><linearGradient
id="linearGradient3246"><stop
style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
offset="0"
id="stop3248" /><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="1"
id="stop3250" /></linearGradient><linearGradient
id="linearGradient3238"><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="0"
id="stop3240" /><stop
style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
offset="1"
id="stop3242" /></linearGradient><linearGradient
id="linearGradient3230"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3232" /><stop
style="stop-color:#000000;stop-opacity:0.74901962;"
offset="1"
id="stop3234" /></linearGradient><linearGradient
id="linearGradient3222"><stop
style="stop-color:#00bf00;stop-opacity:0.87843138;"
offset="0"
id="stop3224" /><stop
style="stop-color:#000000;stop-opacity:0.87843138;"
offset="1"
id="stop3226" /></linearGradient><linearGradient
id="linearGradient3214"><stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3216" /><stop
style="stop-color:#f0f0f0;stop-opacity:1;"
offset="1"
id="stop3218" /></linearGradient><linearGradient
id="linearGradient3200"><stop
style="stop-color:#d0d0d0;stop-opacity:1;"
offset="0"
id="stop3202" /><stop
id="stop3212"
offset="0.37"
style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3204" /></linearGradient><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3200"
id="linearGradient3402"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
x1="9.6981544"
y1="17.388933"
x2="40.301846"
y2="17.388933" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3261"
id="linearGradient3267"
x1="5"
y1="27.5"
x2="45"
y2="27.5"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-1.25)" /><filter
inkscape:collect="always"
x="-0.17068966"
width="1.3413793"
y="-1.2375"
height="3.475"
id="filter3356"><feGaussianBlur
inkscape:collect="always"
stdDeviation="2.578125"
id="feGaussianBlur3358" /></filter><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3378"
id="radialGradient3384"
cx="37.890049"
cy="24.140049"
fx="37.890049"
fy="24.140049"
r="2.5"
gradientUnits="userSpaceOnUse" /><filter
inkscape:collect="always"
x="-0.12"
width="1.24"
y="-0.12"
height="1.24"
id="filter3418"><feGaussianBlur
inkscape:collect="always"
stdDeviation="0.25"
id="feGaussianBlur3420" /></filter><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3422"
id="radialGradient3428"
cx="38.75"
cy="25"
fx="38.75"
fy="25"
r="2.625"
gradientUnits="userSpaceOnUse" /><filter
inkscape:collect="always"
id="filter3430"><feGaussianBlur
inkscape:collect="always"
stdDeviation="0.0825"
id="feGaussianBlur3432" /></filter><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3454"
id="linearGradient3460"
x1="36.375"
y1="14.967752"
x2="13.625"
y2="11.405098"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3261"
id="linearGradient4627"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-1.25)"
x1="5"
y1="27.5"
x2="45"
y2="27.5" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3422"
id="radialGradient4629"
gradientUnits="userSpaceOnUse"
cx="38.75"
cy="25"
fx="38.75"
fy="25"
r="2.625" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3378"
id="radialGradient4631"
gradientUnits="userSpaceOnUse"
cx="37.890049"
cy="24.140049"
fx="37.890049"
fy="24.140049"
r="2.5" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3454"
id="linearGradient4633"
gradientUnits="userSpaceOnUse"
x1="36.375"
y1="14.967752"
x2="13.625"
y2="11.405098" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3261"
id="linearGradient4657"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-1.25)"
x1="5"
y1="27.5"
x2="45"
y2="27.5" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3422"
id="radialGradient4659"
gradientUnits="userSpaceOnUse"
cx="38.75"
cy="25"
fx="38.75"
fy="25"
r="2.625" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3378"
id="radialGradient4661"
gradientUnits="userSpaceOnUse"
cx="37.890049"
cy="24.140049"
fx="37.890049"
fy="24.140049"
r="2.5" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3454"
id="linearGradient4663"
gradientUnits="userSpaceOnUse"
x1="36.375"
y1="14.967752"
x2="13.625"
y2="11.405098" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3261"
id="linearGradient4687"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-1.25)"
x1="5"
y1="27.5"
x2="45"
y2="27.5" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3422"
id="radialGradient4689"
gradientUnits="userSpaceOnUse"
cx="38.75"
cy="25"
fx="38.75"
fy="25"
r="2.625" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3378"
id="radialGradient4691"
gradientUnits="userSpaceOnUse"
cx="37.890049"
cy="24.140049"
fx="37.890049"
fy="24.140049"
r="2.5" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3454"
id="linearGradient4693"
gradientUnits="userSpaceOnUse"
x1="36.375"
y1="14.967752"
x2="13.625"
y2="11.405098" /></defs><sodipodi:namedview
inkscape:cy="50"
inkscape:cx="50"
inkscape:zoom="4.07"
inkscape:window-height="622"
inkscape:window-width="872"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
showgrid="true"
inkscape:object-bbox="true"
inkscape:object-points="true"
inkscape:grid-points="true"
inkscape:guide-points="true"
width="100px"
height="100px"
inkscape:object-paths="true"
inkscape:grid-bbox="true"
inkscape:guide-bbox="true"
inkscape:object-nodes="true"
inkscape:window-x="250"
inkscape:window-y="42"
inkscape:current-layer="svg2"
gridspacingx="0.5px"
gridspacingy="0.5px" />
<g
id="g4615"
transform="matrix(0.64,0,0,0.64,-1.87,17.557087)"><rect
transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)"
y="41.25"
x="6.25"
height="5"
width="36.25"
id="rect3314"
style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)" /><path
sodipodi:nodetypes="csccccccs"
id="rect2276"
d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
style="opacity:1;fill:url(#linearGradient4627);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922" /><rect
ry="5"
rx="5"
y="18.75"
x="5"
height="25"
width="40"
id="rect2279"
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)" /><rect
y="33.821854"
x="10.009353"
height="9.9187946"
width="29.981295"
id="rect3309"
style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
transform="translate(1.375,-1.375)"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
sodipodi:ry="2.5"
sodipodi:rx="2.5"
sodipodi:cy="25"
sodipodi:cx="38.75"
id="path3366"
style="opacity:1;fill:url(#radialGradient4629);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="opacity:0.5;fill:url(#radialGradient4631);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
id="path3376"
sodipodi:cx="38.75"
sodipodi:cy="25"
sodipodi:rx="2.5"
sodipodi:ry="2.5"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
transform="translate(1.375,-1.375)" /><g
id="g3469"><path
style="opacity:0.6667;fill:url(#linearGradient4633);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
id="rect3452"
sodipodi:nodetypes="ccccc" /><path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 33.75,10 L 35,16.25"
id="path3463" /><path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 15.956628,10 L 15,16.25"
id="path3465" /></g></g><g
transform="matrix(0.512,0,0,0.512,25.71,5.7956693)"
id="g4635"><rect
style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
id="rect4637"
width="36.25"
height="5"
x="6.25"
y="41.25"
transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)" /><path
style="opacity:1;fill:url(#linearGradient4657);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
id="path4639"
sodipodi:nodetypes="csccccccs" /><rect
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
id="rect4641"
width="40"
height="25"
x="5"
y="18.75"
rx="5"
ry="5" /><rect
style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4643"
width="29.981295"
height="9.9187946"
x="10.009353"
y="33.821854" /><path
sodipodi:type="arc"
style="opacity:1;fill:url(#radialGradient4659);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4645"
sodipodi:cx="38.75"
sodipodi:cy="25"
sodipodi:rx="2.5"
sodipodi:ry="2.5"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
transform="translate(1.375,-1.375)" /><path
transform="translate(1.375,-1.375)"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
sodipodi:ry="2.5"
sodipodi:rx="2.5"
sodipodi:cy="25"
sodipodi:cx="38.75"
id="path4647"
style="opacity:0.5;fill:url(#radialGradient4661);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
sodipodi:type="arc" /><g
id="g4649"><path
sodipodi:nodetypes="ccccc"
id="path4651"
d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
style="opacity:0.6667;fill:url(#linearGradient4663);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
id="path4653"
d="M 33.75,10 L 35,16.25"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
id="path4655"
d="M 15.956628,10 L 15,16.25"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g><g
id="g4665"
transform="matrix(0.4096,0,0,0.4096,4.202,-1.084)"><rect
transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)"
y="41.25"
x="6.25"
height="5"
width="36.25"
id="rect4667"
style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)" /><path
sodipodi:nodetypes="csccccccs"
id="path4669"
d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
style="opacity:1;fill:url(#linearGradient4687);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922" /><rect
ry="5"
rx="5"
y="18.75"
x="5"
height="25"
width="40"
id="rect4671"
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)" /><rect
y="33.821854"
x="10.009353"
height="9.9187946"
width="29.981295"
id="rect4673"
style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
transform="translate(1.375,-1.375)"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
sodipodi:ry="2.5"
sodipodi:rx="2.5"
sodipodi:cy="25"
sodipodi:cx="38.75"
id="path4675"
style="opacity:1;fill:url(#radialGradient4689);fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="opacity:0.5;fill:url(#radialGradient4691);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
id="path4677"
sodipodi:cx="38.75"
sodipodi:cy="25"
sodipodi:rx="2.5"
sodipodi:ry="2.5"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
transform="translate(1.375,-1.375)" /><g
id="g4679"><path
style="opacity:0.6667;fill:url(#linearGradient4693);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
id="path4681"
sodipodi:nodetypes="ccccc" /><path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 33.75,10 L 35,16.25"
id="path4683" /><path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 15.956628,10 L 15,16.25"
id="path4685" /></g></g></svg>
Lado a Lado

Antes

Largura:  |  Altura:  |  Tamanho: 21 KiB

doc/images/cups-icon.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 9.9 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 16 KiB

doc/images/cups.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 9.2 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 16 KiB

doc/images/cups.svg
+332 -115
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 14 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 35 KiB

doc/images/left.gif
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado Deslizar Sobrepor

Antes

Largura:  |  Altura:  |  Tamanho: 1.8 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 1.8 KiB

doc/images/left.xcf.gz
BIN
Ver Arquivo
Arquivo binário não exibido.
doc/images/printer-idle.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado

Antes

Largura:  |  Altura:  |  Tamanho: 4.2 KiB

doc/images/printer-idle.svg
-292
Ver Arquivo
@@ -1,292 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
viewBox="0 0 50 50"
xml:space="preserve"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docname="printer-idle.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
version="1.0"
inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/printer-idle.png"
inkscape:export-xdpi="115.2"
inkscape:export-ydpi="115.2"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS idle printer icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
id="defs37"><linearGradient
inkscape:collect="always"
id="linearGradient3454"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3456" /><stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3458" /></linearGradient><linearGradient
id="linearGradient3422"><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="0"
id="stop3424" /><stop
style="stop-color:#3f3f3f;stop-opacity:1;"
offset="1"
id="stop3426" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient3378"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3380" /><stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3382" /></linearGradient><linearGradient
id="linearGradient3261"><stop
style="stop-color:#999999;stop-opacity:1;"
offset="0"
id="stop3263" /><stop
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1"
id="stop3265" /></linearGradient><linearGradient
id="linearGradient3409"><stop
style="stop-color:#ffffff;stop-opacity:0.49803922;"
offset="0"
id="stop3411" /><stop
style="stop-color:#ffffff;stop-opacity:0.25098041;"
offset="1"
id="stop3413" /></linearGradient><linearGradient
id="linearGradient3392"><stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3394" /><stop
style="stop-color:#f0f0f0;stop-opacity:1;"
offset="1"
id="stop3396" /></linearGradient><linearGradient
id="linearGradient3262"><stop
style="stop-color:#d0d0d0;stop-opacity:1;"
offset="0"
id="stop3264" /><stop
style="stop-color:#e8e8e8;stop-opacity:1;"
offset="1"
id="stop3266" /></linearGradient><linearGradient
id="linearGradient3254"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3256" /><stop
style="stop-color:#000000;stop-opacity:0.74901962;"
offset="1"
id="stop3258" /></linearGradient><linearGradient
id="linearGradient3246"><stop
style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
offset="0"
id="stop3248" /><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="1"
id="stop3250" /></linearGradient><linearGradient
id="linearGradient3238"><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="0"
id="stop3240" /><stop
style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
offset="1"
id="stop3242" /></linearGradient><linearGradient
id="linearGradient3230"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3232" /><stop
style="stop-color:#000000;stop-opacity:0.74901962;"
offset="1"
id="stop3234" /></linearGradient><linearGradient
id="linearGradient3222"><stop
style="stop-color:#00bf00;stop-opacity:0.87843138;"
offset="0"
id="stop3224" /><stop
style="stop-color:#000000;stop-opacity:0.87843138;"
offset="1"
id="stop3226" /></linearGradient><linearGradient
id="linearGradient3214"><stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3216" /><stop
style="stop-color:#f0f0f0;stop-opacity:1;"
offset="1"
id="stop3218" /></linearGradient><linearGradient
id="linearGradient3200"><stop
style="stop-color:#d0d0d0;stop-opacity:1;"
offset="0"
id="stop3202" /><stop
id="stop3212"
offset="0.37"
style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3204" /></linearGradient><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3200"
id="linearGradient3402"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
x1="9.6981544"
y1="17.388933"
x2="40.301846"
y2="17.388933" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3261"
id="linearGradient3267"
x1="5"
y1="27.5"
x2="45"
y2="27.5"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-1.25)" /><filter
inkscape:collect="always"
x="-0.17068966"
width="1.3413793"
y="-1.2375"
height="3.475"
id="filter3356"><feGaussianBlur
inkscape:collect="always"
stdDeviation="2.578125"
id="feGaussianBlur3358" /></filter><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3378"
id="radialGradient3384"
cx="37.890049"
cy="24.140049"
fx="37.890049"
fy="24.140049"
r="2.5"
gradientUnits="userSpaceOnUse" /><filter
inkscape:collect="always"
x="-0.12"
width="1.24"
y="-0.12"
height="1.24"
id="filter3418"><feGaussianBlur
inkscape:collect="always"
stdDeviation="0.25"
id="feGaussianBlur3420" /></filter><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3422"
id="radialGradient3428"
cx="38.75"
cy="25"
fx="38.75"
fy="25"
r="2.625"
gradientUnits="userSpaceOnUse" /><filter
inkscape:collect="always"
id="filter3430"><feGaussianBlur
inkscape:collect="always"
stdDeviation="0.0825"
id="feGaussianBlur3432" /></filter><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3454"
id="linearGradient3460"
x1="36.375"
y1="14.967752"
x2="13.625"
y2="11.405098"
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
inkscape:cy="50"
inkscape:cx="50"
inkscape:zoom="4.07"
inkscape:window-height="622"
inkscape:window-width="872"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
showgrid="true"
inkscape:object-bbox="true"
inkscape:object-points="true"
inkscape:grid-points="true"
inkscape:guide-points="true"
width="100px"
height="100px"
inkscape:object-paths="true"
inkscape:grid-bbox="true"
inkscape:guide-bbox="true"
inkscape:object-nodes="true"
inkscape:window-x="168"
inkscape:window-y="216"
inkscape:current-layer="svg2"
gridspacingx="0.5px"
gridspacingy="0.5px" />
<rect
style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
id="rect3314"
width="36.25"
height="5"
x="6.25"
y="41.25"
transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)" /><path
style="opacity:1;fill:url(#linearGradient3267);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
id="rect2276"
sodipodi:nodetypes="csccccccs" /><rect
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
id="rect2279"
width="40"
height="25"
x="5"
y="18.75"
rx="5"
ry="5" /><rect
style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3309"
width="29.981295"
height="9.9187946"
x="10.009353"
y="33.821854" /><path
sodipodi:type="arc"
style="opacity:1;fill:url(#radialGradient3428);fill-opacity:1.0;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3366"
sodipodi:cx="38.75"
sodipodi:cy="25"
sodipodi:rx="2.5"
sodipodi:ry="2.5"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
transform="translate(1.375,-1.375)" /><path
transform="translate(1.375,-1.375)"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
sodipodi:ry="2.5"
sodipodi:rx="2.5"
sodipodi:cy="25"
sodipodi:cx="38.75"
id="path3376"
style="opacity:0.5;fill:url(#radialGradient3384);fill-opacity:1.0;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
sodipodi:type="arc" /><g
id="g3469"><path
sodipodi:nodetypes="ccccc"
id="rect3452"
d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
style="opacity:0.6667;fill:url(#linearGradient3460);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
id="path3463"
d="M 33.75,10 L 35,16.25"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
id="path3465"
d="M 15.956628,10 L 15,16.25"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /></g></svg>
Lado a Lado

Antes

Largura:  |  Altura:  |  Tamanho: 11 KiB

doc/images/printer-processing.png
BIN
Ver Arquivo
Arquivo binário não exibido.
Lado a Lado

Antes

Largura:  |  Altura:  |  Tamanho: 4.8 KiB

doc/images/printer-processing.svg
-313
Ver Arquivo
@@ -1,313 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
viewBox="0 0 50 50"
xml:space="preserve"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docname="printer-processing.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:docbase="/home/mike/c/cups-trunk/doc/images"
version="1.0"
inkscape:export-filename="/home/mike/c/cups-trunk/doc/images/printer-processing.png"
inkscape:export-xdpi="115.2"
inkscape:export-ydpi="115.2"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>CUPS processing printer icon</dc:title><dc:creator><cc:Agent><dc:title>Michael Sweet</dc:title></cc:Agent></dc:creator><cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
id="defs37"><linearGradient
inkscape:collect="always"
id="linearGradient3474"><stop
style="stop-color:#3f3f3f;stop-opacity:1;"
offset="0"
id="stop3476" /><stop
style="stop-color:#3f3f3f;stop-opacity:0;"
offset="1"
id="stop3478" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient3454"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3456" /><stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3458" /></linearGradient><linearGradient
id="linearGradient3422"><stop
style="stop-color:#00ff00;stop-opacity:1;"
offset="0"
id="stop3424" /><stop
style="stop-color:#007f00;stop-opacity:1;"
offset="1"
id="stop3426" /></linearGradient><linearGradient
inkscape:collect="always"
id="linearGradient3378"><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3380" /><stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3382" /></linearGradient><linearGradient
id="linearGradient3261"><stop
style="stop-color:#999999;stop-opacity:1;"
offset="0"
id="stop3263" /><stop
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1"
id="stop3265" /></linearGradient><linearGradient
id="linearGradient3409"><stop
style="stop-color:#ffffff;stop-opacity:0.49803922;"
offset="0"
id="stop3411" /><stop
style="stop-color:#ffffff;stop-opacity:0.25098041;"
offset="1"
id="stop3413" /></linearGradient><linearGradient
id="linearGradient3392"><stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3394" /><stop
style="stop-color:#f0f0f0;stop-opacity:1;"
offset="1"
id="stop3396" /></linearGradient><linearGradient
id="linearGradient3262"><stop
style="stop-color:#d0d0d0;stop-opacity:1;"
offset="0"
id="stop3264" /><stop
style="stop-color:#e8e8e8;stop-opacity:1;"
offset="1"
id="stop3266" /></linearGradient><linearGradient
id="linearGradient3254"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3256" /><stop
style="stop-color:#000000;stop-opacity:0.74901962;"
offset="1"
id="stop3258" /></linearGradient><linearGradient
id="linearGradient3246"><stop
style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
offset="0"
id="stop3248" /><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="1"
id="stop3250" /></linearGradient><linearGradient
id="linearGradient3238"><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="0"
id="stop3240" /><stop
style="stop-color:#7f7f7f;stop-opacity:0.49803922;"
offset="1"
id="stop3242" /></linearGradient><linearGradient
id="linearGradient3230"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3232" /><stop
style="stop-color:#000000;stop-opacity:0.74901962;"
offset="1"
id="stop3234" /></linearGradient><linearGradient
id="linearGradient3222"><stop
style="stop-color:#00bf00;stop-opacity:0.87843138;"
offset="0"
id="stop3224" /><stop
style="stop-color:#000000;stop-opacity:0.87843138;"
offset="1"
id="stop3226" /></linearGradient><linearGradient
id="linearGradient3214"><stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3216" /><stop
style="stop-color:#f0f0f0;stop-opacity:1;"
offset="1"
id="stop3218" /></linearGradient><linearGradient
id="linearGradient3200"><stop
style="stop-color:#d0d0d0;stop-opacity:1;"
offset="0"
id="stop3202" /><stop
id="stop3212"
offset="0.37"
style="stop-color:#e0e0e0;stop-opacity:1;" /><stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3204" /></linearGradient><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3200"
id="linearGradient3402"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,-0.8179946,1.0011004,0,7.375104,34.766877)"
x1="9.6981544"
y1="17.388933"
x2="40.301846"
y2="17.388933" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3261"
id="linearGradient3267"
x1="5"
y1="27.5"
x2="45"
y2="27.5"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-1.25)" /><filter
inkscape:collect="always"
x="-0.17068966"
width="1.3413793"
y="-1.2375"
height="3.475"
id="filter3356"><feGaussianBlur
inkscape:collect="always"
stdDeviation="2.578125"
id="feGaussianBlur3358" /></filter><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3378"
id="radialGradient3384"
cx="37.890049"
cy="24.140049"
fx="37.890049"
fy="24.140049"
r="2.5"
gradientUnits="userSpaceOnUse" /><filter
inkscape:collect="always"
x="-0.12"
width="1.24"
y="-0.12"
height="1.24"
id="filter3418"><feGaussianBlur
inkscape:collect="always"
stdDeviation="0.25"
id="feGaussianBlur3420" /></filter><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3422"
id="radialGradient3428"
cx="38.75"
cy="25"
fx="38.75"
fy="25"
r="2.625"
gradientUnits="userSpaceOnUse" /><filter
inkscape:collect="always"
id="filter3430"><feGaussianBlur
inkscape:collect="always"
stdDeviation="0.0825"
id="feGaussianBlur3432" /></filter><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3454"
id="linearGradient3460"
x1="36.375"
y1="14.967752"
x2="13.625"
y2="11.405098"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3474"
id="linearGradient3480"
x1="25.311939"
y1="15.734048"
x2="25.311939"
y2="16.375"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9655774,0,0,1.0002916,0.5572142,-0.1254361)" /></defs><sodipodi:namedview
inkscape:cy="50"
inkscape:cx="50"
inkscape:zoom="4.07"
inkscape:window-height="622"
inkscape:window-width="872"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
showgrid="true"
inkscape:object-bbox="true"
inkscape:object-points="true"
inkscape:grid-points="true"
inkscape:guide-points="true"
width="100px"
height="100px"
inkscape:object-paths="true"
inkscape:grid-bbox="true"
inkscape:guide-bbox="true"
inkscape:object-nodes="true"
inkscape:window-x="120"
inkscape:window-y="168"
inkscape:current-layer="svg2"
gridspacingx="0.5px"
gridspacingy="0.5px" />
<rect
style="opacity:0.6667;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;filter:url(#filter3356)"
id="rect3314"
width="36.25"
height="5"
x="6.25"
y="41.25"
transform="matrix(0.9310344,0,0,1,1.6810348,-1.4173228)" /><path
style="opacity:1;fill:url(#linearGradient3267);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
d="M 15,8.75 C 22.5,8.75 30,8.75 35,8.75 C 37.690077,8.75 45,20.98 45,23.75 L 45,38.75 C 45,41.52 42.77,43.75 40,43.75 L 10,43.75 C 7.23,43.75 5,41.52 5,38.75 L 5,23.75 C 5,20.98 12.309923,8.75 15,8.75 z "
id="rect2276"
sodipodi:nodetypes="csccccccs" /><rect
style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3430)"
id="rect2279"
width="40"
height="25"
x="5"
y="18.75"
rx="5"
ry="5" /><rect
style="opacity:0.66660001;fill:#999999;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.1437055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3309"
width="29.981295"
height="9.9187946"
x="10.009353"
y="33.821854" /><path
sodipodi:type="arc"
style="opacity:1;fill:url(#radialGradient3428);fill-opacity:1.0;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3366"
sodipodi:cx="38.75"
sodipodi:cy="25"
sodipodi:rx="2.5"
sodipodi:ry="2.5"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
transform="translate(1.375,-1.375)" /><path
transform="translate(1.375,-1.375)"
d="M 41.25 25 A 2.5 2.5 0 1 1 36.25,25 A 2.5 2.5 0 1 1 41.25 25 z"
sodipodi:ry="2.5"
sodipodi:rx="2.5"
sodipodi:cy="25"
sodipodi:cx="38.75"
id="path3376"
style="opacity:0.6667;fill:url(#radialGradient3384);fill-opacity:1.0;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3418)"
sodipodi:type="arc" /><g
id="g3469"><path
sodipodi:nodetypes="ccccc"
id="rect3452"
d="M 15.956628,10 L 33.75,10 L 36.25,16.25 L 13.75,16.25 L 15.956628,10 z "
style="opacity:0.6667;fill:url(#linearGradient3460);fill-opacity:1;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
id="path3463"
d="M 33.75,10 L 35,16.25"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
id="path3465"
d="M 15.956628,10 L 15,16.25"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /></g><path
style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient3480);stroke-width:0.24569531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 20.598421,1.3621917 C 25.247456,1.3621917 24.748269,1.3621917 29.397305,1.3621917 C 32.696885,1.3621917 33.747879,16.129302 33.747879,16.129302 L 16.247847,16.129302 C 16.247847,16.129302 16.198978,1.3621917 20.598421,1.3621917 z "
id="rect3311"
sodipodi:nodetypes="csccs" /></svg>
Lado a Lado

Antes

Largura:  |  Altura:  |  Tamanho: 12 KiB

Alguns arquivos não foram exibidos porque demasiados arquivos foram alterados neste diff Mostrar Mais