You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
151 lines
5.3 KiB
151 lines
5.3 KiB
Index: bin/varnishd/common.h |
|
--- bin/varnishd/common.h.orig 2010-04-19 14:00:31.000000000 +0200 |
|
+++ bin/varnishd/common.h 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -53,6 +53,10 @@ |
|
|
|
#define TRUST_ME(ptr) ((void*)(uintptr_t)(ptr)) |
|
|
|
+#ifndef NAN |
|
+#define NAN (__builtin_nanf("")) |
|
+#endif |
|
+ |
|
/* Really belongs in mgt.h, but storage_file chokes on both */ |
|
void mgt_child_inherit(int fd, const char *what); |
|
|
|
Index: bin/varnishd/mgt_child.c |
|
--- bin/varnishd/mgt_child.c.orig 2010-04-21 12:36:14.000000000 +0200 |
|
+++ bin/varnishd/mgt_child.c 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -300,6 +300,21 @@ |
|
struct vev *e; |
|
int i, cp[2]; |
|
|
|
+#ifdef OPKG_PIDFILE |
|
+ { |
|
+ pid_t pid; |
|
+ FILE *fp; |
|
+ |
|
+ pid = getpid(); |
|
+ if ((fp = fopen(OPKG_PIDFILE, "w")) == NULL) { |
|
+ fprintf(stderr, "varnishd:ERROR: cannot write PID file '%s'\n", OPKG_PIDFILE); |
|
+ exit(1); |
|
+ } |
|
+ fprintf(fp, "%ld\n", (long)pid); |
|
+ fclose(fp); |
|
+ } |
|
+#endif |
|
+ |
|
if (child_state != CH_STOPPED && child_state != CH_DIED) |
|
return; |
|
|
|
Index: bin/varnishhist/Makefile.in |
|
--- bin/varnishhist/Makefile.in.orig 2010-07-28 13:58:56.000000000 +0200 |
|
+++ bin/varnishhist/Makefile.in 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -240,9 +240,9 @@ |
|
dist_man_MANS = varnishhist.1 |
|
varnishhist_SOURCES = varnishhist.c |
|
varnishhist_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
-lm \ |
|
${CURSES_LIBS} ${PTHREAD_LIBS} |
|
|
|
Index: bin/varnishlog/Makefile.in |
|
--- bin/varnishlog/Makefile.in.orig 2010-07-28 13:58:56.000000000 +0200 |
|
+++ bin/varnishlog/Makefile.in 2010-07-30 11:14:12.000000000 +0200 |
|
@@ -55,9 +55,9 @@ |
|
varnishlog_OBJECTS = $(am_varnishlog_OBJECTS) |
|
am__DEPENDENCIES_1 = |
|
varnishlog_DEPENDENCIES = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(am__DEPENDENCIES_1) |
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
|
depcomp = $(SHELL) $(top_srcdir)/depcomp |
|
Index: bin/varnishncsa/Makefile.in |
|
--- bin/varnishncsa/Makefile.in.orig 2010-07-28 13:58:56.000000000 +0200 |
|
+++ bin/varnishncsa/Makefile.in 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -240,9 +240,9 @@ |
|
dist_man_MANS = varnishncsa.1 |
|
varnishncsa_SOURCES = varnishncsa.c |
|
varnishncsa_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${PTHREAD_LIBS} |
|
|
|
all: all-am |
|
Index: bin/varnishreplay/Makefile.in |
|
--- bin/varnishreplay/Makefile.in.orig 2010-07-28 13:58:57.000000000 +0200 |
|
+++ bin/varnishreplay/Makefile.in 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -242,9 +242,9 @@ |
|
varnishreplay.c |
|
|
|
varnishreplay_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${PTHREAD_LIBS} ${NET_LIBS} |
|
|
|
all: all-am |
|
Index: bin/varnishsizes/Makefile.in |
|
--- bin/varnishsizes/Makefile.in.orig 2010-07-28 13:58:57.000000000 +0200 |
|
+++ bin/varnishsizes/Makefile.in 2010-07-30 11:13:20.000000000 +0200 |
|
@@ -240,9 +240,9 @@ |
|
dist_man_MANS = varnishsizes.1 |
|
varnishsizes_SOURCES = varnishsizes.c |
|
varnishsizes_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
-lm \ |
|
${CURSES_LIBS} ${PTHREAD_LIBS} |
|
|
|
Index: bin/varnishstat/Makefile.in |
|
--- bin/varnishstat/Makefile.in.orig 2010-07-28 13:58:57.000000000 +0200 |
|
+++ bin/varnishstat/Makefile.in 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -241,9 +241,9 @@ |
|
dist_man_MANS = varnishstat.1 |
|
varnishstat_SOURCES = varnishstat.c |
|
varnishstat_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${CURSES_LIBS} ${RT_LIBS} ${PTHREAD_LIBS} |
|
|
|
all: all-am |
|
Index: bin/varnishtest/Makefile.in |
|
--- bin/varnishtest/Makefile.in.orig 2010-07-28 13:58:57.000000000 +0200 |
|
+++ bin/varnishtest/Makefile.in 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -256,9 +256,9 @@ |
|
vtc_varnish.c |
|
|
|
varnishtest_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${LIBM} ${PTHREAD_LIBS} |
|
|
|
EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \ |
|
Index: bin/varnishtop/Makefile.in |
|
--- bin/varnishtop/Makefile.in.orig 2010-07-28 13:58:57.000000000 +0200 |
|
+++ bin/varnishtop/Makefile.in 2010-07-30 11:10:24.000000000 +0200 |
|
@@ -240,9 +240,9 @@ |
|
dist_man_MANS = varnishtop.1 |
|
varnishtop_SOURCES = varnishtop.c |
|
varnishtop_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${CURSES_LIBS} ${PTHREAD_LIBS} |
|
|
|
all: all-am
|
|
|