Patch for www/syweb

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

Patch for www/syweb

Ralf Horstmann-2
Hi,

"rrdtool-chroot enable" installs rrdtool into /var/www/usr/local/bin/rrdtool,
so adjust the default config. Also document that /bin/sh is needed in the
chroot.

Regards,
Ralf

Index: Makefile
===================================================================
RCS file: /usr/cvs/openbsd/ports/www/syweb/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- Makefile 5 Jun 2015 06:00:23 -0000 1.21
+++ Makefile 5 Sep 2015 06:59:08 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= web frontend to symon
 DISTNAME= syweb-0.65
-REVISION= 3
+REVISION= 4
 CATEGORIES= www sysutils
 
 MAINTAINER= Stuart Henderson <[hidden email]>
Index: patches/patch-htdocs_syweb_setup_inc
===================================================================
RCS file: /usr/cvs/openbsd/ports/www/syweb/patches/patch-htdocs_syweb_setup_inc,v
retrieving revision 1.3
diff -u -u -r1.3 patch-htdocs_syweb_setup_inc
--- patches/patch-htdocs_syweb_setup_inc 9 Aug 2013 08:40:47 -0000 1.3
+++ patches/patch-htdocs_syweb_setup_inc 5 Sep 2015 06:57:17 -0000
@@ -1,13 +1,14 @@
 $OpenBSD: patch-htdocs_syweb_setup_inc,v 1.3 2013/08/09 08:40:47 sthen Exp $
---- htdocs/syweb/setup.inc.orig Wed Mar 13 08:12:56 2013
-+++ htdocs/syweb/setup.inc Fri Aug  9 09:20:23 2013
+--- htdocs/syweb/setup.inc.orig Wed Mar 13 09:12:56 2013
++++ htdocs/syweb/setup.inc Sat Sep  5 08:57:09 2015
 @@ -18,12 +18,11 @@
   *
   */
 
 -/* running OpenBSD, apache chrooted:
+-$symon['rrdtool_path']='/bin/rrdtool';
 +/* running OpenBSD, apache chrooted: */
- $symon['rrdtool_path']='/bin/rrdtool';
++$symon['rrdtool_path']='/usr/local/bin/rrdtool';
  $symon['cache_dir']='/symon/cache';
  $symon['host_tree']='/symon/rrds';
  $symon['layout_dir']='/symon';
Index: pkg/MESSAGE
===================================================================
RCS file: /usr/cvs/openbsd/ports/www/syweb/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -u -r1.2 MESSAGE
--- pkg/MESSAGE 7 May 2014 18:10:27 -0000 1.2
+++ pkg/MESSAGE 5 Sep 2015 07:02:28 -0000
@@ -6,3 +6,6 @@
 Customise ${PREFIX}/htdocs/syweb/setup.inc if these assumptions are
 incorrect. rrdtool must also be copied into the chroot jail; for this,
 see rrdtool's pkg-readme document.
+
+In addition /bin/sh needs to be copied into the chroot:
+cp /bin/sh /var/www/bin/sh