[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 13:15:31
Branch: HEAD Handle: 2009032712153000
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
upgrading package: varnish 2.0.2 -> 2.0.3
Summary:
RevisionChanges Path
1.9 +9 -9 openpkg-src/varnish/varnish.patch
1.19+3 -3 openpkg-src/varnish/varnish.spec
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
$ cvs diff -u -r1.8 -r1.9 varnish.patch
--- openpkg-src/varnish/varnish.patch 18 Oct 2008 18:18:51 - 1.8
+++ openpkg-src/varnish/varnish.patch 27 Mar 2009 12:15:30 - 1.9
@@ -1,6 +1,6 @@
Index: bin/varnishd/common.h
bin/varnishd/common.h.orig 2008-10-17 20:59:49 +0200
-+++ bin/varnishd/common.h2008-10-18 20:14:49 +0200
+--- bin/varnishd/common.h.orig 2009-02-12 12:15:25 +0100
bin/varnishd/common.h2009-03-27 13:09:35 +0100
@@ -52,3 +52,8 @@
fprintf(stderr, "Error: " __VA_ARGS__); \
exit(2);\
@@ -11,9 +11,9 @@
+#endif
+
Index: bin/varnishd/mgt_child.c
bin/varnishd/mgt_child.c.orig2008-10-17 20:59:49 +0200
-+++ bin/varnishd/mgt_child.c 2008-10-18 20:14:49 +0200
-@@ -239,6 +239,21 @@
+--- bin/varnishd/mgt_child.c.orig2009-02-12 12:15:25 +0100
bin/varnishd/mgt_child.c 2009-03-27 13:09:35 +0100
+@@ -238,6 +238,21 @@
struct vev *e;
int i, cp[2];
@@ -36,12 +36,12 @@
return;
Index: configure
configure.orig 2008-10-17 21:00:05 +0200
-+++ configure2008-10-18 20:15:14 +0200
-@@ -26612,9 +26612,6 @@
+--- configure.orig 2009-02-12 12:15:43 +0100
configure2009-03-27 13:10:04 +0100
+@@ -26417,9 +26417,6 @@
VCC_CC="$ac_cv_env_VCC_CC_value"
else
- case $host in
+ case $target in
-*-*-solaris*)
-VCC_CC="cc -Kpic -G -o %o %s"
-;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.spec
$ cvs diff -u -r1.18 -r1.19 varnish.spec
--- openpkg-src/varnish/varnish.spec 18 Nov 2008 20:18:42 - 1.18
+++ openpkg-src/varnish/varnish.spec 27 Mar 2009 12:15:30 - 1.19
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 2.0.2
-%define V_dist 2.0.2
+%define V_opkg 2.0.3
+%define V_dist 2.0.3
# package information
Name: varnish
@@ -36,7 +36,7 @@
Group:Web
License: BSD
Version: %{V_opkg}
-Release: 20081118
+Release: 20090327
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{V_dist}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
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: 18-Oct-2008 20:18:51
Branch: HEAD Handle: 2008101819185100
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
upgrading package: varnish 2.0b2 -> 2.0.1
Summary:
RevisionChanges Path
1.8 +16 -16 openpkg-src/varnish/varnish.patch
1.17+3 -3 openpkg-src/varnish/varnish.spec
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
$ cvs diff -u -r1.7 -r1.8 varnish.patch
--- openpkg-src/varnish/varnish.patch 25 Sep 2008 07:20:25 - 1.7
+++ openpkg-src/varnish/varnish.patch 18 Oct 2008 18:18:51 - 1.8
@@ -1,6 +1,6 @@
Index: bin/varnishd/common.h
bin/varnishd/common.h.orig 2008-09-24 20:05:20 +0200
-+++ bin/varnishd/common.h2008-09-25 09:14:05 +0200
+--- bin/varnishd/common.h.orig 2008-10-17 20:59:49 +0200
bin/varnishd/common.h2008-10-18 20:14:49 +0200
@@ -52,3 +52,8 @@
fprintf(stderr, "Error: " __VA_ARGS__); \
exit(2);\
@@ -11,8 +11,8 @@
+#endif
+
Index: bin/varnishd/mgt_child.c
bin/varnishd/mgt_child.c.orig2008-09-24 20:05:20 +0200
-+++ bin/varnishd/mgt_child.c 2008-09-25 09:14:05 +0200
+--- bin/varnishd/mgt_child.c.orig2008-10-17 20:59:49 +0200
bin/varnishd/mgt_child.c 2008-10-18 20:14:49 +0200
@@ -239,6 +239,21 @@
struct vev *e;
int i, cp[2];
@@ -36,15 +36,15 @@
return;
Index: configure
configure.orig 2008-09-24 20:36:08 +0200
-+++ configure2008-09-25 09:16:28 +0200
-@@ -26605,9 +26605,6 @@
- # to figure this out dynamically without introducing a run-time
- # dependency on libtool.
- case $host in
--*-*-solaris*)
--VCC_CC="cc -Kpic ${CFLAGS} -G -o %o %s"
--;;
- *-*-darwin*)
- VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s"
- ;;
+--- configure.orig 2008-10-17 21:00:05 +0200
configure2008-10-18 20:15:14 +0200
+@@ -26612,9 +26612,6 @@
+ VCC_CC="$ac_cv_env_VCC_CC_value"
+ else
+ case $host in
+-*-*-solaris*)
+-VCC_CC="cc -Kpic -G -o %o %s"
+-;;
+ *-*-darwin*)
+ VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o
%s"
+ ;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.spec
$ cvs diff -u -r1.16 -r1.17 varnish.spec
--- openpkg-src/varnish/varnish.spec 25 Sep 2008 07:20:25 - 1.16
+++ openpkg-src/varnish/varnish.spec 18 Oct 2008 18:18:51 - 1.17
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 2.0b2
-%define V_dist 2.0-beta2
+%define V_opkg 2.0.1
+%define V_dist 2.0.1
# package information
Name: varnish
@@ -36,7 +36,7 @@
Group:Web
License: BSD
Version: %{V_opkg}
-Release: 20080925
+Release: 20081018
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{V_dist}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
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: 25-Sep-2008 09:20:26
Branch: HEAD Handle: 2008092508202500
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
upgrading package: varnish 1.1.2 -> 2.0b2
Summary:
RevisionChanges Path
1.7 +26 -25 openpkg-src/varnish/varnish.patch
1.16+11 -7 openpkg-src/varnish/varnish.spec
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
$ cvs diff -u -r1.6 -r1.7 varnish.patch
--- openpkg-src/varnish/varnish.patch 20 Dec 2007 16:40:08 - 1.6
+++ openpkg-src/varnish/varnish.patch 25 Sep 2008 07:20:25 - 1.7
@@ -1,21 +1,21 @@
Index: bin/varnishd/common.h
bin/varnishd/common.h.orig 2007-08-20 22:05:40 +0200
-+++ bin/varnishd/common.h2007-10-06 10:39:12 +0200
-@@ -44,3 +44,8 @@
- void TCP_name(struct sockaddr *addr, unsigned l, char *abuf, unsigned alen,
char *pbuf, unsigned plen);
- void TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned
plen);
- int TCP_filter_http(int sock);
+--- bin/varnishd/common.h.orig 2008-09-24 20:05:20 +0200
bin/varnishd/common.h2008-09-25 09:14:05 +0200
+@@ -52,3 +52,8 @@
+ fprintf(stderr, "Error: " __VA_ARGS__); \
+ exit(2);\
+ } while (0);
+
+#ifndef NAN
+#define NAN (__builtin_nanf(""))
+#endif
+
Index: bin/varnishd/mgt_child.c
bin/varnishd/mgt_child.c.orig2007-08-20 22:05:40 +0200
-+++ bin/varnishd/mgt_child.c 2007-10-06 10:39:12 +0200
-@@ -217,6 +217,21 @@
-
- fprintf(stderr, "start child pid %jd\n", (intmax_t)pid);
+--- bin/varnishd/mgt_child.c.orig2008-09-24 20:05:20 +0200
bin/varnishd/mgt_child.c 2008-09-25 09:14:05 +0200
+@@ -239,6 +239,21 @@
+ struct vev *e;
+ int i, cp[2];
+#ifdef OPKG_PIDFILE
+{
@@ -32,18 +32,19 @@
+}
+#endif
+
- AZ(close(child_fds[1]));
- child_fds[1] = -1;
+ if (child_state != CH_STOPPED && child_state != CH_DIED)
+ return;
-Index: bin/varnishd/mgt_vcc.c
bin/varnishd/mgt_vcc.c.orig 2007-08-20 22:05:39 +0200
-+++ bin/varnishd/mgt_vcc.c 2007-10-06 10:39:12 +0200
-@@ -184,7 +184,7 @@
- #ifdef __APPLE__
- "exec cc -dynamiclib -Wl,-flat_namespace,-undefined,suppress -o %s
-x c - < %s 2>&1",
- #else
--"exec cc -fpic -shared -Wl,-x -o %s -x c - < %s 2>&1",
-+"exec @l_cc@ -fpic -shared -Wl,-x -o %s -x c - < %s 2>&1",
- #endif
- sf, of, sf);
- xxxassert(len < sizeof buf);
+Index: configure
+--- configure.orig 2008-09-24 20:36:08 +0200
configure2008-09-25 09:16:28 +0200
+@@ -26605,9 +26605,6 @@
+ # to figure this out dynamically without introducing a run-time
+ # dependency on libtool.
+ case $host in
+-*-*-solaris*)
+-VCC_CC="cc -Kpic ${CFLAGS} -G -o %o %s"
+-;;
+ *-*-darwin*)
+ VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s"
+ ;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.spec
$ cvs diff -u -r1.15 -r1.16 varnish.spec
--- openpkg-src/varnish/varnish.spec 1 Jan 2008 15:06:46 - 1.15
+++ openpkg-src/varnish/varnish.spec 25 Sep 2008 07:20:25 - 1.16
@@ -21,6 +21,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_opkg 2.0b2
+%define V_dist 2.0-beta2
+
# package information
Name: varnish
Summary: High-Performance HTTP Accelerator
@@ -31,11 +35,11 @@
Class:EVAL
Group:Web
License: BSD
-Version: 1.1.2
-Release: 20080101
+Version: %{V_opkg}
+Release: 20080925
# list of sources
-Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
+Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{V_dist}.tar.gz
Source1: rc.varnish
Source2: varnish.vcl
Patch0: varnish.patch
@@ -64,7 +68,7 @@
%track
prog varnish = {
-version = %{version}
+version = %{V_dist}
url = http://prdownloads.sourceforge.net/varnish/
regex = varnish-(__VER__)\.tar\.gz
}
@@ -84,14 +88,14 @@
esac
# unpack and patch Varnish distribution
[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
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:
RevisionChanges Path
1.6 +0 -184openpkg-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 - 1.5
+++ openpkg-src/varnish/varnish.patch 20 Dec 2007 16:40:08 - 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/null2007-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.orig2007-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) $(lib
[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
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: 06-Oct-2007 10:46:47
Branch: HEAD Handle: 2007100609464700
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
port to Sun Solaris; remove some unnecessary sub-shell constructs and
move the overriding subst to %build to allow one to more easily patch
varnish
Summary:
RevisionChanges Path
1.5 +203 -7 openpkg-src/varnish/varnish.patch
1.12+22 -16 openpkg-src/varnish/varnish.spec
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
$ cvs diff -u -r1.4 -r1.5 varnish.patch
--- openpkg-src/varnish/varnish.patch 21 Aug 2007 21:06:42 - 1.4
+++ openpkg-src/varnish/varnish.patch 6 Oct 2007 08:46:47 - 1.5
@@ -1,9 +1,21 @@
+Index: bin/varnishd/common.h
+--- bin/varnishd/common.h.orig 2007-08-20 22:05:40 +0200
bin/varnishd/common.h2007-10-06 10:39:12 +0200
+@@ -44,3 +44,8 @@
+ void TCP_name(struct sockaddr *addr, unsigned l, char *abuf, unsigned alen,
char *pbuf, unsigned plen);
+ void TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned
plen);
+ int TCP_filter_http(int sock);
++
++#ifndef NAN
++#define NAN (__builtin_nanf(""))
++#endif
++
Index: bin/varnishd/mgt_child.c
bin/varnishd/mgt_child.c.orig2006-09-20 19:18:51 +0200
-+++ bin/varnishd/mgt_child.c 2006-10-11 22:42:04 +0200
-@@ -172,6 +172,21 @@
+--- bin/varnishd/mgt_child.c.orig2007-08-20 22:05:40 +0200
bin/varnishd/mgt_child.c 2007-10-06 10:39:12 +0200
+@@ -217,6 +217,21 @@
- fprintf(stderr, "start child pid %d\n", i);
+ fprintf(stderr, "start child pid %jd\n", (intmax_t)pid);
+#ifdef OPKG_PIDFILE
+{
@@ -23,9 +35,9 @@
AZ(close(child_fds[1]));
child_fds[1] = -1;
-Index: bin/varnishd/mgt_vcc.c2007-07-20 16:43:35 +0200
bin/varnishd/mgt_vcc.c.orig 2007-07-20 13:30:04 +0200
-+++ bin/varnishd/mgt_vcc.c 2007-07-20 16:43:35 +0200
+Index: bin/varnishd/mgt_vcc.c
+--- bin/varnishd/mgt_vcc.c.orig 2007-08-20 22:05:39 +0200
bin/varnishd/mgt_vcc.c 2007-10-06 10:39:12 +0200
@@ -184,7 +184,7 @@
#ifdef __APPLE__
"exec cc -dynamiclib -Wl,-flat_namespace,-undefined,suppress -o %s
-x c - < %s 2>&1",
@@ -35,3 +47,187 @@
#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/null2007-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.orig2007-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) $(CC
[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
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: 21-Aug-2007 23:06:42
Branch: HEAD Handle: 2007082122064200
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
upgrading package: varnish 1.1 -> 1.1.1
Summary:
RevisionChanges Path
1.4 +0 -45 openpkg-src/varnish/varnish.patch
1.10+2 -2 openpkg-src/varnish/varnish.spec
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
$ cvs diff -u -r1.3 -r1.4 varnish.patch
--- openpkg-src/varnish/varnish.patch 20 Jul 2007 19:28:11 - 1.3
+++ openpkg-src/varnish/varnish.patch 21 Aug 2007 21:06:42 - 1.4
@@ -35,48 +35,3 @@
#endif
sf, of, sf);
xxxassert(len < sizeof buf);
-Index: bin/varnishhist/varnishhist.c
bin/varnishhist/varnishhist.c.orig 2007-07-20 13:30:04 +0200
-+++ bin/varnishhist/varnishhist.c2007-07-20 16:16:26 +0200
-@@ -41,6 +41,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
-
-Index: bin/varnishstat/varnishstat.c
bin/varnishstat/varnishstat.c2007-07-20 13:30:04 +0200
-+++ bin/varnishstat/varnishstat.c2007-07-20 16:18:58 +0200
-@@ -40,6 +40,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-Index: bin/varnishtop/varnishtop.c
bin/varnishtop/varnishtop.c.orig 2007-07-20 13:30:04 +0200
-+++ bin/varnishtop/varnishtop.c 2007-07-20 16:22:58 +0200
-@@ -39,6 +39,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-Index: Makefile
Makefile.in.orig 2007-07-20 13:33:02 +0200
-+++ Makefile.in 2007-07-20 16:37:05 +0200
-@@ -670,7 +670,7 @@
-
-
- install-data-local:
--$(install_sh) -d -m 0755 $(localstatedir)/varnish
-+$(install_sh) -d -m 0755 $(DESTDIR)$(localstatedir)/varnish
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.spec
$ cvs diff -u -r1.9 -r1.10 varnish.spec
--- openpkg-src/varnish/varnish.spec 7 Aug 2007 21:18:27 - 1.9
+++ openpkg-src/varnish/varnish.spec 21 Aug 2007 21:06:42 - 1.10
@@ -32,8 +32,8 @@
Class:EVAL
Group:Web
License: BSD
-Version: 1.1
-Release: 20070807
+Version: 1.1.1
+Release: 20070821
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/varnish/ varnish.patch varnish.spec
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: 11-Oct-2006 22:53:42
Branch: HEAD Handle: 2006101121534200
Modified files:
openpkg-src/varnish varnish.patch varnish.spec
Log:
- bugfix: exit(1) in case the PID file is not writable or
a segfault would happen by the following fprintf/fclose.
- cleanup: do not keep the C library files in the package as they
are both useless without the corresponding C header files and even with
them they are not really useful as varnish is a self-contained
application.
- consistency: use "switch" instead of "osdn" for SourceForge URLs
to be in sync with all(!) other packages (although
we know that the host "osdn" is available again).
- cosmetics: use our usual 'all-caps' style in Summary header
- cosmetics: use 0-prefix patch to avoid hard-coded versions
in patch files when easily possible
Summary:
RevisionChanges Path
1.2 +6 -8 openpkg-src/varnish/varnish.patch
1.2 +4 -3 openpkg-src/varnish/varnish.spec
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
$ cvs diff -u -r1.1 -r1.2 varnish.patch
--- openpkg-src/varnish/varnish.patch 11 Oct 2006 18:04:03 - 1.1
+++ openpkg-src/varnish/varnish.patch 11 Oct 2006 20:53:42 - 1.2
@@ -1,21 +1,19 @@
varnish-1.0.1.orig/bin/varnishd/mgt_child.c Wed Sep 20 19:18:51 2006
-+++ varnish-1.0.1/bin/varnishd/mgt_child.c Wed Oct 11 15:29:18 2006
-@@ -172,6 +172,24 @@
+Index: bin/varnishd/mgt_child.c
+--- bin/varnishd/mgt_child.c.orig2006-09-20 19:18:51 +0200
bin/varnishd/mgt_child.c 2006-10-11 22:42:04 +0200
+@@ -172,6 +172,21 @@
fprintf(stderr, "start child pid %d\n", i);
+#ifdef OPKG_PIDFILE
-+/*
-+ * create PID file
-+ */
+{
+pid_t pid;
+FILE *fp;
+
+pid = getpid();
+if ((fp = fopen(OPKG_PIDFILE, "w")) == NULL) {
-+fprintf(stderr, "can't write PID file '%s'",
-+OPKG_PIDFILE);
++fprintf(stderr, "varnishd:ERROR: cannot write PID file
'%s'\n", OPKG_PIDFILE);
++exit(1);
+}
+fprintf(fp, "%ld\n", (long)pid);
+fclose(fp);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.spec
$ cvs diff -u -r1.1 -r1.2 varnish.spec
--- openpkg-src/varnish/varnish.spec 11 Oct 2006 18:04:03 - 1.1
+++ openpkg-src/varnish/varnish.spec 11 Oct 2006 20:53:42 - 1.2
@@ -24,7 +24,7 @@
# package information
Name: varnish
-Summary: High-performance HTTP accelerator
+Summary: High-Performance HTTP Accelerator
URL: http://www.varnish-cache.org/
Vendor: Poul-Henning Kamp et al.
Packager: OpenPKG
@@ -36,7 +36,7 @@
Release: 20061011
# list of sources
-Source0:
http://osdn.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
+Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
Source1: rc.varnish
Source2: varnish.vcl
Patch0: varnish.patch
@@ -86,7 +86,7 @@
# unpack and patch Varnish distribution
%setup -q
-%patch -p1
+%patch -p0
# ensure OpenPKG %{l_cc} is being used for VCL code generation
%{l_shtool} subst \
@@ -131,6 +131,7 @@
# strip installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
