Bug 185543 - [PATCH] www/varnish update to 3.0.5
Summary: [PATCH] www/varnish update to 3.0.5
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Kubilay Kocak
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-07 01:40 UTC by Mark Felder
Modified: 2014-01-25 11:50 UTC (History)
0 users

See Also:


Attachments
file.diff (3.63 KB, patch)
2014-01-07 01:40 UTC, Mark Felder
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mark Felder freebsd_committer 2014-01-07 01:40:00 UTC
update to 3.0.5
minor cleanup (don't silence installation actions)
STAGE support

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2014-01-07 01:40:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->anders

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Kubilay Kocak freebsd_committer freebsd_triage 2014-01-25 09:18:24 UTC
Responsible Changed
From-To: anders->koobs

I'll take it, includes additional changes to ports/185188 (maintainer 
timeout, 2 weeks)
Comment 3 dfilter service freebsd_committer 2014-01-25 09:27:27 UTC
Author: koobs
Date: Sat Jan 25 09:27:18 2014
New Revision: 340999
URL: http://svnweb.freebsd.org/changeset/ports/340999
QAT: https://qat.redports.org/buildarchive/r340999/

Log:
  www/varnish: Update to 3.0.5, Enable STAGE support
  
  - Update to 3.0.5
  - Enable STAGE support, update pkg-plist accordingly
  - Update LICENSE
  - Modernize LIB_DEPENDS
  - Pet portlint (space->tab)
  
  Changes:
  
   * A bad interaction between -b, -c and -m in the varnishlog tool has
     been fixed.
   * A malformed request could in some configurations lead to Varnish
     crashing has been corrected. This is CVE-2013-4484.
   * Duplicate Content-Length headers were in some cases sent to clients
     when streaming is enabled, this has been fixed
   * ESI parse errors are no longer printed to standard output.
   * Stop segfaulting if the first part of a synthetic page is NULL.
  
  PR:		ports/185188
  PR:		ports/185543
  Submitted by:	feld, Hung-Yi Chen <gaod@hychen.org>
  Approved by:	maintainer timeout (1 month)
  Security:	http://www.vuxml.org/freebsd/d9dbe6e8-84da-11e3-98bd-080027f2d077.html

Modified:
  head/www/varnish/Makefile
  head/www/varnish/distinfo
  head/www/varnish/pkg-plist

Modified: head/www/varnish/Makefile
==============================================================================
--- head/www/varnish/Makefile	Sat Jan 25 09:24:38 2014	(r340998)
+++ head/www/varnish/Makefile	Sat Jan 25 09:27:18 2014	(r340999)
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	varnish
-PORTVERSION=	3.0.4
+PORTVERSION=	3.0.5
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	The Varnish high-performance HTTP accelerator
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFLICTS=	varnish-2.*
 
@@ -20,16 +20,11 @@ USE_PYTHON_BUILD=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
 CONFIGURE_ENV=	RST2MAN=true
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  aclocal libtool libtoolize automake autoconf
+USE_AUTOTOOLS=	aclocal libtool libtoolize automake autoconf
 ACLOCAL_ARGS=	-I m4
 LIBTOOLFLAGS=	--copy --force --disable-static
 AUTOMAKE_ARGS=	--add-missing --copy --foreign
 
-MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
-		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
-		varnishstat.1 varnishtest.1 varnishtop.1
-MAN3=		vmod_std.3
-MAN7=		vcl.7 varnish-cli.7 varnish-counters.7
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
@@ -37,7 +32,6 @@ BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
@@ -59,16 +53,16 @@ post-build:
 	#
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/varnish
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${PREFIX}/share/varnish
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/varnish
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${STAGEDIR}${PREFIX}/share/varnish
 .for f in cache.h heritage.h steps.h common.h acct_fields.h locks.h body_status.h
-	@${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${PREFIX}/include/varnish
+	${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${STAGEDIR}${PREFIX}/include/varnish
 .endfor
 .for f in vct.h vmod_abi.h vre.h vrt.h vqueue.h vsb.h libvarnish.h miniobj.h vas.h vav.h http_headers.h vcl_returns.h
-	@${INSTALL_DATA} ${WRKSRC}/include/${f} ${PREFIX}/include/varnish
+	${INSTALL_DATA} ${WRKSRC}/include/${f} ${STAGEDIR}${PREFIX}/include/varnish
 .endfor
 	@${CAT} ${PKGMESSAGE}
-	@${RM} -f ${PREFIX}/lib/libvarnishapi.*a ${PREFIX}/lib/varnish/lib*a ${PREFIX}/lib/varnish/vmods/lib*a
+	@${RM} -f ${STAGEDIR}${PREFIX}/lib/libvarnishapi.*a ${STAGEDIR}${PREFIX}/lib/varnish/lib*a ${STAGEDIR}${PREFIX}/lib/varnish/vmods/lib*a
 
 .include <bsd.port.pre.mk>
 

Modified: head/www/varnish/distinfo
==============================================================================
--- head/www/varnish/distinfo	Sat Jan 25 09:24:38 2014	(r340998)
+++ head/www/varnish/distinfo	Sat Jan 25 09:27:18 2014	(r340999)
@@ -1,2 +1,2 @@
-SHA256 (varnish-3.0.4.tar.gz) = 4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79
-SIZE (varnish-3.0.4.tar.gz) = 2081361
+SHA256 (varnish-3.0.5.tar.gz) = 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7
+SIZE (varnish-3.0.5.tar.gz) = 2116664

Modified: head/www/varnish/pkg-plist
==============================================================================
--- head/www/varnish/pkg-plist	Sat Jan 25 09:24:38 2014	(r340998)
+++ head/www/varnish/pkg-plist	Sat Jan 25 09:27:18 2014	(r340999)
@@ -43,6 +43,20 @@ lib/varnish/vmods/libvmod_std.so
 lib/libvarnishapi.so.1
 lib/libvarnishapi.so
 libdata/pkgconfig/varnishapi.pc
+man/man1/varnishadm.1.gz
+man/man1/varnishd.1.gz
+man/man1/varnishhist.1.gz
+man/man1/varnishlog.1.gz
+man/man1/varnishncsa.1.gz
+man/man1/varnishreplay.1.gz
+man/man1/varnishsizes.1.gz
+man/man1/varnishstat.1.gz
+man/man1/varnishtest.1.gz
+man/man1/varnishtop.1.gz
+man/man3/vmod_std.3.gz
+man/man7/varnish-cli.7.gz
+man/man7/varnish-counters.7.gz
+man/man7/vcl.7.gz
 sbin/varnishd
 share/varnish/vmod.py
 @exec [ -d %D/varnish ] || mkdir %D/varnish
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Kubilay Kocak freebsd_committer freebsd_triage 2014-01-25 09:44:39 UTC
State Changed
From-To: open->closed

Committed. Thank you! :)
Comment 5 dfilter service freebsd_committer 2014-01-25 11:45:01 UTC
Author: koobs
Date: Sat Jan 25 11:44:53 2014
New Revision: 341011
URL: http://svnweb.freebsd.org/changeset/ports/341011
QAT: https://qat.redports.org/buildarchive/r341011/

Log:
  MFH: r340999
  
  www/varnish: Update to 3.0.5, Enable STAGE support
  
  - Update to 3.0.5
  - Enable STAGE support, update pkg-plist accordingly
  - Update LICENSE
  - Modernize LIB_DEPENDS
  - Pet portlint (space->tab)
  
  Changes:
  
   * A bad interaction between -b, -c and -m in the varnishlog tool has
     been fixed.
   * A malformed request could in some configurations lead to Varnish
     crashing has been corrected. This is CVE-2013-4484.
   * Duplicate Content-Length headers were in some cases sent to clients
     when streaming is enabled, this has been fixed
   * ESI parse errors are no longer printed to standard output.
   * Stop segfaulting if the first part of a synthetic page is NULL.
  
  PR:		ports/185188
  PR:		ports/185543
  Submitted by:	feld, Hung-Yi Chen <gaod@hychen.org>
  Approved by:	maintainer timeout (1month)
  Approved by:	portmgr (mat)
  Security:	http://www.vuxml.org/freebsd/d9dbe6e8-84da-11e3-98bd-080027f2d077.html

Modified:
  branches/2014Q1/www/varnish/Makefile
  branches/2014Q1/www/varnish/distinfo
  branches/2014Q1/www/varnish/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/varnish/Makefile
==============================================================================
--- branches/2014Q1/www/varnish/Makefile	Sat Jan 25 11:25:39 2014	(r341010)
+++ branches/2014Q1/www/varnish/Makefile	Sat Jan 25 11:44:53 2014	(r341011)
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	varnish
-PORTVERSION=	3.0.4
+PORTVERSION=	3.0.5
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	The Varnish high-performance HTTP accelerator
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFLICTS=	varnish-2.*
 
@@ -20,16 +20,11 @@ USE_PYTHON_BUILD=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
 CONFIGURE_ENV=	RST2MAN=true
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  aclocal libtool libtoolize automake autoconf
+USE_AUTOTOOLS=	aclocal libtool libtoolize automake autoconf
 ACLOCAL_ARGS=	-I m4
 LIBTOOLFLAGS=	--copy --force --disable-static
 AUTOMAKE_ARGS=	--add-missing --copy --foreign
 
-MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
-		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
-		varnishstat.1 varnishtest.1 varnishtop.1
-MAN3=		vmod_std.3
-MAN7=		vcl.7 varnish-cli.7 varnish-counters.7
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
@@ -37,7 +32,6 @@ BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
@@ -59,16 +53,16 @@ post-build:
 	#
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/varnish
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${PREFIX}/share/varnish
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/varnish
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${STAGEDIR}${PREFIX}/share/varnish
 .for f in cache.h heritage.h steps.h common.h acct_fields.h locks.h body_status.h
-	@${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${PREFIX}/include/varnish
+	${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${STAGEDIR}${PREFIX}/include/varnish
 .endfor
 .for f in vct.h vmod_abi.h vre.h vrt.h vqueue.h vsb.h libvarnish.h miniobj.h vas.h vav.h http_headers.h vcl_returns.h
-	@${INSTALL_DATA} ${WRKSRC}/include/${f} ${PREFIX}/include/varnish
+	${INSTALL_DATA} ${WRKSRC}/include/${f} ${STAGEDIR}${PREFIX}/include/varnish
 .endfor
 	@${CAT} ${PKGMESSAGE}
-	@${RM} -f ${PREFIX}/lib/libvarnishapi.*a ${PREFIX}/lib/varnish/lib*a ${PREFIX}/lib/varnish/vmods/lib*a
+	@${RM} -f ${STAGEDIR}${PREFIX}/lib/libvarnishapi.*a ${STAGEDIR}${PREFIX}/lib/varnish/lib*a ${STAGEDIR}${PREFIX}/lib/varnish/vmods/lib*a
 
 .include <bsd.port.pre.mk>
 

Modified: branches/2014Q1/www/varnish/distinfo
==============================================================================
--- branches/2014Q1/www/varnish/distinfo	Sat Jan 25 11:25:39 2014	(r341010)
+++ branches/2014Q1/www/varnish/distinfo	Sat Jan 25 11:44:53 2014	(r341011)
@@ -1,2 +1,2 @@
-SHA256 (varnish-3.0.4.tar.gz) = 4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79
-SIZE (varnish-3.0.4.tar.gz) = 2081361
+SHA256 (varnish-3.0.5.tar.gz) = 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7
+SIZE (varnish-3.0.5.tar.gz) = 2116664

Modified: branches/2014Q1/www/varnish/pkg-plist
==============================================================================
--- branches/2014Q1/www/varnish/pkg-plist	Sat Jan 25 11:25:39 2014	(r341010)
+++ branches/2014Q1/www/varnish/pkg-plist	Sat Jan 25 11:44:53 2014	(r341011)
@@ -43,6 +43,20 @@ lib/varnish/vmods/libvmod_std.so
 lib/libvarnishapi.so.1
 lib/libvarnishapi.so
 libdata/pkgconfig/varnishapi.pc
+man/man1/varnishadm.1.gz
+man/man1/varnishd.1.gz
+man/man1/varnishhist.1.gz
+man/man1/varnishlog.1.gz
+man/man1/varnishncsa.1.gz
+man/man1/varnishreplay.1.gz
+man/man1/varnishsizes.1.gz
+man/man1/varnishstat.1.gz
+man/man1/varnishtest.1.gz
+man/man1/varnishtop.1.gz
+man/man3/vmod_std.3.gz
+man/man7/varnish-cli.7.gz
+man/man7/varnish-counters.7.gz
+man/man7/vcl.7.gz
 sbin/varnishd
 share/varnish/vmod.py
 @exec [ -d %D/varnish ] || mkdir %D/varnish
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"