Test Page for Yaws Installation

Seeing this instead of the website you +expected?

This page is here because the site administrator has changed the +configuration of this web server. Please contact the person +responsible for maintaining this server with questions. +The Yaws web server software this site administrator is using has +nothing to do with maintaining this site and cannot help resolve +configuration issues.

+#http://www.example.com/downloads.php yaws-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/yaws-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/yaws-(.*)\.tar\.gz debian uupdate + +# Uncomment to use Roland's hack for sourceforge based projects - YMMV! +#http://people.debian.org/~lolando/sfdlr.php?project=yaws yaws-([\d.]*).tar.gz + +http://yaws.hyber.org/download/yaws-(.*)\.tar\.gz --- yaws-1.81.orig/debian/copyright +++ yaws-1.81/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Will Newton on +Thu, 19 May 2005 20:55:25 +0100. + +It was downloaded from http://yaws.hyber.org/ + +Author: Claes Wikstrom + +Copyright (c) 2006, Claes Wikstrom, klacke@hyber.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of "Yaws" nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + --- yaws-1.81.orig/debian/yaws-mail.install +++ yaws-1.81/debian/yaws-mail.install @@ -0,0 +1 @@ +debian/conf/yaws-mail.conf /etc/yaws/conf.avail/ --- yaws-1.81.orig/debian/compat +++ yaws-1.81/debian/compat @@ -0,0 +1 @@ +5 --- yaws-1.81.orig/debian/yaws-mail.links +++ yaws-1.81/debian/yaws-mail.links @@ -0,0 +1 @@ +usr/share/yaws-mail usr/lib/yaws/mail/priv/docroot --- yaws-1.81.orig/debian/yaws-application.postinst.in +++ yaws-1.81/debian/yaws-application.postinst.in @@ -0,0 +1,66 @@ +#! /bin/sh +# postinst script for yaws-@APPLICATION@ +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + # Wiki requires write permissions, so give them to make wiki working + # out-of-the-box + if [ "@APPLICATION@" = "wiki" ] ; then + chown yaws:yaws /var/lib/yaws-@APPLICATION@ + fi + + # Create config symlink + f=yaws-@APPLICATION@.conf + if [ -f /etc/yaws/conf.avail/$f ] && [ ! -f /etc/yaws/conf.d/$f ] ; then + echo "Creating config symlink /etc/yaws/conf.d/$f" + ln -s ../conf.avail/$f /etc/yaws/conf.d/ + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# Reload yaws configuration (for yet unknown reason, invoke-rc.d yaws reload +# doesn't work here, so restart). +if [ -x "/etc/init.d/yaws" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d yaws restart || exit $? + else + /etc/init.d/yaws restart || exit $? + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- yaws-1.81.orig/debian/yaws.install +++ yaws-1.81/debian/yaws.install @@ -0,0 +1,5 @@ +debian/conf/yaws.conf /etc/yaws/ +debian/conf/localhost.conf /etc/yaws/conf.avail/ +debian/conf/localhost-ssl.conf /etc/yaws/conf.avail/ +debian/index.html /usr/share/yaws/ +www/icons/yaws.gif /usr/share/yaws/ --- yaws-1.81.orig/debian/yaws.lintian-override +++ yaws-1.81/debian/yaws.lintian-override @@ -0,0 +1,2 @@ +yaws: package-contains-empty-directory usr/lib/yaws/ebin/ +yaws: package-contains-empty-directory usr/lib/yaws/include/ --- yaws-1.81.orig/debian/yaws-wiki.install +++ yaws-1.81/debian/yaws-wiki.install @@ -0,0 +1 @@ +debian/conf/yaws-wiki.conf /etc/yaws/conf.avail/ --- yaws-1.81.orig/debian/yaws-wiki.links +++ yaws-1.81/debian/yaws-wiki.links @@ -0,0 +1,2 @@ +var/lib/yaws-wiki usr/lib/yaws/wiki/priv/docroot +var/lib/yaws-wiki usr/share/yaws-wiki --- yaws-1.81.orig/debian/control +++ yaws-1.81/debian/control @@ -0,0 +1,63 @@ +Source: yaws +Section: web +Priority: optional +Maintainer: Erlang Packagers +Uploaders: Torsten Werner , Sergei Golovan +Build-Depends: debhelper (>= 5.0.0), autotools-dev, + erlang-dev (>= 1:11.b.2), erlang-nox, mime-support, libpam0g-dev, + texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended, + texlive-extra-utils, ghostscript, quilt +Standards-Version: 3.8.0 +Homepage: http://yaws.hyber.org/ + +Package: yaws +Architecture: any +Provides: httpd, httpd-cgi +Depends: ${erlang-nox:Depends}, ${erlang-abi:Depends}, adduser, openssl, ${shlibs:Depends}, ${misc:Depends} +Suggests: ${erlang-dev:Depends}, yaws-chat, yaws-mail, yaws-wiki, yaws-yapp, zip, bzip2 +Description: High performance HTTP 1.1 webserver written in Erlang + Yaws is a high performance HTTP 1.1 webserver written in Erlang. It is a + multithreaded webserver where one Erlang light weight process is used to + handle each client. Two separate modes of operation are supported. + . + Standalone mode where Yaws runs as a regular webserver daemon. This is the + default mode. + . + Embedded mode where Yaws runs as an embedded webserver in another Erlang + application. + . + The main advantages of yaws compared to other Web technologies are + performance and elegance. The performance comes from the underlying Erlang + system and its ability to handle concurrent processes in an efficent way. + Its elegance comes from Erlang as well. Web applications don't have to be + written in ugly adhoc languages. + +Package: yaws-chat +Architecture: all +Depends: yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0) +Description: Chat application for Yaws web server + Yaws-chat allows to create a very simple web-based chatroom. + +Package: yaws-mail +Architecture: all +Depends: yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0) +Description: Webmail application for Yaws web server + Yaws-mail is a small stateless webmail application. It requires + SMTP and POP3 servers to operate and does not store email locally. + +Package: yaws-wiki +Architecture: all +Depends: yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0) +Description: Wiki application for Yaws web server + Yaws-wiki is a small wiki application, written in Erlang for Yaws + web server. + +Package: yaws-yapp +Architecture: all +Depends: yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0) +Description: An easy way to deploy applications for Yaws web server + Yaws-yapp (Yaws application handler) is a helper application. + It takes care of adding, and removing, the applications into a running + server. When anyone access the server with an URL that matches the path + for an added application, the docroot will be temporarily switched + to where the web pages for that application are located. --- yaws-1.81.orig/debian/yaws.prerm +++ yaws-1.81/debian/yaws.prerm @@ -0,0 +1,31 @@ +#! /bin/sh +# prerm script for yaws +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour'

+# * `deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ + +case "$1" in + remove|upgrade|deconfigure|failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + --- yaws-1.81.orig/debian/yaws-mail.docs +++ yaws-1.81/debian/yaws-mail.docs @@ -0,0 +1,2 @@ +applications/mail/README +applications/mail/TODO --- yaws-1.81.orig/debian/yaws.postinst +++ yaws-1.81/debian/yaws.postinst @@ -0,0 +1,105 @@ +#! /bin/sh +# postinst script for yaws +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + # Create yaws user + adduser --quiet --system --shell /bin/sh --group --home /var/cache/yaws yaws + # Moving home directory if it's still in /var/run + usermod --home /var/cache/yaws --move-home yaws >/dev/null 2>/dev/null + + # Fixing config directory permissions + chown root:yaws /etc/yaws + chmod 750 /etc/yaws + + # Yaws configs may contain sensitive information (passwords) + chown root:yaws /etc/yaws/yaws.conf + chmod 640 /etc/yaws/yaws.conf + + chown -R root:yaws /etc/yaws/conf.avail + chmod 640 /etc/yaws/conf.avail/* + + # Create config symlinks + # Do it only if it's a fresh install or upgrade from version + # less than 1.66-2 (which is the first version with multiple + # configs), allowing admin to safely remove it. + + if dpkg --compare-versions "$2" lt "1.66-2" ; then + for f in localhost.conf localhost-ssl.conf ; do + if [ ! -f /etc/yaws/conf.d/$f ] ; then + echo "Creating config symlink /etc/yaws/conf.d/$f" + ln -s ../conf.avail/$f /etc/yaws/conf.d/ + fi + done + fi + + # Making /etc/yaws/yaws-cert.pem and /etc/yaws/yaws-key.pem + # if they do not exist. + ( cd /etc/yaws + if [ ! -f yaws-cert.pem ] || [ ! -f yaws-key.pem ] ; then + HOST=$(hostname -s 2>/dev/null || echo localhost) + DOMAIN=$(hostname -d 2>/dev/null || echo localdomain) + openssl req -new -x509 -days 365 -nodes \ + -out yaws-cert.pem \ + -keyout yaws-key.pem > /dev/null 2>&1 <<+++ +. +. +. +$DOMAIN +$HOST +localhost +root@$HOST.$DOMAIN ++++ + echo "Created /etc/yaws/yaws-cert.pem and /etc/yaws/yaws-key.pem for localhost ONLY" + fi ) + + # Make yaws certificates readable only by the server + chown root:yaws /etc/yaws/*.pem + chmod 640 /etc/yaws/*.pem + + # Only user yaws and root are allowed to create + # yaws control files + chown -R yaws:yaws /var/cache/yaws + chmod 750 /var/cache/yaws + + install -o yaws -g yaws -m 750 -d /var/run/yaws + install -o yaws -g adm -m 750 -d /var/log/yaws + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- yaws-1.81.orig/debian/patches/clean.diff +++ yaws-1.81/debian/patches/clean.diff @@ -0,0 +1,44 @@ +Patch fixes cleaning up after build process. + +--- yaws-1.80.orig/Makefile ++++ yaws-1.80/Makefile +@@ -36,6 +36,7 @@ + + conf_clean: + -rm include.mk config.cache config.status config.log 2> /dev/null ++ -rm test/support/include.mk test/support/include.sh $(PKGCONFIG_FILES) 2> /dev/null + + local_install: all + (cd scripts && $(MAKE) local_install) +--- yaws-1.80.orig/doc/Makefile ++++ yaws-1.80/doc/Makefile +@@ -28,6 +28,7 @@ + + clean: + rm -f *.ps *.dvi *.log *.aux *.pdf *.toc *.beam 2> /dev/null || true ++ rm -f *.out ../www/yaws.ps ../www/yaws.pdf 2> /dev/null || true + + install: + -install -d $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN) +--- yaws-1.80.orig/applications/wiki/scripts/Makefile ++++ yaws-1.80/applications/wiki/scripts/Makefile +@@ -27,7 +27,7 @@ + chmod +x $@ + + clean: +- rm importFiles getPassword updateWiki ++ rm -f $(SCRIPTS) + + + install: +--- yaws-1.80.orig/applications/yapp/Makefile ++++ yaws-1.80/applications/yapp/Makefile +@@ -21,7 +21,7 @@ + $(ERL) -noshell -run edoc_run application "'$(APPNAME)'" '"."' '$(DOC_OPTS)' -s init stop + + cleandocs: +- rm -rf doc/*.html doc/edoc-info doc/stylesheet.css ++ rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png + + install: all docs + $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/ebin --- yaws-1.81.orig/debian/patches/ctl.diff +++ yaws-1.81/debian/patches/ctl.diff @@ -0,0 +1,28 @@ +Patch adds processing the case when ctlfile is parsable but its +content is invalid. + +--- yaws-1.80.orig/src/yaws_ctl.erl ++++ yaws-1.80/src/yaws_ctl.erl +@@ -314,6 +314,8 @@ + Err -> + Err + end; ++ {ok, Terms} -> ++ {error, {content, Terms}}; + Err -> + Err + end. +@@ -334,6 +336,13 @@ + io:format("No yaws system responds~n",[]), + timer:sleep(10), + erlang:halt(2); ++ {error, {content,Terms}} -> ++ io:format("The ctlfile ~s is readable but its content~n" ++ "~p~n" ++ "isn't in YAWS control file format~n", ++ [yaws:ctl_file(SID),Terms]), ++ timer:sleep(10), ++ erlang:halt(2); + {error, Reason} -> + io:format("You failed to read the ctlfile ~s~n" + "error was: <~p>~n" --- yaws-1.81.orig/debian/patches/man.diff +++ yaws-1.81/debian/patches/man.diff @@ -0,0 +1,40 @@ +Patch fixes erros in yaws manual pages. + +--- yaws-1.80.orig/man/yaws.conf.5 ++++ yaws-1.80/man/yaws.conf.5 +@@ -194,11 +194,11 @@ + Yaws can virthost several webservers on the same ip address as well + as several webservers on different ip addresses. The on limitation here is + that there can be only one server with ssl enabled per each individual ip address. +-.pp ++.PP + Each virtual host is defined within a matching pair of \fB\fR + and \fB\fR. The ServerName will be the name of the webserver. + +-.pp ++.PP + The following directives are allowed inside a server definition. + .TP + \fBport = Port \fR +@@ -530,7 +530,7 @@ + + .fi + +-.pp ++.PP + And this example shows a similar setup but two webservers on the same ip address + + .nf +--- yaws-1.80.orig/man/yaws_api.5 ++++ yaws-1.80/man/yaws_api.5 +@@ -197,8 +197,8 @@ + from a process. The other process can call this function to deliver + these chunks. It requires the \fBout/1\fR function to return the + value \fB{streamcontent, MimeType, FirstChunk}\fR to work. +-YawsPid is the process identifier of the yaws process delivering the original +-.yaws file. That is self() in the yaws code. ++YawsPid is the process identifier of the yaws process delivering the ++original .yaws file. That is self() in the yaws code. + The Pid must typically be passed (somehow) to the producer of the stream. + + .TP --- yaws-1.81.orig/debian/patches/docs.diff +++ yaws-1.81/debian/patches/docs.diff @@ -0,0 +1,14 @@ +Patch removes dependency om non-free latex2html package when building +docs. + +--- yaws-1.81.orig/doc/yaws.tex ++++ yaws-1.81/doc/yaws.tex +@@ -44,7 +44,7 @@ + + \usepackage[T1]{fontenc} + \usepackage{xspace} +-\usepackage{html} ++%\usepackage{html} + + \makeatother + \begin{document} --- yaws-1.81.orig/debian/patches/installdocs.diff +++ yaws-1.81/debian/patches/installdocs.diff @@ -0,0 +1,15 @@ +Patch makes docs installing into /usr/share/docs/yaws (without +yaws version number in directory name, see section 12.3 of +Debian Policy Manual). + +--- yaws-1.80.orig/doc/Makefile ++++ yaws-1.80/doc/Makefile +@@ -30,6 +30,5 @@ + rm -f *.ps *.dvi *.log *.aux *.toc *.beam 2> /dev/null || true + + install: +- -install -d $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN) +- -cp yaws.pdf $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN) +- ++ -install -d $(DESTDIR)$(PREFIX)/share/doc/yaws ++ -cp yaws.pdf $(DESTDIR)$(PREFIX)/share/doc/yaws --- yaws-1.81.orig/debian/patches/install.diff +++ yaws-1.81/debian/patches/install.diff @@ -0,0 +1,151 @@ +Patch makes yaws installing into /usr/lib/erlang/lib hierarchy to +make its use more convenient. Also yaws paths in the examples are +corrected. + +--- yaws-1.80.orig/src/Makefile ++++ yaws-1.80/src/Makefile +@@ -98,15 +98,15 @@ + rm -f $(EBIN_FILES) yaws_generated.erl charset.def mime_types.erl yaws_configure.hrl + + install: regen all docsinstall +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/examples/ebin +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/examples/include +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/ebin +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/priv ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/examples/ebin ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/examples/include ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/ebin ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/priv + $(INSTALL) -d $(DESTDIR)$(VARDIR)/log/yaws + $(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/ebin +- (cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - ) +- (cd ..; tar cf - include ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - ) +- (cd ..; tar cf - priv/*.xsd ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - ) ++ (cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN); tar xf - ) ++ (cd ..; tar cf - include ) | (cd $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN); tar xf - ) ++ (cd ..; tar cf - priv/*.xsd ) | (cd $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN); tar xf - ) + $(RM) yaws_generated.erl ../ebin/yaws_generated.beam 2>/dev/null || true + + docsinstall: +--- yaws-1.80.orig/Makefile ++++ yaws-1.80/Makefile +@@ -25,7 +25,7 @@ + @echo + @echo "** etc files went into ${ETCDIR}" + @echo "** executables went into ${prefix}/bin" +- @echo "** library files went into ${prefix}/lib/yaws" ++ @echo "** library files went into ${prefix}/lib/erlang/lib/yaws-$(YAWS_VSN)" + @echo "** var files went into ${VARDIR}" + @echo "** default docroot went into ${VARDIR}/yaws/www" + @echo +@@ -76,7 +76,7 @@ + @echo + @echo "** etc files will go into ${ETCDIR}" + @echo "** executables will go into ${prefix}/bin" +- @echo "** library file will go into ${prefix}/lib/yaws" ++ @echo "** library file will go into ${prefix}/lib/erlang/lib/yaws-$(YAWS_VSN)" + @echo "** var files will go into ${VARDIR}" + @echo + @echo "--------------------------------" +--- yaws-1.80.orig/c_src/Makefile ++++ yaws-1.80/c_src/Makefile +@@ -1,5 +1,5 @@ + include ../include.mk +- ++include ../vsn.mk + + # don't c-compile anything on win32 (yet) + # I don't know how to make a linked in driver using gcc, or any +@@ -32,12 +32,12 @@ + -rm -f $(PRIV_FILES) setuid_drv.$(OBJ) epam.$(OBJ) yaws_sendfile_drv.$(OBJ) hashtable.$(OBJ) + + install: $(PRIV_FILES) +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/priv/lib +- $(INSTALL) $(PRIV_FILES) $(DESTDIR)$(PREFIX)/lib/yaws/priv/lib ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/lib ++ $(INSTALL) $(PRIV_FILES) $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/lib + ifndef WIN32 +- if [ `id -u` = "0" -a -d $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam ]; then \ +- chown root $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam; \ +- chmod a+s $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam; \ ++ if [ `id -u` = "0" -a -d $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/lib/epam ]; then \ ++ chown root $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/lib/epam; \ ++ chmod a+s $(DESTDIR)$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/lib/epam; \ + fi + endif + +--- yaws-1.80.orig/scripts/Makefile ++++ yaws-1.80/scripts/Makefile +@@ -1,5 +1,5 @@ + include ../include.mk +- ++include ../vsn.mk + + all debug: ../bin/yaws yaws.conf + +@@ -40,7 +40,7 @@ + yaws.conf: + @echo PREFIX is $(PREFIX) + cat yaws.conf.template | \ +- ./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \ ++ ./Subst %yawsdir% "$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)" | \ + ./Subst %logdir% "$(VARDIR)/log/yaws" | \ + ./Subst %vardir% "$(VARDIR)" | \ + ./Subst %host% `hostname` | \ +--- yaws-1.80.orig/scripts/Install ++++ yaws-1.80/scripts/Install +@@ -19,10 +19,10 @@ + v=${vardir} + + install -d ${destdir}${prefix}/bin +-install -d ${destdir}${prefix}/etc ++install -d ${destdir}${etcdir} + + cat yaws.template | \ +- ./Subst %yawsdir% ${prefix}/lib/yaws | \ ++ ./Subst %yawsdir% ${prefix}/lib/erlang/lib/yaws-${YAWS_VSN} | \ + ./Subst %vardir% ${vardir} | \ + ./Subst %erl% "${erl}" | \ + ./Subst %run_erl% "${bindir}/run_erl" | \ +@@ -31,8 +31,8 @@ + + chmod +x ${destdir}${prefix}/bin/yaws + +-install -d ${destdir}${prefix}/lib/yaws/examples/ebin +-install -d ${destdir}${prefix}/lib/yaws/examples/include ++install -d ${destdir}${prefix}/lib/erlang/lib/yaws-${YAWS_VSN}/examples/ebin ++install -d ${destdir}${prefix}/lib/erlang/lib/yaws-${YAWS_VSN}/examples/include + + ## seems gentoo don't like to be installed in /usr/local/etc + ## since /sbin/runscript still reads /etc/conf.d +--- yaws-1.80.orig/www/embed.yaws ++++ yaws-1.80/www/embed.yaws +@@ -186,7 +186,7 @@ +

+-# erl -pa /usr/local/lib/yaws/ebin -yaws embedded true -s ybed
++# erl -yaws embedded true -s ybed
+

+ +@@ -199,7 +199,7 @@ + +

+ +-# erl -pa /usr/local/lib/yaws/ebin -yaws embedded true -s ybed ++# erl -yaws embedded true -s ybed + Erlang (BEAM) emulator version 5.3.b1 [source] [hipe] + + Eshell V5.3.b1 (abort with ^G) +--- yaws-1.80.orig/www/ybed.erl ++++ yaws-1.80/www/ybed.erl +@@ -8,7 +8,7 @@ + -module(ybed). + -compile(export_all). + +--include("/usr/local/lib/yaws/include/yaws.hrl"). ++-include_lib("yaws/include/yaws.hrl"). + + start() -> + application:start(yaws), --- yaws-1.81.orig/debian/patches/mime.diff +++ yaws-1.81/debian/patches/mime.diff @@ -0,0 +1,14 @@ +Patch makes using system wide mime.types instead of possibly outdated +mime.types, supplied by upstream. + +--- yaws-1.80.orig/src/mime_type_c.erl ++++ yaws-1.80/src/mime_type_c.erl +@@ -21,7 +21,7 @@ + + + c() -> +- {ok, F} = file:open("mime.types", [read]), ++ {ok, F} = file:open("/etc/mime.types", [read]), + io:format("Compiling mime.types ... > mime_types.erl ~n", []), + {ok, B} = file:read_file("charset.def"), + case string:tokens(binary_to_list(B)," \r\n\t" ++ [0, 12]) of --- yaws-1.81.orig/debian/patches/installapps.diff +++ yaws-1.81/debian/patches/installapps.diff @@ -0,0 +1,20 @@ +Patch makes yaws applications installing under /usr/lib/yaws directory +and docs installing to /usr/share/doc/yaws directory. + +--- yaws-1.80.orig/applications/yapp/Makefile ++++ yaws-1.80/applications/yapp/Makefile +@@ -24,8 +24,10 @@ + rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png + + install: all docs +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/ebin +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/priv/docroot +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/$(APPNAME)/doc +- (tar cf - ebin priv doc) | (cd $(DESTDIR)$(PREFIX)/lib/yapp; tar xf - ) ++ $(INSTALL) -d $(DESTDIR)/usr/lib/yaws/$(APPNAME)/ebin ++ $(INSTALL) -d $(DESTDIR)/usr/share/yaws-$(APPNAME) ++ $(INSTALL) -d $(DESTDIR)/usr/share/doc/yaws-$(APPNAME)/doc ++ (tar cf - ebin) | (cd $(DESTDIR)/usr/lib/yaws/$(APPNAME); tar xf - ) ++ (cd priv/docroot; tar cf - .) | (cd $(DESTDIR)/usr/share/yaws-$(APPNAME); tar xf - ) ++ (tar cf - doc) | (cd $(DESTDIR)/usr/share/doc/yaws-$(APPNAME); tar xf - ) + --- yaws-1.81.orig/debian/patches/gnu.diff +++ yaws-1.81/debian/patches/gnu.diff @@ -0,0 +1,37 @@ +Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture. + +--- yaws-1.80.orig/configure ++++ yaws-1.80/configure +@@ -3895,6 +3895,16 @@ + FPIC=-fPIC + + ;; ++ *gnu*) ++ cat >>confdefs.h <<\_ACEOF ++#define GNU 1 ++_ACEOF ++ ++ LD_SHARED="gcc -shared" ++ ++ FPIC=-fpic ++ ++ ;; + *cygwin*) + # Extract the first word of "werl", so it can be a program name with args. + set dummy werl; ac_word=$2 +--- yaws-1.80.orig/configure.in ++++ yaws-1.80/configure.in +@@ -246,6 +246,13 @@ + FPIC=-fPIC + AC_SUBST(FPIC) + ;; ++ *gnu*) ++ AC_DEFINE(GNU) ++ LD_SHARED="gcc -shared" ++ AC_SUBST(LD_SHARED) ++ FPIC=-fPIC ++ AC_SUBST(FPIC) ++ ;; + *cygwin*) + AC_PATH_PROG(WERL, werl) + AC_SUBST(WERL) --- yaws-1.81.orig/debian/patches/series +++ yaws-1.81/debian/patches/series @@ -0,0 +1,9 @@ +clean.diff +mime.diff +install.diff +installdocs.diff +installapps.diff +gnu.diff +man.diff +ctl.diff +docs.diff --- yaws-1.81.orig/debian/conf/yaws.conf +++ yaws-1.81/debian/conf/yaws.conf @@ -0,0 +1,154 @@ +# conf for yaws + + +# first we have a set of globals +# That apply to all virtual servers + + +# This is the directory where all logfiles for +# all virtual servers will be written + +logdir = /var/log/yaws + + +# This the path to a directory where additional +# beam code can be placed. The daemon will add this +# directory to its search path + +ebin_dir = /usr/lib/yaws/ebin + + +# This is a directory where application specific .hrl +# files can be placed. application specifig .yaws code can +# then include these .hrl files + +include_dir = /usr/lib/yaws/include + + +# This is a debug variable, possible values are http | traffic | false +# It is also possible to set the trace (possibly to the tty) while +# invoking yaws from the shell as in +# yaws -i -T -x (see man yaws) + +trace = false + + +# it is possible to have yaws start additional +# application specific code at startup + +# runmod = my_app + + +# By default yaws will copy the erlang error_log and +# end write it to a wrap log called report.log (in the logdir) +# this feature can be turned off. This would typically +# be the case when yaws runs within another larger app + +copy_error_log = true + + +# Logs are wrap logs + +log_wrap_size = 1000000 + + +# Possibly resolve all hostnames in logfiles so webalizer +# can produce the nice geography piechart + +log_resolve_hostname = false + + +# fail completely or not if yaws fails +# to bind a listen socket + +fail_on_bind_err = true + + +# If HTTP auth is used, it is possible to have a specific +# auth log. + +auth_log = true + + +# When we're running multiple yaws systems on the same +# host, we need to give each yaws system an individual +# name. Yaws will write a number of runtime files under +# /tmp/yaws/${id} +# The default value is "default" +# +# In Debian system init script supplies id from the command +# line, so it's not necessary to specify it here + +#id = debian_yaws + + +# earlier versions of Yaws picked the first virtual host +# in a list of hosts with the same IP/PORT when the Host: +# header doesn't match any name on any Host +# This is often nice in testing environments but not +# acceptable in real live hosting scenarios + +pick_first_virthost_on_nomatch = true + + +# All unices are broken since it's not possible to bind to +# a privileged port (< 1024) unless uid==0 +# There is a contrib in jungerl which makes it possible by means +# of an external setuid root programm called fdsrv to listen to +# to privileged port. +# If we use this feature, it requires fdsrv to be properly installed. +# Doesn't yet work with SSL. + +use_fdsrv = false + +# Load external config files. To add virtual server, don't +# edit this config file. Instead, put additional config to +# /etc/yaws/config.d/ and it will be sourced during yaws +# reload. + +subconfigdir = /etc/yaws/conf.d + +# End then a set of virtual server examples +# (If you want to use privileged port, run yaws as root, +# setting YAWS_USER in /etc/default/yaws, or use port +# redirection, e.g. via iptables.) + +# All virtual server examples are commented out. + +# First two virthosted servers on the same IP (0.0.0.0) +# in this case, but an explicit IP can be given as well + +# +# port = 8080 +# listen = 0.0.0.0 +# docroot = /var/www/yaws +# + +# +# port = 8080 +# listen = 0.0.0.0 +# docroot = /var/www/yaws-webdav +# dir_listings = true +# dav = true +# +# realm = foobar +# dir = / +# user = foo:bar +# user = baz:bar +# +# + + +# And then an ssl server + +# +# port = 8443 +# docroot = /var/www/yaws-ssl +# listen = 0.0.0.0 +# dir_listings = true +# +# keyfile = /etc/yaws/yaws-key.pem +# certfile = /etc/yaws/yaws-cert.pem +# +# + --- yaws-1.81.orig/debian/conf/yaws-yapp.conf +++ yaws-1.81/debian/conf/yaws-yapp.conf @@ -0,0 +1,31 @@ +# Configuration file for yaws-yapp + +# This the path to a directory where yapp +# beam code is placed. The daemon will add this +# directory to its search path + +ebin_dir = /usr/lib/yaws/yapp/ebin + + +# Start yapp at startup + +runmod = yapp + +# To enable yapp, also you should create Mnesia database +# scheme for running with Yaws. + +# Edit the following virtual server definition to +# enable web-GUI to list/add/remove Yaws applications. + +# +# port = 8080 +# listen = 0.0.0.0 +# docroot = /usr/share/yaws-yapp +# dir_listings = true +# arg_rewrite_mod = yapp +# +# yapp_server_id = yappexample +# bootstrap_yapps = yapp +# +# + --- yaws-1.81.orig/debian/conf/yaws-wiki.conf +++ yaws-1.81/debian/conf/yaws-wiki.conf @@ -0,0 +1,17 @@ +# Configuration file for yaws-wiki + +# This the path to a directory where wiki +# beam code is placed. The daemon will add this +# directory to its search path + +ebin_dir = /usr/lib/yaws/wiki/ebin + +# Edit the following virtual server definition to +# enable yaws wiki. + +# +# port = 8080 +# listen = 0.0.0.0 +# docroot = /var/lib/yaws-wiki +# + --- yaws-1.81.orig/debian/conf/localhost-ssl.conf +++ yaws-1.81/debian/conf/localhost-ssl.conf @@ -0,0 +1,24 @@ +# Configuration file for Yaws HTTP daemon + +# This config defines SSL-enabled virtual server localhost. +# It is enabled by default. If you want to disable it, remove +# symlink from /etc/yaws/conf.d/. + +# Instead you may edit this file and after that reload +# yaws configureation using invoke-rc.d yaws reload + +# (If you want to use privileged port, run yaws as root, +# setting YAWS_USER in /etc/default/yaws, or use port +# redirection, e.g. via iptables.) + + + port = 8443 + listen = 0.0.0.0 + docroot = /usr/share/yaws + # dir_listings = true + + keyfile = /etc/yaws/yaws-key.pem + certfile = /etc/yaws/yaws-cert.pem + + + --- yaws-1.81.orig/debian/conf/yaws-chat.conf +++ yaws-1.81/debian/conf/yaws-chat.conf @@ -0,0 +1,17 @@ +# Configuration file for yaws-chat + +# This the path to a directory where chat +# beam code is placed. The daemon will add this +# directory to its search path + +ebin_dir = /usr/lib/yaws/chat/ebin + +# Edit the following virtual server definition to +# enable chat server. + +# +# port = 8080 +# listen = 0.0.0.0 +# docroot = /usr/share/yaws-chat +# + --- yaws-1.81.orig/debian/conf/yaws-mail.conf +++ yaws-1.81/debian/conf/yaws-mail.conf @@ -0,0 +1,17 @@ +# Configuration file for yaws-mail + +# This the path to a directory where mail +# beam code is placed. The daemon will add this +# directory to its search path + +ebin_dir = /usr/lib/yaws/mail/ebin + +# Edit the following virtual server definition to +# enable webmail application. + +# +# port = 8080 +# listen = 0.0.0.0 +# docroot = /usr/share/yaws-mail +# + --- yaws-1.81.orig/debian/conf/localhost.conf +++ yaws-1.81/debian/conf/localhost.conf @@ -0,0 +1,20 @@ +# Configuration file for Yaws HTTP daemon + +# This config defines virtual server localhost. It is +# enabled by default. If you want to disable it, remove +# symlink from /etc/yaws/conf.d/. + +# Instead you may edit this file and after that reload +# yaws configureation using invoke-rc.d yaws reload + +# (If you want to use privileged port, run yaws as root, +# setting YAWS_USER in /etc/default/yaws, or use port +# redirection, e.g. via iptables.) + + + port = 8080 + listen = 0.0.0.0 + docroot = /usr/share/yaws + # dir_listings = true + +