From 7d1296ed6003e73b8b3b31ffc6dba251d1b74a3a Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 17 Nov 2006 09:54:22 +0000 Subject: [PATCH] Stefan Fiedler: update cups (1.2.4) [2006101611140967620] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8019 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/praenti/cups/cups.desc | 4 +- package/praenti/cups/noinit.patch | 75 +++++++-------- package/praenti/cups/setprinter.patch | 127 +++++++++++--------------- 3 files changed, 85 insertions(+), 121 deletions(-) diff --git a/package/praenti/cups/cups.desc b/package/praenti/cups/cups.desc index ed6976556..669671b35 100644 --- a/package/praenti/cups/cups.desc +++ b/package/praenti/cups/cups.desc @@ -52,8 +52,8 @@ [L] GPL [S] Stable -[V] 1.1.23 +[V] 1.2.4 [P] X -?---5---9 121.200 -[D] 3717166286 cups-1.1.23-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.1.23/ +[D] 528298239 cups-1.2.4-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.2.4/ diff --git a/package/praenti/cups/noinit.patch b/package/praenti/cups/noinit.patch index 4fc15b614..1a2e72bc1 100644 --- a/package/praenti/cups/noinit.patch +++ b/package/praenti/cups/noinit.patch @@ -1,52 +1,39 @@ -# --- 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/praenti/cups/noinit.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- 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 @@ +--- cups-1.2.4-orig/Makefile 2006-08-29 17:51:19.000000000 +0200 ++++ cups-1.2.4/Makefile 2006-10-12 22:09:13.000000000 +0200 +@@ -99,36 +99,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 \ +- echo Installing init scripts...; \ +- $(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; \ +- echo Installing StartupItems files...; \ +- $(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 \ +- echo Installing LaunchDaemons configuration files...; \ +- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ +- $(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \ - else \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ +- echo Installing RC script...; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - fi \ - fi - - # - # Install source and header files... + if test "x$(DBUSDIR)" != x; then \ + echo Installing cups.conf in $(DBUSDIR)...;\ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \ diff --git a/package/praenti/cups/setprinter.patch b/package/praenti/cups/setprinter.patch index e2c562b7d..b266cc5b5 100644 --- a/package/praenti/cups/setprinter.patch +++ b/package/praenti/cups/setprinter.patch @@ -1,93 +1,76 @@ -# --- 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/praenti/cups/setprinter.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -Nur ../cups-1.1.21-org/berkeley/Makefile ./berkeley/Makefile ---- ../cups-1.1.21-org/berkeley/Makefile 2004-09-26 16:42:06.254764248 +0200 -+++ ./berkeley/Makefile 2004-09-26 16:43:33.658476864 +0200 +diff -dur cups-1.2.4-orig/berkeley/Makefile cups-1.2.4/berkeley/Makefile +--- cups-1.2.4-orig/berkeley/Makefile 2006-03-05 17:48:12.000000000 +0100 ++++ cups-1.2.4/berkeley/Makefile 2006-10-12 22:11:29.000000000 +0200 @@ -57,11 +57,11 @@ install: all - $(INSTALL_DIR) $(BINDIR) + $(INSTALL_DIR) -m 755 $(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_DIR) -m 755 $(SBINDIR) - $(INSTALL_BIN) lpc $(SBINDIR) + $(INSTALL_BIN) lpc $(SBINDIR)/lpc_cups # -diff -Nur ../cups-1.1.21-org/man/Makefile ./man/Makefile ---- ../cups-1.1.21-org/man/Makefile 2004-09-26 16:42:07.097636112 +0200 -+++ ./man/Makefile 2004-09-26 16:49:54.448587968 +0200 -@@ -70,25 +70,25 @@ +diff -dur cups-1.2.4-orig/man/Makefile cups-1.2.4/man/Makefile +--- cups-1.2.4-orig/man/Makefile 2006-07-12 22:45:13.000000000 +0200 ++++ cups-1.2.4/man/Makefile 2006-10-12 22:11:29.000000000 +0200 +@@ -107,27 +107,28 @@ install: all - $(INSTALL_DIR) $(MANDIR)/man1 + $(INSTALL_DIR) -m 755 $(MANDIR)/man1 for file in $(MAN1); do \ - echo Installing $$file in $(MANDIR)/man1...; \ -- $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \ +- $(INSTALL_MAN) $$file $(MANDIR)/man1; \ + 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.1 $(MANDIR)/man1/cancel_cups.1 - $(INSTALL_DIR) $(MANDIR)/man5 + $(INSTALL_DIR) -m 755 $(MANDIR)/man5 for file in $(MAN5); do \ - echo Installing $$file in $(MANDIR)/man5...; \ -- $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \ +- $(INSTALL_MAN) $$file $(MANDIR)/man5; \ + inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ $(INSTALL_MAN) $$file $(MANDIR)/man5/$$(inst)'_cups.5'; \ ++ $(INSTALL_MAN) $$file $(MANDIR)/man5/$$inst'_cups.5'; \ done - $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT) + $(INSTALL_DIR) -m 755 $(MANDIR)/man7 + for file in $(MAN7); do \ +- echo Installing $$file in $(MANDIR)/man7...; \ +- $(INSTALL_MAN) $$file $(MANDIR)/man7; \ ++ inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ ++ $(INSTALL_MAN) $$file $(MANDIR)/man7/$$inst'_cups.7'; \ + done + $(INSTALL_DIR) -m 755 $(AMANDIR)/man$(MAN8DIR) for file in $(MAN8); do \ -- echo Installing $$file in $(AMANDIR)/man$(MAN8EXT)...; \ -- $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \ +- echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \ +- $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \ ++ echo $$file; \ + inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/$$(inst)'_cups'.$(MAN8EXT); \ ++ $(INSTALL_MAN) $$file $(AMANDIR)/man8/$$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 \ - echo Installing $$file in $(MANDIR)/cat1...; \ -diff -Nur ../cups-1.1.21-org/systemv/Makefile ./systemv/Makefile ---- ../cups-1.1.21-org/systemv/Makefile 2004-09-26 16:42:07.529570448 +0200 -+++ ./systemv/Makefile 2004-09-26 16:52:35.884046048 +0200 -@@ -60,26 +60,24 @@ +- $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) +- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) +- $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) ++ $(RM) $(AMANDIR)/man$(MAN8DIR)/reject_cups.$(MAN8EXT) ++ $(LN) accept_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject_cups.$(MAN8EXT) ++ $(RM) $(AMANDIR)/man8/cupsdisable.$(MAN8EXT) + $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) + + +diff -dur cups-1.2.4-orig/systemv/Makefile cups-1.2.4/systemv/Makefile +--- cups-1.2.4-orig/systemv/Makefile 2006-06-05 17:25:23.000000000 +0200 ++++ cups-1.2.4/systemv/Makefile 2006-10-12 22:14:25.000000000 +0200 +@@ -60,25 +60,25 @@ install: all - $(INSTALL_DIR) $(SBINDIR) + $(INSTALL_DIR) -m 755 $(SBINDIR) - $(INSTALL_BIN) accept $(SBINDIR) -- $(RM) $(SBINDIR)/reject -- $(LN) accept $(SBINDIR)/reject + $(INSTALL_BIN) accept $(SBINDIR)/accept_cups + $(RM) $(SBINDIR)/reject +- $(LN) accept $(SBINDIR)/reject + $(LN) accept $(SBINDIR)/reject_cups $(INSTALL_BIN) cupsaddsmb $(SBINDIR) - $(INSTALL_BIN) lpadmin $(SBINDIR) @@ -95,30 +78,24 @@ diff -Nur ../cups-1.1.21-org/systemv/Makefile ./systemv/Makefile - $(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) lpmove $(SBINDIR)/lpmove_cups + $(INSTALL_DIR) -m 755 $(BINDIR) - $(INSTALL_BIN) cancel $(BINDIR) + $(INSTALL_BIN) cancel $(BINDIR)/cancel_cups + $(INSTALL_BIN) cupstestdsc $(BINDIR) $(INSTALL_BIN) cupstestppd $(BINDIR) -- $(RM) $(BINDIR)/disable -- $(LN) ../sbin/accept $(BINDIR)/disable -- $(RM) $(BINDIR)/enable -- $(LN) ../sbin/accept $(BINDIR)/enable + $(RM) $(SBINDIR)/cupsdisable + $(LN) accept $(SBINDIR)/cupsdisable + $(RM) $(SBINDIR)/cupsenable + $(LN) accept $(SBINDIR)/cupsenable - $(INSTALL_BIN) lp $(BINDIR) - $(INSTALL_BIN) lpoptions $(BINDIR) - $(INSTALL_BIN) lpstat $(BINDIR) -- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) -- if test ! -x $(BINDIR)/lppasswd; then \ -- chmod 755 $(BINDIR)/lppasswd; \ -+ $(LN) ../sbin/accept $(BINDIR)/disable_cups -+ $(LN) ../sbin/accept $(BINDIR)/enable_cups +- $(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR) + $(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 -+ if test ! -x $(BINDIR)/lppasswd_cups; then \ -+ chmod 755 $(BINDIR)/lppasswd_cups; \ - fi ++ $(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR)/lppasswd_cups || $(INSTALL_BIN) lppasswd $(BINDIR)/lppasswd_cups + #