On Wed, Sep 16, 2015 at 02:31:57PM -0500, Kent R. Spillner wrote:
> *bump*
>
> On Mon, Aug 31, 2015 at 03:52:16PM -0500, Kent R. Spillner wrote:
> > Resending; reattaching diff below. This was already merged upstream:
> > https://github.com/joewalnes/websocketd/pull/166
> >
> > Ok?
> >
> > On Mon, Jul 27, 2015 at 12:56:26PM -0500, Kent R. Spillner wrote:
> > > Small tweak to previous patch (already fed upstream), and bump. The
> > > intended behavior of this example is to print the value of every named
> > > environment variable, or "<unset>" if the environment variable isn't set.
> > > The original patch accidentally just printed the name of every environment
> > > variable regardless of whether or not the environment variable was set
> > > (e.g. HTTPS=HTTPS). This only affected the example script, websocketd
> > > itself still worked fine, but the examples are the best source of
> > > websocketd
> > > documentation so I think this is useful before release.
> > >
> > > Ok?
I have an ok from czarkoff@ but would like one from a senior porter, too,
before I commit. Any volunteers? :) I'm happy to wait for the next
upstream release, too, if that's preferable to patching patches; I'm
just not sure when that might happen so I wanted to fix the example that
we package in the meantime.
Index: Makefile
===================================================================
RCS file: /work/cvsroot/ports/net/websocketd/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile 20 Jul 2015 20:53:58 -0000 1.5
+++ Makefile 27 Jul 2015 17:45:59 -0000
@@ -8,6 +8,7 @@ DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v$V
+REVISION = 0
CATEGORIES = net www
Index: patches/patch-examples_cgi-bin_dump-env_sh
===================================================================
RCS file:
/work/cvsroot/ports/net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh,v
retrieving revision 1.1
diff -p -u -r1.1 patch-examples_cgi-bin_dump-env_sh
--- patches/patch-examples_cgi-bin_dump-env_sh 20 Jul 2015 20:53:59 -0000
1.1
+++ patches/patch-examples_cgi-bin_dump-env_sh 31 Aug 2015 20:47:31 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-examples_cgi-bin_dump-env_sh,v 1.1 2015/07/20 20:53:59
kspillner Exp $
-Drop Bash and tweak to work with our ksh.
+Drop Bash and tweak to work with our ksh. Merged upstream in PR#166.
--- examples/cgi-bin/dump-env.sh.orig Thu Jul 16 11:52:56 2015
+++ examples/cgi-bin/dump-env.sh Thu Jul 16 11:58:52 2015
@@ -1,4 +1,4 @@
@@ -9,12 +9,13 @@ Drop Bash and tweak to work with our ksh
# Copyright 2013 Joe Walnes and the websocketd team.
# All rights reserved.
-@@ -36,7 +36,7 @@ echo
+@@ -36,7 +36,8 @@ echo
for NAME in ${NAMES}
do
- echo ${NAME}=${!NAME:-<unset>}
-+ echo ${NAME}=${NAME:-<unset>}
++ eval "value=\${${NAME}}"
++ env -i "${NAME}=${value:-<unset>}"
done
# Additional HTTP headers
