From nobody@FreeBSD.org  Mon Dec 12 02:46:32 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA174106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Dec 2011 02:46:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id B85158FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Dec 2011 02:46:32 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pBC2kWDu025549
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Dec 2011 02:46:32 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id pBC2kWP3025548;
	Mon, 12 Dec 2011 02:46:32 GMT
	(envelope-from nobody)
Message-Id: <201112120246.pBC2kWP3025548@red.freebsd.org>
Date: Mon, 12 Dec 2011 02:46:32 GMT
From: Juan Cristobal Caranza <sysadmin@su-casa.com.mx>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] www/cherokee to 1.2.101
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: dschulz@gmail.com

>Number:         163197
>Category:       ports
>Synopsis:       [UPDATE] www/cherokee to 1.2.101
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 12 02:50:01 UTC 2011
>Closed-Date:    Tue Jan 03 23:33:09 UTC 2012
>Last-Modified:  Tue Jan  3 23:40:11 UTC 2012
>Originator:     Juan Cristobal Caranza
>Release:        FreeBSD 8.2-RELEASE-p4
>Organization:
>Environment:
n/a
>Description:
Update Cherokee to 1.2.101 current version is 1.2.2.
>How-To-Repeat:
n/a
>Fix:
Patch is attached.

Patch attached with submission follows:

Index: cherokee/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/cherokee/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- cherokee/Makefile	23 Sep 2011 22:25:57 -0000	1.99
+++ cherokee/Makefile	11 Dec 2011 20:13:27 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.101
 CATEGORIES=	www
 MASTER_SITES=	http://www.cherokee-project.com/download/1.2/${PORTVERSION}/ \
 		http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
@@ -82,7 +81,7 @@
 DEFCONFS=	cherokee.conf
 CONFSUBDIRS=	ssl mods-available mods-enabled sites-available sites-enabled
 MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee-admin.1 cherokee-admin-launcher.1 \
-		cherokee-tweak.1 cherokee-worker.1
+		cherokee-tweak.1 cherokee-worker.1 
 PORTDOCS=	*
 
 OPTIONS=	IPV6	  "IPv6 support"	on	\
@@ -201,15 +200,11 @@
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/contrib/tracelor.py
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/gitlog2changelog.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/po/po_stats.py
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/qa/fcgi.py
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/qa/run-tests.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/svnlog2changelog.py
 
 post-install:
 	@${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|}
Index: cherokee/distinfo
===================================================================
RCS file: /home/ncvs/ports/www/cherokee/distinfo,v
retrieving revision 1.56
diff -u -r1.56 distinfo
--- cherokee/distinfo	12 Apr 2011 04:31:27 -0000	1.56
+++ cherokee/distinfo	11 Dec 2011 20:00:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (cherokee-1.2.2.tar.gz) = 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475
-SIZE (cherokee-1.2.2.tar.gz) = 6108853
+SHA256 (cherokee-1.2.101.tar.gz) = ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
+SIZE (cherokee-1.2.101.tar.gz) = 6320209
Index: cherokee/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/cherokee/pkg-plist,v
retrieving revision 1.43
diff -u -r1.43 pkg-plist
--- cherokee/pkg-plist	12 Apr 2011 04:31:27 -0000	1.43
+++ cherokee/pkg-plist	11 Dec 2011 20:49:56 -0000
@@ -197,6 +197,7 @@
 %%NLS%%share/locale/pl/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/cherokee.mo
+%%NLS%%share/locale/jp/LC_MESSAGES/cherokee.mo
 %%ADMIN%%%%DATADIR%%/admin/Auth.py
 %%ADMIN%%%%DATADIR%%/admin/Auth.pyc
 %%ADMIN%%%%DATADIR%%/admin/Balancer.py
@@ -333,6 +334,8 @@
 %%ADMIN%%%%DATADIR%%/admin/market/Maintenance.pyc
 %%ADMIN%%%%DATADIR%%/admin/market/ows_consts.pyc
 %%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Distro.py
+%%ADMIN%%%%DATADIR%%/admin/market/Distro.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.py
@@ -380,6 +383,7 @@
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-error.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-information.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-warning.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/forbid.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ibutton-slider-default.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/input-bg.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/loader.gif
@@ -403,6 +407,8 @@
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Help.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Submitter.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/common.js
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-1.3.2.js
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-ui-1.7.2.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-1.3.2.min.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-ui-1.7.2.custom.min.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery.cookie.js
@@ -414,6 +420,8 @@
 %%ADMIN%%%%DATADIR%%/admin/CgiBase.pyc
 %%ADMIN%%%%DATADIR%%/admin/Cherokee.py
 %%ADMIN%%%%DATADIR%%/admin/Cherokee.pyc
+%%ADMIN%%%%DATADIR%%/admin/Certs.py
+%%ADMIN%%%%DATADIR%%/admin/Certs.pyc
 %%ADMIN%%%%DATADIR%%/admin/Flags.py
 %%ADMIN%%%%DATADIR%%/admin/Flags.pyc
 %%ADMIN%%%%DATADIR%%/admin/Graph.py
@@ -916,6 +924,8 @@
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/uwsgi.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/wordpress.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/zend.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/flcache.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/ssl_test.png
 %%ADMIN%%%%DATADIR%%/admin/static/js/SelectionPanel.js
 %%ADMIN%%%%DATADIR%%/admin/static/help_404.html
 %%ADMIN%%%%DATADIR%%/admin/theme.html
@@ -963,6 +973,10 @@
 %%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/zend.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/zend.pyc
+%%ADMIN%%%%DATADIR%%/admin/wizards/flcache.py
+%%ADMIN%%%%DATADIR%%/admin/wizards/ssl_test.py
+%%ADMIN%%%%DATADIR%%/admin/wizards/flcache.pyc
+%%ADMIN%%%%DATADIR%%/admin/wizards/ssl_test.pyc
 %%DATADIR%%/deps/cgi.deps
 %%DATADIR%%/deps/combined.deps
 %%DATADIR%%/deps/common.deps
@@ -1028,6 +1042,8 @@
 @dirrm www/cherokee
 %%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sv_SE
+%%NLS%%@dirrmtry share/locale/jp/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/jp
 @dirrm %%DATADIR%%/themes/white
 @dirrm %%DATADIR%%/themes/plain
 @dirrm %%DATADIR%%/themes/firefox3


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Dec 12 02:50:16 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163197 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dschulz@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/163197: [UPDATE] www/cherokee to 1.2.101
Date: Mon, 12 Dec 2011 02:50:14 UT

 Maintainer of www/cherokee,
 
 Please note that PR ports/163197 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/163197
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Dec 12 14:56:03 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163197 

From: Diego Schulz <dschulz@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/163197: [UPDATE] www/cherokee to 1.2.101
Date: Mon, 12 Dec 2011 12:26:04 -0300

 --001636ed6c84bf3c0104b3e6c0bf
 Content-Type: text/plain; charset=ISO-8859-1
 
 On Sun, Dec 11, 2011 at 11:50 PM, Edwin Groothuis <edwin@freebsd.org> wrote:
 
 > Maintainer of www/cherokee,
 >
 > Please note that PR ports/163197 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/163197
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 >
 
 Agreed.
 
 
 regards,
 
 diego
 
 
 diego
 
 --001636ed6c84bf3c0104b3e6c0bf
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <br><br><div class=3D"gmail_quote">On Sun, Dec 11, 2011 at 11:50 PM, Edwin =
 Groothuis <span dir=3D"ltr">&lt;<a href=3D"mailto:edwin@freebsd.org">edwin@=
 freebsd.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" styl=
 e=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
 Maintainer of www/cherokee,<br>
 <br>
 Please note that PR ports/163197 has just been submitted.<br>
 <br>
 If it contains a patch for an upgrade, an enhancement or a bug fix<br>
 you agree on, reply to this email stating that you approve the patch<br>
 and a committer will take care of it.<br>
 <br>
 The full text of the PR can be found at:<br>
  =A0 =A0<a href=3D"http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/16319=
 7" target=3D"_blank">http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/163=
 197</a><br>
 <span class=3D"HOEnZb"><font color=3D"#888888"><br>
 --<br>
 Edwin Groothuis via the GNATS Auto Assign Tool<br>
 edwin@FreeBSD.org<br>
 </font></span></blockquote></div><br><div>Agreed.=A0</div><div><br></div><d=
 iv><br></div><div>regards,</div><div><br></div><div>diego</div><div><br></d=
 iv><div><br></div><div>diego</div>
 
 --001636ed6c84bf3c0104b3e6c0bf--
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Jan 3 23:33:06 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163197 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163197: commit references a PR
Date: Tue,  3 Jan 2012 23:33:10 +0000 (UTC)

 miwi        2012-01-03 23:32:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/cherokee         Makefile distinfo pkg-plist 
   Log:
   - Update to 1.2.101
   
   PR:             163197
   Submitted by:   Juan Cristobal Caranza <sysadmin@su-casa.com.mx>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.100     +2 -7      ports/www/cherokee/Makefile
   1.57      +2 -2      ports/www/cherokee/distinfo
   1.44      +16 -0     ports/www/cherokee/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
