OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Sep-2004 21:01:37
Branch: HEAD Handle: 2004092020013500
Modified files:
openpkg-src/cups cups.patch cups.spec
Log:
upgrading package: cups 1.1.20 -> 1.1.21
Summary:
Revision Changes Path
1.4 +16 -5 openpkg-src/cups/cups.patch
1.19 +1 -1 openpkg-src/cups/cups.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 cups.patch
--- openpkg-src/cups/cups.patch 11 Aug 2003 14:39:14 -0000 1.3
+++ openpkg-src/cups/cups.patch 20 Sep 2004 19:01:35 -0000 1.4
@@ -1,6 +1,6 @@
--- scheduler/main.c.orig 2003-05-01 19:58:28.000000000 +0200
+++ scheduler/main.c 2003-05-03 18:54:34.000000000 +0200
-@@ -222,6 +222,25 @@
+@@ -249,6 +249,25 @@
chdir("/");
@@ -26,13 +26,24 @@
#ifndef DEBUG
/*
* Disable core dumps...
---- backend/usb.c.dist 2003-08-11 15:10:48.000000000 +0200
-+++ backend/usb.c 2003-08-11 16:36:10.000000000 +0200
-@@ -63,6 +63,7 @@
+--- backend/usb-unix.c.orig 2004-09-20 20:40:47 +0200
++++ backend/usb-unix.c 2004-09-20 20:40:49 +0200
+@@ -50,6 +50,7 @@
# ifdef __sparc
# include <sys/ecppio.h>
# else
+# include <sys/ioctl.h>
+ # include <sys/ioccom.h>
# include <sys/ecppsys.h>
# endif /* __sparc */
- #endif /* __sun */
+--- systemv/Makefile.orig 2004-09-20 20:45:52 +0200
++++ systemv/Makefile 2004-09-20 20:47:30 +0200
+@@ -78,7 +78,7 @@
+ $(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 \
++ if -e $(BINDIR)/lppasswd -a test ! -x $(BINDIR)/lppasswd; then \
+ chmod 755 $(BINDIR)/lppasswd; \
+ fi
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 cups.spec
--- openpkg-src/cups/cups.spec 20 Sep 2004 14:33:20 -0000 1.18
+++ openpkg-src/cups/cups.spec 20 Sep 2004 19:01:35 -0000 1.19
@@ -33,7 +33,7 @@
Class: EVAL
Group: Print
License: GPL/LGPL with exceptions
-Version: 1.1.20
+Version: 1.1.21
Release: 20040920
# package options
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
