rpms/cups/devel cups-rc2-5446.patch,NONE,1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 21 13:48:51 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25578
Added Files:
cups-rc2-5446.patch
Log Message:
Include the patch.
cups-rc2-5446.patch:
CHANGES.txt | 50
CREDITS.txt | 5
backend/Dependencies | 5
backend/Makefile | 13
backend/ieee1284.c | 359 ++
backend/parallel.c | 2
backend/serial.c | 59
backend/snmp.c | 2182 +++++++++++++++++
backend/snmp.txt | 172 +
cgi-bin/admin.c | 71
cgi-bin/ipp-var.c | 4
conf/Makefile | 3
conf/mime.convs | 5
conf/mime.types | 8
config-scripts/cups-defaults.m4 | 2
configure.in | 12
cups/Dependencies | 18
cups/Makefile | 3
cups/custom.c | 12
cups/getifaddrs.c | 275 ++
cups/http-addr.c | 23
cups/http-private.h | 44
cups/http.c | 109
cups/ipp.c | 69
cups/localize.c | 2
cups/request.c | 32
cups/testi18n.c | 36
doc/Makefile | 1
doc/help/api-ppd.html | 109
doc/help/ref-client-conf.html | 59
doc/help/ref-snmp-conf.html | 100
doc/sv/images/button-accept-jobs.gif | 0
doc/sv/images/button-add-class.gif | 0
doc/sv/images/button-add-printer.gif | 0
doc/sv/images/button-add-this-printer.gif | 0
doc/sv/images/button-cancel-all-jobs.gif | 0
doc/sv/images/button-cancel-job.gif | 0
doc/sv/images/button-change-settings.gif | 0
doc/sv/images/button-clean-print-heads.gif | 0
doc/sv/images/button-clear.gif | 0
doc/sv/images/button-continue.gif | 0
doc/sv/images/button-delete-class.gif | 0
doc/sv/images/button-delete-printer.gif | 0
doc/sv/images/button-edit-configuration-file.gif | 0
doc/sv/images/button-export-samba.gif | 0
doc/sv/images/button-help.gif | 0
doc/sv/images/button-hold-job.gif | 0
doc/sv/images/button-manage-classes.gif | 0
doc/sv/images/button-manage-jobs.gif | 0
doc/sv/images/button-manage-printers.gif | 0
doc/sv/images/button-manage-server.gif | 0
doc/sv/images/button-modify-class.gif | 0
doc/sv/images/button-modify-printer.gif | 0
doc/sv/images/button-move-job.gif | 0
doc/sv/images/button-move-jobs.gif | 0
doc/sv/images/button-print-self-test-page.gif | 0
doc/sv/images/button-print-test-page.gif | 0
doc/sv/images/button-publish-printer.gif | 0
doc/sv/images/button-reject-jobs.gif | 0
doc/sv/images/button-release-job.gif | 0
doc/sv/images/button-restart-job.gif | 0
doc/sv/images/button-save-changes.gif | 0
doc/sv/images/button-search.gif | 0
doc/sv/images/button-set-allowed-users.gif | 0
doc/sv/images/button-set-as-default.gif | 0
doc/sv/images/button-set-printer-options.gif | 0
doc/sv/images/button-show-active.gif | 0
doc/sv/images/button-show-all.gif | 0
doc/sv/images/button-show-completed.gif | 0
doc/sv/images/button-show-next.gif | 0
doc/sv/images/button-show-previous.gif | 0
doc/sv/images/button-sort-ascending.gif | 0
doc/sv/images/button-sort-descending.gif | 0
doc/sv/images/button-start-class.gif | 0
doc/sv/images/button-start-printer.gif | 0
doc/sv/images/button-stop-class.gif | 0
doc/sv/images/button-stop-printer.gif | 0
doc/sv/images/button-unpublish-printer.gif | 0
doc/sv/images/button-use-default-config.gif | 0
doc/sv/images/button-view-access-log.gif | 0
doc/sv/images/button-view-error-log.gif | 0
doc/sv/images/button-view-page-log.gif | 0
doc/sv/images/button-view-printable-version.gif | 0
doc/sv/index.html.in | 137 +
driver/testdriver.c | 179 +
locale/cups.pot | 2
locale/cups_es.po | 13
locale/cups_ja.po | 9
locale/cups_sv.po | 2813 +++++++++++++++++++++++
man/Makefile | 1
man/cups-snmp.conf.man | 77
man/cupsaddsmb.man.in | 25
packaging/cups.list.in | 24
packaging/cups.spec.in | 20
scheduler/auth.c | 16
scheduler/client.c | 90
scheduler/cups-driverd.c | 6
scheduler/ipp.c | 166 -
scheduler/job.c | 161 -
scheduler/job.h | 5
scheduler/mime.c | 18
scheduler/network.c | 43
standards/Makefile | 0
standards/X.690-0207.pdf | 0
standards/rfc1155.txt | 0
standards/rfc1157.txt | 0
standards/rfc2790.txt | 0
systemv/cupstestdsc.c | 15
systemv/cupstestppd.c | 60
templates/admin.tmpl | 6
templates/es/admin.tmpl | 8
templates/ja/admin.tmpl | 8
templates/ja/edit-config.tmpl.in | 90
templates/sv/add-class.tmpl | 33
templates/sv/add-printer.tmpl | 28
templates/sv/admin.tmpl | 77
templates/sv/choose-device.tmpl | 26
templates/sv/choose-make.tmpl | 42
templates/sv/choose-model.tmpl | 34
templates/sv/choose-serial.tmpl | 47
templates/sv/choose-uri.tmpl | 42
templates/sv/class-added.tmpl | 1
templates/sv/class-confirm.tmpl | 7
templates/sv/class-deleted.tmpl | 1
templates/sv/class-jobs-header.tmpl | 1
templates/sv/class-modified.tmpl | 2
templates/sv/classes-header.tmpl | 1
templates/sv/classes.tmpl | 54
templates/sv/edit-config.tmpl.in | 90
templates/sv/error-op.tmpl | 3
templates/sv/error.tmpl | 3
templates/sv/header.tmpl.in | 63
templates/sv/help-header.tmpl | 47
templates/sv/help-printable.tmpl | 11
templates/sv/job-cancel.tmpl | 1
templates/sv/job-hold.tmpl | 1
templates/sv/job-move.tmpl | 22
templates/sv/job-moved.tmpl | 2
templates/sv/job-release.tmpl | 1
templates/sv/job-restart.tmpl | 1
templates/sv/jobs-header.tmpl | 15
templates/sv/jobs.tmpl | 42
templates/sv/maintenance.tmpl | 2
templates/sv/modify-class.tmpl | 34
templates/sv/modify-printer.tmpl | 29
templates/sv/option-boolean.tmpl | 6
templates/sv/option-conflict.tmpl | 7
templates/sv/option-header.tmpl | 3
templates/sv/option-pickmany.tmpl | 6
templates/sv/option-pickone.tmpl | 6
templates/sv/option-trailer.tmpl | 5
templates/sv/pager.tmpl | 7
templates/sv/printer-accept.tmpl | 3
templates/sv/printer-added.tmpl | 1
templates/sv/printer-configured.tmpl | 1
templates/sv/printer-confirm.tmpl | 7
templates/sv/printer-default.tmpl | 7
templates/sv/printer-deleted.tmpl | 1
templates/sv/printer-jobs-header.tmpl | 1
templates/sv/printer-modified.tmpl | 1
templates/sv/printer-purge.tmpl | 3
templates/sv/printer-reject.tmpl | 3
templates/sv/printer-start.tmpl | 3
templates/sv/printer-stop.tmpl | 3
templates/sv/printers-header.tmpl | 1
templates/sv/printers.tmpl | 64
templates/sv/restart.tmpl | 1
templates/sv/samba-export.tmpl | 55
templates/sv/samba-exported.tmpl | 1
templates/sv/search.tmpl | 13
templates/sv/set-printer-options-header.tmpl | 3
templates/sv/set-printer-options-trailer.tmpl | 1
templates/sv/test-page.tmpl | 2
templates/sv/trailer.tmpl | 21
templates/sv/users.tmpl | 26
test/ipptest.c | 109
176 files changed, 8299 insertions(+), 671 deletions(-)
--- NEW FILE cups-rc2-5446.patch ---
Index: packaging/cups.spec.in
===================================================================
--- packaging/cups.spec.in (revision 5384)
+++ packaging/cups.spec.in (working copy)
@@ -86,6 +86,11 @@
Group: System Environment/Daemons
Requires: %{name} = %{epoch}:%{version}
+%package sv
+Summary: Common UNIX Printing System - Swedish support
+Group: System Environment/Daemons
+Requires: %{name} = %{epoch}:%{version}
+
%if %{?_with_php:1}%{!?_with_php:0}
%package php
Summary: Common UNIX Printing System - PHP support
@@ -120,6 +125,10 @@
The Common UNIX Printing System provides a portable printing layer for
UNIX® operating systems. This package provides Japanese support.
+%description sv
+The Common UNIX Printing System provides a portable printing layer for
+UNIX® operating systems. This package provides Swedish support.
+
%if %{?_with_php:1}%{!?_with_php:0}
%description php
The Common UNIX Printing System provides a portable printing layer for
@@ -230,6 +239,7 @@
/usr/lib/cups/backend/parallel
/usr/lib/cups/backend/scsi
/usr/lib/cups/backend/serial
+/usr/lib/cups/backend/snmp
/usr/lib/cups/backend/socket
/usr/lib/cups/backend/usb
%dir /usr/lib/cups/cgi-bin
@@ -372,6 +382,16 @@
/usr/share/cups/templates/ja/*
/usr/share/locale/ja/cups_ja.po
+%files sv
+%defattr(-,root,root)
+%dir /usr/share/doc/cups/sv
+/usr/share/doc/cups/sv/index.html
+%dir /usr/share/doc/cups/sv/images
+/usr/share/doc/cups/sv/images/*
+%dir /usr/share/cups/templates/sv
+/usr/share/cups/templates/sv/*
+/usr/share/locale/sv/cups_sv.po
+
%if %{?_with_php:1}%{!?_with_php:0}
%files php
# PHP
Index: packaging/cups.list.in
===================================================================
--- packaging/cups.list.in (revision 5384)
+++ packaging/cups.list.in (working copy)
@@ -103,6 +103,9 @@
%subpackage ja
%description Common UNIX Printing System - Japanese support
+%subpackage sv
+%description Common UNIX Printing System - Swedish support
+
%subpackage
@@ -190,12 +193,13 @@
d 0755 root sys $SERVERBIN -
d 0755 root sys $SERVERBIN/backend -
-f 0755 root sys $SERVERBIN/backend/ipp backend/ipp
-l 0755 root sys $SERVERBIN/backend/http ipp
-f 0755 root sys $SERVERBIN/backend/lpd backend/lpd
+f 0700 root sys $SERVERBIN/backend/ipp backend/ipp
+l 0700 root sys $SERVERBIN/backend/http ipp
+f 0700 root sys $SERVERBIN/backend/lpd backend/lpd
f 0755 root sys $SERVERBIN/backend/parallel backend/parallel
f 0755 root sys $SERVERBIN/backend/scsi backend/scsi
f 0755 root sys $SERVERBIN/backend/serial backend/serial
+f 0755 root sys $SERVERBIN/backend/snmp backend/snmp
f 0755 root sys $SERVERBIN/backend/socket backend/socket
f 0755 root sys $SERVERBIN/backend/usb backend/usb
d 0755 root sys $SERVERBIN/cgi-bin -
@@ -334,6 +338,8 @@
f 0644 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
%subpackage ja
f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+%subpackage sv
+f 0644 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
%subpackage
d 0755 root sys $DATADIR -
@@ -395,6 +401,9 @@
%subpackage ja
d 0755 root sys $DATADIR/templates/ja
f 0644 root sys $DATADIR/templates/ja templates/ja/*.tmpl
+%subpackage sv
+d 0755 root sys $DATADIR/templates/sv
+f 0644 root sys $DATADIR/templates/sv templates/sv/*.tmpl
%subpackage
# Config files
@@ -403,8 +412,8 @@
d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
c $CUPS_PERM root $CUPS_GROUP $SERVERROOT conf/*.conf
f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf
-f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/mime.convs conf/mime.convs
-f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/mime.types conf/mime.types
+f 0644 root $CUPS_GROUP $SERVERROOT/mime.convs conf/mime.convs
+f 0644 root $CUPS_GROUP $SERVERROOT/mime.types conf/mime.types
%if PAMDIR
d 0755 root sys $PAMDIR -
@@ -468,6 +477,11 @@
f 0644 root sys $DOCDIR/ja doc/ja/*.html
d 0755 root sys $DOCDIR/ja/images -
f 0644 root sys $DOCDIR/ja/images doc/ja/images/*.gif
+%subpackage sv
+d 0755 root sys $DOCDIR/sv
+f 0644 root sys $DOCDIR/sv doc/sv/*.html
+d 0755 root sys $DOCDIR/sv/images -
+f 0644 root sys $DOCDIR/sv/images doc/sv/images/*.gif
%subpackage
# Man pages
Index: conf/mime.types
===================================================================
--- conf/mime.types (revision 5384)
+++ conf/mime.types (working copy)
@@ -147,7 +147,9 @@
application/vnd.cups-command string(0,'#CUPS-COMMAND')
application/vnd.cups-form string(0,"<CUPSFORM>")
+application/vnd.cups-pdf
application/vnd.cups-postscript
+application/vnd.cups-ppd ppd string(0,"*PPD-Adobe:")
application/vnd.cups-raster string(0,"RaSt") string(0,"tSaR")
application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \
string(0,<1B>@) \
@@ -159,12 +161,10 @@
#
# Raw print file support...
#
-# Uncomment the following type and the application/octet-stream
-# filter line in mime.convs to allow raw file printing without the
-# -oraw option.
+# Comment the following type to prevent raw file printing.
#
-#application/octet-stream
+application/octet-stream
#
# End of "$Id$".
Index: conf/Makefile
===================================================================
--- conf/Makefile (revision 5384)
+++ conf/Makefile (working copy)
@@ -74,8 +74,7 @@
if test -r $(SERVERROOT)/$$file ; then \
$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
fi ; \
- $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
- chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
+ $(INSTALL_DATA) $$file $(SERVERROOT) ; \
done
-if test x$(PAMDIR) != x; then \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
Index: conf/mime.convs
===================================================================
--- conf/mime.convs (revision 5384)
+++ conf/mime.convs (working copy)
@@ -107,9 +107,8 @@
#
# Raw filter...
#
-# Uncomment the following filter and the application/octet-stream type
-# in mime.types to allow printing of arbitrary files without the -oraw
-# option.
+# Uncomment the following filter to allow printing of arbitrary files
+# without the -oraw option.
#
#application/octet-stream application/vnd.cups-raw 0 -
Index: backend/Dependencies
===================================================================
--- backend/Dependencies (revision 5384)
+++ backend/Dependencies (working copy)
@@ -19,6 +19,11 @@
serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
serial.o: ../cups/language.h ../cups/string.h ../config.h
+snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
+snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
+snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
+snmp.o: ../cups/debug.h
socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
[...11057 lines suppressed...]
@@ -106,15 +115,6 @@
mimeDeleteType(mime, type);
/*
- * Loop through filters and free them...
- */
-
- for (filter = (mime_filter_t *)cupsArrayFirst(mime->filters);
- filter;
- filter = (mime_filter_t *)cupsArrayNext(mime->filters))
- mimeDeleteFilter(mime, filter);
-
- /*
* Free the types and filters arrays, and then the MIME database structure.
*/
Index: driver/testdriver.c
===================================================================
--- driver/testdriver.c (revision 0)
+++ driver/testdriver.c (revision 5446)
@@ -0,0 +1,179 @@
+/*
+ * "$Id$"
+ *
+ * Sample/test driver interface program for the Common UNIX Printing
+ * System (CUPS).
+ *
+ * This program handles listing and installing both static PPD files
+ * in CUPS_DATADIR/model and dynamically generated PPD files using
+ * the driver helper programs in CUPS_SERVERBIN/driver.
+ *
+ * Copyright 1997-2006 by Easy Software Products.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Easy Software Products 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 missing or damaged please contact Easy Software Products
+ * at:
+ *
+ * Attn: CUPS Licensing Information
+ * Easy Software Products
+ * 44141 Airport View Drive, Suite 204
+ * Hollywood, Maryland 20636 USA
+ *
+ * Voice: (301) 373-9600
+ * EMail: cups-info at cups.org
+ * WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ * main() - Enumerate or display PPD files.
+ * cat_ppd() - Display a PPD file.
+ * list_ppds() - List PPDs.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+
+/*
+ * Local functions...
+ */
+
+static int cat_ppd(const char *uri);
+static int list_ppds(const char *name);
+
+
+/*
+ * Sample data...
+ */
+
+static const char *models[][2] =
+ {
+ { "foojet.ppd", "Foo Printer" },
+ { "barjet.ppd", "Bar Printer" },
+ { "foobar.ppd", "Foo/Bar Multifunction Printer" }
+ };
+
+
+/*
+ * 'main()' - Enumerate or display PPD files.
+ */
+
+int /* O - Exit status */
+main(int argc, /* I - Number of command-line args */
+ char *argv[]) /* I - Command-line arguments */
+{
+ if (argc == 2 && !strcmp(argv[1], "list"))
+ return (list_ppds(argv[0]));
+ else if (argc == 3 && !strcmp(argv[1], "cat"))
+ return (cat_ppd(argv[2]));
+
+ fprintf(stderr, "ERROR: Usage: %s cat URI\n", argv[0]);
+ fprintf(stderr, "ERROR: Usage: %s list\n", argv[0]);
+ return (1);
+}
+
+
+/*
+ * 'cat_ppd()' - Display a PPD file.
+ */
+
+static int /* O - Exit status */
+cat_ppd(const char *uri) /* I - PPD URI */
+{
+ int i; /* Looping var */
+ const char *name; /* Pointer to name in URI */
+
+
+ if ((name = strchr(uri, ':')) == NULL)
+ {
+ fprintf(stderr, "ERROR: Bad URI \"%s\"!\n", uri);
+ return (1);
+ }
+
+ name ++;
+
+ for (i = 0 ; i < (int)(sizeof(models) / sizeof(models[0])); i ++)
+ if (!strcmp(name, models[i][0]))
+ {
+ /*
+ * Actually display the PPD file...
+ */
+ puts("*PPD-Adobe: \"4.3\"");
+
+ puts("*LanguageEncoding: ISOLatin1");
+ puts("*LanguageVersion: English");
+ puts("*Manufacturer: \"Test\"");
+ puts("*FileVersion: \"1.0\"");
+ puts("*FormatVersion: \"4.3\"");
+ puts("*PSVersion: \"(3010) 1\"");
+ printf("*PCFileName: \"%s\"\n", models[i][0]);
+
+ printf("*Product: \"(%s)\"\n", models[i][1]);
+ printf("*ModelName: \"Test %s\"\n", models[i][1]);
+ printf("*NickName: \"Test %s\"\n", models[i][1]);
+ printf("*ShortNickName: \"Test %s\"\n", models[i][1]);
+
+ puts("*OpenUI PageSize: PickOne");
+ puts("*OrderDependency: 10 AnySetup *PageSetup");
+ puts("*DefaultPageSize: Letter");
+ puts("*PageSize Letter: \"<</PageSize[612 792]>>setpagedevice\"");
+ puts("*PageSize A4: \"<</PageSize[585 842]>>setpagedevice\"");
+ puts("*CloseUI: *PageSize");
+
+ puts("*OpenUI PageRegion: PickOne");
+ puts("*OrderDependency: 10 AnySetup *PageRegion");
+ puts("*DefaultPageRegion: Letter");
+ puts("*PageRegion Letter: \"<</PageRegion[612 792]>>setpagedevice\"");
+ puts("*PageRegion A4: \"<</PageRegion[585 842]>>setpagedevice\"");
+ puts("*CloseUI: *PageRegion");
+
+ puts("*DefaultImageableArea: Letter");
+ puts("*ImageableArea Letter: \"0 0 612 792\"");
+ puts("*ImageableArea A4: \"0 0 595 842\"");
+
+ puts("*DefaultPaperDimension: Letter");
+ puts("*PaperDimension Letter: \"612 792\"");
+ puts("*PaperDimension A4: \"595 842\"");
+
+ return (0);
+ }
+
+ fprintf(stderr, "ERROR: Unknown URI \"%s\"!\n", uri);
+ return (1);
+}
+
+
+/*
+ * 'list_ppds()' - List PPDs.
+ */
+
+static int /* O - Exit status */
+list_ppds(const char *name) /* I - Program name */
+{
+ int i; /* Looping var */
+ const char *base; /* Base name of program */
+
+
+ if ((base = strrchr(name, '/')) != NULL)
+ base ++;
+ else
+ base = name;
+
+ for (i = 0; i < (int)(sizeof(models) / sizeof(models[0])); i ++)
+ printf("\"%s:%s\" en \"Test\" \"Test %s\" \"1284 device id\"\n",
+ base, models[i][0], models[i][1]);
+
+ return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
More information about the fedora-cvs-commits
mailing list