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-Jul-2007 21:28:11
Branch: HEAD Handle: 2007072020281100
Modified files:
openpkg-src/varnish rc.varnish varnish.patch varnish.spec
Log:
upgrading package: varnish 1.0.4 -> 1.1
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-src/varnish/rc.varnish
1.3 +57 -0 openpkg-src/varnish/varnish.patch
1.8 +4 -4 openpkg-src/varnish/varnish.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/rc.varnish
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.varnish
--- openpkg-src/varnish/rc.varnish 11 Oct 2006 18:04:03 -0000 1.1
+++ openpkg-src/varnish/rc.varnish 20 Jul 2007 19:28:11 -0000 1.2
@@ -14,7 +14,7 @@
[ -f $varnish_pidfile ] && kill -$1 `cat $varnish_pidfile`
}
varnish_start () {
- ( @l_prefix@/bin/varnishd ${varnish_conf_vcl:+-f $varnish_conf_vcl} \
+ ( @l_prefix@/sbin/varnishd ${varnish_conf_vcl:+-f $varnish_conf_vcl}
\
$varnish_conf_flags &
echo $! >$varnish_pidfile
) >/dev/null 2>&1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/varnish/varnish.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 varnish.patch
--- openpkg-src/varnish/varnish.patch 11 Oct 2006 20:53:42 -0000 1.2
+++ openpkg-src/varnish/varnish.patch 20 Jul 2007 19:28:11 -0000 1.3
@@ -23,3 +23,60 @@
AZ(close(child_fds[1]));
child_fds[1] = -1;
+Index: bin/varnishd/mgt_vcc.c 2007-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
+@@ -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: bin/varnishhist/varnishhist.c
+--- bin/varnishhist/varnishhist.c.orig 2007-07-20 13:30:04 +0200
++++ bin/varnishhist/varnishhist.c 2007-07-20 16:16:26 +0200
+@@ -41,6 +41,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <string.h>
+ #include <unistd.h>
+
+Index: bin/varnishstat/varnishstat.c
+--- bin/varnishstat/varnishstat.c 2007-07-20 13:30:04 +0200
++++ bin/varnishstat/varnishstat.c 2007-07-20 16:18:58 +0200
+@@ -40,6 +40,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
+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 <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <limits.h>
+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.7 -r1.8 varnish.spec
--- openpkg-src/varnish/varnish.spec 21 May 2007 07:25:05 -0000 1.7
+++ openpkg-src/varnish/varnish.spec 20 Jul 2007 19:28:11 -0000 1.8
@@ -32,8 +32,8 @@
Class: EVAL
Group: Web
License: BSD
-Version: 1.0.4
-Release: 20070521
+Version: 1.1
+Release: 20070720
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
@@ -90,8 +90,8 @@
# ensure OpenPKG %{l_cc} is being used for VCL code generation
%{l_shtool} subst \
- -e 's;^\([ ]*"\)cc\( -fpic.*\)$;\1%{l_cc}\2;' \
- lib/libvcl/vcc_compile.c
+ -e 's;@l_cc@;%{l_cc};g' \
+ bin/varnishd/mgt_vcc.c
%build
# configure package
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
