Re: UPDATE: cherokee 1.0.14 -> 1.2.101
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 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 >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 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
> > > > > --- Makefile16 Sep 2011 12:00:06 - 1.31
> > > > > +++ Makefile16 Nov 2011 02:19:05 -
> > > > > @@ -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 \
> > > > >
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
On 30/11/11 9:30 AM, Antoine Jacoutot 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. Ya. I haven't had a chance to look at this yet as I went to rebuild the port and had to build PHP 5.3 and ran into a dependency issue and then got sidetracked with other ports stuff. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
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
> 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 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
> > > > --- Makefile16 Sep 2011 12:00:06 - 1.31
> > > > +++ Makefile16 Nov 2011 02:19:05 -
> > > > @@ -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.
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
ok, I will check.
The problem is with the hard restart?
On Wed, Nov 30, 2011 at 9:30 AM, Antoine Jacoutot 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 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
> > > --- Makefile16 Sep 2011 12:00:06 - 1.31
> > > +++ Makefile16 Nov 2011 02:19:05 -
> > > @@ -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:
> > >
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
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 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
> > --- Makefile16 Sep 2011 12:00:06 - 1.31
> > +++ Makefile16 Nov 2011 02:19:05 -
> > @@ -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
> > Index: distinfo
> > ===
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
Hi!,
Some news about it?
comments?
oks?
On Wed, Nov 16, 2011 at 12:25 PM, Brad 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
> --- Makefile16 Sep 2011 12:00:06 - 1.31
> +++ Makefile16 Nov 2011 02:19:05 -
> @@ -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
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/cherokee/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo20 Dec 2010 07:51:58 - 1.9
> +++ distinfo19 Oct 2011 17:13:21 -
> @@ -1,5 +1,5 @@
> -MD5 (cherokee-1.0.14.tar.gz) = baLMjbz/2dnTecTuKJUyBA==
> -RMD160 (cherokee-1.0.14.tar.gz) = WD2bRRFDgFGrZhTQ/YSLL3GLvN0=
>
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
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
--- Makefile16 Sep 2011 12:00:06 - 1.31
+++ Makefile16 Nov 2011 02:19:05 -
@@ -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
Index: distinfo
===
RCS file: /home/cvs/ports/www/cherokee/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo20 Dec 2010 07:51:58 - 1.9
+++ distinfo19 Oct 2011 17:13:21 -
@@ -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 (ch
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
On 2011-11-14, Antoine Jacoutot 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? > > Removing .la files for loadable modules seems fine, but not for the standard > solibs I think. > I already said that to Brad a couple weeks ago but I see they are still > removed. I would like some discussion with other porters to happen about this > before it goes in. I totally agree, this is obviously intended to be linked against as they provide a pkg-config file, so we should keep the .la too.
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
Hi Antoine,
Is there any info on this in the FAQ?
Some porter have a similar case?
On Mon, Nov 14, 2011 at 3:29 AM, Antoine Jacoutot 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?
>
> Removing .la files for loadable modules seems fine, but not for the
> standard solibs I think.
> I already said that to Brad a couple weeks ago but I see they are still
> removed. I would like some discussion with other porters to happen about
> this before it goes in.
>
> > Index: Makefile
> > ===
> > RCS file: /home/cvs/ports/www/cherokee/Makefile,v
> > retrieving revision 1.31
> > diff -u -p -r1.31 Makefile
> > --- Makefile16 Sep 2011 12:00:06 -1.31
> > +++ Makefile19 Oct 2011 18:00:49 -
> > @@ -8,8 +8,8 @@ COMMENT-ldap =LDAP module for Cherokee
> > 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-base0.0 \
> > cherokee-client0.0 \
> > cherokee-server0.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 -name '*.la' -print | xargs rm
> >
> > .include
> > Index: distinfo
> > ===
> > RCS file: /home/cvs/ports/www/cherokee/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 distinfo
> > --- distinfo20 Dec 2010 07:51:58 - 1.9
> > +++ distinfo19 Oct 2011 17:13:21 -
> > @@ -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)
Re: UPDATE: cherokee 1.0.14 -> 1.2.101
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?
Removing .la files for loadable modules seems fine, but not for the standard
solibs I think.
I already said that to Brad a couple weeks ago but I see they are still
removed. I would like some discussion with other porters to happen about this
before it goes in.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/cherokee/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile16 Sep 2011 12:00:06 -1.31
> +++ Makefile19 Oct 2011 18:00:49 -
> @@ -8,8 +8,8 @@ COMMENT-ldap =LDAP module for Cherokee
> 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-base0.0 \
> cherokee-client0.0 \
> cherokee-server0.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 -name '*.la' -print | xargs rm
>
> .include
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/cherokee/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo20 Dec 2010 07:51:58 -1.9
> +++ distinfo19 Oct 2011 17:13:21 -
> @@ -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.
