rpms/cups/FC-6 .cvsignore, 1.27, 1.28 cups-1.1.15-initscript.patch, 1.7, 1.8 cups-logrotate.patch, 1.1, 1.2 cups.spec, 1.321, 1.322 sources, 1.29, 1.30 cups-get_jobs.patch, 1.1, NONE cups-options.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 16 12:45:52 UTC 2007
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv4906
Modified Files:
.cvsignore cups-1.1.15-initscript.patch cups-logrotate.patch
cups.spec sources
Removed Files:
cups-get_jobs.patch cups-options.patch
Log Message:
* Fri Mar 16 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.9-1
- 1.2.9.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 14 Feb 2007 18:04:29 -0000 1.27
+++ .cvsignore 16 Mar 2007 12:45:49 -0000 1.28
@@ -18,3 +18,4 @@
cups-1.2.6-source.tar.bz2
cups-1.2.7-source.tar.bz2
cups-1.2.8-source.tar.bz2
+cups-1.2.9-source.tar.bz2
cups-1.1.15-initscript.patch:
Makefile | 33 ---------------------------------
1 files changed, 33 deletions(-)
Index: cups-1.1.15-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups-1.1.15-initscript.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cups-1.1.15-initscript.patch 30 Aug 2006 15:01:37 -0000 1.7
+++ cups-1.1.15-initscript.patch 16 Mar 2007 12:45:50 -0000 1.8
@@ -1,6 +1,6 @@
---- cups-1.2.3/Makefile.noinit 2006-08-29 16:51:19.000000000 +0100
-+++ cups-1.2.3/Makefile 2006-08-30 15:46:36.000000000 +0100
-@@ -99,36 +99,6 @@
+--- cups-1.2.9/Makefile.noinit 2007-03-12 20:49:13.000000000 +0000
++++ cups-1.2.9/Makefile 2007-03-16 10:43:41.000000000 +0000
+@@ -99,39 +99,6 @@
echo Installing cups-config script...
$(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
@@ -8,14 +8,17 @@
- echo Installing init scripts...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+- for level in $(RCLEVELS); do \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
+- if test `uname` = HP-UX; then \
+- level=`expr $$level - 1`; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+- fi; \
+- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
+- done; \
- $(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; \
+- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
- fi
- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
cups-logrotate.patch:
log.c | 102 ++++++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 40 deletions(-)
Index: cups-logrotate.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups-logrotate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-logrotate.patch 6 Mar 2007 19:05:28 -0000 1.1
+++ cups-logrotate.patch 16 Mar 2007 12:45:50 -0000 1.2
@@ -1,5 +1,5 @@
---- cups-1.2.8/scheduler/log.c.logrotate 2006-10-11 22:04:58.000000000 +0100
-+++ cups-1.2.8/scheduler/log.c 2007-03-06 18:46:25.000000000 +0000
+--- cups-1.2.9/scheduler/log.c.logrotate 2007-03-12 20:49:13.000000000 +0000
++++ cups-1.2.9/scheduler/log.c 2007-03-16 12:40:18.000000000 +0000
@@ -37,6 +37,9 @@
#include "cupsd.h"
#include <stdarg.h>
@@ -10,7 +10,7 @@
/*
-@@ -427,60 +430,51 @@
+@@ -428,60 +431,51 @@
return (1);
/*
@@ -37,36 +37,34 @@
+ filename[0] = '\0';
- if (logname[0] != '/')
-+ for (ptr = filename + strlen(filename);
-+ *logname && ptr < (filename + sizeof(filename) - 1);
-+ logname ++)
-+ if (*logname == '%')
++ for (logptr = logname, ptr = filename + strlen(filename);
++ *logptr && ptr < (filename + sizeof(filename) - 1);
++ logptr ++)
++ if (*logptr == '%')
{
- strlcpy(filename, ServerRoot, sizeof(filename));
- strlcat(filename, "/", sizeof(filename));
- }
- else
- filename[0] = '\0';
-+ /*
-+ * Format spec...
-+ */
-
-- for (ptr = filename + strlen(filename);
-- *logname && ptr < (filename + sizeof(filename) - 1);
-- logname ++)
-- if (*logname == '%')
-+ logname ++;
-+ if (*logname == 's')
++ /*
++ * Format spec...
++ */
+
+- for (logptr = logname, ptr = filename + strlen(filename);
+- *logptr && ptr < (filename + sizeof(filename) - 1);
+- logptr ++)
+- if (*logptr == '%')
++ logptr ++;
++ if (*logptr == 's')
{
-- /*
+ /*
- * Format spec...
-- */
-+ /*
-+ * Insert the server name...
-+ */
++ * Insert the server name...
+ */
-- logname ++;
-- if (*logname == 's')
+- logptr ++;
+- if (*logptr == 's')
- {
- /*
- * Insert the server name...
@@ -81,22 +79,22 @@
- * Otherwise just insert the character...
- */
-
-- *ptr++ = *logname;
+- *ptr++ = *logptr;
- }
+ strlcpy(ptr, ServerName, sizeof(filename) - (ptr - filename));
+ ptr += strlen(ptr);
}
else
+ {
-+ /*
-+ * Otherwise just insert the character...
-+ */
++ /*
++ * Otherwise just insert the character...
++ */
+
- *ptr++ = *logname;
+ *ptr++ = *logptr;
+ }
+ }
+ else
-+ *ptr++ = *logname;
++ *ptr++ = *logptr;
- *ptr = '\0';
- }
@@ -104,7 +102,7 @@
/*
* See if the log file is open...
-@@ -512,10 +506,41 @@
+@@ -513,6 +507,34 @@
}
/*
@@ -126,15 +124,12 @@
+ return (0);
+ }
+
-+ if (strncmp(logname, "/dev/", 5))
-+ {
-+ /*
-+ * Change ownership and permissions of non-device logs...
-+ */
++ /*
++ * Change ownership and permissions of non-device logs...
++ */
+
-+ fchown(cupsFileNumber(*lf), RunUser, Group);
-+ fchmod(cupsFileNumber(*lf), LogFilePerm);
-+ }
++ fchown(cupsFileNumber(*lf), RunUser, Group);
++ fchmod(cupsFileNumber(*lf), LogFilePerm);
+ }
+ }
+
@@ -142,8 +137,3 @@
* Do we need to rotate the log?
*/
-- if (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
-+ if (strncmp(filename, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
- MaxLogSize > 0)
- {
- /*
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- cups.spec 14 Mar 2007 18:02:18 -0000 1.321
+++ cups.spec 16 Mar 2007 12:45:50 -0000 1.322
@@ -5,8 +5,8 @@
Summary: Common Unix Printing System
Name: cups
-Version: 1.2.8
-Release: 5%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -45,9 +45,7 @@
Patch19: cups-eggcups.patch
Patch20: cups-getpass.patch
Patch21: cups-driverd-timeout.patch
-Patch22: cups-options.patch
-Patch23: cups-logrotate.patch
-Patch24: cups-get_jobs.patch
+Patch22: cups-logrotate.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -154,9 +152,7 @@
%patch19 -p1 -b .eggcups
%patch20 -p1 -b .getpass
%patch21 -p1 -b .driverd-timeout
-%patch22 -p1 -b .options
-%patch23 -p1 -b .logrotate
-%patch24 -p1 -b .get_jobs
+%patch22 -p1 -b .logrotate
%if %lspp
%patch100 -p1 -b .lspp
@@ -440,6 +436,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Fri Mar 16 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.9-1
+- 1.2.9.
+
* Wed Mar 14 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.8-5
- Applied patch for STR #2288 (bug #231992).
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 14 Feb 2007 18:04:29 -0000 1.29
+++ sources 16 Mar 2007 12:45:50 -0000 1.30
@@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
-d2cc0604113d5300b7b3e823b660d04a cups-1.2.8-source.tar.bz2
+73433d7e8c04b66702732928aaf087b8 cups-1.2.9-source.tar.bz2
--- cups-get_jobs.patch DELETED ---
--- cups-options.patch DELETED ---
More information about the fedora-cvs-commits
mailing list