head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.8 OPENPKG_E1_MP:1.8 OPENPKG_E1_MP_2_STABLE:1.6.2.3 OPENPKG_E1_FP:1.6.2.3 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.6.2.2 OPENPKG_2_STABLE:1.6.0.2 OPENPKG_CW_FP:1.5 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.10 date 2009.08.29.08.05.19; author rse; state Exp; branches; next 1.9; commitid Dt2pNaRzEyWk5z1u; 1.9 date 2008.04.02.07.44.48; author rse; state Exp; branches; next 1.8; commitid rG0y2BCtLT2EuvXs; 1.8 date 2006.11.10.17.56.19; author cs; state Exp; branches; next 1.7; commitid 9wPOPnw1rnQOe9Ur; 1.7 date 2006.10.22.14.33.15; author rse; state Exp; branches; next 1.6; commitid a6llmMGdpI01JGRr; 1.6 date 2006.05.14.19.03.16; author rse; state Exp; branches 1.6.2.1; next 1.5; commitid vFlz2KmfQrVuo1xr; 1.5 date 2004.11.02.18.53.57; author ms; state Exp; branches; next 1.4; 1.4 date 2004.09.20.19.01.35; author ms; state Exp; branches; next 1.3; 1.3 date 2003.08.11.14.39.14; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2003.08.11.13.19.21; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2003.06.09.16.11.35; author rse; state Exp; branches; next ; 1.6.2.1 date 2006.05.14.19.03.16; author rse; state dead; branches; next 1.6.2.2; commitid iZxwRSmmWscPXUQr; 1.6.2.2 date 2006.10.16.14.49.10; author rse; state Exp; branches; next 1.6.2.3; commitid iZxwRSmmWscPXUQr; 1.6.2.3 date 2006.10.22.14.36.40; author rse; state Exp; branches; next ; commitid SmbHJ50JCVmcKGRr; desc @@ 1.10 log @upgrading package: cups 1.3.11 -> 1.4.0 @ text @Index: Makedefs.in --- Makedefs.in.orig 2009-05-27 01:27:06 +0200 +++ Makedefs.in 2009-08-29 09:57:23 +0200 @@@@ -258,7 +258,6 @@@@ # Rules... # -.SILENT: .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz .c.o: Index: configure --- configure.orig 2009-08-28 17:35:34 +0200 +++ configure 2009-08-29 09:56:53 +0200 @@@@ -10102,7 +10102,7 @@@@ if test x$cachedir = x; then if test "x$uname" = xDarwin; then - CUPS_CACHEDIR="$localstatedir/spool/cups/cache" + CUPS_CACHEDIR="$localstatedir/spool/cache" else CUPS_CACHEDIR="$localstatedir/cache/cups" fi @@@@ -10256,9 +10256,9 @@@@ # Longer-term spool data -CUPS_REQUESTS="$localstatedir/spool/cups" +CUPS_REQUESTS="$localstatedir/spool" cat >>confdefs.h <<_ACEOF -#define CUPS_REQUESTS "$localstatedir/spool/cups" +#define CUPS_REQUESTS "$localstatedir/spool" _ACEOF Index: scheduler/main.c --- scheduler/main.c.orig 2009-05-18 17:43:32 +0200 +++ scheduler/main.c 2009-08-29 09:56:53 +0200 @@@@ -404,6 +404,25 @@@@ chdir("/"); + /* + * Write PID file + */ +#ifdef PID_FILE + { + mode_t old_umask; + pid_t pid; + FILE *fp; + + old_umask = umask((mode_t) 0022); + pid = getpid(); + if ((fp = fopen(PID_FILE, "w")) == NULL) + syslog(LOG_ERR, "cannot write PID file '%s'", PID_FILE); + fprintf(fp, "%ld\n", (long)pid); + fclose(fp); + umask(old_umask); + } +#endif + #ifndef DEBUG /* * Disable core dumps... @ 1.9 log @upgrading package: cups 1.3.5 -> 1.3.7 @ text @d2 3 a4 3 --- Makedefs.in.orig 2008-01-22 23:37:21 +0100 +++ Makedefs.in 2008-04-02 09:10:32 +0200 @@@@ -241,7 +241,7 @@@@ d9 1 a9 2 + .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz d13 3 a15 3 --- configure.orig 2008-04-01 23:59:43 +0200 +++ configure 2008-04-02 09:10:32 +0200 @@@@ -9384,7 +9384,7 @@@@ d24 1 a24 1 @@@@ -9539,9 +9539,9 @@@@ d37 3 a39 3 --- scheduler/main.c.orig 2008-03-21 22:36:40 +0100 +++ scheduler/main.c 2008-04-02 09:10:32 +0200 @@@@ -377,6 +377,25 @@@@ @ 1.8 log @upgrading package: cups 1.2.5 -> 1.2.6 @ text @d2 3 a4 3 --- Makedefs.in.orig 2006-08-03 02:54:38 +0200 +++ Makedefs.in 2006-10-22 16:24:14 +0200 @@@@ -238,7 +238,7 @@@@ d14 3 a16 3 --- configure.orig 2006-10-20 17:11:43 +0200 +++ configure 2006-10-22 16:24:28 +0200 @@@@ -7636,7 +7636,7 @@@@ d25 1 a25 1 @@@@ -7750,9 +7750,9 @@@@ d38 3 a40 3 --- scheduler/main.c.orig 2006-08-24 17:55:42 +0200 +++ scheduler/main.c 2006-10-22 16:24:14 +0200 @@@@ -315,6 +315,25 @@@@ @ 1.7 log @merge a contributed patch and the substitutions into a new patch; cleanup the headers and %description @ text @a36 9 @@@@ -12458,7 +12458,7 @@@@ # Solaris requires _POSIX_PTHREAD_SEMANTICS to # be POSIX-compliant... :( if test $uname = SunOS; then - PTHREAD_FLAGS="$PTHREAD_FLAGS _POSIX_PTHREAD_SEMANTICS" + PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS" fi break fi @ 1.6 log @upgrading package: cups 1.1.23 -> 1.2.0 @ text @d1 45 d47 2 a48 2 --- scheduler/main.c.orig 2006-05-04 22:53:35 +0200 +++ scheduler/main.c 2006-05-14 20:26:13 +0200 @ 1.6.2.1 log @file cups.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:10 +0000 @ text @d1 29 @ 1.6.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 29 Index: scheduler/main.c --- scheduler/main.c.orig 2006-05-04 22:53:35 +0200 +++ scheduler/main.c 2006-05-14 20:26:13 +0200 @@@@ -315,6 +315,25 @@@@ chdir("/"); + /* + * Write PID file + */ +#ifdef PID_FILE + { + mode_t old_umask; + pid_t pid; + FILE *fp; + + old_umask = umask((mode_t) 0022); + pid = getpid(); + if ((fp = fopen(PID_FILE, "w")) == NULL) + syslog(LOG_ERR, "cannot write PID file '%s'", PID_FILE); + fprintf(fp, "%ld\n", (long)pid); + fclose(fp); + umask(old_umask); + } +#endif + #ifndef DEBUG /* * Disable core dumps... @ 1.6.2.3 log @MFC: latest version; merge a contributed patch and the substitutions into a new patch; cleanup the headers and %description @ text @a0 45 Index: Makedefs.in --- Makedefs.in.orig 2006-08-03 02:54:38 +0200 +++ Makedefs.in 2006-10-22 16:24:14 +0200 @@@@ -238,7 +238,7 @@@@ # Rules... # -.SILENT: + .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz .c.o: Index: configure --- configure.orig 2006-10-20 17:11:43 +0200 +++ configure 2006-10-22 16:24:28 +0200 @@@@ -7636,7 +7636,7 @@@@ if test x$cachedir = x; then if test "x$uname" = xDarwin; then - CUPS_CACHEDIR="$localstatedir/spool/cups/cache" + CUPS_CACHEDIR="$localstatedir/spool/cache" else CUPS_CACHEDIR="$localstatedir/cache/cups" fi @@@@ -7750,9 +7750,9 @@@@ # Longer-term spool data -CUPS_REQUESTS="$localstatedir/spool/cups" +CUPS_REQUESTS="$localstatedir/spool" cat >>confdefs.h <<_ACEOF -#define CUPS_REQUESTS "$localstatedir/spool/cups" +#define CUPS_REQUESTS "$localstatedir/spool" _ACEOF @@@@ -12458,7 +12458,7 @@@@ # Solaris requires _POSIX_PTHREAD_SEMANTICS to # be POSIX-compliant... :( if test $uname = SunOS; then - PTHREAD_FLAGS="$PTHREAD_FLAGS _POSIX_PTHREAD_SEMANTICS" + PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS" fi break fi d2 2 a3 2 --- scheduler/main.c.orig 2006-08-24 17:55:42 +0200 +++ scheduler/main.c 2006-10-22 16:24:14 +0200 @ 1.5 log @upgrading package: cups 1.1.21 -> 1.1.22 @ text @d1 4 a4 3 --- scheduler/main.c.orig 2003-05-01 19:58:28.000000000 +0200 +++ scheduler/main.c 2003-05-03 18:54:34.000000000 +0200 @@@@ -250,6 +250,25 @@@@ a29 21 --- backend/usb-unix.c.orig 2004-11-02 19:45:51 +0100 +++ backend/usb-unix.c 2004-11-02 19:45:59 +0100 @@@@ -50,6 +50,7 @@@@ # ifdef __sparc # include # else +# include # include # include # endif /* __sparc */ --- 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 @ 1.4 log @upgrading package: cups 1.1.20 -> 1.1.21 @ text @d3 1 a3 1 @@@@ -249,6 +249,25 @@@@ d29 2 a30 2 --- backend/usb-unix.c.orig 2004-09-20 20:40:47 +0200 +++ backend/usb-unix.c 2004-09-20 20:40:49 +0200 @ 1.3 log @add includes for Sun != Sparc @ text @d3 1 a3 1 @@@@ -222,6 +222,25 @@@@ d29 3 a31 3 --- 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 @@@@ d36 1 d39 11 a49 1 #endif /* __sun */ @ 1.2 log @drop broken platform test for Sun != Sparc @ text @d30 8 a37 12 +++ backend/usb.c 2003-08-11 15:11:16.000000000 +0200 @@@@ -60,11 +60,8 @@@@ #endif /* __linux */ #ifdef __sun -# ifdef __sparc -# include -# else -# include -# endif /* __sparc */ +# include +# include a38 2 @ 1.1 log @add missing files and move up to EVAL because required by EVAL package @ text @d29 16 @