OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Dec-2007 17:40:09
Branch: HEAD Handle: 2007122016400800
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
upgrading package: varnish 1.1.1 -> 1.1.2
Summary:
Revision Changes Path
1.6 +0 -184 openpkg-src/varnish/varnish.patch
1.14 +2 -2 openpkg-src/varnish/varnish.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 varnish.patch
--- openpkg-src/varnish/varnish.patch 6 Oct 2007 08:46:47 -0000 1.5
+++ openpkg-src/varnish/varnish.patch 20 Dec 2007 16:40:08 -0000 1.6
@@ -47,187 +47,3 @@
#endif
sf, of, sf);
xxxassert(len < sizeof buf);
-Index: bin/varnishd/storage_file.c
---- bin/varnishd/storage_file.c.orig 2007-08-20 22:05:39 +0200
-+++ bin/varnishd/storage_file.c 2007-10-06 10:39:12 +0200
-@@ -116,7 +116,11 @@
- static void
- smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
- {
-+#if defined(__sun__)
-+ struct statvfs fsst;
-+#else
- struct statfs fsst;
-+#endif
- uintmax_t l, fssize;
- unsigned bs;
- char suff[2];
-Index: include/compat/daemon.h
---- /dev/null 2007-10-06 10:39:16 +0200
-+++ include/compat/daemon.h 2007-10-06 10:39:12 +0200
-@@ -0,0 +1,8 @@
-+#ifndef _DAEMON_H_
-+#define _DAEMON_H_
-+
-+#ifndef HAVE_DAEMON
-+extern int daemon(int, int);
-+#endif
-+
-+#endif
-Index: lib/libvarnishcompat/Makefile.in
---- lib/libvarnishcompat/Makefile.in.orig 2007-08-20 22:05:59 +0200
-+++ lib/libvarnishcompat/Makefile.in 2007-10-06 10:39:12 +0200
-@@ -57,6 +57,7 @@
- am_libvarnishcompat_la_OBJECTS = libvarnishcompat_la-asprintf.lo \
- libvarnishcompat_la-vasprintf.lo \
- libvarnishcompat_la-setproctitle.lo \
-+ libvarnishcompat_la-daemon.lo \
- libvarnishcompat_la-srandomdev.lo \
- libvarnishcompat_la-strlcat.lo libvarnishcompat_la-strlcpy.lo \
- libvarnishcompat_la-strndup.lo libvarnishcompat_la-vis.lo
-@@ -203,6 +204,7 @@
- asprintf.c \
- vasprintf.c \
- setproctitle.c \
-+ daemon.c \
- srandomdev.c \
- strlcat.c \
- strlcpy.c \
-@@ -281,6 +283,7 @@
-
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL
PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
-@@ -330,6 +333,13 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libvarnishcompat_la_CFLAGS) $(CFLAGS) -c -o
libvarnishcompat_la-setproctitle.lo `test -f 'setproctitle.c' || echo
'$(srcdir)/'`setproctitle.c
-
-+libvarnishcompat_la-daemon.lo: daemon.c
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(libvarnishcompat_la_CFLAGS) $(CFLAGS) -MT
libvarnishcompat_la-daemon.lo -MD -MP -MF
$(DEPDIR)/libvarnishcompat_la-daemon.Tpo -c -o libvarnishcompat_la-daemon.lo
`test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/libvarnishcompat_la-daemon.Tpo
$(DEPDIR)/libvarnishcompat_la-daemon.Plo
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='daemon.c'
object='libvarnishcompat_la-daemon.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(libvarnishcompat_la_CFLAGS) $(CFLAGS) -c -o
libvarnishcompat_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c
-+
- libvarnishcompat_la-srandomdev.lo: srandomdev.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libvarnishcompat_la_CFLAGS) $(CFLAGS) -MT
libvarnishcompat_la-srandomdev.lo -MD -MP -MF
$(DEPDIR)/libvarnishcompat_la-srandomdev.Tpo -c -o
libvarnishcompat_la-srandomdev.lo `test -f 'srandomdev.c' || echo
'$(srcdir)/'`srandomdev.c
- @am__fastdepCC_TRUE@ mv -f
$(DEPDIR)/libvarnishcompat_la-srandomdev.Tpo
$(DEPDIR)/libvarnishcompat_la-srandomdev.Plo
-Index: lib/libvarnishcompat/daemon.c
---- /dev/null 2007-10-06 10:39:16 +0200
-+++ lib/libvarnishcompat/daemon.c 2007-10-06 10:39:12 +0200
-@@ -0,0 +1,112 @@
-+/*
-+** proc_daemon.c -- daemonize current process
-+** Copyright (c) 1999-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
-+**
-+** See "Unix Programming Frequently Asked Questions":
-+** http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC10
-+*/
-+
-+#if !defined(HAVE_DAEMON)
-+
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <signal.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/ioctl.h>
-+
-+#include "compat/daemon.h"
-+
-+int daemon(int nochdir, int noclose)
-+{
-+ int fd;
-+ int rc;
-+
-+#if 0
-+ /* if we are started from init, no need to become daemon. */
-+ if (getppid() == 1)
-+ return;
-+#endif
-+
-+ /* ignore tty related signals */
-+#ifdef SIGTTOU
-+ signal(SIGTTOU, SIG_IGN);
-+#endif
-+#ifdef SIGTTIN
-+ signal(SIGTTIN, SIG_IGN);
-+#endif
-+#ifdef SIGTSTP
-+ signal(SIGTSTP, SIG_IGN);
-+#endif
-+
-+ /* fork so the parent can exit, this returns control to the command line
-+ or shell invoking your program. This step is required so that the new
-+ process is guaranteed not to be a process group leader (The next
step,
-+ setsid, would fail if you're a process group leader). */
-+ rc = fork();
-+ switch (rc) {
-+ case -1: return -1;
-+ case 0: break;
-+ default: _exit(0); /* exit original process */
-+ }
-+
-+ /* setsid to become a process group and session group leader. Since a
-+ controlling terminal is associated with a session, and this new
session
-+ has not yet acquired a controlling terminal our process now has no
-+ controlling terminal, which is a Good Thing for daemons. */
-+#if defined(HAVE_SETSID) || defined(__sun__)
-+ if (setsid() == -1)
-+ return -1;
-+#else
-+ if (setpgid(0, getpid()) == -1)
-+ return -1;
-+#if defined(TIOCNOTTY)
-+#ifndef _PATH_TTY
-+#define _PATH_TTY "/dev/tty"
-+#endif
-+ if ((fd = open(_PATH_TTY, O_RDWR)) == -1)
-+ return -1;
-+ ioctl(fd, TIOCNOTTY, NULL);
-+ close(fd);
-+#endif
-+#endif
-+
-+ /* fork again so the parent (the session group leader) can exit. This
-+ means that we, as a non-session group leader, can never regain a
-+ controlling terminal. */
-+ rc = fork();
-+ switch (rc) {
-+ case -1: return -1;
-+ case 0: break;
-+ default: _exit(0); /* exit original process */
-+ }
-+
-+ /* change to root directory ensure that our process doesn't keep
-+ any directory in use. Failure to do this could make it so that
-+ an administrator couldn't unmount a filesystem, because it was
-+ our current directory. [Equivalently, we could change to any
-+ directory containing files important to the daemon's operation.] */
-+ if (!nochdir)
-+ chdir("/");
-+
-+ /* give us complete control over the permissions of anything we
-+ write. We don't know what umask we may have inherited.
-+ [This step is optional] */
-+ umask(0);
-+
-+ /* close fds 0, 1, and 2. This releases the standard in, out, and
-+ error we inherited from our parent process. We have no way of
-+ knowing where these fds might have been redirected to. */
-+ if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) {
-+ dup2(fd, STDIN_FILENO);
-+ dup2(fd, STDOUT_FILENO);
-+ dup2(fd, STDERR_FILENO);
-+ if (fd > 2)
-+ close(fd);
-+ }
-+
-+ return 0;
-+}
-+
-+#endif
-+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 varnish.spec
--- openpkg-src/varnish/varnish.spec 13 Dec 2007 17:54:37 -0000 1.13
+++ openpkg-src/varnish/varnish.spec 20 Dec 2007 16:40:08 -0000 1.14
@@ -32,8 +32,8 @@
Class: EVAL
Group: Web
License: BSD
-Version: 1.1.1
-Release: 20071213
+Version: 1.1.2
+Release: 20071220
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
