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:
Revision Changes 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 -0000 1.1
+++ openpkg-src/varnish/varnish.patch 11 Oct 2006 20:53:42 -0000 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.orig 2006-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 -0000 1.1
+++ openpkg-src/varnish/varnish.spec 11 Oct 2006 20:53:42 -0000 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 Project www.openpkg.org
CVS Repository Commit List [email protected]
