From 0511ff7f187aadb29247e88907da77480cd3624b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 20 Aug 2007 21:55:55 +0000 Subject: Upgrade to 1.1.1. --- www/varnish2/Makefile | 6 ++---- www/varnish2/distinfo | 6 +++--- www/varnish2/files/patch-svn-r1745 | 19 ------------------- www/varnish2/files/patch-svn-r1750 | 26 ------------------------- www/varnish2/files/patch-svn-r1751 | 12 ------------ www/varnish2/files/patch-svn-r1752 | 10 ---------- www/varnish2/files/patch-svn-r1753 | 39 -------------------------------------- www/varnish2/files/patch-svn-r1754 | 35 ---------------------------------- www/varnish2/pkg-descr | 6 +----- 9 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 www/varnish2/files/patch-svn-r1745 delete mode 100644 www/varnish2/files/patch-svn-r1750 delete mode 100644 www/varnish2/files/patch-svn-r1751 delete mode 100644 www/varnish2/files/patch-svn-r1752 delete mode 100644 www/varnish2/files/patch-svn-r1753 delete mode 100644 www/varnish2/files/patch-svn-r1754 (limited to 'www/varnish2') diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile index 90b3d692b7aa..e8dabd2adf81 100644 --- a/www/varnish2/Makefile +++ b/www/varnish2/Makefile @@ -6,11 +6,9 @@ # PORTNAME= varnish -PORTVERSION= 1.1 -PORTREVISION= 2 +PORTVERSION= 1.1.1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= des@FreeBSD.org COMMENT= The Varnish high-performance HTTP accelerator diff --git a/www/varnish2/distinfo b/www/varnish2/distinfo index b09eecca040e..e6e94e79b807 100644 --- a/www/varnish2/distinfo +++ b/www/varnish2/distinfo @@ -1,3 +1,3 @@ -MD5 (varnish-1.1.tar.gz) = 7e0d9937f9989362acfe370268bbc587 -SHA256 (varnish-1.1.tar.gz) = 345f7563c16eb2f00843ebe31c7da9612a1db59996bc87bdcba23b15111009f6 -SIZE (varnish-1.1.tar.gz) = 561608 +MD5 (varnish-1.1.1.tar.gz) = fb4159a46a32b8c5bceca88f22e999a5 +SHA256 (varnish-1.1.1.tar.gz) = a7fadf7e109c22bd6bf750e2ed98af4423f801ad183e8241668311dea57e2c19 +SIZE (varnish-1.1.1.tar.gz) = 569143 diff --git a/www/varnish2/files/patch-svn-r1745 b/www/varnish2/files/patch-svn-r1745 deleted file mode 100644 index 3f265f43d82d..000000000000 --- a/www/varnish2/files/patch-svn-r1745 +++ /dev/null @@ -1,19 +0,0 @@ -Index: bin/varnishd/cache_vrt.c -=================================================================== ---- bin/varnishd/cache_vrt.c (revision 1744) -+++ bin/varnishd/cache_vrt.c (revision 1745) -@@ -234,6 +234,14 @@ - http_SetH(&sp->obj->http, HTTP_HDR_STATUS, p); - } - -+int -+VRT_r_obj_status(struct sess *sp) -+{ -+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); -+ CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); -+ return (atoi(sp->obj->http.hd[HTTP_HDR_STATUS].b)); -+} -+ - void - VRT_l_resp_status(struct sess *sp, int num) - { diff --git a/www/varnish2/files/patch-svn-r1750 b/www/varnish2/files/patch-svn-r1750 deleted file mode 100644 index f585d60de408..000000000000 --- a/www/varnish2/files/patch-svn-r1750 +++ /dev/null @@ -1,26 +0,0 @@ -Index: bin/varnishd/cache_response.c -=================================================================== ---- bin/varnishd/cache_response.c (revision 1749) -+++ bin/varnishd/cache_response.c (revision 1750) -@@ -76,8 +76,8 @@ - http_PrintfHeader(sp->wrk, sp->fd, sp->http, "X-Varnish: %u", sp->xid); - TIM_format(sp->obj->last_modified, lm); - http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Last-Modified: %s", lm); -- if (sp->doclose != NULL) -- http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close"); -+ http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Connection: %s", -+ sp->doclose ? "close" : "keep-alive"); - sp->wantbody = 0; - } - -@@ -129,8 +129,8 @@ - http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Age: %.0f", - sp->obj->age + sp->t_resp - sp->obj->entered); - http_SetHeader(sp->wrk, sp->fd, sp->http, "Via: 1.1 varnish"); -- if (sp->doclose != NULL) -- http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close"); -+ http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Connection: %s", -+ sp->doclose ? "close" : "keep-alive"); - } - - /*--------------------------------------------------------------------*/ diff --git a/www/varnish2/files/patch-svn-r1751 b/www/varnish2/files/patch-svn-r1751 deleted file mode 100644 index 22eb2938b56a..000000000000 --- a/www/varnish2/files/patch-svn-r1751 +++ /dev/null @@ -1,12 +0,0 @@ -Index: bin/varnishd/cache_response.c -=================================================================== ---- bin/varnishd/cache_response.c (revision 1750) -+++ bin/varnishd/cache_response.c (revision 1751) -@@ -50,6 +50,7 @@ - - /* synthesize error page and send it */ - SYN_ErrorPage(sp, code, reason, 0); -+ RES_BuildHttp(sp); - RES_WriteObj(sp); - - /* GC the error page */ diff --git a/www/varnish2/files/patch-svn-r1752 b/www/varnish2/files/patch-svn-r1752 deleted file mode 100644 index 0e2fd98452cb..000000000000 --- a/www/varnish2/files/patch-svn-r1752 +++ /dev/null @@ -1,10 +0,0 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 1751) -+++ Makefile.am (revision 1752) -@@ -10,4 +10,4 @@ - EXTRA_DIST = LICENSE autogen.sh varnishapi.pc.in - - install-data-local: -- $(install_sh) -d -m 0755 $(localstatedir)/varnish -+ $(install_sh) -d -m 0755 $(DESTDIR)$(localstatedir)/varnish diff --git a/www/varnish2/files/patch-svn-r1753 b/www/varnish2/files/patch-svn-r1753 deleted file mode 100644 index ad906879afc3..000000000000 --- a/www/varnish2/files/patch-svn-r1753 +++ /dev/null @@ -1,39 +0,0 @@ -Index: bin/varnishhist/varnishhist.c -=================================================================== ---- bin/varnishhist/varnishhist.c (revision 1752) -+++ bin/varnishhist/varnishhist.c (revision 1753) -@@ -247,7 +247,7 @@ - raw(); - noecho(); - nonl(); -- intrflush(stdscr, false); -+ intrflush(stdscr, FALSE); - curs_set(0); - erase(); - for (;;) { -Index: bin/varnishstat/varnishstat.c -=================================================================== ---- bin/varnishstat/varnishstat.c (revision 1752) -+++ bin/varnishstat/varnishstat.c (revision 1753) -@@ -78,7 +78,7 @@ - raw(); - noecho(); - nonl(); -- intrflush(stdscr, false); -+ intrflush(stdscr, FALSE); - curs_set(0); - erase(); - -Index: bin/varnishtop/varnishtop.c -=================================================================== ---- bin/varnishtop/varnishtop.c (revision 1752) -+++ bin/varnishtop/varnishtop.c (revision 1753) -@@ -201,7 +201,7 @@ - raw(); - noecho(); - nonl(); -- intrflush(stdscr, false); -+ intrflush(stdscr, FALSE); - curs_set(0); - erase(); - for (;;) { diff --git a/www/varnish2/files/patch-svn-r1754 b/www/varnish2/files/patch-svn-r1754 deleted file mode 100644 index b2cdf2015edb..000000000000 --- a/www/varnish2/files/patch-svn-r1754 +++ /dev/null @@ -1,35 +0,0 @@ -Index: bin/varnishreplay/varnishreplay.c -=================================================================== ---- bin/varnishreplay/varnishreplay.c (revision 1753) -+++ bin/varnishreplay/varnishreplay.c (revision 1754) -@@ -145,7 +145,7 @@ - if (lvl > debug) - return; - pthread_mutex_lock(&log_mutex); -- fprintf(stderr, "%08x ", (unsigned int)pthread_self()); -+ fprintf(stderr, "%p ", (void *)pthread_self()); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); -@@ -183,8 +183,8 @@ - mailbox_destroy(&threads[fd]->mbox); - freez(threads[fd]); - } -- thread_log(1, "thread %08x started\n", -- (unsigned int)threads[fd]->thread_id); -+ thread_log(1, "thread %p started\n", -+ (void *)threads[fd]->thread_id); - } - return (threads[fd]); - } -@@ -204,8 +204,8 @@ - return; - mailbox_close(&threads[fd]->mbox); - pthread_join(threads[fd]->thread_id, NULL); -- thread_log(1, "thread %08x stopped\n", -- (unsigned int)threads[fd]->thread_id); -+ thread_log(1, "thread %p stopped\n", -+ (void *)threads[fd]->thread_id); - mailbox_destroy(&threads[fd]->mbox); - freez(threads[fd]); - } diff --git a/www/varnish2/pkg-descr b/www/varnish2/pkg-descr index 2a388e5182df..d6e8c679fbb4 100644 --- a/www/varnish2/pkg-descr +++ b/www/varnish2/pkg-descr @@ -1,11 +1,7 @@ This is the Varnish high-performance HTTP accelerator. Documentation and additional information about Varnish is available on -the following web sites: - - http://www.varnish-cache.org/ Official web site - - http://varnish.projects.linpro.no/ Developer site and wiki +. Technical questions about Varnish and this release should be addressed to . -- cgit v1.2.3