Patchwork [PATCHv4] monkey: new v1.5.1 release.

login
register
mail settings
Submitter Eduardo Silva
Date June 18, 2014, 11:41 p.m.
Message ID <1403134870-29746-1-git-send-email-eduardo@monkey.io>
Download mbox | patch
Permalink /patch/74039/
State Superseded, archived
Headers show

Comments

Eduardo Silva - June 18, 2014, 11:41 p.m.
This patch add the minor release fix of Monkey HTTP Server v1.5.1. It fixes
some problems when switching user when started as root.

monkey/yocto: 3163d01492ea3d85268dc3773419e94db57ee8df

Signed-off-by: Eduardo Silva <eduardo@monkey.io>
---
 .../recipes-httpd/monkey/{monkey_1.5.0.bb => monkey_1.5.1.bb}       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-webserver/recipes-httpd/monkey/{monkey_1.5.0.bb => monkey_1.5.1.bb} (83%)
Martin Jansa - June 19, 2014, 8:39 a.m.
On Wed, Jun 18, 2014 at 05:41:10PM -0600, Eduardo Silva wrote:
> This patch add the minor release fix of Monkey HTTP Server v1.5.1. It fixes
> some problems when switching user when started as root.
> 
> monkey/yocto: 3163d01492ea3d85268dc3773419e94db57ee8df

[meta-webserver] is still missing in subject (helps me a lot when
separating patches on patchwork), you don't need to resend it now, but
please remember it for next time.

> Signed-off-by: Eduardo Silva <eduardo@monkey.io>
> ---
>  .../recipes-httpd/monkey/{monkey_1.5.0.bb => monkey_1.5.1.bb}       | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta-webserver/recipes-httpd/monkey/{monkey_1.5.0.bb => monkey_1.5.1.bb} (83%)
> 
> diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> similarity index 83%
> rename from meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> rename to meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> index 6fa1b77..2ea18f5 100644
> --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> @@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
>  SECTION = "net"
>  
>  SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz"
> -SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3"
> -SRC_URI[sha256sum] = "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7"
> +SRC_URI[md5sum] = "2fe04135728f5c3a86c3a412059e0da3"
> +SRC_URI[sha256sum] = "28dfc5e57bbcd305727e7af6a1a0587868db1c1286498757bfeb72edddf457e7"
>  
>  EXTRA_OECONF = " \
>               --plugdir=${libdir}/monkey/ \
>               --logdir=${localstatedir}/log/monkey/ \
>               --pidfile=${localstatedir}/run/monkey.pid \
>               --default-user=www-data \
> -             --datadir= ${localstatedir}/www/monkey/ \
> +             --datadir=${localstatedir}/www/monkey/ \
>               --sysconfdir=${sysconfdir}/monkey/ \
>               --enable-plugins=* \
>               --disable-plugins=polarssl \
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Eduardo Silva - June 19, 2014, 6:12 p.m.
>
> [meta-webserver] is still missing in subject (helps me a lot when
> separating patches on patchwork), you don't need to resend it now, but
> please remember it for next time.
>

thanks for the suggestion, it will be done from now,

best
Martin Jansa - June 21, 2014, 12:01 a.m.
On Thu, Jun 19, 2014 at 10:39:08AM +0200, Martin Jansa wrote:
> On Wed, Jun 18, 2014 at 05:41:10PM -0600, Eduardo Silva wrote:
> > This patch add the minor release fix of Monkey HTTP Server v1.5.1. It fixes
> > some problems when switching user when started as root.
> > 
> > monkey/yocto: 3163d01492ea3d85268dc3773419e94db57ee8df
> 
> [meta-webserver] is still missing in subject (helps me a lot when
> separating patches on patchwork), you don't need to resend it now, but
> please remember it for next time.

It seems to fail with systemd enabled:

| ERROR: Function failed: SYSTEMD_SERVICE_monkey value monkey.service does not exist 
NOTE: recipe monkey-1.5.1-r0: task do_package: Failed

> > Signed-off-by: Eduardo Silva <eduardo@monkey.io>
> > ---
> >  .../recipes-httpd/monkey/{monkey_1.5.0.bb => monkey_1.5.1.bb}       | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >  rename meta-webserver/recipes-httpd/monkey/{monkey_1.5.0.bb => monkey_1.5.1.bb} (83%)
> > 
> > diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> > similarity index 83%
> > rename from meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> > rename to meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> > index 6fa1b77..2ea18f5 100644
> > --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> > +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> > @@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
> >  SECTION = "net"
> >  
> >  SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz"
> > -SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3"
> > -SRC_URI[sha256sum] = "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7"
> > +SRC_URI[md5sum] = "2fe04135728f5c3a86c3a412059e0da3"
> > +SRC_URI[sha256sum] = "28dfc5e57bbcd305727e7af6a1a0587868db1c1286498757bfeb72edddf457e7"
> >  
> >  EXTRA_OECONF = " \
> >               --plugdir=${libdir}/monkey/ \
> >               --logdir=${localstatedir}/log/monkey/ \
> >               --pidfile=${localstatedir}/run/monkey.pid \
> >               --default-user=www-data \
> > -             --datadir= ${localstatedir}/www/monkey/ \
> > +             --datadir=${localstatedir}/www/monkey/ \
> >               --sysconfdir=${sysconfdir}/monkey/ \
> >               --enable-plugins=* \
> >               --disable-plugins=polarssl \
> > -- 
> > 1.9.1
> > 
> > -- 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
Eduardo Silva - June 24, 2014, 2:54 p.m.
On Fri, Jun 20, 2014 at 6:01 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> On Thu, Jun 19, 2014 at 10:39:08AM +0200, Martin Jansa wrote:
> > On Wed, Jun 18, 2014 at 05:41:10PM -0600, Eduardo Silva wrote:
> > > This patch add the minor release fix of Monkey HTTP Server v1.5.1. It
> fixes
> > > some problems when switching user when started as root.
> > >
> > > monkey/yocto: 3163d01492ea3d85268dc3773419e94db57ee8df
> >
> > [meta-webserver] is still missing in subject (helps me a lot when
> > separating patches on patchwork), you don't need to resend it now, but
> > please remember it for next time.
>
> It seems to fail with systemd enabled:
>
> | ERROR: Function failed: SYSTEMD_SERVICE_monkey value monkey.service does
> not exist
> NOTE: recipe monkey-1.5.1-r0: task do_package: Failed
>

thanks for pointing out the problem.

There is a missing configure script option that is the one in charge to
create the systemd service file. I will make sure to fix it shortly,

best

Patch

diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
similarity index 83%
rename from meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
rename to meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
index 6fa1b77..2ea18f5 100644
--- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
@@ -8,15 +8,15 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
 
 SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz"
-SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3"
-SRC_URI[sha256sum] = "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7"
+SRC_URI[md5sum] = "2fe04135728f5c3a86c3a412059e0da3"
+SRC_URI[sha256sum] = "28dfc5e57bbcd305727e7af6a1a0587868db1c1286498757bfeb72edddf457e7"
 
 EXTRA_OECONF = " \
              --plugdir=${libdir}/monkey/ \
              --logdir=${localstatedir}/log/monkey/ \
              --pidfile=${localstatedir}/run/monkey.pid \
              --default-user=www-data \
-             --datadir= ${localstatedir}/www/monkey/ \
+             --datadir=${localstatedir}/www/monkey/ \
              --sysconfdir=${sysconfdir}/monkey/ \
              --enable-plugins=* \
              --disable-plugins=polarssl \