ok stuart,
not answer from upstream yet.
On Thu, Jul 23, 2009 at 6:07 PM, Stuart Henderson<st...@openbsd.org> wrote:
> On 2009/07/23 23:48, Stuart Henderson wrote:
>>
>> Apache 2 which also uses getgrnam_r() uses a different method and
>> just uses a static 8K buffer.
>>
>> #define GRBUF_SIZE 8192
>> ...
>> char grbuf[GRBUF_SIZE];
>
> going for the easy fix (and updating the port while there)
> produces this diff. server launches ok again like this.
>
> if it goes in like this, then the two patches added are probably
> candidates for -stable.
>
> patches/patch-cherokee_source_interpreter_c
> patches/patch-cherokee_server_c
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 15 May 2009 06:57:18 -0000 1.9
> +++ Makefile 23 Jul 2009 23:00:47 -0000
> @@ -8,7 +8,7 @@ COMMENT-ldap = LDAP module for Cherokee
> COMMENT-mysql = MySQL module for Cherokee web server
> COMMENT-streaming = Streaming module for Cherokee web server
>
> -VERSION = 0.99.15
> +VERSION = 0.99.20
> DIR = 0.99
> DISTNAME = cherokee-${VERSION}
>
> @@ -65,7 +65,7 @@ RUN_DEPENDS-mysql = ::${BASE_PKGPATH}
>
> LIB_DEPENDS-streaming =
> avutil.>=6,avcodec.>=13,avformat.>=12::graphics/ffmpeg \
> bz2::archivers/bzip2
> -WANTLIB-streaming = crypto
> +WANTLIB-streaming = crypto m
> RUN_DEPENDS-streaming = ::${BASE_PKGPATH}
>
> FLAVORS = debug
> @@ -81,7 +81,8 @@ FAKE_FLAGS = cherokeeconfdir="${PREFIX}/
> CONFIGURE_STYLE = gnu
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> - PHPCGI="${LOCALBASE}/bin/php-fastcgi"
> + PHPCGI="${LOCALBASE}/bin/php-fastcgi" \
> + ac_cv_func_getgrnam_r=no
> CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
> --disable-static \
> --sysconfdir=${SYSCONFDIR} \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 15 May 2009 06:57:18 -0000 1.4
> +++ distinfo 23 Jul 2009 23:00:47 -0000
> @@ -1,5 +1,5 @@
> -MD5 (cherokee-0.99.15.tar.gz) = e+aJE5CexGuIYuOm6+G1Rw==
> -RMD160 (cherokee-0.99.15.tar.gz) = M2imJpbydjAeFcgn3dr9tjCAgyo=
> -SHA1 (cherokee-0.99.15.tar.gz) = 6hXuExSpr81er9dtlU3ExZPH7Js=
> -SHA256 (cherokee-0.99.15.tar.gz) =
> n+8Uqplgt8/DinkCiCq9i57bDZv4oiQ4FUb3TNAO3iI=
> -SIZE (cherokee-0.99.15.tar.gz) = 4637443
> +MD5 (cherokee-0.99.20.tar.gz) = eKNw97AS536iJ4wQSLrnVA==
> +RMD160 (cherokee-0.99.20.tar.gz) = 0W7zuTXRCM4t+KCs3dp1gQWKDAU=
> +SHA1 (cherokee-0.99.20.tar.gz) = HNIObtThz61AhLk6fKCQkDlzhJE=
> +SHA256 (cherokee-0.99.20.tar.gz) =
> rtTQkyCSDdJV0NaMVVUkS6lAOGwkRwra7vhZi96o4zM=
> +SIZE (cherokee-0.99.20.tar.gz) = 4698370
> Index: patches/patch-cherokee_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/patches/patch-cherokee_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-cherokee_Makefile_in
> --- patches/patch-cherokee_Makefile_in 15 May 2009 06:57:18 -0000 1.4
> +++ patches/patch-cherokee_Makefile_in 23 Jul 2009 23:00:47 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-cherokee_Makefile_in,v 1.4 2009/05/15 06:57:18 sthen Exp $
> ---- cherokee/Makefile.in.orig Thu Apr 30 11:20:10 2009
> -+++ cherokee/Makefile.in Sun May 3 01:48:23 2009
> -@@ -1276,7 +1276,8 @@ $(common_ldflags) \
> +--- cherokee/Makefile.in.orig Wed Jul 1 14:57:29 2009
> ++++ cherokee/Makefile.in Thu Jul 23 22:57:56 2009
> +@@ -1286,7 +1286,8 @@ $(common_ldflags) \
> -module \
> -avoid-version \
> -export-dynamic \
> Index: patches/patch-cherokee_conf_sample_pre
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/patches/patch-cherokee_conf_sample_pre,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-cherokee_conf_sample_pre
> --- patches/patch-cherokee_conf_sample_pre 15 May 2009 06:57:18 -0000
> 1.3
> +++ patches/patch-cherokee_conf_sample_pre 23 Jul 2009 23:00:47 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-cherokee_conf_sample_pre,v 1.3 2009/05/15 06:57:18 sthen Exp
> $
> ---- cherokee.conf.sample.pre.orig Tue May 12 04:27:39 2009
> -+++ cherokee.conf.sample.pre Thu May 14 20:39:33 2009
> +--- cherokee.conf.sample.pre.orig Mon May 25 08:16:06 2009
> ++++ cherokee.conf.sample.pre Tue Jun 9 22:35:47 2009
> @@ -13,6 +13,9 @@
> #
> server!bind!1!port = 80
> @@ -11,7 +11,7 @@ $OpenBSD: patch-cherokee_conf_sample_pre
> server!keepalive = 1
> server!keepalive_max_requests = 500
> server!server_tokens = full
> -@@ -27,10 +30,10 @@ vserver!1!directory_index = index.php,index.html
> +@@ -27,10 +30,10 @@ vserver!1!directory_index = index.html
>
> vserver!1!logger = combined
> vserver!1!logger!access!type = file
> Index: patches/patch-cherokee_server_c
> ===================================================================
> RCS file: patches/patch-cherokee_server_c
> diff -N patches/patch-cherokee_server_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-cherokee_server_c 23 Jul 2009 23:00:47 -0000
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +getgrnam_r() needs a larger buffer on OpenBSD (and some other systems).
> +
> +--- cherokee/server.c.orig Mon Jun 29 18:17:39 2009
> ++++ cherokee/server.c Thu Jul 23 23:59:32 2009
> +@@ -88,6 +88,7 @@
> + #include "source_interpreter.h"
> +
> + #define ENTRIES "core,server"
> ++#define GRBUF_SIZE 8192
> +
> + ret_t
> + cherokee_server_new (cherokee_server_t **srv)
> +@@ -1356,7 +1357,7 @@ configure_server_property (cherokee_config_node_t *con
> +
> + } else if (equal_buf_str (&conf->key, "group")) {
> + struct group grp;
> +- char tmp[1024];
> ++ char tmp[GRBUF_SIZE];
> +
> + ret = cherokee_getgrnam (conf->val.buf, &grp, tmp,
> sizeof(tmp));
> + if (ret != ret_ok) {
> Index: patches/patch-cherokee_source_interpreter_c
> ===================================================================
> RCS file: patches/patch-cherokee_source_interpreter_c
> diff -N patches/patch-cherokee_source_interpreter_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-cherokee_source_interpreter_c 23 Jul 2009 23:00:47 -0000
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +getgrnam_r() needs a larger buffer on OpenBSD (and some other systems).
> +
> +--- cherokee/source_interpreter.c.orig Mon Jun 29 18:43:26 2009
> ++++ cherokee/source_interpreter.c Thu Jul 23 23:58:55 2009
> +@@ -37,6 +37,7 @@
> +
> + #define ENTRIES "source,src,interpreter"
> + #define DEFAULT_TIMEOUT 10
> ++#define GRBUF_SIZE 8192
> +
> +
> + static void interpreter_free (void *src);
> +@@ -280,7 +281,7 @@ cherokee_source_interpreter_configure (cherokee_source
> +
> + } else if (equal_buf_str (&child->key, "group")) {
> + struct group grp;
> +- char tmp[1024];
> ++ char tmp[GRBUF_SIZE];
> +
> + ret = cherokee_getgrnam (child->val.buf, &grp, tmp,
> sizeof(tmp));
> + if (ret != ret_ok) {
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/patches/patch-configure,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configure
> --- patches/patch-configure 15 May 2009 06:57:18 -0000 1.5
> +++ patches/patch-configure 23 Jul 2009 23:00:47 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.5 2009/05/15 06:57:18 sthen Exp $
> ---- configure.orig Thu Apr 30 11:20:13 2009
> -+++ configure Sun May 3 01:48:23 2009
> -@@ -32362,13 +32362,13 @@ echo "${ECHO_T}no" >&6; }
> +--- configure.orig Wed Jul 1 14:57:31 2009
> ++++ configure Thu Jul 23 22:57:56 2009
> +@@ -32366,13 +32366,13 @@ echo "${ECHO_T}no" >&6; }
> esac
>
> if test "$have_pthread" != "yes"; then
> @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.5 2009/05/
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h. */
> _ACEOF
> -@@ -32424,7 +32424,7 @@ else
> +@@ -32428,7 +32428,7 @@ else
> fi
>
> if test "$have_pthread" = "yes"; then
> @@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.5 2009/05/
> fi
> fi
>
> -@@ -38803,7 +38803,7 @@ if test "${ac_cv_lib_avformat_main+set}" = set; then
> +@@ -39215,7 +39215,7 @@ if test "${ac_cv_lib_avformat_main+set}" = set; then
> echo $ECHO_N "(cached) $ECHO_C" >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> Index: patches/patch-contrib_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/patches/patch-contrib_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-contrib_Makefile_in
> --- patches/patch-contrib_Makefile_in 15 May 2009 06:57:18 -0000 1.3
> +++ patches/patch-contrib_Makefile_in 23 Jul 2009 23:00:47 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-contrib_Makefile_in,v 1.
>
> remove gratuitous GNUism, allows building with /usr/bin/make
>
> ---- contrib/Makefile.in.orig Thu Apr 30 11:20:10 2009
> -+++ contrib/Makefile.in Sun May 3 01:48:23 2009
> -@@ -388,7 +388,7 @@ uninstall-am:
> +--- contrib/Makefile.in.orig Tue Jun 9 12:23:53 2009
> ++++ contrib/Makefile.in Tue Jun 9 22:35:47 2009
> +@@ -389,7 +389,7 @@ uninstall-am:
>
>
> cherokee: cherokee.pre
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/www/cherokee/pkg/PLIST-main,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST-main
> --- pkg/PLIST-main 15 May 2009 06:57:18 -0000 1.6
> +++ pkg/PLIST-main 23 Jul 2009 23:00:47 -0000
> @@ -89,6 +89,10 @@ lib/cherokee/libplugin_fastcgi.so
> 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
> @@ -133,8 +137,6 @@ lib/cherokee/libplugin_secdownload.so
> lib/cherokee/libplugin_server_info.so
> �...@comment lib/cherokee/libplugin_ssi.la
> lib/cherokee/libplugin_ssi.so
> -...@comment lib/cherokee/libplugin_w3c.la
> -lib/cherokee/libplugin_w3c.so
> �...@comment lib/cherokee/libplugin_wildcard.la
> lib/cherokee/libplugin_wildcard.so
> �...@comment lib/libcherokee-base.la
> @@ -183,6 +185,8 @@ share/cherokee/admin/ModuleExists.py
> share/cherokee/admin/ModuleExtensions.py
> share/cherokee/admin/ModuleFcgi.py
> share/cherokee/admin/ModuleFile.py
> +share/cherokee/admin/ModuleFrom.py
> +share/cherokee/admin/ModuleFullpath.py
> share/cherokee/admin/ModuleGeoip.py
> share/cherokee/admin/ModuleHandler.py
> share/cherokee/admin/ModuleHeader.py
> @@ -225,6 +229,15 @@ share/cherokee/admin/Rule.py
> share/cherokee/admin/RuleList.py
> share/cherokee/admin/Table.py
> share/cherokee/admin/Theme.py
> +share/cherokee/admin/Wizard.py
> +share/cherokee/admin/Wizard_Django.py
> +share/cherokee/admin/Wizard_Drupal.py
> +share/cherokee/admin/Wizard_HotLinking.py
> +share/cherokee/admin/Wizard_Mailman.py
> +share/cherokee/admin/Wizard_PHP.py
> +share/cherokee/admin/Wizard_Redirect.py
> +share/cherokee/admin/Wizard_RoR.py
> +share/cherokee/admin/Wizard_WordPress.py
> share/cherokee/admin/cherokee.conf.sample
> share/cherokee/admin/config.py
> share/cherokee/admin/configured.py
> @@ -243,12 +256,15 @@ share/cherokee/admin/static/css/cherokee
> share/cherokee/admin/static/css/reset-min.css
> share/cherokee/admin/static/css/thickbox.css
> share/cherokee/admin/static/images/
> +share/cherokee/admin/static/images/arrow_ns.png
> +share/cherokee/admin/static/images/arrow_ns_h.png
> share/cherokee/admin/static/images/background.png
> share/cherokee/admin/static/images/bin.png
> share/cherokee/admin/static/images/button-left.png
> share/cherokee/admin/static/images/button-right.png
> share/cherokee/admin/static/images/cherokee-logo-bar.png
> share/cherokee/admin/static/images/collapsed.gif
> +share/cherokee/admin/static/images/cross.png
> share/cherokee/admin/static/images/dialog-error.png
> share/cherokee/admin/static/images/dialog-information.png
> share/cherokee/admin/static/images/dialog-warning.png
> @@ -510,9 +526,20 @@ share/cherokee/admin/static/images/menu-
> share/cherokee/admin/static/images/menu-sep.png
> share/cherokee/admin/static/images/offline.png
> share/cherokee/admin/static/images/online.png
> +share/cherokee/admin/static/images/rulestable-th.png
> share/cherokee/admin/static/images/tab.png
> +share/cherokee/admin/static/images/tick.png
> share/cherokee/admin/static/images/top-bar.png
> share/cherokee/admin/static/images/web_proud.jpg
> +share/cherokee/admin/static/images/wizards/
> +share/cherokee/admin/static/images/wizards/django.png
> +share/cherokee/admin/static/images/wizards/drupal.png
> +share/cherokee/admin/static/images/wizards/hotlinking.png
> +share/cherokee/admin/static/images/wizards/mailman.png
> +share/cherokee/admin/static/images/wizards/php.jpg
> +share/cherokee/admin/static/images/wizards/redirect.jpg
> +share/cherokee/admin/static/images/wizards/ror.png
> +share/cherokee/admin/static/images/wizards/wordpress.png
> share/cherokee/admin/static/images/workarea.png
> share/cherokee/admin/static/js/
> share/cherokee/admin/static/js/common.js
> @@ -528,7 +555,9 @@ share/cherokee/admin/static/js/ui.dialog
> share/cherokee/admin/static/js/ui.draggable.js
> share/cherokee/admin/static/js/ui.resizable.js
> share/cherokee/admin/static/js/ui.tabs.js
> +share/cherokee/admin/static/js/wizards.js
> share/cherokee/admin/status.template.html
> +share/cherokee/admin/util.py
> share/cherokee/admin/validations.py
> share/cherokee/deps/
> share/cherokee/deps/cgi.deps
>
--
--------------
Fernando Quintero
http://nonroot.blogspot.com/
*Just a nonroot User*
