Re: UPDATE: cherokee 1.0.14 -> 1.2.101 (again)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: cherokee 1.0.14 -> 1.2.101 (again)

Fernando Quintero
Hi all,

Here is a new patch for cherokee 1.2.101 (lastest).
It's working for me, the stop, start and restart are working ok from
rcscript and the web gui.
thanks all for the support!

comments?
oks?


On Fri, Dec 16, 2011 at 6:06 PM, Fernando Quintero <
[hidden email]> wrote:

> The reason why the daemon doesn't stop is because the pid file has the
> parent process and not the cherokee-worker process, I wrote to the dev
> list, and I'm waiting answer. When the server start on OpenBSD, it has 2
> process, one owned by root and other one owned by _cherokee user.
>
> Some idea?
>
> The code is in line 62 from server.py there catch the PID, which one is
> wrong.
>
>  pid = os.getpid()
>
> It's necessary catch the pid for the child and save it to
> /var/run/cherokee.pid
>
> Cheers.
>
>
> On Wed, Nov 30, 2011 at 9:52 AM, Antoine Jacoutot <[hidden email]>wrote:
>
>> On Wed, Nov 30, 2011 at 09:33:11AM -0500, Fernando Quintero wrote:
>> > ok, I will check.
>> > The problem is with the hard restart?
>>
>> Dunno. I just know that I cannot kill it properly, I need to use -9...
>>
>>
>> >
>> > On Wed, Nov 30, 2011 at 9:30 AM, Antoine Jacoutot <
>> [hidden email]>wrote:
>> >
>> > > On Wed, Nov 30, 2011 at 09:21:19AM -0500, Fernando Quintero wrote:
>> > > > Hi!,
>> > > > Some news about it?
>> > > > comments?
>> > > > oks?
>> > >
>> > > Yes I told Brad the server cannot be properly killed; so something is
>> > > going on.
>> > >
>> > >
>> > > >
>> > > > On Wed, Nov 16, 2011 at 12:25 PM, Brad <[hidden email]> wrote:
>> > > >
>> > > > > On Sun, Nov 13, 2011 at 11:47:09PM -0500, Fernando Quintero wrote:
>> > > > > > Thanks to brad for the patch and the people who test it.
>> > > > > > I test it on @x86 and @x64
>> > > > > > comments?
>> > > > > > oks?
>> > > > >
>> > > > > Updated diff.
>> > > > >
>> > > > >
>> > > > > Index: Makefile
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/Makefile,v
>> > > > > retrieving revision 1.31
>> > > > > diff -u -p -r1.31 Makefile
>> > > > > --- Makefile    16 Sep 2011 12:00:06 -0000      1.31
>> > > > > +++ Makefile    16 Nov 2011 02:19:05 -0000
>> > > > > @@ -2,14 +2,14 @@
>> > > > >
>> > > > >  SHARED_ONLY=   Yes
>> > > > >
>> > > > > -COMMENT-main = fast, flexible and easy to configure Web Server
>> > > > > +COMMENT-main = fast, flexible and easy to configure web server
>> > > > >  COMMENT-geoip =        GeoIP module for Cherokee web server
>> > > > >  COMMENT-ldap = LDAP module for Cherokee web server
>> > > > >  COMMENT-mysql =        MySQL module for Cherokee web server
>> > > > >  COMMENT-streaming = Streaming module for Cherokee web server
>> > > > >
>> > > > > -DIR =          1.0
>> > > > > -VERSION =      ${DIR}.14
>> > > > > +DIR =          1.2
>> > > > > +VERSION =      ${DIR}.101
>> > > > >  DISTNAME =     cherokee-${VERSION}
>> > > > >
>> > > > >  PKGNAME-main = ${DISTNAME}
>> > > > > @@ -18,12 +18,6 @@ PKGNAME-mysql =      cherokee-mysql-${VERSION
>> > > > >  PKGNAME-geoip =        cherokee-geoip-${VERSION}
>> > > > >  PKGNAME-streaming = cherokee-streaming-${VERSION}
>> > > > >
>> > > > > -REVISION-main =        7
>> > > > > -REVISION-geoip = 3
>> > > > > -REVISION-ldap =        4
>> > > > > -REVISION-mysql = 3
>> > > > > -REVISION-streaming = 6
>> > > > > -
>> > > > >  SHARED_LIBS =  cherokee-base           0.0 \
>> > > > >                cherokee-client         0.0 \
>> > > > >                cherokee-server         0.0
>> > > > > @@ -47,7 +41,8 @@ MASTER_SITES =        ${HOMEPAGE}download/${DIR
>> > > > >
>> > > > >  MULTI_PACKAGES =-main -ldap -mysql -geoip -streaming
>> > > > >
>> > > > > -MODULES =      lang/python lang/php
>> > > > > +MODULES =      lang/php \
>> > > > > +               lang/python
>> > > > >
>> > > > >  BUILD_DEPENDS =        textproc/py-docutils \
>> > > > >                lang/php/${MODPHP_VERSION},-fastcgi
>> > > > > @@ -78,6 +73,7 @@ WANTLIB-streaming += theoradec theoraenc
>> > > > >  WANTLIB-streaming += x264 z
>> > > > >  RUN_DEPENDS-streaming = ${BASE_PKGPATH}
>> > > > >
>> > > > > +USE_GMAKE=     Yes
>> > > > >  USE_LIBTOOL =  Yes
>> > > > >  LIBTOOL_FLAGS =        --tag=disable-static
>> > > > >  USE_GROFF =    Yes
>> > > > > @@ -89,37 +85,40 @@ FAKE_FLAGS =
>>  cherokeeconfdir="${PREFIX}/
>> > > > >  CONFIGURE_STYLE =      gnu
>> > > > >  CONFIGURE_ENV =                CPPFLAGS="-I${LOCALBASE}/include"
>> \
>> > > > >                        LDFLAGS="-L${LOCALBASE}/lib" \
>> > > > > -
>> > > > > PHPCGI="${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION}" \
>> > > > >                        ac_cv_func_getgrnam_r=no
>> > > > >  CONFIGURE_ARGS =       ${CONFIGURE_SHARED} \
>> > > > >                        --disable-static \
>> > > > > +                       --enable-tmpdir=/tmp \
>> > > > >                        --sysconfdir=${SYSCONFDIR} \
>> > > > >                        --localstatedir=/var \
>> > > > > +                       --with-cgiroot=/var/cherokee/cgi-bin \
>> > > > >                        --with-wwwroot=/var/cherokee \
>> > > > >                        --with-wwwuser=_cherokee \
>> > > > >                        --with-wwwgroup=_cherokee \
>> > > > >                        --disable-nls \
>> > > > >                        --disable-pam \
>> > > > > +                       --with-ffmpeg \
>> > > > >                        --with-geoip \
>> > > > >                        --with-ldap \
>> > > > >                        --with-mysql \
>> > > > > -                       --with-ffmpeg
>> > > > > +
>> > > > > --with-php=${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION} \
>> > > > > +                       --with-python=${MODPY_BIN}
>> > > > >
>> > > > >  .ifdef DEBUG
>> > > > >  CFLAGS +=              -O0 -g3
>> > > > >  CONFIGURE_ARGS +=      --enable-trace
>> > > > >  .endif
>> > > > >
>> > > > > -MODPY_ADJ_FILES= admin/CTK/CTK-run.pre admin/upgrade_config.py \
>> > > > > +MODPY_ADJ_FILES=admin/CTK/CTK-run.pre admin/upgrade_config.py \
>> > > > >                cherokee/cherokee-admin-launcher \
>> > > > >                cherokee/cherokee-tweak doc/test_images.py \
>> > > > > -               gitlog2changelog.py po/po_stats.py
>> svnlog2changelog.py
>> > > \
>> > > > > -               admin/server.py qa/run-tests.py
>> contrib/tracelor.py
>> > > > > +               po/po_stats.py admin/server.py qa/run-tests.py \
>> > > > > +               contrib/tracelor.py
>> > > > >
>> > > > >  LANGUAGES =    en es de nl sv_SE zh_CN fr pt_BR pl ca it gl
>> > > > >
>> > > > >  pre-configure:
>> > > > > -       ${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
>> > > > > +       @${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
>> > > > >
>> > > > >  post-install:
>> > > > >        cd ${PREFIX}/share/cherokee/admin && find . -name "*.py" |
>> \
>> > > > > @@ -130,5 +129,6 @@ post-install:
>> > > > >        ${INSTALL_DATA} ${WRKSRC}/po/admin/$i.gmo \
>> > > > >                ${PREFIX}/share/locale/$i/LC_MESSAGES/cherokee.mo
>> > > > >  .endfor
>> > > > > +       @find ${PREFIX}/lib/cherokee -name '*.la' -print | xargs
>> rm
>> > > > >
>> > > > >  .include <bsd.port.mk>
>> > > > > Index: distinfo
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/distinfo,v
>> > > > > retrieving revision 1.9
>> > > > > diff -u -p -r1.9 distinfo
>> > > > > --- distinfo    20 Dec 2010 07:51:58 -0000      1.9
>> > > > > +++ distinfo    19 Oct 2011 17:13:21 -0000
>> > > > > @@ -1,5 +1,5 @@
>> > > > > -MD5 (cherokee-1.0.14.tar.gz) = baLMjbz/2dnTecTuKJUyBA==
>> > > > > -RMD160 (cherokee-1.0.14.tar.gz) = WD2bRRFDgFGrZhTQ/YSLL3GLvN0=
>> > > > > -SHA1 (cherokee-1.0.14.tar.gz) = pyVuudRqBQLkT9fx5lweh+uTLyo=
>> > > > > -SHA256 (cherokee-1.0.14.tar.gz) =
>> > > > > HxipAoBClXbPpRnz5TuvUfQ1uVqpgJ5YuVy27F4REa4=
>> > > > > -SIZE (cherokee-1.0.14.tar.gz) = 5727356
>> > > > > +MD5 (cherokee-1.2.101.tar.gz) = 70cAM1Wi42jk2Vls0HDvIw==
>> > > > > +RMD160 (cherokee-1.2.101.tar.gz) = 3T3tw1K6F73O/Y4gAUO4/6Ga0DU=
>> > > > > +SHA1 (cherokee-1.2.101.tar.gz) = sn8UnH1xESB6yMPNikhWwFSQ0TY=
>> > > > > +SHA256 (cherokee-1.2.101.tar.gz) =
>> > > > > ykZas3ckefyEOzj/xFETvyTYv66Rhc3VF2sJnVoX/rg=
>> > > > > +SIZE (cherokee-1.2.101.tar.gz) = 6320209
>> > > > > Index: patches/patch-Makefile_in
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/patches/patch-Makefile_in,v
>> > > > > retrieving revision 1.3
>> > > > > diff -u -p -r1.3 patch-Makefile_in
>> > > > > --- patches/patch-Makefile_in   20 Dec 2010 07:51:58 -0000
>>  1.3
>> > > > > +++ patches/patch-Makefile_in   19 Oct 2011 17:54:01 -0000
>> > > > > @@ -1,7 +1,7 @@
>> > > > >  $OpenBSD: patch-Makefile_in,v 1.3 2010/12/20 07:51:58 ajacoutot
>> Exp $
>> > > > > ---- Makefile.in.orig   Mon Dec 13 14:49:57 2010
>> > > > > -+++ Makefile.in        Wed Dec 15 16:37:42 2010
>> > > > > -@@ -1058,10 +1058,6 @@ uninstall-local-config:
>> > > > > +--- Makefile.in.orig   Tue Oct 18 15:38:21 2011
>> > > > > ++++ Makefile.in        Wed Oct 19 13:44:04 2011
>> > > > > +@@ -1055,10 +1055,6 @@ uninstall-local-config:
>> > > > >        fi
>> > > > >
>> > > > >  install-data-local: $(CONFS) install-data-local-config
>> > > > > @@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2010/1
>> > > > >        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)
>> > > > >        @$(mkinstalldirs) $(DESTDIR)$(cherokeeadmindir)
>> > > > >        @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ;
>> then \
>> > > > > -@@ -1079,7 +1075,6 @@ install-data-local: $(CONFS)
>> > > > > install-data-local-config
>> > > > > +@@ -1076,7 +1072,6 @@ install-data-local: $(CONFS)
>> > > > > install-data-local-config
>> > > > >        @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d
>> > > > > $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
>> > > > >                $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee
>> > > > > $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
>> > > > >        fi
>> > > > > Index: patches/patch-admin_CTK_Makefile_in
>> > > > >
>> ===================================================================
>> > > > > RCS file: patches/patch-admin_CTK_Makefile_in
>> > > > > diff -N patches/patch-admin_CTK_Makefile_in
>> > > > > --- patches/patch-admin_CTK_Makefile_in 20 Dec 2010 07:51:58 -0000
>> > >  1.1
>> > > > > +++ /dev/null   1 Jan 1970 00:00:00 -0000
>> > > > > @@ -1,12 +0,0 @@
>> > > > > -$OpenBSD: patch-admin_CTK_Makefile_in,v 1.1 2010/12/20 07:51:58
>> > > ajacoutot
>> > > > > Exp $
>> > > > > ---- admin/CTK/Makefile.in.orig Wed Dec 15 17:18:18 2010
>> > > > > -+++ admin/CTK/Makefile.in      Wed Dec 15 17:18:54 2010
>> > > > > -@@ -672,7 +672,7 @@ uninstall-am: uninstall-binSCRIPTS
>> > > > > -
>> > > > > -
>> > > > > - CTK-run: CTK-run.pre
>> > > > > --      sed -e "s|%sysconfdir%|${sysconfdir}|g;
>> > > s|%sbindir%|${sbindir}|g;
>> > > > > s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g;
>> > > > > s|%localstatedir%|${localstatedir}|g; s|%libdir%|${libdir}|g;
>> > > > > s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g;
>> > > > > s|%phpcgi%|${PHPCGI}|g; s|%datadir%|${datadir}|g;
>> > > > > s|%localedir%|${localedir}|g" $< > $@
>> > > > > -+      sed -e "s|%sysconfdir%|${sysconfdir}|g;
>> > > s|%sbindir%|${sbindir}|g;
>> > > > > s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g;
>> > > > > s|%localstatedir%|${localstatedir}|g; s|%libdir%|${libdir}|g;
>> > > > > s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g;
>> > > > > s|%phpcgi%|${PHPCGI}|g; s|%datadir%|${datadir}|g;
>> > > > > s|%localedir%|${localedir}|g" CTK-run.pre > $@
>> > > > > -
>> > > > > - # 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.
>> > > > > Index: patches/patch-admin_SystemStats_py
>> > > > >
>> ===================================================================
>> > > > > RCS file: patches/patch-admin_SystemStats_py
>> > > > > diff -N patches/patch-admin_SystemStats_py
>> > > > > --- patches/patch-admin_SystemStats_py  20 Jul 2011 15:26:00 -0000
>> > >  1.2
>> > > > > +++ /dev/null   1 Jan 1970 00:00:00 -0000
>> > > > > @@ -1,132 +0,0 @@
>> > > > > -$OpenBSD: patch-admin_SystemStats_py,v 1.2 2011/07/20 15:26:00
>> sthen
>> > > Exp $
>> > > > > ---- admin/SystemStats.py.orig  Mon Dec 13 08:01:04 2010
>> > > > > -+++ admin/SystemStats.py       Fri Dec 17 06:20:44 2010
>> > > > > -@@ -45,6 +45,8 @@ def get_system_stats():
>> > > > > -             _stats = System_stats__Darwin()
>> > > > > -         elif sys.platform.startswith ('freebsd'):
>> > > > > -             _stats = System_stats__FreeBSD()
>> > > > > -+        elif sys.platform.startswith ('openbsd'):
>> > > > > -+            _stats = System_stats__OpenBSD()
>> > > > > -
>> > > > > -     assert _stats, "Not implemented"
>> > > > > -     return _stats
>> > > > > -@@ -398,6 +400,119 @@ class System_stats__FreeBSD (Thread,
>> > > System_stats):
>> > > > > -       if not len(values) == 18:
>> > > > > -               return
>> > > > > -
>> > > > > -+        self.mem.free  = int(values[4])
>> > > > > -+        self.mem.used  = self.mem.total - self.mem.free
>> > > > > -+
>> > > > > -+    def run (self):
>> > > > > -+        while True:
>> > > > > -+            self._read_cpu()
>> > > > > -+            self._read_memory()
>> > > > > -+            time.sleep (self.CHECK_INTERVAL)
>> > > > > -+
>> > > > > -+# OpenBSD implementation
>> > > > > -+class System_stats__OpenBSD (Thread, System_stats):
>> > > > > -+    CHECK_INTERVAL = 2
>> > > > > -+
>> > > > > -+    def __init__ (self):
>> > > > > -+        Thread.__init__ (self)
>> > > > > -+        System_stats.__init__ (self)
>> > > > > -+
>> > > > > -+        self.vmstat_fd = subprocess.Popen ("/usr/bin/vmstat
>> -w%d"
>> > > > > %(self.CHECK_INTERVAL),
>> > > > > -+                                            shell=True, stdout =
>> > > > > subprocess.PIPE, close_fds=True )
>> > > > > -+
>> > > > > -+        # Read valid values
>> > > > > -+        self._read_hostname()
>> > > > > -+        self._read_cpu()
>> > > > > -+        self._read_memory()
>> > > > > -+        self._read_cpu_and_mem_info()
>> > > > > -+
>> > > > > -+        self.start()
>> > > > > -+
>> > > > > -+    def _read_hostname (self):
>> > > > > -+        # First try: uname()
>> > > > > -+      self.hostname = os.uname()[1]
>> > > > > -+        if self.hostname:
>> > > > > -+            return
>> > > > > -+
>> > > > > -+        # Second try: sysctl()
>> > > > > -+        ret = popen.popen_sync ("/sbin/sysctl -n kern.hostname")
>> > > > > -+        self.hostname = ret['stdout'].rstrip()
>> > > > > -+        if self.hostname:
>> > > > > -+            return
>> > > > > -+
>> > > > > -+        # Could not figure it out
>> > > > > -+        self.hostname = "Unknown"
>> > > > > -+
>> > > > > -+    def _read_cpu_and_mem_info (self):
>> > > > > -+        # Execute sysctl
>> > > > > -+        ret = popen.popen_sync ("/sbin/sysctl hw.ncpufound
>> hw.ncpu
>> > > > > hw.cpuspeed hw.physmem")
>> > > > > -+        lines = filter (lambda x: x, ret['stdout'].split('\n'))
>> > > > > -+
>> > > > > -+        # Parse output
>> > > > > -+
>> > > > > -+      # cpu related
>> > > > > -+        ncpus = 0
>> > > > > -+        vcpus = 0
>> > > > > -+      clock = ''
>> > > > > -+
>> > > > > -+        # mem related
>> > > > > -+      pmem = 0
>> > > > > -+
>> > > > > -+      for line in lines:
>> > > > > -+          parts = line.split("=")
>> > > > > -+          if parts[0] == 'hw.ncpufound':
>> > > > > -+              ncpus = int(parts[1])
>> > > > > -+            elif parts[0] == 'hw.ncpu':
>> > > > > -+              vcpus = parts[1]
>> > > > > -+            elif parts[0] == 'hw.cpuspeed':
>> > > > > -+              clock = parts[1]
>> > > > > -+            elif parts[0] == 'hw.physmem':
>> > > > > -+              pmem = parts[1]
>> > > > > -+
>> > > > > -+      # Deal with cores
>> > > > > -+        if vcpus:
>> > > > > -+            self.cpu.num   = ncpus
>> > > > > -+            self.cpu.cores = vcpus
>> > > > > -+        else:
>> > > > > -+            self.cpu.num   = int (ncpus)
>> > > > > -+            self.cpu.cores = int (ncpus)
>> > > > > -+
>> > > > > -+        # Global speed
>> > > > > -+      self.cpu.speed = '%s MHz' %(clock)
>> > > > > -+
>> > > > > -+      # Physical mem
>> > > > > -+      self.mem.total =  int (pmem) / 1024
>> > > > > -+
>> > > > > -+    def _read_cpu (self):
>> > > > > -+      # Read a new line
>> > > > > -+        line = self.vmstat_fd.stdout.readline().rstrip('\n')
>> > > > > -+
>> > > > > -+        # Skip headers
>> > > > > -+      if len(filter (lambda x: x not in " .0123456789", line)):
>> > > > > -+          return
>> > > > > -+
>> > > > > -+        # Parse
>> > > > > -+      parts = filter (lambda x: x, line.split(' '))
>> > > > > -+
>> > > > > -+      # For OpenBSD there are 19 fields output from vmstat
>> > > > > -+      if not len(parts) == 19:
>> > > > > -+              return
>> > > > > -+
>> > > > > -+      self.cpu.idle  = int(parts[18])
>> > > > > -+      self.cpu.usage = 100 - self.cpu.idle
>> > > > > -+
>> > > > > -+    def _read_memory (self):
>> > > > > -+      # Read a new line
>> > > > > -+        line = self.vmstat_fd.stdout.readline().rstrip('\n')
>> > > > > -+        # Skip headers
>> > > > > -+        if len(filter (lambda x: x not in " .0123456789",
>> line)):
>> > > > > -+            return
>> > > > > -+
>> > > > > -+        # Parse
>> > > > > -+        values = filter (lambda x: x, line.split(' '))
>> > > > > -+
>> > > > > -+      if not len(values) == 19:
>> > > > > -+              return
>> > > > > -         self.mem.free  = int(values[4])
>> > > > > -         self.mem.used  = self.mem.total - self.mem.free
>> > > > > -
>> > > > > Index: patches/patch-admin_wizards_php_py
>> > > > >
>> ===================================================================
>> > > > > RCS file:
>> > > /home/cvs/ports/www/cherokee/patches/patch-admin_wizards_php_py,v
>> > > > > retrieving revision 1.2
>> > > > > diff -u -p -r1.2 patch-admin_wizards_php_py
>> > > > > --- patches/patch-admin_wizards_php_py  20 Dec 2010 07:51:58 -0000
>> > >  1.2
>> > > > > +++ patches/patch-admin_wizards_php_py  19 Oct 2011 17:54:05 -0000
>> > > > > @@ -1,13 +1,13 @@
>> > > > >  $OpenBSD: patch-admin_wizards_php_py,v 1.2 2010/12/20 07:51:58
>> > > ajacoutot
>> > > > > Exp $
>> > > > > ---- admin/wizards/php.py.orig  Mon Dec 13 13:58:50 2010
>> > > > > -+++ admin/wizards/php.py       Wed Dec 15 16:37:42 2010
>> > > > > -@@ -84,7 +84,8 @@ STD_ETC_PATHS = ['/etc/php.ini',
>> > > > > -                  '/opt/php*/etc/php.ini',
>> > > > > +--- admin/wizards/php.py.orig  Wed Oct 12 14:07:44 2011
>> > > > > ++++ admin/wizards/php.py       Wed Oct 19 13:52:56 2011
>> > > > > +@@ -88,7 +88,8 @@ STD_ETC_PATHS = ['/etc/php.ini',
>> > > > >                   '/opt/local/etc/php*/php.ini',
>> > > > >                   '/etc/php*/*/php.ini',
>> > > > > --                 '/etc/php*/php.ini']
>> > > > > -+                 '/etc/php*/php.ini',
>> > > > > -+               '/var/www/conf/php.ini']
>> > > > > +                  '/etc/php*/php.ini',
>> > > > > +-                 '/usr/local/lib*/php.ini']
>> > > > > ++                 '/usr/local/lib*/php.ini',
>> > > > > ++                 '/var/www/conf/php.ini']
>> > > > >
>> > > > >  CFG_PREFIX    = 'tmp!wizard!php'
>> > > > >
>> > > > > Index: patches/patch-cherokee_Makefile_in
>> > > > >
>> ===================================================================
>> > > > > RCS file:
>> > > /home/cvs/ports/www/cherokee/patches/patch-cherokee_Makefile_in,v
>> > > > > retrieving revision 1.8
>> > > > > diff -u -p -r1.8 patch-cherokee_Makefile_in
>> > > > > --- patches/patch-cherokee_Makefile_in  20 Dec 2010 07:51:58 -0000
>> > >  1.8
>> > > > > +++ patches/patch-cherokee_Makefile_in  19 Oct 2011 17:54:01 -0000
>> > > > > @@ -1,7 +1,7 @@
>> > > > >  $OpenBSD: patch-cherokee_Makefile_in,v 1.8 2010/12/20 07:51:58
>> > > ajacoutot
>> > > > > Exp $
>> > > > > ---- cherokee/Makefile.in.orig  Mon Dec 13 14:49:55 2010
>> > > > > -+++ cherokee/Makefile.in       Wed Dec 15 16:37:42 2010
>> > > > > -@@ -1415,8 +1415,8 @@ $(common_ldflags) \
>> > > > > +--- cherokee/Makefile.in.orig  Tue Oct 18 15:38:20 2011
>> > > > > ++++ cherokee/Makefile.in       Wed Oct 19 13:44:04 2011
>> > > > > +@@ -1430,8 +1430,8 @@ $(common_ldflags) \
>> > > > >  -module \
>> > > > >  -avoid-version \
>> > > > >  -export-dynamic \
>> > > > > Index: patches/patch-cherokee_conf_sample_pre
>> > > > >
>> ===================================================================
>> > > > > RCS file:
>> > > > >
>> /home/cvs/ports/www/cherokee/patches/patch-cherokee_conf_sample_pre,v
>> > > > > retrieving revision 1.6
>> > > > > diff -u -p -r1.6 patch-cherokee_conf_sample_pre
>> > > > > --- patches/patch-cherokee_conf_sample_pre      20 Dec 2010
>> 07:51:58
>> > > -0000
>> > > > >      1.6
>> > > > > +++ patches/patch-cherokee_conf_sample_pre      19 Oct 2011
>> 17:54:02
>> > > -0000
>> > > > > @@ -1,6 +1,6 @@
>> > > > >  $OpenBSD: patch-cherokee_conf_sample_pre,v 1.6 2010/12/20
>> 07:51:58
>> > > > > ajacoutot Exp $
>> > > > > ---- cherokee.conf.sample.pre.orig      Thu May 20 03:28:51 2010
>> > > > > -+++ cherokee.conf.sample.pre   Wed Dec 15 16:37:42 2010
>> > > > > +--- cherokee.conf.sample.pre.orig      Wed Oct 12 14:07:44 2011
>> > > > > ++++ cherokee.conf.sample.pre   Wed Oct 19 13:49:33 2011
>> > > > >  @@ -13,6 +13,9 @@
>> > > > >  #
>> > > > >  server!bind!1!port = 80
>> > > > > @@ -25,12 +25,3 @@ $OpenBSD: patch-cherokee_conf_sample_pre
>> > > > >
>> > > > >  vserver!1!rule!1!match = default
>> > > > >  vserver!1!rule!1!handler = common
>> > > > > -@@ -49,7 +52,7 @@ vserver!1!rule!3!handler = file
>> > > > > -
>> > > > > - vserver!1!rule!4!match = directory
>> > > > > - vserver!1!rule!4!match!directory = /cgi-bin
>> > > > > --vserver!1!rule!4!document_root = %prefix%/lib/cgi-bin
>> > > > > -+vserver!1!rule!4!document_root = %wwwroot%/cgi-bin
>> > > > > - vserver!1!rule!4!handler = cgi
>> > > > > -
>> > > > > - vserver!1!rule!5!match = directory
>> > > > > Index: patches/patch-cherokee_main_admin_c
>> > > > >
>> ===================================================================
>> > > > > RCS file:
>> > > > > /home/cvs/ports/www/cherokee/patches/patch-cherokee_main_admin_c,v
>> > > > > retrieving revision 1.1
>> > > > > diff -u -p -r1.1 patch-cherokee_main_admin_c
>> > > > > --- patches/patch-cherokee_main_admin_c 20 Dec 2010 07:51:58 -0000
>> > >  1.1
>> > > > > +++ patches/patch-cherokee_main_admin_c 19 Oct 2011 17:54:01 -0000
>> > > > > @@ -1,12 +1,12 @@
>> > > > >  $OpenBSD: patch-cherokee_main_admin_c,v 1.1 2010/12/20 07:51:58
>> > > ajacoutot
>> > > > > Exp $
>> > > > > ---- cherokee/main_admin.c.orig Mon Dec 13 14:01:05 2010
>> > > > > -+++ cherokee/main_admin.c      Mon Dec 20 07:52:33 2010
>> > > > > -@@ -496,7 +496,7 @@ check_for_python (void)
>> > > > > +--- cherokee/main_admin.c.orig Wed Oct 12 14:07:44 2011
>> > > > > ++++ cherokee/main_admin.c      Wed Oct 19 13:51:21 2011
>> > > > > +@@ -554,7 +554,7 @@ check_for_python (void)
>> > > > >        int         re;
>> > > > >        pid_t       pid;
>> > > > >        int         exitcode = -1;
>> > > > > --      char *const args[]   = {"env", "python", "-c", "raise
>> > > SystemExit",
>> > > > > NULL};
>> > > > > -+      char *const args[]   = {"env", "python${MODPY_VERSION}",
>> "-c",
>> > > > > "raise SystemExit", NULL};
>> > > > > +-      char const *args[]   = {"env", "python", "-c", "raise
>> > > SystemExit",
>> > > > > NULL};
>> > > > > ++      char const *args[]   = {"env", "python${MODPY_VERSION}",
>> "-c",
>> > > > > "raise SystemExit", NULL};
>> > > > >
>> > > > >        pid = fork();
>> > > > >        if (pid == -1) {
>> > > > > Index: patches/patch-configure
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/patches/patch-configure,v
>> > > > > retrieving revision 1.9
>> > > > > diff -u -p -r1.9 patch-configure
>> > > > > --- patches/patch-configure     20 Dec 2010 07:51:58 -0000
>>  1.9
>> > > > > +++ patches/patch-configure     19 Oct 2011 17:54:02 -0000
>> > > > > @@ -1,7 +1,7 @@
>> > > > >  $OpenBSD: patch-configure,v 1.9 2010/12/20 07:51:58 ajacoutot
>> Exp $
>> > > > > ---- configure.orig     Mon Dec 13 14:49:57 2010
>> > > > > -+++ configure  Wed Dec 15 16:37:42 2010
>> > > > > -@@ -17414,13 +17414,14 @@ $as_echo "no" >&6; }
>> > > > > +--- configure.orig     Tue Oct 18 15:38:22 2011
>> > > > > ++++ configure  Wed Oct 19 13:44:04 2011
>> > > > > +@@ -17494,13 +17494,14 @@ $as_echo "no" >&6; }
>> > > > >       esac
>> > > > >
>> > > > >        if test "$have_pthread" != "yes"; then
>> > > > > @@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.9 2010/12/
>> > > > >  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>> > > > >  /* end confdefs.h.  */
>> > > > >
>> > > > > -@@ -17451,7 +17452,7 @@ else
>> > > > > +@@ -17531,7 +17532,7 @@ else
>> > > > >  fi
>> > > > >
>> > > > >           if test "$have_pthread" = "yes"; then
>> > > > > @@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.9 2010/12/
>> > > > >           fi
>> > > > >       fi
>> > > > >
>> > > > > -@@ -21048,7 +21049,7 @@ if ${ac_cv_lib_avformat_main+:} false;
>> then :
>> > > > > +@@ -21098,7 +21099,7 @@ if ${ac_cv_lib_avformat_main+:} false;
>> then :
>> > > > >    $as_echo_n "(cached) " >&6
>> > > > >  else
>> > > > >    ac_check_lib_save_LIBS=$LIBS
>> > > > > Index: patches/patch-constants_h_pre
>> > > > >
>> ===================================================================
>> > > > > RCS file:
>> /home/cvs/ports/www/cherokee/patches/patch-constants_h_pre,v
>> > > > > retrieving revision 1.2
>> > > > > diff -u -p -r1.2 patch-constants_h_pre
>> > > > > --- patches/patch-constants_h_pre       20 Dec 2010 07:51:58 -0000
>> > >  1.2
>> > > > > +++ patches/patch-constants_h_pre       19 Oct 2011 17:54:02 -0000
>> > > > > @@ -1,11 +1,14 @@
>> > > > >  $OpenBSD: patch-constants_h_pre,v 1.2 2010/12/20 07:51:58
>> ajacoutot
>> > > Exp $
>> > > > > ---- constants.h.pre.orig       Tue Jan 12 09:52:45 2010
>> > > > > -+++ constants.h.pre    Wed Dec 15 16:37:42 2010
>> > > > > -@@ -16,6 +16,6 @@
>> > > > > - # define CHEROKEE_ICONSDIR    "%prefix%/share/cherokee/icons"
>> > > > > - # define CHEROKEE_THEMEDIR    "%prefix%/share/cherokee/themes"
>> > > > > - # define CHEROKEE_PANIC_PATH  "%prefix%/bin/cherokee-panic"
>> > > > > +--- constants.h.pre.orig       Wed Oct 12 14:07:44 2011
>> > > > > ++++ constants.h.pre    Wed Oct 19 13:47:36 2011
>> > > > > +@@ -10,8 +10,8 @@
>> > > > > + # define CHEROKEE_DOCDIR      "%docdir%"
>> > > > > +
>> > > > > + # define CHEROKEE_VAR_RUN     "%localstatedir%/run"
>> > > > > +-# define CHEROKEE_FLCACHE
>> "%localstatedir%/lib/cherokee/flcache"
>> > > > >  -# define CHEROKEE_RRD_DIR
>> "%localstatedir%/lib/cherokee/graphs"
>> > > > > ++# define CHEROKEE_FLCACHE
>> "%localstatedir%/db/cherokee/flcache"
>> > > > >  +# define CHEROKEE_RRD_DIR
>> "%localstatedir%/db/cherokee/graphs"
>> > > > >
>> > > > > - #endif
>> > > > > + # define CHEROKEE_CONFDIR     "%sysconfdir%/cherokee"
>> > > > > + # define CHEROKEE_SERVER      "%prefix%/sbin/cherokee"
>> > > > > Index: pkg/PLIST-geoip
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/pkg/PLIST-geoip,v
>> > > > > retrieving revision 1.1.1.1
>> > > > > diff -u -p -r1.1.1.1 PLIST-geoip
>> > > > > --- pkg/PLIST-geoip     5 Sep 2008 11:19:48 -0000       1.1.1.1
>> > > > > +++ pkg/PLIST-geoip     19 Oct 2011 17:18:03 -0000
>> > > > > @@ -1,3 +1,2 @@
>> > > > >  @comment $OpenBSD: PLIST-geoip,v 1.1.1.1 2008/09/05 11:19:48
>> ajacoutot
>> > > > > Exp $
>> > > > > -@comment lib/cherokee/libplugin_geoip.la
>> > > > >  lib/cherokee/libplugin_geoip.so
>> > > > > Index: pkg/PLIST-ldap
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/pkg/PLIST-ldap,v
>> > > > > retrieving revision 1.1.1.1
>> > > > > diff -u -p -r1.1.1.1 PLIST-ldap
>> > > > > --- pkg/PLIST-ldap      5 Sep 2008 11:19:48 -0000       1.1.1.1
>> > > > > +++ pkg/PLIST-ldap      19 Oct 2011 17:18:09 -0000
>> > > > > @@ -1,3 +1,2 @@
>> > > > >  @comment $OpenBSD: PLIST-ldap,v 1.1.1.1 2008/09/05 11:19:48
>> ajacoutot
>> > > Exp
>> > > > > $
>> > > > > -@comment lib/cherokee/libplugin_ldap.la
>> > > > >  lib/cherokee/libplugin_ldap.so
>> > > > > Index: pkg/PLIST-main
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/pkg/PLIST-main,v
>> > > > > retrieving revision 1.13
>> > > > > diff -u -p -r1.13 PLIST-main
>> > > > > --- pkg/PLIST-main      22 Dec 2010 07:28:04 -0000      1.13
>> > > > > +++ pkg/PLIST-main      16 Nov 2011 15:49:15 -0000
>> > > > > @@ -5,6 +5,7 @@ bin/CTK-run
>> > > > >  @bin bin/cget
>> > > > >  bin/cherokee-admin-launcher
>> > > > >  bin/cherokee-config
>> > > > > +bin/cherokee-macos-askpass
>> > > > >  bin/cherokee-panic
>> > > > >  bin/cherokee-tweak
>> > > > >  include/cherokee/
>> > > > > @@ -49,111 +50,59 @@ include/cherokee/util.h
>> > > > >  include/cherokee/validator.h
>> > > > >  include/cherokee/version.h
>> > > > >  lib/cherokee/
>> > > > > -@comment lib/cherokee/libplugin_admin.la
>> > > > >  lib/cherokee/libplugin_admin.so
>> > > > > -@comment lib/cherokee/libplugin_and.la
>> > > > >  lib/cherokee/libplugin_and.so
>> > > > > -@comment lib/cherokee/libplugin_authlist.la
>> > > > >  lib/cherokee/libplugin_authlist.so
>> > > > > -@comment lib/cherokee/libplugin_bind.la
>> > > > >  lib/cherokee/libplugin_bind.so
>> > > > > -@comment lib/cherokee/libplugin_cgi.la
>> > > > >  lib/cherokee/libplugin_cgi.so
>> > > > > -@comment lib/cherokee/libplugin_combined.la
>> > > > >  lib/cherokee/libplugin_combined.so
>> > > > > -@comment lib/cherokee/libplugin_common.la
>> > > > >  lib/cherokee/libplugin_common.so
>> > > > > -@comment lib/cherokee/libplugin_custom.la
>> > > > >  lib/cherokee/libplugin_custom.so
>> > > > > -@comment lib/cherokee/libplugin_custom_error.la
>> > > > >  lib/cherokee/libplugin_custom_error.so
>> > > > > -@comment lib/cherokee/libplugin_deflate.la
>> > > > >  lib/cherokee/libplugin_deflate.so
>> > > > > -@comment lib/cherokee/libplugin_directory.la
>> > > > >  lib/cherokee/libplugin_directory.so
>> > > > > -@comment lib/cherokee/libplugin_dirlist.la
>> > > > >  lib/cherokee/libplugin_dirlist.so
>> > > > > -@comment lib/cherokee/libplugin_empty_gif.la
>> > > > > +lib/cherokee/libplugin_drop.so
>> > > > >  lib/cherokee/libplugin_empty_gif.so
>> > > > > -@comment lib/cherokee/libplugin_error_nn.la
>> > > > >  lib/cherokee/libplugin_error_nn.so
>> > > > > -@comment lib/cherokee/libplugin_error_redir.la
>> > > > >  lib/cherokee/libplugin_error_redir.so
>> > > > > -@comment lib/cherokee/libplugin_evhost.la
>> > > > >  lib/cherokee/libplugin_evhost.so
>> > > > > -@comment lib/cherokee/libplugin_exists.la
>> > > > >  lib/cherokee/libplugin_exists.so
>> > > > > -@comment lib/cherokee/libplugin_extensions.la
>> > > > >  lib/cherokee/libplugin_extensions.so
>> > > > > -@comment lib/cherokee/libplugin_failover.la
>> > > > >  lib/cherokee/libplugin_failover.so
>> > > > > -@comment lib/cherokee/libplugin_fcgi.la
>> > > > >  lib/cherokee/libplugin_fcgi.so
>> > > > > -@comment lib/cherokee/libplugin_file.la
>> > > > >  lib/cherokee/libplugin_file.so
>> > > > > -@comment lib/cherokee/libplugin_from.la
>> > > > >  lib/cherokee/libplugin_from.so
>> > > > > -@comment lib/cherokee/libplugin_fullpath.la
>> > > > >  lib/cherokee/libplugin_fullpath.so
>> > > > > -@comment lib/cherokee/libplugin_gzip.la
>> > > > >  lib/cherokee/libplugin_gzip.so
>> > > > > -@comment lib/cherokee/libplugin_header.la
>> > > > >  lib/cherokee/libplugin_header.so
>> > > > > -@comment lib/cherokee/libplugin_htdigest.la
>> > > > >  lib/cherokee/libplugin_htdigest.so
>> > > > > -@comment lib/cherokee/libplugin_htpasswd.la
>> > > > >  lib/cherokee/libplugin_htpasswd.so
>> > > > > -@comment lib/cherokee/libplugin_ip_hash.la
>> > > > >  lib/cherokee/libplugin_ip_hash.so
>> > > > > -@comment lib/cherokee/libplugin_libssl.la
>> > > > >  lib/cherokee/libplugin_libssl.so
>> > > > > -@comment lib/cherokee/libplugin_method.la
>> > > > >  lib/cherokee/libplugin_method.so
>> > > > > -@comment lib/cherokee/libplugin_ncsa.la
>> > > > >  lib/cherokee/libplugin_ncsa.so
>> > > > > -@comment lib/cherokee/libplugin_not.la
>> > > > >  lib/cherokee/libplugin_not.so
>> > > > > -@comment lib/cherokee/libplugin_or.la
>> > > > >  lib/cherokee/libplugin_or.so
>> > > > > -@comment lib/cherokee/libplugin_plain.la
>> > > > >  lib/cherokee/libplugin_plain.so
>> > > > > -@comment lib/cherokee/libplugin_post_report.la
>> > > > >  lib/cherokee/libplugin_post_report.so
>> > > > > -@comment lib/cherokee/libplugin_post_track.la
>> > > > >  lib/cherokee/libplugin_post_track.so
>> > > > > -@comment lib/cherokee/libplugin_proxy.la
>> > > > >  lib/cherokee/libplugin_proxy.so
>> > > > > -@comment lib/cherokee/libplugin_redir.la
>> > > > >  lib/cherokee/libplugin_redir.so
>> > > > > -@comment lib/cherokee/libplugin_rehost.la
>> > > > >  lib/cherokee/libplugin_rehost.so
>> > > > > -@comment lib/cherokee/libplugin_render_rrd.la
>> > > > >  lib/cherokee/libplugin_render_rrd.so
>> > > > > -@comment lib/cherokee/libplugin_request.la
>> > > > >  lib/cherokee/libplugin_request.so
>> > > > > -@comment lib/cherokee/libplugin_round_robin.la
>> > > > >  lib/cherokee/libplugin_round_robin.so
>> > > > > -@comment lib/cherokee/libplugin_rrd.la
>> > > > >  lib/cherokee/libplugin_rrd.so
>> > > > > -@comment lib/cherokee/libplugin_scgi.la
>> > > > >  lib/cherokee/libplugin_scgi.so
>> > > > > -@comment lib/cherokee/libplugin_secdownload.la
>> > > > >  lib/cherokee/libplugin_secdownload.so
>> > > > > -@comment lib/cherokee/libplugin_server_info.la
>> > > > >  lib/cherokee/libplugin_server_info.so
>> > > > > -@comment lib/cherokee/libplugin_ssi.la
>> > > > >  lib/cherokee/libplugin_ssi.so
>> > > > > -@comment lib/cherokee/libplugin_target_ip.la
>> > > > >  lib/cherokee/libplugin_target_ip.so
>> > > > > -@comment lib/cherokee/libplugin_tls.la
>> > > > >  lib/cherokee/libplugin_tls.so
>> > > > > -@comment lib/cherokee/libplugin_url_arg.la
>> > > > >  lib/cherokee/libplugin_url_arg.so
>> > > > > -@comment lib/cherokee/libplugin_uwsgi.la
>> > > > >  lib/cherokee/libplugin_uwsgi.so
>> > > > > -@comment lib/cherokee/libplugin_v_or.la
>> > > > >  lib/cherokee/libplugin_v_or.so
>> > > > > -@comment lib/cherokee/libplugin_wildcard.la
>> > > > >  lib/cherokee/libplugin_wildcard.so
>> > > > >  lib/libcherokee-base.la
>> > > > >  @lib lib/libcherokee-base.so.${LIBcherokee-base_VERSION}
>> > > > > @@ -172,7 +121,6 @@ lib/pkgconfig/cherokee.pc
>> > > > >  @bin sbin/cherokee
>> > > > >  @bin sbin/cherokee-admin
>> > > > >  @bin sbin/cherokee-worker
>> > > > > -share/aclocal/
>> > > > >  share/aclocal/cherokee.m4
>> > > > >  share/cherokee/
>> > > > >  share/cherokee/admin/
>> > > > > @@ -228,6 +176,8 @@ share/cherokee/admin/CTK/CTK/Link.py
>> > > > >  share/cherokee/admin/CTK/CTK/Link.pyc
>> > > > >  share/cherokee/admin/CTK/CTK/List.py
>> > > > >  share/cherokee/admin/CTK/CTK/List.pyc
>> > > > > +share/cherokee/admin/CTK/CTK/MailHTML.py
>> > > > > +share/cherokee/admin/CTK/CTK/MailHTML.pyc
>> > > > >  share/cherokee/admin/CTK/CTK/Notice.py
>> > > > >  share/cherokee/admin/CTK/CTK/Notice.pyc
>> > > > >  share/cherokee/admin/CTK/CTK/Page.py
>> > > > > @@ -314,6 +264,7 @@ share/cherokee/admin/CTK/static/images/d
>> > > > >  share/cherokee/admin/CTK/static/images/dialog-error.png
>> > > > >  share/cherokee/admin/CTK/static/images/dialog-information.png
>> > > > >  share/cherokee/admin/CTK/static/images/dialog-warning.png
>> > > > > +share/cherokee/admin/CTK/static/images/forbid.png
>> > > > >  share/cherokee/admin/CTK/static/images/ibutton-slider-default.png
>> > > > >  share/cherokee/admin/CTK/static/images/input-bg.png
>> > > > >  share/cherokee/admin/CTK/static/images/jquery.ui.stars.gif
>> > > > > @@ -334,18 +285,23 @@ share/cherokee/admin/CTK/static/images/u
>> > > > >
>>  share/cherokee/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png
>> > > > >  share/cherokee/admin/CTK/static/images/uploadify.cancel.png
>> > > > >  share/cherokee/admin/CTK/static/js/
>> > > > > +share/cherokee/admin/CTK/static/js/Carousel.js
>> > > > >  share/cherokee/admin/CTK/static/js/Help.js
>> > > > >  share/cherokee/admin/CTK/static/js/StarRating.js
>> > > > >  share/cherokee/admin/CTK/static/js/Submitter.js
>> > > > >  share/cherokee/admin/CTK/static/js/ajaxupload.3.6.js
>> > > > >  share/cherokee/admin/CTK/static/js/common.js
>> > > > > +share/cherokee/admin/CTK/static/js/jquery-1.3.2.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery-1.3.2.min.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery-ui-1.7.2.custom.min.js
>> > > > > +share/cherokee/admin/CTK/static/js/jquery-ui-1.7.2.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery.cookie.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery.form-defaults.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery.ibutton.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery.tablednd_0_5.js
>> > > > >  share/cherokee/admin/CTK/static/js/jquery.uploadProgress.js
>> > > > > +share/cherokee/admin/Certs.py
>> > > > > +share/cherokee/admin/Certs.pyc
>> > > > >  share/cherokee/admin/CgiBase.py
>> > > > >  share/cherokee/admin/CgiBase.pyc
>> > > > >  share/cherokee/admin/Cherokee.py
>> > > > > @@ -404,6 +360,8 @@ share/cherokee/admin/RuleSimple.py
>> > > > >  share/cherokee/admin/RuleSimple.pyc
>> > > > >  share/cherokee/admin/SaveButton.py
>> > > > >  share/cherokee/admin/SaveButton.pyc
>> > > > > +share/cherokee/admin/SavingChecks.py
>> > > > > +share/cherokee/admin/SavingChecks.pyc
>> > > > >  share/cherokee/admin/SelectionPanel.py
>> > > > >  share/cherokee/admin/SelectionPanel.pyc
>> > > > >  share/cherokee/admin/SystemInfo.py
>> > > > > @@ -425,9 +383,20 @@ share/cherokee/admin/consts.py
>> > > > >  share/cherokee/admin/consts.pyc
>> > > > >  share/cherokee/admin/exception.html
>> > > > >  share/cherokee/admin/help.html
>> > > > > +share/cherokee/admin/icons/
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-128.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-16.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-256.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-32.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-48.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-512.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher-96.png
>> > > > > +share/cherokee/admin/icons/cherokee-admin-launcher.svg
>> > > > >  share/cherokee/admin/market/
>> > > > >  share/cherokee/admin/market/CommandProgress.py
>> > > > >  share/cherokee/admin/market/CommandProgress.pyc
>> > > > > +share/cherokee/admin/market/Distro.py
>> > > > > +share/cherokee/admin/market/Distro.pyc
>> > > > >  share/cherokee/admin/market/Install.py
>> > > > >  share/cherokee/admin/market/Install.pyc
>> > > > >  share/cherokee/admin/market/InstallUtil.py
>> > > > > @@ -448,6 +417,8 @@ share/cherokee/admin/market/PageIndex.py
>> > > > >  share/cherokee/admin/market/PageIndex.pyc
>> > > > >  share/cherokee/admin/market/PageSearch.py
>> > > > >  share/cherokee/admin/market/PageSearch.pyc
>> > > > > +share/cherokee/admin/market/Report.py
>> > > > > +share/cherokee/admin/market/Report.pyc
>> > > > >  share/cherokee/admin/market/Review.py
>> > > > >  share/cherokee/admin/market/Review.pyc
>> > > > >  share/cherokee/admin/market/Util.py
>> > > > > @@ -478,6 +449,8 @@ share/cherokee/admin/plugins/directory.p
>> > > > >  share/cherokee/admin/plugins/directory.pyc
>> > > > >  share/cherokee/admin/plugins/dirlist.py
>> > > > >  share/cherokee/admin/plugins/dirlist.pyc
>> > > > > +share/cherokee/admin/plugins/drop.py
>> > > > > +share/cherokee/admin/plugins/drop.pyc
>> > > > >  share/cherokee/admin/plugins/empty_gif.py
>> > > > >  share/cherokee/admin/plugins/empty_gif.pyc
>> > > > >  share/cherokee/admin/plugins/error_nn.py
>> > > > > @@ -565,6 +538,7 @@ share/cherokee/admin/server.pyc
>> > > > >  share/cherokee/admin/static/
>> > > > >  share/cherokee/admin/static/css/
>> > > > >  share/cherokee/admin/static/css/cherokee-admin.css
>> > > > > +share/cherokee/admin/static/help_404.html
>> > > > >  share/cherokee/admin/static/images/
>> > > > >  share/cherokee/admin/static/images/advanced.png
>> > > > >  share/cherokee/admin/static/images/backup.png
>> > > > > @@ -868,6 +842,7 @@ share/cherokee/admin/static/images/wizar
>> > > > >  share/cherokee/admin/static/images/wizards/dbslayer.png
>> > > > >  share/cherokee/admin/static/images/wizards/django.png
>> > > > >  share/cherokee/admin/static/images/wizards/drupal.png
>> > > > > +share/cherokee/admin/static/images/wizards/flcache.png
>> > > > >  share/cherokee/admin/static/images/wizards/gallery.png
>> > > > >  share/cherokee/admin/static/images/wizards/glassfish.png
>> > > > >  share/cherokee/admin/static/images/wizards/hotlinking.png
>> > > > > @@ -886,6 +861,7 @@ share/cherokee/admin/static/images/wizar
>> > > > >  share/cherokee/admin/static/images/wizards/rails.png
>> > > > >  share/cherokee/admin/static/images/wizards/redirect.png
>> > > > >  share/cherokee/admin/static/images/wizards/rtorrent.png
>> > > > > +share/cherokee/admin/static/images/wizards/ssl_test.png
>> > > > >  share/cherokee/admin/static/images/wizards/static.png
>> > > > >  share/cherokee/admin/static/images/wizards/streaming.png
>> > > > >  share/cherokee/admin/static/images/wizards/sugar.png
>> > > > > @@ -914,54 +890,36 @@ share/cherokee/admin/wizards/concrete5.p
>> > > > >  share/cherokee/admin/wizards/concrete5.pyc
>> > > > >  share/cherokee/admin/wizards/django.py
>> > > > >  share/cherokee/admin/wizards/django.pyc
>> > > > > -share/cherokee/admin/wizards/drupal.py
>> > > > > -share/cherokee/admin/wizards/drupal.pyc
>> > > > > +share/cherokee/admin/wizards/flcache.py
>> > > > > +share/cherokee/admin/wizards/flcache.pyc
>> > > > >  share/cherokee/admin/wizards/glassfish.py
>> > > > >  share/cherokee/admin/wizards/glassfish.pyc
>> > > > >  share/cherokee/admin/wizards/hotlinking.py
>> > > > >  share/cherokee/admin/wizards/hotlinking.pyc
>> > > > >  share/cherokee/admin/wizards/icons.py
>> > > > >  share/cherokee/admin/wizards/icons.pyc
>> > > > > -share/cherokee/admin/wizards/joomla.py
>> > > > > -share/cherokee/admin/wizards/joomla.pyc
>> > > > > -share/cherokee/admin/wizards/liferay.py
>> > > > > -share/cherokee/admin/wizards/liferay.pyc
>> > > > >  share/cherokee/admin/wizards/mailman.py
>> > > > >  share/cherokee/admin/wizards/mailman.pyc
>> > > > > -share/cherokee/admin/wizards/mediawiki.py
>> > > > > -share/cherokee/admin/wizards/mediawiki.pyc
>> > > > > -share/cherokee/admin/wizards/moinmoin.py
>> > > > > -share/cherokee/admin/wizards/moinmoin.pyc
>> > > > >  share/cherokee/admin/wizards/mono.py
>> > > > >  share/cherokee/admin/wizards/mono.pyc
>> > > > > -share/cherokee/admin/wizards/moodle.py
>> > > > > -share/cherokee/admin/wizards/moodle.pyc
>> > > > >  share/cherokee/admin/wizards/php.py
>> > > > >  share/cherokee/admin/wizards/php.pyc
>> > > > > -share/cherokee/admin/wizards/phpbb.py
>> > > > > -share/cherokee/admin/wizards/phpbb.pyc
>> > > > > -share/cherokee/admin/wizards/phpmyadmin.py
>> > > > > -share/cherokee/admin/wizards/phpmyadmin.pyc
>> > > > >  share/cherokee/admin/wizards/rails.py
>> > > > >  share/cherokee/admin/wizards/rails.pyc
>> > > > >  share/cherokee/admin/wizards/redirect.py
>> > > > >  share/cherokee/admin/wizards/redirect.pyc
>> > > > >  share/cherokee/admin/wizards/rtorrent.py
>> > > > >  share/cherokee/admin/wizards/rtorrent.pyc
>> > > > > +share/cherokee/admin/wizards/ssl_test.py
>> > > > > +share/cherokee/admin/wizards/ssl_test.pyc
>> > > > >  share/cherokee/admin/wizards/static.py
>> > > > >  share/cherokee/admin/wizards/static.pyc
>> > > > >  share/cherokee/admin/wizards/streaming.py
>> > > > >  share/cherokee/admin/wizards/streaming.pyc
>> > > > > -share/cherokee/admin/wizards/sugar.py
>> > > > > -share/cherokee/admin/wizards/sugar.pyc
>> > > > >  share/cherokee/admin/wizards/symfony.py
>> > > > >  share/cherokee/admin/wizards/symfony.pyc
>> > > > > -share/cherokee/admin/wizards/trac.py
>> > > > > -share/cherokee/admin/wizards/trac.pyc
>> > > > >  share/cherokee/admin/wizards/uwsgi.py
>> > > > >  share/cherokee/admin/wizards/uwsgi.pyc
>> > > > > -share/cherokee/admin/wizards/wordpress.py
>> > > > > -share/cherokee/admin/wizards/wordpress.pyc
>> > > > >  share/cherokee/admin/wizards/zend.py
>> > > > >  share/cherokee/admin/wizards/zend.pyc
>> > > > >  share/cherokee/deps/
>> > > > > @@ -1031,6 +989,7 @@ share/doc/cherokee/
>> > > > >  share/doc/cherokee/basics.html
>> > > > >  share/doc/cherokee/basics_download.html
>> > > > >  share/doc/cherokee/basics_installation.html
>> > > > > +share/doc/cherokee/basics_installation_easy-install.html
>> > > > >  share/doc/cherokee/basics_installation_osx.html
>> > > > >  share/doc/cherokee/basics_installation_svn.html
>> > > > >  share/doc/cherokee/basics_installation_unix.html
>> > > > > @@ -1044,12 +1003,13 @@ share/doc/cherokee/config_advanced.html
>> > > > >  share/doc/cherokee/config_general.html
>> > > > >  share/doc/cherokee/config_index.html
>> > > > >  share/doc/cherokee/config_info_sources.html
>> > > > > -share/doc/cherokee/config_quickstart.html
>> > > > > +share/doc/cherokee/config_market.html
>> > > > >  share/doc/cherokee/config_status.html
>> > > > >  share/doc/cherokee/config_virtual_servers.html
>> > > > >  share/doc/cherokee/config_virtual_servers_evhost.html
>> > > > >  share/doc/cherokee/config_virtual_servers_rule.html
>> > > > >  share/doc/cherokee/config_virtual_servers_rule_types.html
>> > > > > +share/doc/cherokee/config_walkthrough.html
>> > > > >  share/doc/cherokee/config_wizards.html
>> > > > >  share/doc/cherokee/cookbook.html
>> > > > >  share/doc/cherokee/cookbook_alfresco.html
>> > > > > @@ -1059,6 +1019,7 @@ share/doc/cherokee/cookbook_concrete5.ht
>> > > > >  share/doc/cherokee/cookbook_cross_compilation.html
>> > > > >  share/doc/cherokee/cookbook_dbslayer.html
>> > > > >  share/doc/cherokee/cookbook_django.html
>> > > > > +share/doc/cherokee/cookbook_domain_matching.html
>> > > > >  share/doc/cherokee/cookbook_drupal.html
>> > > > >  share/doc/cherokee/cookbook_embedding_cherokee.html
>> > > > >  share/doc/cherokee/cookbook_glassfish.html
>> > > > > @@ -1084,15 +1045,18 @@ share/doc/cherokee/cookbook_streaming.ht
>> > > > >  share/doc/cherokee/cookbook_sugarcrm.html
>> > > > >  share/doc/cherokee/cookbook_symfony.html
>> > > > >  share/doc/cherokee/cookbook_trac.html
>> > > > > +share/doc/cherokee/cookbook_traffic_restriction.html
>> > > > >  share/doc/cherokee/cookbook_uwsgi.html
>> > > > >  share/doc/cherokee/cookbook_wordpress.html
>> > > > >  share/doc/cherokee/cookbook_zend.html
>> > > > >  share/doc/cherokee/dev.html
>> > > > >  share/doc/cherokee/dev_cherokee.conf.html
>> > > > > +share/doc/cherokee/dev_ctk.html
>> > > > >  share/doc/cherokee/dev_debug.html
>> > > > > -share/doc/cherokee/dev_issues.html
>> > > > >  share/doc/cherokee/dev_qa.html
>> > > > >  share/doc/cherokee/dev_quickstart.html
>> > > > > +share/doc/cherokee/distro.html
>> > > > > +share/doc/cherokee/distro_dev_intro.html
>> > > > >  share/doc/cherokee/index.html
>> > > > >  share/doc/cherokee/media/
>> > > > >  share/doc/cherokee/media/css/
>> > > > > @@ -1125,6 +1089,8 @@ share/doc/cherokee/media/images/admin_ha
>> > > > >  share/doc/cherokee/media/images/admin_handler_proxy.png
>> > > > >  share/doc/cherokee/media/images/admin_handler_secdownload.png
>> > > > >  share/doc/cherokee/media/images/admin_index.png
>> > > > > +share/doc/cherokee/media/images/admin_index_backup.png
>> > > > > +share/doc/cherokee/media/images/admin_index_restore.png
>> > > > >  share/doc/cherokee/media/images/admin_info_sources.png
>> > > > >  share/doc/cherokee/media/images/admin_launch.png
>> > > > >  share/doc/cherokee/media/images/admin_noconfig.png
>> > > > > @@ -1139,6 +1105,7 @@ share/doc/cherokee/media/images/admin_vs
>> > > > >  share/doc/cherokee/media/images/admin_vserver_evhost.png
>> > > > >  share/doc/cherokee/media/images/admin_vserver_loggers.png
>> > > > >  share/doc/cherokee/media/images/admin_vserver_security.png
>> > > > > +share/doc/cherokee/media/images/admin_vserver_security_ssl.png
>> > > > >  share/doc/cherokee/media/images/admin_vserver_wizard.png
>> > > > >  share/doc/cherokee/media/images/admin_vservers_wizard.png
>> > > > >  share/doc/cherokee/media/images/cookbook_alfresco_alfresco.png
>> > > > > @@ -1155,6 +1122,14 @@ share/doc/cherokee/media/images/cookbook
>> > > > >  share/doc/cherokee/media/images/cookbook_django_common.png
>> > > > >  share/doc/cherokee/media/images/cookbook_django_infosources.png
>> > > > >  share/doc/cherokee/media/images/cookbook_drupal.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules_1.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules_2.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules_3.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules_4.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules_6.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_dir_rules_7.png
>> > > > > +share/doc/cherokee/media/images/cookbook_drupal_vserver_rules.png
>> > > > >  share/doc/cherokee/media/images/cookbook_glassfish.png
>> > > > >
>>  share/doc/cherokee/media/images/cookbook_https_accelerator_handler.png
>> > > > >
>>  share/doc/cherokee/media/images/cookbook_https_accelerator_sources.png
>> > > > > @@ -1222,7 +1197,11 @@ share/doc/cherokee/media/images/cookbook
>> > > > >  share/doc/cherokee/media/images/cookbook_wp3.png
>> > > > >  share/doc/cherokee/media/images/cookbook_wp4.png
>> > > > >  share/doc/cherokee/media/images/cookbook_wp5.png
>> > > > > +share/doc/cherokee/media/images/cookbook_wp_example1.png
>> > > > > +share/doc/cherokee/media/images/cookbook_wp_example2.png
>> > > > > +share/doc/cherokee/media/images/cookbook_wp_example3.png
>> > > > >  share/doc/cherokee/media/images/cookbook_zend1.png
>> > > > > +share/doc/cherokee/media/images/market_index.png
>> > > > >  share/doc/cherokee/media/images/other_graphs_conns.png
>> > > > >  share/doc/cherokee/media/images/other_graphs_logging.png
>> > > > >  share/doc/cherokee/media/images/other_graphs_timeouts.png
>> > > > > @@ -1246,6 +1225,7 @@ share/doc/cherokee/modules_handlers_comm
>> > > > >  share/doc/cherokee/modules_handlers_custom_error.html
>> > > > >  share/doc/cherokee/modules_handlers_dbslayer.html
>> > > > >  share/doc/cherokee/modules_handlers_dirlist.html
>> > > > > +share/doc/cherokee/modules_handlers_drop.html
>> > > > >  share/doc/cherokee/modules_handlers_empty_gif.html
>> > > > >  share/doc/cherokee/modules_handlers_fcgi.html
>> > > > >  share/doc/cherokee/modules_handlers_file.html
>> > > > > @@ -1273,6 +1253,7 @@ share/doc/cherokee/modules_validators_pl
>> > > > >  share/doc/cherokee/other.html
>> > > > >  share/doc/cherokee/other_bundle.html
>> > > > >  share/doc/cherokee/other_bundle_cget.html
>> > > > > +share/doc/cherokee/other_bundle_cherokee-admin-launcher.html
>> > > > >  share/doc/cherokee/other_bundle_cherokee-admin.html
>> > > > >  share/doc/cherokee/other_bundle_cherokee-config.html
>> > > > >  share/doc/cherokee/other_bundle_cherokee-tweak.html
>> > > > > @@ -1281,8 +1262,10 @@ share/doc/cherokee/other_bundle_cherokee
>> > > > >  share/doc/cherokee/other_community.html
>> > > > >  share/doc/cherokee/other_errors.html
>> > > > >  share/doc/cherokee/other_faq.html
>> > > > > +share/doc/cherokee/other_front_line_cache.html
>> > > > >  share/doc/cherokee/other_goodies.html
>> > > > >  share/doc/cherokee/other_graphs.html
>> > > > > +share/doc/cherokee/other_os_tuning.html
>> > > > >  share/doc/cherokee/other_signals.html
>> > > > >  share/examples/cherokee/
>> > > > >  share/examples/cherokee/blank
>> > > > > @@ -1317,41 +1300,17 @@ share/examples/cherokee/www/images/power
>> > > > >  @sample /var/cherokee/images/powered_by_cherokee.png
>> > > > >  share/examples/cherokee/www/index.html
>> > > > >  @sample /var/cherokee/index.html
>> > > > > -share/locale/
>> > > > > -share/locale/ca/
>> > > > > -share/locale/ca/LC_MESSAGES/
>> > > > >  share/locale/ca/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/de/
>> > > > > -share/locale/de/LC_MESSAGES/
>> > > > >  share/locale/de/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/en/
>> > > > > -share/locale/en/LC_MESSAGES/
>> > > > >  share/locale/en/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/es/
>> > > > > -share/locale/es/LC_MESSAGES/
>> > > > >  share/locale/es/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/fr/
>> > > > > -share/locale/fr/LC_MESSAGES/
>> > > > >  share/locale/fr/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/gl/
>> > > > > -share/locale/gl/LC_MESSAGES/
>> > > > >  share/locale/gl/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/it/
>> > > > > -share/locale/it/LC_MESSAGES/
>> > > > >  share/locale/it/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/nl/
>> > > > > -share/locale/nl/LC_MESSAGES/
>> > > > >  share/locale/nl/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/pl/
>> > > > > -share/locale/pl/LC_MESSAGES/
>> > > > >  share/locale/pl/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/pt_BR/
>> > > > > -share/locale/pt_BR/LC_MESSAGES/
>> > > > >  share/locale/pt_BR/LC_MESSAGES/cherokee.mo
>> > > > >  share/locale/sv_SE/
>> > > > >  share/locale/sv_SE/LC_MESSAGES/
>> > > > >  share/locale/sv_SE/LC_MESSAGES/cherokee.mo
>> > > > > -share/locale/zh_CN/
>> > > > > -share/locale/zh_CN/LC_MESSAGES/
>> > > > >  share/locale/zh_CN/LC_MESSAGES/cherokee.mo
>> > > > > -@rcscript ${RCDIR}/cherokee
>> > > > > Index: pkg/PLIST-mysql
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/pkg/PLIST-mysql,v
>> > > > > retrieving revision 1.3
>> > > > > diff -u -p -r1.3 PLIST-mysql
>> > > > > --- pkg/PLIST-mysql     17 Apr 2009 23:17:07 -0000      1.3
>> > > > > +++ pkg/PLIST-mysql     19 Oct 2011 17:17:58 -0000
>> > > > > @@ -1,5 +1,3 @@
>> > > > >  @comment $OpenBSD: PLIST-mysql,v 1.3 2009/04/17 23:17:07 sthen
>> Exp $
>> > > > > -@comment lib/cherokee/libplugin_dbslayer.la
>> > > > >  lib/cherokee/libplugin_dbslayer.so
>> > > > > -@comment lib/cherokee/libplugin_mysql.la
>> > > > >  lib/cherokee/libplugin_mysql.so
>> > > > > Index: pkg/PLIST-streaming
>> > > > >
>> ===================================================================
>> > > > > RCS file: /home/cvs/ports/www/cherokee/pkg/PLIST-streaming,v
>> > > > > retrieving revision 1.1
>> > > > > diff -u -p -r1.1 PLIST-streaming
>> > > > > --- pkg/PLIST-streaming 22 Apr 2009 00:28:54 -0000      1.1
>> > > > > +++ pkg/PLIST-streaming 19 Oct 2011 17:18:16 -0000
>> > > > > @@ -1,3 +1,2 @@
>> > > > >  @comment $OpenBSD: PLIST-streaming,v 1.1 2009/04/22 00:28:54
>> sthen
>> > > Exp $
>> > > > > -@comment lib/cherokee/libplugin_streaming.la
>> > > > >  lib/cherokee/libplugin_streaming.so
>> > > > >
>> > > > > --
>> > > > > This message has been scanned for viruses and
>> > > > > dangerous content by MailScanner, and is
>> > > > > believed to be clean.
>> > > > >
>> > > > >
>> > > >
>> > > >
>> > > > --
>> > > >
>> > > >
>> > > > --------------
>> > > > Fernando Quintero
>> > > > http://nonroot.blogspot.com/
>> > > > Just a nonroot User
>> > >
>> > > --
>> > > Antoine
>> > >
>> >
>> >
>> >
>> > --
>> >
>> >
>> > --------------
>> > Fernando Quintero
>> > http://nonroot.blogspot.com/
>> > Just a nonroot User
>>
>> --
>> Antoine
>>
>
>
>
> --
>
>
> --------------
> Fernando Quintero
> http://nonroot.blogspot.com/
> Just a nonroot User
>


--


--------------
Fernando Quintero
http://nonroot.blogspot.com/
Just a nonroot User

patch-Cherokee-1.2.101.txt (53K) Download Attachment