OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-Aug-2008 09:23:48 Branch: HEAD Handle: 2008083008234800 Modified files: openpkg-src/xjobs xjobs.patch xjobs.spec Log: upgrading package: xjobs 20080520 -> 20080824 Summary: Revision Changes Path 1.7 +68 -8 openpkg-src/xjobs/xjobs.patch 1.12 +2 -2 openpkg-src/xjobs/xjobs.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/xjobs/xjobs.patch ============================================================================ $ cvs diff -u -r1.6 -r1.7 xjobs.patch --- openpkg-src/xjobs/xjobs.patch 21 May 2008 18:27:38 -0000 1.6 +++ openpkg-src/xjobs/xjobs.patch 30 Aug 2008 07:23:48 -0000 1.7 @@ -1,6 +1,6 @@ Index: Makefile.in ---- Makefile.in.orig 2008-05-20 21:31:54 +0200 -+++ Makefile.in 2008-05-21 20:24:20 +0200 +--- Makefile.in.orig 2008-08-29 17:56:02 +0200 ++++ Makefile.in 2008-08-30 09:19:23 +0200 @@ -25,7 +25,7 @@ $(OBJECTS): config.h Makefile @@ -10,16 +10,19 @@ %.o: %.c $(CC) $(CFLAGS) -c $< -o $@ -@@ -43,4 +43,5 @@ +@@ -43,7 +43,8 @@ install: $(TARGET) -$(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) - $(INSTALL) xjobs.1 $(mandir) + -$(INSTALL) -d $(DESTDIR)$(mandir) + $(INSTALL) xjobs.1 $(DESTDIR)$(mandir) + + lint: + lint $(CFLAGS) $(SOURCES) Index: tokenizer.l ---- tokenizer.l.orig 2008-05-20 21:31:54 +0200 -+++ tokenizer.l 2008-05-21 20:23:53 +0200 +--- tokenizer.l.orig 2008-08-29 17:56:02 +0200 ++++ tokenizer.l 2008-08-30 09:19:23 +0200 @@ -1,11 +1,4 @@ %pointer -%e 150 @@ -33,13 +36,70 @@ %{ /* Index: xjobs.c ---- xjobs.c.orig 2008-05-20 21:31:54 +0200 -+++ xjobs.c 2008-05-21 20:23:53 +0200 -@@ -7,7 +7,6 @@ +--- xjobs.c.orig 2008-08-29 17:56:02 +0200 ++++ xjobs.c 2008-08-30 09:22:07 +0200 +@@ -7,9 +7,6 @@ #include "config.h" #endif +-#ifdef HAVE_ALLOCA_H -#include <alloca.h> +-#endif #include <assert.h> #include <errno.h> #include <fcntl.h> +@@ -96,11 +93,13 @@ + static RETSIGTYPE processSignal(int sig) + { + switch (sig) { ++#if defined(SIGPOLL) + case SIGPOLL: + if (Verbose == Debug) + (void) write(STDERR_FILENO,"SIGPOLL\n",8); + ++InputsWaiting; + break; ++#endif + case SIGTERM: + if (Verbose == Debug) + (void) write(STDERR_FILENO,"SIGTERM\n",8); +@@ -994,10 +993,14 @@ + dbug("input script is a named pipe\n"); + sig.sa_handler = processSignal; + sigemptyset(&sig.sa_mask); ++#if defined(SIGPOLL) + sigaddset(&sig.sa_mask,SIGPOLL); ++#endif + sig.sa_flags = SA_RESTART; ++#if defined(SIGPOLL) + ret = sigaction(SIGPOLL,&sig,0); + assert(ret == 0); ++#endif + #ifndef __CYGWIN__ + (void) open(optarg,O_WRONLY); + #endif +@@ -1239,10 +1242,14 @@ + dbug("wait blocking - listening for new pipe connection\n"); + sig.sa_handler = processSignal; + sigemptyset(&sig.sa_mask); ++#if defined(SIGPOLL) + sigaddset(&sig.sa_mask,SIGPOLL); ++#endif + sig.sa_flags = 0; ++#if defined(SIGPOLL) + ret = sigaction(SIGPOLL,&sig,&orig); + assert(ret == 0); ++#endif + restore = 1; + } + #ifdef HAVE_WAIT4 +@@ -1262,8 +1269,10 @@ + } + #endif + if (restore) { ++#if defined(SIGPOLL) + ret = sigaction(SIGPOLL,&orig,0); + assert(ret == 0); ++#endif + } + start_jobs(); + } @@ . patch -p0 <<'@@ .' Index: openpkg-src/xjobs/xjobs.spec ============================================================================ $ cvs diff -u -r1.11 -r1.12 xjobs.spec --- openpkg-src/xjobs/xjobs.spec 21 May 2008 18:27:38 -0000 1.11 +++ openpkg-src/xjobs/xjobs.spec 30 Aug 2008 07:23:48 -0000 1.12 @@ -31,8 +31,8 @@ Class: EVAL Group: ShellUtils License: GPL -Version: 20080520 -Release: 20080521 +Version: 20080824 +Release: 20080830 # list of sources Source0: http://www.maier-komor.de/xjobs/xjobs-%{version}.tgz @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org