for 2004100519345927957

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4567 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago · 0808090513
6 changed files with 0 additions and 363 deletions
--- a/package/rene/cups/cups.cache
+++ b/package/rene/cups/cups.cache
@ -1,37 +0,0 @@
 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/rene/cups/cups.cache
 [COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [TIMESTAMP] 1097021373 Wed Oct  6 02:09:33 2004
 [CONFIG-ID] 2.1.0-DEV-x86-reference-expert
 [ROCKVER] 2.1.0-DEV

 [LOGS] 5-cups.log

 [BUILDTIME] 11190 (5)
 [SIZE] 2.63 MB, 333 files

 [DEP] 00-dirtree bash2 binutils bzip2 coreutils diffutils findutils gawk
 [DEP] gcc34 gcc34:dev glibc23 glibc23:dev grep groff libjpeg libjpeg:dev
 [DEP] libpng libpng:dev libtiff libtiff:dev linux24-header:dev m4 make
 [DEP] mktemp net-tools openslp openslp:dev openssl openssl:dev pam pam:dev
 [DEP] patch sed sysfiles tar util-linux zlib:dev

--- a/package/rene/cups/cups.conf
+++ b/package/rene/cups/cups.conf
@ -1,39 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/rene/cups/cups.conf
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # 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 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 cups_pm(){
 	install_init cups $confdir/cups.init

 	# cups is too stupid to create the ../tmp dir itself - only
 	# needed for some ipp transfers (...?) -ReneR
 	mkdir -p $root/var/spool/cups/tmp
 	chown daemon:daemon $root/var/spool/cups/tmp
 }

 var_append copfopt "--with-logdir=/var/cups/log
                    --with-cups-user=daemon --with-cups-group=daemon"

 # Force same compiler version for C and C++
 export CC="${CXX/[cg]++/gcc}"

 hook_add postmake 5 cups_pm

--- a/package/rene/cups/cups.desc
+++ b/package/rene/cups/cups.desc
@ -1,58 +0,0 @@

 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/rene/cups/cups.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [I] Common Unix Printing System

 [T] CUPS provides a portable printing layer for UNIX(r)-based operating
 [T] systems.  It has been developed by Easy Software Products to provide
 [T] a standard printing solution for all UNIX vendors and users. CUPS
 [T] provides the System V and Berkeley command-line interfaces.
 [T]
 [T] CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis
 [T] for managing print jobs and queues. The Line Printer Daemon (LPD,
 [T] RFC1179), Server Message Block (SMB), and AppSocket protocols are
 [T] also supported with reduced functionality. CUPS adds network printer
 [T] browsing and PostScript Printer Description ("PPD")-based printing
 [T] options to support real world applications under UNIX.
 [T]
 [T] CUPS also includes a customized version of GNU GhostScript (currently
 [T] based off GNU GhostScript 4.03) and an image file RIP that can be
 [T] used to support non-PostScript printers.

 [U] http://www.cups.org/

 [A] Easy Software Products
 [M] Rene Rebe <rene@exactcode.de>
 [M] Kent Skaar <skaar@ita.chalmers.se>

 [C] extra/server extra/printing

 [F] PRINTER

 [L] GPL
 [S] Stable
 [V] 1.1.19
 [P] X -?---5---9 122.900

 [D] 1920679965 cups-1.1.19-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/1.1.19/

--- a/package/rene/cups/cups.init
+++ b/package/rene/cups/cups.init
@ -1,46 +0,0 @@
 #!/bin/bash
 #
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/rene/cups/cups.init
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # 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 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 #
 # ROCK Linux /etc/rc.d/init.d/pdnsd
 #
 # Desc: The CUPS print server
 # Runlevel: 30 rcX
 #

 main_begin

    block_begin(start, `Starting cupsd.')
        check(`D_prefix/sbin/cupsd')
    block_end

    block_begin(stop, `Stopping cupsd.')
        check(`killall -15 D_prefix/sbin/cupsd')
    block_end

    block_begin(restart, `Restarting cupsd.')
        check(`killall -1 D_prefix/sbin/cupsd')
    block_end

 main_end

--- a/package/rene/cups/noinit.patch
+++ b/package/rene/cups/noinit.patch
@ -1,55 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/rene/cups/noinit.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # 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 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./Makefile.orig	2003-08-16 17:12:44.000000000 +0000
 +++ ./Makefile	2003-08-16 17:12:58.000000000 +0000
@@ -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...
--- a/package/rene/cups/setprinter.patch
+++ b/package/rene/cups/setprinter.patch
@ -1,128 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/rene/cups/setprinter.patch
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # 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 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 diff -ur cups-1.1.19/berkeley/Makefile cups-1.1.19-fixed/berkeley/Makefile
 --- cups-1.1.19/berkeley/Makefile	2002-12-17 19:56:34.000000000 +0100
 +++ cups-1.1.19-fixed/berkeley/Makefile	2003-05-07 01:26:05.794298504 +0200
@@ -57,11 +57,11 @@
 
 install:	all
 	$(INSTALL_DIR) $(BINDIR)
 -	$(INSTALL_BIN) lpq $(BINDIR)
 -	$(INSTALL_BIN) lpr $(BINDIR)
 -	$(INSTALL_BIN) lprm $(BINDIR)
 +	$(INSTALL_BIN) lpq $(BINDIR)/lpq_cups
 +	$(INSTALL_BIN) lpr $(BINDIR)/lpr_cups
 +	$(INSTALL_BIN) lprm $(BINDIR)/lprm_cups
 	$(INSTALL_DIR) $(SBINDIR)
 -	$(INSTALL_BIN) lpc $(SBINDIR)
 +	$(INSTALL_BIN) lpc $(SBINDIR)/lpc_cups
 
 
 #
 diff -ur cups-1.1.19/man/Makefile cups-1.1.19-fixed/man/Makefile
 --- cups-1.1.19/man/Makefile	2002-12-17 19:59:55.000000000 +0100
 +++ cups-1.1.19-fixed/man/Makefile	2003-05-07 01:43:21.878789720 +0200
@@ -70,26 +70,30 @@
 install:	all
 	$(INSTALL_DIR) $(MANDIR)/man1
 	for file in $(MAN1); do \
 -		$(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
 +	        inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(MANDIR)/man1/$$inst'_cups.1'; \
 	done
 -	$(RM) $(MANDIR)/man1/cancel.1
 -	$(LN) lp.1 $(MANDIR)/man1/cancel.1
 +	$(RM) $(MANDIR)/man1/cancel_cups.1
 +	$(LN) lp_cups.1 $(MANDIR)/man1/cancel_cups.1
 	$(INSTALL_DIR) $(PMANDIR)/man3
 	for file in $(MAN3); do \
 -		$(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
 +	        inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(PMANDIR)/man3/$$(inst)'_cups.3'; \
 	done
 	$(INSTALL_DIR) $(MANDIR)/man5
 	for file in $(MAN5); do \
 -		$(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
 +	        inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(MANDIR)/man5/$$(inst)'_cups.5'; \
 	done
 	$(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
 	for file in $(MAN8); do \
 -		$(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
 +	        inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/$$(inst)'_cups'.$(MAN8EXT); \
 	done
 -	$(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
 -	$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
 -	$(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
 -	$(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
 +	$(RM) $(AMANDIR)/man$(MAN8EXT)/reject_cups.$(MAN8EXT)
 +	$(LN) accept_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject_cups.$(MAN8EXT)
 +	$(RM) $(AMANDIR)/man$(MAN8EXT)/disable_cups.$(MAN8EXT)
 +	$(LN) enable_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable_cups.$(MAN8EXT)
 	$(INSTALL_DIR) $(MANDIR)/cat1
 	for file in $(CAT1); do \
 		$(INSTALL_MAN) $$file $(MANDIR)/cat1; \
 diff -ur cups-1.1.19/systemv/Makefile cups-1.1.19-fixed/systemv/Makefile
 --- cups-1.1.19/systemv/Makefile.orig	2003-08-16 18:15:53.000000000 +0000
 +++ cups-1.1.19-fixed/systemv/Makefile	2003-08-16 18:19:53.000000000 +0000
@@ -60,25 +60,22 @@
 
 install:	all
 	$(INSTALL_DIR) $(SBINDIR)
 -	$(INSTALL_BIN) accept $(SBINDIR)
 -	$(RM) $(SBINDIR)/reject
 -	$(LN) accept $(SBINDIR)/reject
 +	$(INSTALL_BIN) accept $(SBINDIR)/accept_cups
 +	$(LN) accept $(SBINDIR)/reject_cups
 	$(INSTALL_BIN) cupsaddsmb $(SBINDIR)
 -	$(INSTALL_BIN) lpadmin $(SBINDIR)
 -	$(INSTALL_BIN) lpinfo $(SBINDIR)
 -	$(INSTALL_BIN) lpmove $(SBINDIR)
 +	$(INSTALL_BIN) lpadmin $(SBINDIR)/lpadmin_cups
 +	$(INSTALL_BIN) lpinfo $(SBINDIR)/lpinfo_cups
 +	$(INSTALL_BIN) lpmove $(SBINDIR)/lpremove_cups
 	$(INSTALL_DIR) $(BINDIR)
 -	$(INSTALL_BIN) cancel $(BINDIR)
 +	$(INSTALL_BIN) cancel $(BINDIR)/cancel_cups
 	$(INSTALL_BIN) cupstestppd $(BINDIR)
 -	$(RM) $(BINDIR)/disable
 -	$(LN) ../sbin/accept $(BINDIR)/disable
 -	$(RM) $(BINDIR)/enable
 -	$(LN) ../sbin/accept $(BINDIR)/enable
 -	$(INSTALL_BIN) lp $(BINDIR)
 -	$(INSTALL_BIN) lpoptions $(BINDIR)
 -	$(INSTALL_BIN) lpstat $(BINDIR)
 -	$(INSTALL_BIN) lppasswd $(BINDIR)
 -	-$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
 +	$(LN) ../sbin/accept $(BINDIR)/disable_cups
 +	$(LN) ../sbin/accept $(BINDIR)/enable_cups
 +	$(INSTALL_BIN) lp $(BINDIR)/lp_cups
 +	$(INSTALL_BIN) lpoptions $(BINDIR)/lpoptions_cups
 +	$(INSTALL_BIN) lpstat $(BINDIR)/lpstat_cups
 +	$(INSTALL_BIN) lppasswd $(BINDIR)/lppasswd_cups
 +	-$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)/lppasswd_cups
 
 
 #