================================
cups:source=1.2.1-0.2 (previous: 1.2.1-0.1)
cvc rdiff cups -1 /[EMAIL PROTECTED]:devel//[EMAIL PROTECTED]:desktop/1.2.1-0.2
================================
1.2.1-0.2 Ken VanDine ([EMAIL PROTECTED]) Mon Jul 10 12:45:55 2006
Cleaned up patches
cups-ext.patch: new
--- /dev/null
+++ cups-ext.patch
@@ -0,0 +50 @@
+--- cups-1.1.22/pdftops/gfile.cxx.ext 2003-11-19 18:17:03.000000000 +0000
++++ cups-1.1.22/pdftops/gfile.cxx 2004-11-29 17:58:13.250694162 +0000
+@@ -487,32 +487,14 @@
+ char *s;
+ int fd;
+
+- if (ext) {
+-#if HAVE_MKSTEMPS
+- if ((s = getenv("TMPDIR"))) {
+- *name = new GString(s);
+- } else {
+- *name = new GString("/tmp");
+- }
+- (*name)->append("/XXXXXX")->append(ext);
+- fd = mkstemps((*name)->getCString(), strlen(ext));
+-#else
+- if (!(s = tmpnam(NULL))) {
+- return gFalse;
+- }
++#if HAVE_MKSTEMP
++ if ((s = getenv("TMPDIR"))) {
+ *name = new GString(s);
+- (*name)->append(ext);
+- fd = open((*name)->getCString(), O_WRONLY | O_CREAT | O_EXCL, 0600);
+-#endif
+ } else {
+-#if HAVE_MKSTEMP
+- if ((s = getenv("TMPDIR"))) {
+- *name = new GString(s);
+- } else {
+- *name = new GString("/tmp");
+- }
+- (*name)->append("/XXXXXX");
+- fd = mkstemp((*name)->getCString());
++ *name = new GString("/tmp");
++ }
++ (*name)->append("/XXXXXX");
++ fd = mkstemp((*name)->getCString());
+ #else // HAVE_MKSTEMP
+ if (!(s = tmpnam(NULL))) {
+ return gFalse;
+@@ -520,7 +502,7 @@
+ *name = new GString(s);
+ fd = open((*name)->getCString(), O_WRONLY | O_CREAT | O_EXCL, 0600);
+ #endif // HAVE_MKSTEMP
+- }
++
+ if (fd < 0 || !(*f = fdopen(fd, mode))) {
+ delete *name;
+ return gFalse;
cups.cron: new
--- /dev/null
+++ cups.cron
@@ -0,0 +8 @@
+#!/bin/sh
+for d in /var/spool/cups/tmp
+do
+ if [ -d "$d" ]; then
+ /usr/sbin/tmpwatch -f 720 "$d"
+ fi
+done
+exit 0
pstoraster.convs: new
--- /dev/null
+++ pstoraster.convs
@@ -0,0 +29 @@
+#
+# "$Id: pstoraster.convs,v 1.1 2002/04/23 11:58:37 easysw Exp $"
+#
+# MIME converts file for Ghostscript.
+#
+# Copyright 1997-2002 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-3111 USA
+#
+# Voice: (301) 373-9603
+# EMail: [EMAIL PROTECTED]
+# WWW: http://www.cups.org
+#
+
+application/vnd.cups-postscript application/vnd.cups-raster 100
pstoraster
+
+#
+# End of "$Id: pstoraster.convs,v 1.1 2002/04/23 11:58:37 easysw Exp $".
+#
cupsprinter.png: new
cups-maxlogsize.patch: new
--- /dev/null
+++ cups-maxlogsize.patch
@@ -0,0 +10 @@
+--- cups-1.1.20/conf/cupsd.conf.in.maxlogsize 2004-05-26 17:05:48.832768176
+0100
++++ cups-1.1.20/conf/cupsd.conf.in 2004-05-26 17:06:09.538811826 +0100
+@@ -169,6 +169,7 @@
+ # MaxLogSize: controls the maximum size of each log file before they are
+ # rotated. Defaults to 1048576 (1MB). Set to 0 to disable log rotating.
+ #
++MaxLogSize 2000000000
+
+
+
cups-pid.patch: new
--- /dev/null
+++ cups-pid.patch
@@ -0,0 +36 @@
+--- cups-1.1.21/scheduler/main.c.pid 2004-09-24 11:29:05.073748138 +0100
++++ cups-1.1.21/scheduler/main.c 2004-09-24 11:44:35.826446564 +0100
+@@ -349,6 +349,8 @@
+ * Setup signal handlers for the parent...
+ */
+
++ pid_t pid;
++
+ #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+ sigset(SIGUSR1, parent_handler);
+ sigset(SIGCHLD, parent_handler);
+@@ -372,7 +374,7 @@
+ signal(SIGHUP, SIG_IGN);
+ #endif /* HAVE_SIGSET */
+
+- if (fork() > 0)
++ if ((pid = fork()) > 0)
+ {
+ /*
+ * OK, wait for the child to startup and send us SIGUSR1 or to crash
+@@ -384,7 +386,15 @@
+ sleep(1);
+
+ if (parent_signal == SIGUSR1)
++ {
++ FILE *f = fopen ("/var/run/cupsd.pid", "w");
++ if (f)
++ {
++ fprintf (f, "%d\n", pid);
++ fclose (f);
++ }
+ return (0);
++ }
+
+ if (wait(&i) < 0)
+ {
cups-no-gzip-man.patch: new
--- /dev/null
+++ cups-no-gzip-man.patch
@@ -0,0 +17 @@
+--- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man
2006-02-13 02:46:10.000000000 +0000
++++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4 2006-02-17
09:55:45.000000000 +0000
+@@ -80,10 +80,10 @@
+ ;;
+ Linux* | GNU*)
+ # Linux and GNU Hurd
+- MAN1EXT=1.gz
+- MAN5EXT=5.gz
+- MAN7EXT=7.gz
+- MAN8EXT=8.gz
++ MAN1EXT=1
++ MAN5EXT=5
++ MAN7EXT=7
++ MAN8EXT=8
+ MAN8DIR=8
+ ;;
+ *)
postscript.ppd.gz: new
cups.logrotate: new
--- /dev/null
+++ cups.logrotate
@@ -0,0 +8 @@
+/var/log/cups/*_log {
+ missingok
+ notifempty
+ sharedscripts
+ postrotate
+ /etc/init.d/cups condrestart >/dev/null 2>&1 || true
+ endscript
+}
cups-language.patch: new
--- /dev/null
+++ cups-language.patch
@@ -0,0 +37 @@
+--- cups-1.1.20/scheduler/client.c.language 2004-01-07 14:16:46.692772382
+0000
++++ cups-1.1.20/scheduler/client.c 2004-01-07 14:21:18.991462185 +0000
+@@ -2722,6 +2722,34 @@
+
+ if ((status = stat(filename, filestats)) != 0 && con->language != NULL)
+ {
++ /* Try removing the country code, if there is one. */
++ if (strncmp(con->uri, "/ppd/", 5) != 0 &&
++ strncmp(con->uri, "/admin/conf/", 12) != 0)
++ {
++ char *bare_lang = NULL;
++ size_t ln = strcspn (con->language->language, "_");
++ if (con->language->language[ln] == '_')
++ {
++ bare_lang = malloc (sizeof (char) * (ln + 1));
++ if (bare_lang)
++ {
++ memcpy (bare_lang, con->language->language, ln);
++ bare_lang[ln] = '\0';
++ snprintf(filename, len,
++ "%s/%s%s", DocumentRoot, bare_lang, con->uri);
++
++ if ((ptr = strchr(filename, '?')) != NULL)
++ *ptr = '\0';
++
++ status = stat(filename, filestats);
++ free (bare_lang);
++ }
++ }
++ }
++ }
++
++ if (status != 0 && con->language != NULL)
++ {
+ /*
+ * Drop the language prefix and try the current directory...
+ */
cups-locale.patch: new
--- /dev/null
+++ cups-locale.patch
@@ -0,0 +28 @@
+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/ */
+ real[48], /* Real language name */
++ ll_cc[48], /* Language + Country name */
+ filename[1024], /* Filename for language locale file */
+ *localedir; /* Directory for locale files */
+ cups_encoding_t encoding; /* Encoding to use */
+@@ -356,6 +357,7 @@
+ */
+
+ snprintf(real, sizeof(real), "%s_%s", langname, country);
++ strcpy(ll_cc, real);
+
+ if ((lang = cups_cache_lookup(real, encoding)) != NULL)
+ return (lang);
+@@ -468,7 +470,7 @@
+ */
+
+ lang->used ++;
+- strlcpy(lang->language, real, sizeof(lang->language));
++ strlcpy(lang->language, ll_cc, sizeof(lang->language));
+
+ if (charset[0])
+ lang->encoding = encoding;
pstoraster: new
--- /dev/null
+++ pstoraster
@@ -0,0 +59 @@
+#!/bin/sh
+#
+# "$Id: pstoraster.in,v 1.3 2002/05/12 00:46:34 easysw Exp $"
+#
+# CUPS filter script for Ghostscript.
+#
+# Copyright 2001-2002 by Easy Software Products.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+# Installation directories...
+prefix=/usr
+exec_prefix=${prefix}
+bindir=${exec_prefix}/bin
+
+# Set the library/font path...
+GS_FONTPATH="$CUPS_FONTPATH"
+export GS_FONTPATH
+
+# Options we use with Ghostscript...
+gsopts="-dQUIET -dDEBUG -dPARANOIDSAFER -dNOPAUSE -dBATCH "
+gsopts="$gsopts -dNOMEDIAATTRS -sDEVICE=cups -sstdout=%stderr"
+
+# See if we have a profile=n,n,n,n,n,n,n,n,n,n,n option...
+profile=""
+for option in $5; do
+ case $option in
+ profile=*)
+ profile="-scupsProfile=`echo $option | awk -F= '{print $2}'`"
+ ;;
+ esac
+done
+
+# See if we have a filename on the command-line...
+if test -z "$6"; then
+ ifile="-"
+else
+ ifile="$6"
+fi
+
+# Now run Ghostscript...
+$bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile
+
+#
+# End of "$Id: pstoraster.in,v 1.3 2002/05/12 00:46:34 easysw Exp $".
+#
cups-1.1.16-system-auth.patch: new
--- /dev/null
+++ cups-1.1.16-system-auth.patch
@@ -0,0 +21 @@
+--- /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 required pam_stack.so service=system-auth
++account required pam_stack.so service=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 @@
+ done
+ -if test x$(PAMDIR) != x$(BUILDROOT); then \
+ $(INSTALL_DIR) $(PAMDIR); \
+- $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
++ if test -f /etc/pam.d/system-auth; then \
++ $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \
++ else \
++ $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
++ fi \
+ fi
+
+
ncp.backend: new
--- /dev/null
+++ ncp.backend
@@ -0,0 +51 @@
+#!/bin/sh
+# This is a modified version of 'ncpprint'. It can now be used as a CUPS
+# backend.
+# Modifications:
+# Copyright (C) 2002 Red Hat, inc
+# Copyright (C) 2002 Tim Waugh
+# Before modification: shipped as /usr/share/printconf/util/ncpprint
+
+if [ -z "$*" ]
+then
+ # This is where we would enumerate all the URIs we support.
+ # Patches welcome.
+ exit 0
+fi
+
+FILE=$6
+if [ -z "$FILE" ]
+then
+ FILE=-
+fi
+
+# $DEVICE_URI is 'ncp://[user:[EMAIL PROTECTED]/queue'
+URI=${DEVICE_URI#*://}
+queue=${URI#*/}
+URI=${URI%/$queue}
[EMAIL PROTECTED]
+URI=${URI%$server}
[EMAIL PROTECTED]
+if [ -n "$URI" ]
+then
+ user=${URI%:*}
+ URI=${URI#$user}
+ password=${URI#:}
+fi
+
+#echo user: ${user-(none)}
+#echo password: ${password-(none)}
+#echo server: $server
+#echo queue: $queue
+
+if [ -n "$user" ]
+then
+ if [ -n "$password" ]
+ then
+ /usr/bin/nprint -S "$server" -q "$queue" -U "$user" -P "$password" -N
"$FILE" 2>/dev/null
+ else
+ /usr/bin/nprint -S "$server" -q "$queue" -U "$user" -n -N "$FILE"
2>/dev/null
+ fi
+else
+ /usr/bin/nprint -S "$server" -q "$queue" -N "$FILE" 2>/dev/null
+fi
cups.init: new
--- /dev/null
+++ cups.init
@@ -0,0 +118 @@
+#!/bin/sh
+#
+# "$Id: cups.sh,v 1.10 2000/03/30 05:19:16 mike Exp $"
+#
+# Startup/shutdown script for the Common UNIX Printing System (CUPS).
+#
+# Linux chkconfig stuff:
+#
+# chkconfig: 2345 55 10
+# description: Startup/shutdown script for the Common UNIX \
+# Printing System (CUPS).
+#
+# Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#
+# 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-3111 USA
+#
+# Voice: (301) 373-9603
+# EMail: [EMAIL PROTECTED]
+# WWW: http://www.cups.org
+#
+# heavily edited so that it's more like other scripts in init.d on Red Hat
+# Linux
+
+# Source function library.
+if [ -f /etc/init.d/functions ] ; then
+ . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ] ; then
+ . /etc/rc.d/init.d/functions
+else
+ exit 0
+fi
+
+DAEMON=cupsd
+
+prog=cups
+
+config () {
+ # Is this a printconf system?
+ if [ -x /usr/sbin/printconf-backend ]
+ then
+ # run printconf-backend to set up the configuration.
+ /usr/sbin/printconf-backend
+ fi
+}
+
+start () {
+ echo -n $"Starting $prog: "
+
+ config
+
+ # start daemon
+ daemon $DAEMON
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/cups
+ return $RETVAL
+}
+
+stop () {
+ # stop daemon
+ echo -n $"Stopping $prog: "
+ killproc $DAEMON
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f /var/lock/subsys/cups
+}
+
+restart() {
+ stop
+ start
+}
+
+case $1 in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ restart
+ ;;
+ condrestart)
+ [ -f /var/lock/subsys/cups ] && restart || :
+ ;;
+ reload)
+ echo -n $"Reloading $prog: "
+ config
+ killproc $DAEMON -HUP
+ RETVAL=$?
+ echo
+ if [ $RETVAL -ne 0 ]
+ then
+ # Rebuild ppds.dat file if the daemon wasn't
+ # there to do it.
+ $DAEMON --ppdsdat
+ fi
+ ;;
+ status)
+ status $DAEMON
+ ;;
+ *)
+
+ echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
+ exit 1
+esac
+
+exit $RETVAL
cups-lpd: new
--- /dev/null
+++ cups-lpd
@@ -0,0 +11 @@
+# default: off
+# description: Allow applications using the legacy lpd protocol to communicate
with CUPS
+service printer
+{
+ disable = yes
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = lp
+ server = @LIBDIR@/cups/daemon/cups-lpd
+}
cups-1.1.15-initscript.patch: new
--- /dev/null
+++ cups-1.1.15-initscript.patch
@@ -0,0 +55 @@
+--- 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 @@
+ echo Installing cups-config script...
+ $(INSTALL_DIR) $(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;
\
+- fi
+- 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; \
+- else \
+- $(INSTALL_SCRIPT) 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
cups-maxlogsize.patch: removed
ncp.backend: removed
cups-pid.patch: removed
cups-lpd: removed
pstoraster.convs: removed
cups-no-gzip-man.patch: removed
cups-language.patch: removed
cups-1.1.16-system-auth.patch: removed
cups.init: removed
cups-ext.patch: removed
pstoraster: removed
cups.cron: removed
postscript.ppd.gz: removed
cupsprinter.png: removed
cups.logrotate: removed
cups-1.1.15-initscript.patch: removed
cups-locale.patch: removed
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
