From 99ecd13c6e5caab643441d15bbb1763f17fa1e70 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:00:59 +0000 Subject: [PATCH] auto-import cups-1.1.15-8 from cups-1.1.15-8.src.rpm --- .cvsignore | 2 +- cups-1.1.15-initscript.patch | 55 +++++++++++++++++++++++++ cups-lpd | 11 +++++ cups.init | 4 +- cups.spec | 79 ++++++++++++++++++++++++------------ pstoraster | 59 +++++++++++++++++++++++++++ pstoraster.convs | 29 +++++++++++++ sources | 2 +- 8 files changed, 211 insertions(+), 30 deletions(-) create mode 100644 cups-1.1.15-initscript.patch create mode 100644 cups-lpd create mode 100644 pstoraster create mode 100644 pstoraster.convs diff --git a/.cvsignore b/.cvsignore index 28f8868..5d0f244 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cups-1.1.14-source.tar.bz2 +cups-1.1.15-1-source.tar.bz2 diff --git a/cups-1.1.15-initscript.patch b/cups-1.1.15-initscript.patch new file mode 100644 index 0000000..9863ed5 --- /dev/null +++ b/cups-1.1.15-initscript.patch @@ -0,0 +1,55 @@ +--- cups-1.1.15/systemv/Makefile.noinit Wed Jun 5 17:11:58 2002 ++++ cups-1.1.15/systemv/Makefile Fri Jun 21 11:22:34 2002 +@@ -76,7 +76,7 @@ + $(INSTALL_BIN) lpoptions $(BINDIR) + $(INSTALL_BIN) lpstat $(BINDIR) + $(INSTALL_BIN) lppasswd $(BINDIR) +- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) ++ -$(INSTALL_BIN) -m 4755 lppasswd $(BINDIR) + + + # +--- cups-1.1.15/Makefile.noinit Tue Apr 23 19:49:34 2002 ++++ cups-1.1.15/Makefile Fri Jun 21 11:22:07 2002 +@@ -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.sh $(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.15/Makedefs.in.noinit Tue Jun 4 22:32:02 2002 ++++ cups-1.1.15/Makedefs.in Fri Jun 21 11:21:08 2002 +@@ -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 diff --git a/cups-lpd b/cups-lpd new file mode 100644 index 0000000..2d9e197 --- /dev/null +++ b/cups-lpd @@ -0,0 +1,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 = /usr/lib/cups/daemon/cups-lpd +} diff --git a/cups.init b/cups.init index 4588a2c..28c467d 100644 --- a/cups.init +++ b/cups.init @@ -6,7 +6,7 @@ # # Linux chkconfig stuff: # -# chkconfig: 2345 99 00 +# chkconfig: 2345 90 10 # description: Startup/shutdown script for the Common UNIX \ # Printing System (CUPS). # @@ -77,7 +77,7 @@ case $1 in restart ;; condrestart) - [ -f /var/lock/subsys/cups ] && restart || : + [ -f /var/lock/subsys/cups ] && restart ;; status) status $DAEMON diff --git a/cups.spec b/cups.spec index 7f8f82e..6d0059d 100644 --- a/cups.spec +++ b/cups.spec @@ -1,11 +1,11 @@ %define initdir /etc/rc.d/init.d -%define patchlevel %{nil} +%define patchlevel 1 %define use_alternatives 1 Summary: Common Unix Printing System Name: cups -Version: 1.1.14 -Release: 15.4 +Version: 1.1.15 +Release: 8 License: GPL Group: System Environment/Daemons %if "%{patchlevel}" != "" @@ -17,16 +17,16 @@ Source1: cups.init Source2: cupsprinter.png Source3: cups.desktop Source4: cupsconfig -Patch: cups-1.1.14-initscript.patch +Source5: cups-lpd +Source6: pstoraster +Source7: pstoraster.convs +Patch: cups-1.1.15-initscript.patch Patch1: cups-1.1.14-doclink.patch -Patch2: cups-1.1.15-security.patch -Patch3: cups-1.1.17-pdftops.patch -Patch4: cups-1.1.14-str75.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root PreReq: /sbin/chkconfig /sbin/service -Requires: %{name}-libs = %{version} htmlview +Requires: %{name}-libs = %{version} htmlview xinetd %if %use_alternatives Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat Prereq: /usr/sbin/alternatives @@ -67,9 +67,6 @@ natively, without needing the lp/lpr commands. %setup -q %patch -p1 -b .noinit %patch1 -p1 -b .doclink -%patch2 -p1 -b .security -%patch3 -p1 -b .pdftops -%patch4 -p1 -b .str75 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in autoconf @@ -77,9 +74,10 @@ autoconf CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --sysconfdir=/etc \ --with-docdir=%{_docdir}/cups-%{version} \ --mandir=%{_mandir} +perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs # If we got this far, all prerequisite libraries must be here. -make OPTIM="$RPM_OPT_FLAGS" +make OPTIM="$RPM_OPT_FLAGS -fpic" %install rm -rf $RPM_BUILD_ROOT @@ -106,12 +104,13 @@ cd $RPM_BUILD_ROOT%{_mandir}/man8 mv lpc.8 lpc-cups.8 %endif -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir} - +install -c -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d +ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc # Deal with users trying to access the admin tool at # /usr/share/doc/cups-%{version}/index.html rather than the # correct http://localhost:631/ @@ -137,8 +136,9 @@ If your browser does not support redirection, please use EOF done -# Remove unshipped files. -rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? +# Ship pstoraster (bug #69573). +install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter +install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups %post /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore @@ -202,6 +202,7 @@ rm -rf $RPM_BUILD_ROOT /etc/cups/mime.types /etc/cups/mime.convs /etc/cups/ppd +/etc/cups/pstoraster.convs /etc/pam.d/cups %doc %{_docdir}/cups-%{version} %config %{initdir}/cups @@ -220,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT %dir %attr(0755,lp,root) /var/log/cups %{_sysconfdir}/X11/sysconfig/cups.desktop %{_sysconfdir}/X11/applnk/System/cups.desktop +%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd %{_datadir}/pixmaps/cupsprinter.png %files libs @@ -234,20 +236,45 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/cups %changelog -* Tue May 13 2003 Tim Waugh 1.1.14-15.4 -- Updated HTTP blocking fix; now based on cups-1.1.18-str75.patchv2. +* Mon Aug 19 2002 Tim Waugh 1.1.15-8 +- Disable cups-lpd by default (bug #71712). +- No need for fread patch now that glibc is fixed. -* Mon May 12 2003 Tim Waugh 1.1.14-15.3 -- Fix HTTP blocking issue with scheduler: http://www.cups.org/str.php?L75. +* Thu Aug 15 2002 Tim Waugh 1.1.15-7 +- Really add cups-lpd xinetd file (bug #63919). +- Ship pstoraster (bug #69573). +- Prevent fread from trying to read from beyond EOF (fixes a segfault + with new glibc). -* Wed Jan 8 2003 Tim Waugh 1.1.14-15.2 -- Add 'exit 0' to postun scriptlet, and fix init script 'condrestart' - behaviour. +* Sat Aug 10 2002 Elliot Lee 1.1.15-6 +- rebuilt with gcc-3.2 (we hope) -* Fri Dec 13 2002 Tim Waugh 1.1.14-15.1 +* Mon Aug 5 2002 Bernhard Rosenkraenzer 1.1.15-5 +- Add cups-lpd xinetd file (#63919) + +* Tue Jul 23 2002 Florian La Roche 1.1.15-4 +- add a "exit 0" to postun script + +* Tue Jul 2 2002 Bernhard Rosenkraenzer 1.1.15-3 +- Add a symlink /usr/share/cups/doc -> /usr/share/doc/cups-devel-1.1.15 + because some applications expect to find the cups docs in + /usr/share/cups/doc + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Fri Jun 21 2002 Bernhard Rosenkraenzer 1.1.15-1 +- 1.1.15-1 - Fix up smb printing trigger (samba-client, not samba-clients) -- Don't install files not shipped. -- Security fixes. +- Start cupsd earlier, apparently it needs to be running before samba + starts up for smb printing to work. + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue May 7 2002 Bernhard Rosenkraenzer 1.1.14-17 +- Rebuild in current environment +- [-16 never existed because of build system breakage] * Wed Apr 17 2002 Bernhard Rosenkraenzer 1.1.14-15 - Fix bug #63387 diff --git a/pstoraster b/pstoraster new file mode 100644 index 0000000..e72f75d --- /dev/null +++ b/pstoraster @@ -0,0 +1,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/local +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 $". +# diff --git a/pstoraster.convs b/pstoraster.convs new file mode 100644 index 0000000..e498d59 --- /dev/null +++ b/pstoraster.convs @@ -0,0 +1,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: cups-info@cups.org +# 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 $". +# diff --git a/sources b/sources index dc7b578..922a92f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7cc9725d94568b24f5ade78fb7e26480 cups-1.1.14-source.tar.bz2 +971a14d35f61ea19871616f437e199a2 cups-1.1.15-1-source.tar.bz2