rpms/cups/FC-5 cups-kde.patch, NONE, 1.1 cups-str1515.patch, NONE, 1.1 cups-str1521.patch, NONE, 1.1 cups-1.1.15-initscript.patch, 1.3, 1.4 cups-1.1.16-system-auth.patch, 1.3, 1.4 cups-1.1.17-ppdsdat.patch, 1.3, 1.4 cups-1.1.17-rcp.patch, 1.2, 1.3 cups-CAN-2005-0064.patch, 1.1, 1.2 cups-dest-cache-v2.patch, 1.1, 1.2 cups-link.patch, 1.2, 1.3 cups-locale.patch, 1.1, 1.2 cups-lpd, 1.2, 1.3 cups-pie.patch, 1.4, 1.5 cups-relro.patch, 1.2, 1.3 cups.spec, 1.134, 1.135 sources, 1.15, 1.16
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Mar 30 15:15:39 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6586
Modified Files:
cups-1.1.15-initscript.patch cups-1.1.16-system-auth.patch
cups-1.1.17-ppdsdat.patch cups-1.1.17-rcp.patch
cups-CAN-2005-0064.patch cups-dest-cache-v2.patch
cups-link.patch cups-locale.patch cups-lpd cups-pie.patch
cups-relro.patch cups.spec sources
Added Files:
cups-kde.patch cups-str1515.patch cups-str1521.patch
Log Message:
* Thu Mar 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.3
- Added conflicts.
- Built for FC5 update.
cups-kde.patch:
ipp.c | 4 ++--
ipp.h | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
--- NEW FILE cups-kde.patch ---
--- cups-1.2b2/cups/ipp.h.kde 2006-03-24 15:51:54.000000000 +0000
+++ cups-1.2b2/cups/ipp.h 2006-03-24 15:52:27.000000000 +0000
@@ -487,6 +487,17 @@
ipp_t *parent, ipp_t *ipp);
+#ifdef __linux
+/*
+ * The following symbol definitions are provided only for KDE
+ * compatibility during the CUPS 1.2 testing period and will be
+ * removed in a future release of CUPS. These are PRIVATE APIs
+ * from CUPS 1.1.x that the KDE developers chose to use...
+ */
+extern ipp_attribute_t *_ipp_add_attr(ipp_t *, int);
+extern void _ipp_free_attr(ipp_attribute_t *);
+#endif /* __linux */
+
/*
* C++ magic...
*/
--- cups-1.2b2/cups/ipp.c.kde 2006-03-24 14:42:41.000000000 +0000
+++ cups-1.2b2/cups/ipp.c 2006-03-24 14:42:53.000000000 +0000
@@ -2806,14 +2806,14 @@
*/
ipp_attribute_t * /* O - New attribute */
-_ipp_add(ipp_t *ipp, /* I - IPP message */
+_ipp_add_attr(ipp_t *ipp, /* I - IPP message */
int num_values) /* I - Number of values */
{
return (_ippAddAttr(ipp, num_values));
}
void
-_ipp_free(ipp_attribute_t *attr) /* I - Attribute to free */
+_ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */
{
_ippFreeAttr(attr);
}
cups-str1515.patch:
lpq.c | 62 ++++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 18 deletions(-)
--- NEW FILE cups-str1515.patch ---
--- cups-1.2rc1/berkeley/lpq.c.str1515 2006-01-29 14:39:44.000000000 +0000
+++ cups-1.2rc1/berkeley/lpq.c 2006-03-28 17:27:50.000000000 +0100
@@ -49,6 +49,7 @@
* Local functions...
*/
+static http_t *connect_server(const char *, http_t *);
static int show_jobs(const char *, http_t *, const char *,
const char *, const int, const int);
static void show_printer(const char *, http_t *, const char *);
@@ -76,35 +77,23 @@
int num_dests; /* Number of destinations */
cups_dest_t *dests; /* Destinations */
cups_lang_t *language; /* Language */
-#ifdef HAVE_SSL
- http_encryption_t encryption; /* Encryption? */
-#endif /* HAVE_SSL */
- language = cupsLangDefault();
- /*
- * Connect to the scheduler...
- */
-
- if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption())) == NULL)
- {
- _cupsLangPrintf(stderr, _("%s: Unable to contact server!\n"), argv[0]);
- return (1);
- }
/*
* Check for command-line options...
*/
+ http = NULL;
dest = NULL;
user = NULL;
id = 0;
interval = 0;
longstatus = 0;
all = 0;
- num_dests = cupsGetDests(&dests);
+ language = cupsLangDefault();
+ num_dests = 0;
for (i = 1; i < argc; i ++)
if (argv[i][0] == '+')
@@ -115,10 +104,10 @@
{
case 'E' : /* Encrypt */
#ifdef HAVE_SSL
- encryption = HTTP_ENCRYPT_REQUIRED;
+ cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
if (http)
- httpEncryption(http, encryption);
+ httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
#else
_cupsLangPrintf(stderr,
_("%s: Sorry, no encryption support compiled in!\n"),
@@ -166,6 +155,11 @@
if ((instance = strchr(dest, '/')) != NULL)
*instance++ = '\0';
+ http = connect_server(argv[0], http);
+
+ if (num_dests == 0)
+ num_dests = cupsGetDests2(http, &dests);
+
if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
{
if (instance)
@@ -186,8 +180,11 @@
break;
case 'h' : /* Connect to host */
- if (http != NULL)
+ if (http)
+ {
httpClose(http);
+ http = NULL;
+ }
if (argv[i][2] != '\0')
cupsSetServer(argv[i] + 2);
@@ -225,8 +222,13 @@
else
user = argv[i];
+ http = connect_server(argv[0], http);
+
if (dest == NULL && !all)
{
+ if (num_dests == 0)
+ num_dests = cupsGetDests2(http, &dests);
+
for (i = 0; i < num_dests; i ++)
if (dests[i].is_default)
dest = dests[i].name;
@@ -295,6 +297,30 @@
/*
+ * 'connect_server()' - Connect to the server as necessary...
+ */
+
+static http_t * /* O - New HTTP connection */
+connect_server(const char *command, /* I - Command name */
+ http_t *http) /* I - Current HTTP connection */
+{
+ if (!http)
+ {
+ http = httpConnectEncrypt(cupsServer(), ippPort(),
+ cupsEncryption());
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"), command);
+ exit(1);
+ }
+ }
+
+ return (http);
+}
+
+
+/*
* 'show_jobs()' - Show jobs.
*/
cups-str1521.patch:
conf.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
--- NEW FILE cups-str1521.patch ---
--- cups-1.2rc1/scheduler/conf.c.str1521 2006-03-14 11:54:45.000000000 +0000
+++ cups-1.2rc1/scheduler/conf.c 2006-03-30 10:09:57.000000000 +0100
@@ -338,22 +338,34 @@
endpwent();
/*
- * Find the default group (nobody)...
+ * Find the default group...
*/
- group = getgrnam("nobody");
+ group = getgrnam(CUPS_DEFAULT_GROUP);
endgrent();
- if (group != NULL)
+ if (group)
Group = group->gr_gid;
else
{
/*
- * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
- * complement number...)
+ * Fallback to group "nobody"...
*/
- Group = 65534;
+ group = getgrnam("nobody");
+ endgrent();
+
+ if (group)
+ Group = group->gr_gid;
+ else
+ {
+ /*
+ * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
+ * complement number...)
+ */
+
+ Group = 65534;
+ }
}
/*
cups-1.1.15-initscript.patch:
Makefile | 26 --------------------------
1 files changed, 26 deletions(-)
Index: cups-1.1.15-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.15-initscript.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-1.1.15-initscript.patch 9 Sep 2004 04:12:00 -0000 1.3
+++ cups-1.1.15-initscript.patch 30 Mar 2006 15:15:35 -0000 1.4
@@ -1,55 +1,35 @@
---- cups-1.1.21rc2/systemv/Makefile.noinit 2004-08-11 15:10:22.000000000 +0100
-+++ cups-1.1.21rc2/systemv/Makefile 2004-08-24 12:30:31.868411346 +0100
-@@ -77,7 +77,7 @@
- $(INSTALL_BIN) lp $(BINDIR)
- $(INSTALL_BIN) lpoptions $(BINDIR)
- $(INSTALL_BIN) lpstat $(BINDIR)
-- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
-+ -$(INSTALL_BIN) -m 4755 lppasswd $(BINDIR)
- if test ! -x $(BINDIR)/lppasswd; then \
- chmod 755 $(BINDIR)/lppasswd; \
- fi
---- cups-1.1.21rc2/Makefile.noinit 2004-02-25 20:14:50.000000000 +0000
-+++ cups-1.1.21rc2/Makefile 2004-08-24 12:28:17.704029413 +0100
-@@ -89,30 +89,6 @@
+--- cups-1.2b2/Makefile.noinit 2006-03-23 11:39:33.000000000 +0000
++++ cups-1.2b2/Makefile 2006-03-23 11:40:22.000000000 +0000
+@@ -80,32 +80,6 @@
echo Installing cups-config script...
- $(INSTALL_DIR) $(BINDIR)
+ $(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
- echo Installing startup script...
-- if test "x$(INITDIR)" != "x"; then \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+- if test "x$(INITDIR)" != x; then \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
- fi
-- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-- $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+- $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- else \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
- fi \
- fi
-
- #
- # Install source and header files...
---- cups-1.1.21rc2/Makedefs.in.noinit 2004-06-29 04:14:19.000000000 +0100
-+++ cups-1.1.21rc2/Makedefs.in 2004-08-24 12:28:17.713027695 +0100
-@@ -47,7 +47,7 @@
- # Installation programs...
- #
-
--INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s
-+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_DIR = $(INSTALL) -d
- INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755
+ if test "x$(DBUSDIR)" != x; then \
+ echo Installing cups.conf in $(DBUSDIR)...;\
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
cups-1.1.16-system-auth.patch:
Makefile | 10 +++++++---
cups.system-auth | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
Index: cups-1.1.16-system-auth.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.16-system-auth.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-1.1.16-system-auth.patch 30 Sep 2005 12:20:31 -0000 1.3
+++ cups-1.1.16-system-auth.patch 30 Mar 2006 15:15:35 -0000 1.4
@@ -1,21 +1,26 @@
---- /dev/null 2004-02-23 21:02:56.000000000 +0000
-+++ cups-1.1.21rc1/conf/cups.system-auth 2004-06-03 15:14:55.795385144 +0100
-@@ -0,0 +1,3 @@
-+#%PAM-1.0
-+auth include system-auth
-+account include system-auth
---- cups-1.1.21rc1/conf/Makefile.system-auth 2004-02-26 16:51:59.000000000 +0000
-+++ cups-1.1.21rc1/conf/Makefile 2004-06-03 15:32:52.108540894 +0100
-@@ -67,7 +67,11 @@
+--- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000
++++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000
+@@ -79,10 +79,14 @@
done
- -if test x$(PAMDIR) != x$(BUILDROOT); then \
- $(INSTALL_DIR) $(PAMDIR); \
-- $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
+ -if test x$(PAMDIR) != x; then \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
+- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+ if test -f /etc/pam.d/system-auth; then \
-+ $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \
-+ else \
-+ $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
-+ fi \
++ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
+ else \
+- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
++ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
++ else \
++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
++ fi ; \
+ fi ; \
fi
-
+--- /dev/null 2006-03-07 09:12:30.964372750 +0000
++++ cups-1.2svn-r5238/conf/cups.system-auth 2006-03-07 09:43:12.000000000 +0000
+@@ -0,0 +1,3 @@
++#%PAM-1.0
++auth include system-auth
++account include system-auth
cups-1.1.17-ppdsdat.patch:
main.c | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
Index: cups-1.1.17-ppdsdat.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.17-ppdsdat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-1.1.17-ppdsdat.patch 9 Sep 2004 04:08:38 -0000 1.3
+++ cups-1.1.17-ppdsdat.patch 30 Mar 2006 15:15:35 -0000 1.4
@@ -1,14 +1,14 @@
---- cups-1.1.21rc1/scheduler/main.c.ppdsdat 2004-05-27 19:17:54.000000000 +0100
-+++ cups-1.1.21rc1/scheduler/main.c 2004-06-03 15:33:51.054269593 +0100
-@@ -91,6 +91,7 @@
+--- cups-1.2svn-r5083/scheduler/main.c.ppdsdat 2006-02-05 21:58:58.000000000 +0000
++++ cups-1.2svn-r5083/scheduler/main.c 2006-02-10 13:46:19.000000000 +0000
+@@ -115,6 +115,7 @@
int i; /* Looping var */
char *opt; /* Option character */
int fg; /* Run in the foreground */
+ int only_ppds; /* Just build ppds.dat */
- int fds; /* Number of ready descriptors select returns */
+ int fds; /* Number of ready descriptors */
fd_set *input, /* Input set for select() */
*output; /* Output set for select() */
-@@ -120,10 +121,25 @@
+@@ -150,10 +151,25 @@
*/
fg = 0;
@@ -28,22 +28,22 @@
+ {
+ fprintf(stderr, "cupsd: Unknown option \'%s\' - aborting!\n",
+ &argv[i][2]);
-+ usage();
++ usage(1);
+ }
+ }
+ else for (opt = argv[i] + 1; *opt != '\0'; opt ++)
switch (*opt)
{
case 'c' : /* Configuration file */
-@@ -166,6 +182,7 @@
- usage();
+@@ -227,6 +243,7 @@
+ usage(1);
break;
}
+ }
else
{
- fprintf(stderr, "cupsd: Unknown argument \'%s\' - aborting!\n", argv[i]);
-@@ -375,6 +392,9 @@
+ _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
+@@ -467,6 +484,9 @@
signal(SIGTERM, sigterm_handler);
#endif /* HAVE_SIGSET */
@@ -53,12 +53,20 @@
#ifdef __sgi
/*
* Try to create a fake lpsched lock file if one is not already there.
-@@ -1310,7 +1330,7 @@
- static void
- usage(void)
+@@ -2311,13 +2331,14 @@
+ usage(int status) /* O - Exit status */
{
-- fputs("Usage: cupsd [-c config-file] [-f] [-F]\n", stderr);
-+ fputs("Usage: cupsd [-c config-file] [-f] [-F] --ppdsdat\n", stderr);
- exit(1);
+ _cupsLangPuts(status ? stderr : stdout,
+- _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
++ _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l] [--ppdsdat]\n"
+ "\n"
+ "-c config-file Load alternate configuration file\n"
+ "-f Run in the foreground\n"
+ "-F Run in the foreground but detach\n"
+ "-h Show this usage message\n"
+- "-l Run cupsd from launchd(8)\n"));
++ "-l Run cupsd from launchd(8)\n"
++ "--ppdsdat Just build ppds.dat\n"));
+ exit(status);
}
cups-1.1.17-rcp.patch:
printers.tmpl | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: cups-1.1.17-rcp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.17-rcp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-1.1.17-rcp.patch 9 Sep 2004 04:06:15 -0000 1.2
+++ cups-1.1.17-rcp.patch 30 Mar 2006 15:15:35 -0000 1.3
@@ -1,11 +1,11 @@
---- cups-1.1.17/templates/printers.tmpl.rcp 2000-09-05 22:08:31.000000000 +0100
-+++ cups-1.1.17/templates/printers.tmpl 2003-01-22 14:17:56.000000000 +0000
-@@ -16,7 +16,7 @@
- <TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
- <IMG SRC="../images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" BORDER="0" ALT=""></A>
- </TD>
-- <TD VALIGN="TOP">Description: {printer_info}<BR>
-+ <TD VALIGN="TOP">{printer_info=Created by redhat-config-printer 0.6.x?<b>Use system-config-printer to edit this!</b>:Description: {printer_info}}<BR>
- Location: {printer_location}<BR>
- Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}},
- {printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}.
+--- cups-1.2svn-r4964/templates/printers.tmpl.rcp 2006-01-14 20:37:40.000000000 +0000
++++ cups-1.2svn-r4964/templates/printers.tmpl 2006-01-24 17:13:14.000000000 +0000
+@@ -7,7 +7,7 @@
+ <TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
+ <IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
+ </TD>
+-<TD VALIGN="TOP"><B>Description:</B> {printer_info}<BR>
++<TD VALIGN="TOP">{printer_info=Created by redhat-config-printer 0.6.x?<B>Use system-config-printer to edit this!</B>:<B>Description:</B> {printer_info}}<BR>
+ <B>Location:</B> {printer_location}<BR>
+ <B>Make and Model:</B> {printer_make_and_model}<BR>
+ <B>Printer State:</B> {printer_state=3?idle:{printer_state=4?processing:stopped}},
cups-CAN-2005-0064.patch:
Decrypt.cxx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
Index: cups-CAN-2005-0064.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-CAN-2005-0064.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-CAN-2005-0064.patch 19 Jan 2005 14:23:42 -0000 1.1
+++ cups-CAN-2005-0064.patch 30 Mar 2006 15:15:35 -0000 1.2
@@ -1,6 +1,6 @@
---- cups-1.1.17/pdftops/Decrypt.cxx 2005-01-14 14:26:55.679891237 +0000
-+++ cups-1.1.17/pdftops/Decrypt.cxx 2005-01-17 14:21:58.917198715 +0000
-@@ -116,13 +116,19 @@
+--- cups-1.2svn-r4929/pdftops/Decrypt.cxx.CAN-2005-0064 2005-09-17 15:52:15.000000000 +0100
++++ cups-1.2svn-r4929/pdftops/Decrypt.cxx 2006-01-20 14:31:21.000000000 +0000
+@@ -135,11 +135,16 @@
Guchar *buf;
Guchar test[32];
Guchar fState[256];
@@ -14,14 +14,11 @@
+ if ( !keyLength || keyLength > 16 ) {
+ return gFalse;
+ }
-+
++
// generate file key
- buf = (Guchar *)gmalloc(68 + fileID->getLength());
-+ tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
+ buf = (Guchar *)gmalloc(72 + fileID->getLength());
if (userPassword) {
- len = userPassword->getLength();
- if (len < 32) {
-@@ -175,6 +181,7 @@
+@@ -201,6 +206,7 @@
ok = gFalse;
}
cups-dest-cache-v2.patch:
dest.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 180 insertions(+)
Index: cups-dest-cache-v2.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-dest-cache-v2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-dest-cache-v2.patch 10 Jan 2006 18:53:00 -0000 1.1
+++ cups-dest-cache-v2.patch 30 Mar 2006 15:15:35 -0000 1.2
@@ -1,18 +1,17 @@
---- cups-1.1.23/cups/dest.c.dest-cache-v2 2005-01-03 19:29:45.000000000 +0000
-+++ cups-1.1.23/cups/dest.c 2006-01-10 17:52:39.000000000 +0000
-@@ -45,7 +45,10 @@
- #include "string.h"
+--- cups-1.2svn-r5238/cups/dest.c.dest-cache-v2 2006-03-07 09:35:05.000000000 +0000
++++ cups-1.2svn-r5238/cups/dest.c 2006-03-07 10:17:06.000000000 +0000
+@@ -44,7 +44,10 @@
+ #include "globals.h"
#include <stdlib.h>
#include <ctype.h>
--
+#include <sys/types.h>
-+#include <sys/stat.h>
+ #include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/timeb.h>
- /*
- * Local functions...
-@@ -204,6 +207,146 @@
+ #ifdef HAVE_NOTIFY_H
+ # include <notify.h>
+@@ -214,6 +217,144 @@
/*
@@ -57,7 +56,7 @@
+ close(fd);
+ return(-1);
+ }
-+
++
+ /* populate the destinations structure */
+ for (i=0; i < num_dests; i++)
+ {
@@ -70,7 +69,7 @@
+ return(-1);
+ strcpy((*dests)[i].instance, &buf[offset]);
+ offset += strlen((*dests)[i].instance) +1;
-+
++
+ /* get number of options */
+ strcpy(word, &buf[offset]);
+ offset += strlen(word)+1;
@@ -153,13 +152,11 @@
+ }
+}
+
-+
-+
+/*
- * 'cupsGetDests()' - Get the list of destinations.
- */
-
-@@ -211,8 +354,44 @@
+ * 'cupsGetDests()' - Get the list of destinations from the default server.
+ *
+ * Starting with CUPS 1.2, the returned list of destinations include the
+@@ -226,8 +367,44 @@
cupsGetDests(cups_dest_t **dests) /* O - Destinations */
{
int num_dests; /* Number of destinations */
@@ -204,7 +201,7 @@
/*
* Connect to the CUPS server and get the destination list and options...
-@@ -225,6 +404,9 @@
+@@ -240,6 +417,9 @@
if (http)
httpClose(http);
cups-link.patch:
Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: cups-link.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-link.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-link.patch 25 Jan 2006 17:09:53 -0000 1.2
+++ cups-link.patch 30 Mar 2006 15:15:35 -0000 1.3
@@ -1,11 +1,11 @@
---- cups-1.1.23/filter/Makefile.lr 2005-10-15 22:58:47.000000000 +0200
-+++ cups-1.1.23/filter/Makefile 2005-10-15 22:59:43.000000000 +0200
-@@ -142,7 +142,7 @@
+--- cups-1.2b2/filter/Makefile.link 2006-03-23 11:42:25.000000000 +0000
++++ cups-1.2b2/filter/Makefile 2006-03-23 11:43:19.000000000 +0000
+@@ -218,7 +218,7 @@
- libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs
+ libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
echo Linking $@...
-- $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
-+ $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups
+- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
++ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups
$(RM) `basename $@ .2`
$(LN) $@ `basename $@ .2`
cups-locale.patch:
language.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
Index: cups-locale.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-locale.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-locale.patch 9 Sep 2004 04:05:22 -0000 1.1
+++ cups-locale.patch 30 Mar 2006 15:15:35 -0000 1.2
@@ -1,28 +1,39 @@
-diff -ruN cups-1.1.19.orig/cups/language.c cups-1.1.19/cups/language.c
---- cups-1.1.19.orig/cups/language.c 2003-08-14 20:13:18.000000000 +0900
-+++ cups-1.1.19/cups/language.c 2003-08-14 20:37:37.000000000 +0900
-@@ -188,6 +188,7 @@
- charset[16], /* Character set */
- *ptr, /* Pointer into language/ */
+--- cups-1.2svn-r5137/cups/language.c.locale 2006-02-15 20:11:10.000000000 +0000
++++ cups-1.2svn-r5137/cups/language.c 2006-02-23 14:43:59.000000000 +0000
+@@ -276,6 +276,7 @@
+ #endif /* CODESET */
+ *ptr, /* Pointer into language/charset */
real[48], /* Real language name */
+ ll_cc[48], /* Language + Country name */
- filename[1024], /* Filename for language locale file */
- *localedir; /* Directory for locale files */
+ filename[1024]; /* Filename for language locale file */
cups_encoding_t encoding; /* Encoding to use */
-@@ -356,6 +357,7 @@
- */
+ cups_lang_t *lang; /* Current language... */
+@@ -445,8 +446,10 @@
+ country[0] = '\0';
- snprintf(real, sizeof(real), "%s_%s", langname, country);
-+ strcpy(ll_cc, real);
+ if (language == NULL || !language[0] ||
+- !strcmp(language, "POSIX"))
++ !strcmp(language, "POSIX")) {
+ strcpy(langname, "C");
++ strcpy(ll_cc, langname);
++ }
+ else
+ {
+ /*
+@@ -476,6 +479,7 @@
+ *ptr = '\0';
+ }
- if ((lang = cups_cache_lookup(real, encoding)) != NULL)
- return (lang);
-@@ -468,7 +470,7 @@
++ snprintf(ll_cc, sizeof(ll_cc), "%s_%s", langname, country);
+ if (*language == '.' && !charset[0])
+ {
+ /*
+@@ -617,7 +621,7 @@
*/
lang->used ++;
- strlcpy(lang->language, real, sizeof(lang->language));
+ strlcpy(lang->language, ll_cc, sizeof(lang->language));
- if (charset[0])
+ if (encoding != CUPS_AUTO_ENCODING)
lang->encoding = encoding;
Index: cups-lpd
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-lpd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-lpd 9 Sep 2004 04:02:40 -0000 1.2
+++ cups-lpd 30 Mar 2006 15:15:35 -0000 1.3
@@ -7,5 +7,5 @@
protocol = tcp
wait = no
user = lp
- server = @LIBDIR@/cups/daemon/cups-lpd
+ server = /usr/lib/cups/daemon/cups-lpd
}
cups-pie.patch:
cups/Makefile | 1 +
filter/Makefile | 23 +++++++++++++++++------
pdftops/Makefile | 7 +++++++
scheduler/Makefile | 3 +++
systemv/Makefile | 3 ++-
5 files changed, 30 insertions(+), 7 deletions(-)
Index: cups-pie.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-pie.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-pie.patch 9 Sep 2004 04:07:27 -0000 1.4
+++ cups-pie.patch 30 Mar 2006 15:15:35 -0000 1.5
@@ -1,65 +1,19 @@
---- cups-1.1.19/cups/Makefile.pie 2003-03-20 02:45:21.000000000 +0000
-+++ cups-1.1.19/cups/Makefile 2003-11-20 15:53:43.000000000 +0000
-@@ -25,6 +25,7 @@
- #
-
- include ../Makedefs
-+CFLAGS += -fpic
-
- #
- # Object files...
---- cups-1.1.19/scheduler/Makefile.pie 2003-04-10 15:30:48.000000000 +0100
-+++ cups-1.1.19/scheduler/Makefile 2003-11-20 15:23:39.000000000 +0000
-@@ -24,6 +24,9 @@
-
- include ../Makedefs
-
-+CFLAGS += -fpie
-+LDFLAGS += -pie
-+
- CUPSDOBJS = auth.o banners.o cert.o classes.o client.o conf.o devices.o \
- dirsvc.o main.o ipp.o listen.o job.o log.o network.o \
- ppds.o printers.o quotas.o server.o
---- cups-1.1.20/config-scripts/cups-compiler.m4.pie 2004-02-05 11:46:38.000000000 +0000
-+++ cups-1.1.20/config-scripts/cups-compiler.m4 2004-02-05 11:46:45.000000000 +0000
-@@ -65,10 +65,6 @@
- fi
- fi
-
-- if test $PICFLAG = 1 -a $uname != AIX; then
-- OPTIM="-fPIC $OPTIM"
-- fi
--
- if test "x$with_optim" = x; then
- OPTIM="-Wall $OPTIM"
- fi
---- cups-1.1.20/pdftops/Makefile.pie 2003-05-14 21:03:03.000000000 +0100
-+++ cups-1.1.20/pdftops/Makefile 2004-02-05 12:05:48.000000000 +0000
-@@ -9,6 +9,7 @@
-
-
- include ../Makedefs
-+LDFLAGS += -pie
-
+--- cups-1.2b2/systemv/Makefile.pie 2006-03-05 16:48:12.000000000 +0000
++++ cups-1.2b2/systemv/Makefile 2006-03-13 14:22:03.000000000 +0000
+@@ -192,9 +192,10 @@
+ # lppasswd
#
- # Object files...
-@@ -58,9 +59,14 @@
- UnicodeMap.o \
- XRef.o
-+# For libxpdf.a:
-+$(LIBOBJS): CXXFLAGS += -fPIC
-+$(LIBOBJS): CFLAGS += -fPIC
++lppasswd.o: CFLAGS += -fPIE
+ lppasswd: lppasswd.o ../cups/$(LIBCUPS)
+ echo Linking $@...
+- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
++ $(CC) -pie $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
- OBJS = pdftops.o $(LIBOBJS)
-+pdftops.o: CXXFLAGS += -fPIE
-+
- #
- # Make everything...
#
---- cups-1.1.20/filter/Makefile.pie 2003-11-17 22:04:53.000000000 +0000
-+++ cups-1.1.20/filter/Makefile 2004-02-05 12:42:53.000000000 +0000
+--- cups-1.2b2/filter/Makefile.pie 2006-03-10 04:00:38.000000000 +0000
++++ cups-1.2b2/filter/Makefile 2006-03-13 14:25:09.000000000 +0000
@@ -25,6 +25,7 @@
#
@@ -67,66 +21,99 @@
+LDFLAGS += -pie
FILTERS = gziptoany hpgltops texttops pstops imagetops imagetoraster \
- rastertodymo rastertoepson rastertohp
-@@ -37,10 +38,21 @@
- image-sgi.o image-sgilib.o image-sun.o image-tiff.o \
- image-zoom.o image.o raster.o
+ rastertolabel rastertoepson rastertohp
+@@ -45,11 +46,21 @@
+ IMAGE32OBJS = $(IMAGEOBJS:.o=.32.o)
+ IMAGE64OBJS = $(IMAGEOBJS:.o=.64.o)
FORMOBJS = form-attr.o form-main.o form-ps.o form-text.o form-tree.o
-OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
- gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \
-+LIBOBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS)
++LIBOBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS)
+BINOBJS = gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \
- rastertodymo.o rastertoepson.o rastertohp.o \
- texttops.o textcommon.o
+ raster.o rastertoepson.o rastertohp.o rastertolabel.o \
+ testimage.o testraster.o textcommon.o texttops.o
+OBJS = $(LIBOBJS) $(BINOBJS)
-+
-+FORMOBJSPIE = $(patsubst %.o,%.opie,$(FORMOBJS))
-+HPGLOBJSPIE = $(patsubst %.o,%.opie,$(HPGLOBJS))
+
++FORMOBJSPIE = $(patsubst %.o,%.opie,$(FORMOBJS))
++HPGLOBJSPIE = $(patsubst %.o,%.opie,$(HPGLOBJS))
+$(LIBOBJS): CFLAGS += -fpic
+
-+$(BINOBJS): CFLAGS += -fpie
++$(BINOBJS): CFLAGS += -fPIE
+.SUFFIXES: .opie
+.c.opie:
+ echo Compiling $<...
-+ $(CC) $(OPTIM) $(CFLAGS) -fpie -c $< -o $@
++ $(CC) $(OPTIM) $(CFLAGS) -fPIE -c $< -o $@
#
# Make all targets...
-@@ -101,9 +113,9 @@
+@@ -178,9 +189,9 @@
# formtops
#
--formtops: $(FORMOBJS) common.o ../Makedefs ../cups/$(LIBCUPS)
-+formtops: $(FORMOBJSPIE) common.o ../Makedefs ../cups/$(LIBCUPS)
+-formtops: $(FORMOBJS) common.o ../cups/$(LIBCUPS)
++formtops: $(FORMOBJSPIE) common.o ../cups/$(LIBCUPS)
echo Linking $@...
- $(CC) $(LDFLAGS) -o $@ $(FORMOBJS) common.o $(LIBS) -lm
+ $(CC) $(LDFLAGS) -o $@ $(FORMOBJSPIE) common.o $(LIBS) -lm
#
-@@ -119,9 +131,9 @@
+@@ -196,9 +207,9 @@
# hpgltops
#
--hpgltops: $(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS)
-+hpgltops: $(HPGLOBJSPIE) common.o ../Makedefs ../cups/$(LIBCUPS)
+-hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS)
++hpgltops: $(HPGLOBJSPIE) common.o ../cups/$(LIBCUPS)
echo Linking $@...
- $(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm
+ $(CC) $(LDFLAGS) -o $@ $(HPGLOBJSPIE) common.o $(LIBS) -lm
#
---- cups-1.1.20/systemv/Makefile.pie 2004-05-11 14:38:24.000000000 +0100
-+++ cups-1.1.20/systemv/Makefile 2004-05-11 14:40:22.000000000 +0100
-@@ -170,9 +170,10 @@
- # lppasswd
+--- cups-1.2b2/pdftops/Makefile.pie 2006-03-05 16:48:12.000000000 +0000
++++ cups-1.2b2/pdftops/Makefile 2006-03-13 14:22:03.000000000 +0000
+@@ -9,6 +9,7 @@
+
+
+ include ../Makedefs
++LDFLAGS += -pie
+
#
+ # Object files...
+@@ -86,8 +87,14 @@
+ XRef.o
-+lppasswd.o: CFLAGS += -fpie
- lppasswd: lppasswd.o ../cups/$(LIBCUPS)
- echo Linking $@...
-- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
-+ $(CC) -pie $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
++# For libxpdf.a:
++$(LIBOBJS): CXXFLAGS += -fPIC
++$(LIBOBJS): CFLAGS += -fPIC
++
+ OBJS = pdftops.o $(LIBOBJS)
+
++pdftops.o: CXXFLAGS += -fPIE
++
+ TARGETS = libxpdf.a pdftops
+
+
+--- cups-1.2b2/scheduler/Makefile.pie 2006-03-05 16:48:12.000000000 +0000
++++ cups-1.2b2/scheduler/Makefile 2006-03-13 14:22:03.000000000 +0000
+@@ -24,6 +24,9 @@
+
+ include ../Makedefs
+
++CFLAGS += -fPIE
++LDFLAGS += -pie
++
+ CUPSDOBJS = \
+ auth.o \
+ banners.o \
+--- cups-1.2b2/cups/Makefile.pie 2006-03-10 04:42:19.000000000 +0000
++++ cups-1.2b2/cups/Makefile 2006-03-13 14:22:03.000000000 +0000
+@@ -25,6 +25,7 @@
+ #
+
+ include ../Makedefs
++CFLAGS += -fpic
#
+ # Object files...
cups-relro.patch:
Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: cups-relro.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-relro.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-relro.patch 19 Dec 2005 18:21:05 -0000 1.2
+++ cups-relro.patch 30 Mar 2006 15:15:35 -0000 1.3
@@ -1,5 +1,5 @@
---- cups-1.1.23/pdftops/Makefile.relro 2005-12-19 16:48:14.000000000 +0000
-+++ cups-1.1.23/pdftops/Makefile 2005-12-19 16:50:49.000000000 +0000
+--- cups-1.2svn-r4964/pdftops/Makefile.relro 2006-01-25 16:56:03.000000000 +0000
++++ cups-1.2svn-r4964/pdftops/Makefile 2006-01-25 16:56:40.000000000 +0000
@@ -9,7 +9,7 @@
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- cups.spec 13 Feb 2006 15:14:55 -0000 1.134
+++ cups.spec 30 Mar 2006 15:15:36 -0000 1.135
@@ -1,15 +1,16 @@
%define initdir /etc/rc.d/init.d
%define use_alternatives 1
-%define use_dbus 1
%define build_as_pie 1
+%define beta rc1
+%define cups_serverbin %{_exec_prefix}/lib/cups
Summary: Common Unix Printing System
Name: cups
-Version: 1.1.23
-Release: 30.2
+Version: 1.2
+Release: 0.2.%{beta}.2.3
License: GPL
Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2
+Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
Source1: cups.init
Source2: cupsprinter.png
Source5: cups-lpd
@@ -20,45 +21,28 @@
Source10: ncp.backend
Source11: cups.conf
Source12: cups.cron
-Patch0: cups-1.1.15-initscript.patch
-Patch1: cups-1.1.14-doclink.patch
-Patch2: cups-1.1.16-system-auth.patch
-Patch3: cups-1.1.17-backend.patch
-Patch4: cups-ext.patch
-Patch5: cups-str1023.patch
-Patch6: cups-1.1.17-pdftops.patch
-Patch7: cups-logfileperm.patch
-Patch8: cups-1.1.17-rcp.patch
-Patch9: cups-1.1.17-ppdsdat.patch
-Patch10: cups-1.1.17-sanity.patch
-Patch11: cups-1.1.19-lpstat.patch
+Patch1: cups-1.1.15-initscript.patch
+Patch2: cups-no-gzip-man.patch
+Patch3: cups-1.1.16-system-auth.patch
+Patch4: cups-1.1.17-backend.patch
+Patch5: cups-ext.patch
+Patch6: cups-kde.patch
+Patch7: cups-str1515.patch
+Patch8: cups-logfileperm.patch
+Patch9: cups-1.1.17-rcp.patch
+Patch10: cups-1.1.17-ppdsdat.patch
Patch12: cups-locale.patch
Patch13: cups-CAN-2005-0064.patch
-Patch14: cups-str1068.patch
-Patch15: cups-sigchld.patch
+Patch14: cups-str1521.patch
Patch16: cups-pie.patch
Patch17: cups-1.1.19-no_rpath.patch
Patch18: cups-language.patch
-Patch19: cups-gcc34.patch
-Patch20: cups-gcc4.patch
-Patch21: cups-slow.patch
Patch22: cups-dest-cache-v2.patch
-Patch23: cups-autodetected-tag.patch
Patch24: cups-maxlogsize.patch
-Patch25: cups-enabledisable.patch
Patch28: cups-no-propagate-ipp-port.patch
Patch32: cups-pid.patch
-Patch33: cups-CAN-2004-0888.patch
-Patch34: cups-CAN-2005-2097.patch
-Patch35: cups-finddest.patch
-Patch36: cups-str1249.patch
-Patch37: cups-str1284.patch
-Patch38: cups-str1290.patch
-Patch39: cups-str1301.patch
Patch40: cups-link.patch
Patch41: cups-relro.patch
-Patch42: cups-CVE-2005-3625,6,7.patch
-Patch43: cups-dbus.patch
Epoch: 1
Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-root
@@ -74,15 +58,19 @@
Provides: lpd lpr LPRng = 3.8.15-3
BuildPrereq: pam-devel openssl-devel pkgconfig
+BuildPrereq: gnutls-devel
BuildRequires: make >= 1:3.80
+BuildRequires: php-devel, aspell-devel, pcre-devel
# -fstack-protector-all requires GCC 4.0.1
BuildRequires: gcc >= 4.0.1
-%if %use_dbus
BuildPrereq: dbus-devel >= 0.60
Requires: dbus >= 0.60
-%endif
+
+# Other packages may be expecting different backend path.
+Conflicts: foomatic < 3.0.2-33.3
+Conflicts: hplip < 0.9.9-5.1
%package devel
Summary: Common Unix Printing System - development environment
@@ -124,50 +112,31 @@
lpd emulation.
%prep
-%setup -q
-%patch0 -p1 -b .noinit
-%patch1 -p1 -b .doclink
-%patch2 -p1 -b .system-auth
-%patch3 -p1 -b .backend
-%patch4 -p1 -b .ext
-%patch5 -p1 -b .str1023
-%patch6 -p1 -b .pdftops
-%patch7 -p1 -b .logfileperm
-%patch8 -p1 -b .rcp
-%patch9 -p1 -b .ppdsdat
-%patch10 -p1 -b .sanity
-%patch11 -p1 -b .lpstat
+%setup -q -n %{name}-%{version}%{beta}
+%patch1 -p1 -b .noinit
+%patch2 -p1 -b .no-gzip-man
+%patch3 -p1 -b .system-auth
+%patch4 -p1 -b .backend
+%patch5 -p1 -b .ext
+%patch6 -p1 -b .kde
+%patch7 -p1 -b .str1515
+%patch8 -p1 -b .logfileperm
+%patch9 -p1 -b .rcp
+%patch10 -p1 -b .ppdsdat
%patch12 -p1 -b .locale
%patch13 -p1 -b .CAN-2005-0064
-%patch14 -p1 -b .str1068
-%patch15 -p1 -b .sigchld
+%patch14 -p1 -b .str1521
%if %build_as_pie
%patch16 -p1 -b .pie
%endif
%patch17 -p1 -b .no_rpath
%patch18 -p1 -b .language
-%patch19 -p1 -b .gcc34
-%patch20 -p1 -b .gcc4
-%patch21 -p1 -b .slow
%patch22 -p1 -b .dest-cache-v2
-%patch23 -p1 -b .autodetected-tag
%patch24 -p1 -b .maxlogsize
-%patch25 -p1 -b .enabledisable
%patch28 -p1 -b .no-propagate-ipp-port
%patch32 -p1 -b .pid
-%patch33 -p1 -b .CAN-2004-0888
-%patch34 -p1 -b .CAN-2005-2097
-%patch35 -p1 -b .finddest
-%patch36 -p1 -b .str1249
-%patch37 -p1 -b .str1284
-%patch38 -p1 -b .str1290
-%patch39 -p1 -b .str1301
%patch40 -p1 -b .link
%patch41 -p1 -b .relro
-%patch42 -p1 -b .CVE-2005-3625,6,7
-%if %use_dbus
-%patch43 -p1 -b .dbus
-%endif
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
aclocal -I config-scripts
autoconf
@@ -178,11 +147,6 @@
# Let's look at the compilation command lines.
perl -pi -e "s,^.SILENT:,," Makedefs.in
-for i in man/{es,fr}/*.man templates/{de,fr}/*.tmpl; do
- iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
- mv "${i}_" "$i"
-done
-
%build
if pkg-config openssl ; then
export CFLAGS=`pkg-config --cflags openssl`
@@ -227,7 +191,7 @@
install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -c -m 644 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
-install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp
+install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp
install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
# Deal with users trying to access the admin tool at
@@ -256,28 +220,24 @@
done
# Ship pstoraster (bug #69573).
-install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter
+install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
# Ship a generic postscript PPD file (#73061)
install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
-%if %use_dbus
-# D-BUS configuration.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
-install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
-%endif
+# Ship a printers.conf file, and a client.conf file. That way, they get
+# their SELinux file contexts set correctly.
+touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
+
+# Ship an SSL directory
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
# Remove unshipped files.
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
-
-# Remove .pdf from docs, fix links
-for pdf in cmp.pdf ipp.pdf sam.pdf spm.pdf ssr.pdf sum.pdf translation.pdf \
- idd.pdf overview.pdf sdd.pdf sps.pdf stp.pdf svd.pdf
-do
- perl -p -i -e "s@$pdf at http://www.cups.org/$pdf@" $RPM_BUILD_ROOT%{_docdir}/cups-%{version}/documentation.html
-done
-find $RPM_BUILD_ROOT%{_docdir}/cups-%{version} -name *.pdf |xargs rm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
%post
@@ -327,90 +287,81 @@
exit 0
%triggerin -- samba-client
-ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || :
+ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || :
exit 0
%triggerun -- samba-client
[ $2 = 0 ] || exit 0
-rm -f %{_libdir}/cups/backend/smb
+rm -f %{cups_serverbin}/backend/smb
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%dir %attr(0775,root,sys) /etc/cups
-%dir %attr(0711,root,sys) /etc/cups/certs
-%config(noreplace) %attr(0640,root,sys) /etc/cups/classes.conf
-%config(noreplace) %attr(0640,root,sys) /etc/cups/cupsd.conf
-%config(noreplace) %attr(0640,root,sys) /etc/cups/printers.conf
-%config(noreplace) /etc/cups/client.conf
+%dir %attr(0755,root,nobody) /etc/cups
+%dir %attr(0511,lp,sys) /var/run/cups/certs
+%config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf
+%attr(0640,root,nobody) /etc/cups/cupsd.conf.default
+%config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
+%config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
/etc/cups/interfaces
%config(noreplace) /etc/cups/mime.types
%config(noreplace) /etc/cups/mime.convs
-%dir %attr(0755,root,sys) /etc/cups/ppd
+%dir %attr(0755,root,nobody) /etc/cups/ppd
+%dir %attr(0700,root,nobody) /etc/cups/ssl
/etc/cups/pstoraster.convs
%config(noreplace) /etc/pam.d/cups
%dir %{_docdir}/cups-%{version}
+%{_docdir}/cups-%{version}/favicon.ico
%{_docdir}/cups-%{version}/images
+%{_docdir}/cups-%{version}/ja
+%{_docdir}/cups-%{version}/es
%{_docdir}/cups-%{version}/*.css
-%{_docdir}/cups-%{version}/documentation.html
-%{_docdir}/cups-%{version}/??
%{_docdir}/cups-%{version}/admin
%{_docdir}/cups-%{version}/classes
%{_docdir}/cups-%{version}/jobs
%{_docdir}/cups-%{version}/printers
%doc %{_docdir}/cups-%{version}/index.html
-%doc %{_docdir}/cups-%{version}/cmp.html
-%doc %{_docdir}/cups-%{version}/idd.html
-%doc %{_docdir}/cups-%{version}/ipp.html
-%doc %{_docdir}/cups-%{version}/overview.html
-%doc %{_docdir}/cups-%{version}/sam.html
-%doc %{_docdir}/cups-%{version}/sdd.html
-%doc %{_docdir}/cups-%{version}/spm.html
-%doc %{_docdir}/cups-%{version}/sps.html
-%doc %{_docdir}/cups-%{version}/ssr.html
-%doc %{_docdir}/cups-%{version}/stp.html
-%doc %{_docdir}/cups-%{version}/sum.html
-%doc %{_docdir}/cups-%{version}/svd.html
-%doc %{_docdir}/cups-%{version}/translation.html
+%doc %{_docdir}/cups-%{version}/help
%doc %{_docdir}/cups-%{version}/robots.txt
%config(noreplace) %{initdir}/cups
%{_bindir}/cupstestppd
+%{_bindir}/cupstestdsc
%{_bindir}/cancel*
-%{_bindir}/enable*
-%{_bindir}/disable*
-%{_bindir}/cupsenable*
-%{_bindir}/cupsdisable*
%{_bindir}/lp*
-%dir %{_libdir}/cups
-%{_libdir}/cups/backend
-%{_libdir}/cups/cgi-bin
-%dir %{_libdir}/cups/daemon
-%{_libdir}/cups/daemon/cups-polld
-%{_libdir}/cups/filter
+%dir %{cups_serverbin}
+%{cups_serverbin}/backend
+%{cups_serverbin}/cgi-bin
+%dir %{cups_serverbin}/daemon
+%{cups_serverbin}/daemon/cups-polld
+%{cups_serverbin}/daemon/cups-deviced
+%{cups_serverbin}/daemon/cups-driverd
+%{cups_serverbin}/notifier/mailto
+%{cups_serverbin}/notifier/testnotify
+%{cups_serverbin}/filter
+%{cups_serverbin}/monitor
%{_mandir}/man?/*
-%{_mandir}/*/man?/*
%{_sbindir}/*
%dir %{_datadir}/cups
%dir %{_datadir}/cups/banners
%config(noreplace) %{_datadir}/cups/banners/*
%{_datadir}/cups/charsets
+%{_datadir}/cups/charmaps
%{_datadir}/cups/data
%{_datadir}/cups/doc
%{_datadir}/cups/fonts
%{_datadir}/cups/model
%{_datadir}/cups/templates
%{_datadir}/locale/*/*
-%dir %attr(1770,root,sys) /var/spool/cups/tmp
-%dir %attr(0710,root,sys) /var/spool/cups
+%dir %attr(1770,root,nobody) /var/spool/cups/tmp
+%dir %attr(0710,root,nobody) /var/spool/cups
%dir %attr(0755,lp,sys) /var/log/cups
%config(noreplace) %{_sysconfdir}/logrotate.d/cups
%{_datadir}/pixmaps/cupsprinter.png
%{_sysconfdir}/cron.daily/cups
-%if %use_dbus
%{_sysconfdir}/dbus-1/system.d/cups.conf
-%endif
+%{_libdir}/php/modules/*.so
%files libs
%defattr(-,root,root)
@@ -420,28 +371,101 @@
%defattr(-,root,root)
%{_bindir}/cups-config
%{_libdir}/*.so
-%{_libdir}/*.a
%{_includedir}/cups
%files lpd
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/daemon
-%{_libdir}/cups/daemon/cups-lpd
+%dir %{cups_serverbin}
+%dir %{cups_serverbin}/daemon
+%{cups_serverbin}/daemon/cups-lpd
%changelog
-* Mon Feb 13 2006 Tim Waugh <twaugh at redhat.com>
-- Removed (unapplied) session printing patch.
+* Thu Mar 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.3
+- Added conflicts.
+- Built for FC5 update.
+
+* Wed Mar 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.3
+- Fix group list of non-root backends (STR #1521, bug #186954).
+
+* Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2
+- Fix lpq -h (STR#1515, bug #186686).
+
+* Mon Mar 27 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.1
+- Ship a printers.conf file, and a client.conf file. That way, they get
+ their SELinux file contexts set correctly.
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.23-30.2
-- bump again for double-long bug on ppc(64)
+* Mon Mar 27 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.0
+- 1.2rc1.
+
+* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.6
+- Add KDE compatibility symbols _ipp_add_attr/_ipp_free_attr to ipp.h, with
+ a comment saying why they shouldn't be used.
+
+* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.5
+- Fix KDE compatibility symbols _ipp_add_attr/_ipp_free_attr.
+
+* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.4
+- Update to svn snapshot.
+
+* Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.3
+- Update to svn snapshot. No longer need users or policy patches.
+
+* Fri Mar 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.2
+- Rebuilt.
+
+* Tue Mar 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.1
+- Build requires gnutls-devel.
+- Fixed default policy name.
+- Fixed 'set-allowed-users' in web UI.
+
+* Mon Mar 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b2.0
+- 1.2b2.
+- Use new CUPS_SERVERBIN location (/usr/lib/cups even on 64-bit hosts).
+
+* Fri Mar 10 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed some permissions.
+
+* Fri Mar 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b1.1
+- Ship /etc/cups/ssl directory.
+
+* Thu Mar 9 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.1.b1.0
+- 1.2b1. No longer need devid patch.
+
+* Wed Mar 8 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn5238.2
+- Fixed 'device-id' attribute in GET_DEVICES requests (STR #1467).
+
+* Tue Mar 7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn5238.1
+- New svn snapshot.
+- No longer need browse or raw patches.
+
+* Wed Mar 1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn5137.1
+- Fixed raw printing.
+- Removed (unapplied) session printing patch.
+- Fixed browse info.
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.23-30.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Thu Feb 23 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn5137.0
+- New svn snapshot.
-* Wed Jan 25 2006 Tim Waugh <twaugh at redhat.com>
-- Fixed link patch.
+* Fri Feb 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn5102.0
+- New svn snapshot.
+- No longer need enabledisable patch.
+- Fixed double-free in scheduler/policy.c (STR #1428).
+
+* Fri Feb 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn5083.0
+- New svn snapshot.
+
+* Wed Jan 25 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.0.svn4964.0
+- Use -fPIE not -fpie in PIE patch.
+- Fix link patch.
+- Patch in PIE instead of using --enable-pie, since that doesn't work.
+
+* Fri Jan 20 2006 Tim Waugh <twaugh at redhat.com>
+- 1.2 svn snapshot.
+- No longer need doclink, str1023, pdftops, sanity, lpstat, str1068,
+ sigchld, gcc34, gcc4, slow, CAN-2004-0888, CAN-2005-2097, finddest,
+ str1249, str1284, str1290, str1301, CVE-2005-3625,6,7 patches.
+- Removed autodetect-tag patch.
* Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-30
- Include 'Autodetected' tag for better integration with autodetection tools.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 4 Jan 2005 12:24:50 -0000 1.15
+++ sources 30 Mar 2006 15:15:36 -0000 1.16
@@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
-4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2
+e1cebe3393c360eb7972efa0715befa1 cups-1.2rc1-source.tar.bz2
More information about the fedora-cvs-commits
mailing list