[Pkg-erlang-commits] r1297 - in yaws/branches/experimental/debian: . conf patches

Fri Nov 19 11:59:11 UTC 2010

Author: sgolovan
Date: 2010-11-19 11:59:10 +0000 (Fri, 19 Nov 2010)
New Revision: 1297

Modified:
   yaws/branches/experimental/debian/changelog
   yaws/branches/experimental/debian/conf/yaws.conf
   yaws/branches/experimental/debian/control
   yaws/branches/experimental/debian/patches/clean.diff
   yaws/branches/experimental/debian/patches/ctl.diff
   yaws/branches/experimental/debian/patches/docs.diff
   yaws/branches/experimental/debian/patches/gnu.diff
   yaws/branches/experimental/debian/patches/install.diff
   yaws/branches/experimental/debian/patches/installapps.diff
   yaws/branches/experimental/debian/patches/installdocs.diff
   yaws/branches/experimental/debian/patches/man.diff
   yaws/branches/experimental/debian/patches/mime.diff
   yaws/branches/experimental/debian/rules
Log:
[yaws-experimental]
  * New upstream release.
  * Synchrinized config file with the upstream version.
  * Bumped standards version to 3.9.1.


Modified: yaws/branches/experimental/debian/changelog
===================================================================

--- yaws/branches/experimental/debian/changelog	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/changelog	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,8 +1,10 @@
-yaws (1.88-3) UNRELEASED; urgency=low
+yaws (1.89-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Synchrinized config file with the upstream version.
+  * Bumped standards version to 3.9.1.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 23 Jul 2010 17:50:21 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 19 Nov 2010 09:19:07 +0300
 
 yaws (1.88-2) unstable; urgency=low
 

Modified: yaws/branches/experimental/debian/conf/yaws.conf
===================================================================
--- yaws/branches/experimental/debian/conf/yaws.conf	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/conf/yaws.conf	2010-11-19 11:59:10 UTC (rev 1297)
@@ -31,6 +31,25 @@
 max_connections = nolimit
 
 
+# Normally, yaws does not restrict the number of times a connection is
+# kept alive using keepalive. Setting this parameter to an integer X
+# will ensure that connections are closed once they have been used X times.
+# This can be a useful to guard against long running connections
+# collecting too much garbage in the erlang VM.
+
+keepalive_maxuses = nolimit
+
+
+# Override the garbage collection option parameters for processes
+# which handle new connections. Useful for systems which expect long lived
+# connections which handle a lot of data. The default value is erlangs
+# default. Valid options are {fullsweep_after, X} and/or {min_heap_size, Y} where
+# X and Y are integers. See erlangs erlang:spawn_opt/4 function for more details.
+# The value type is a quoted string containing an erlang proplist
+
+process_options = "[]"
+
+
 # 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
@@ -39,10 +58,16 @@
 trace = false
 
 
+# Enable this if we want to use the old OTP ssl implementation
+# OTP R13B03 is known to work with this flag set         to false (default)
+
+use_old_ssl = false
+
+
 # it is possible to have yaws start additional 
 # application specific code at startup
 
-# runmod = my_app
+# runmod = mymodule
 
 
 # By default yaws will copy the erlang error_log and
@@ -97,6 +122,13 @@
 pick_first_virthost_on_nomatch = true
 
 
+# If the HTTP client session is to be kept alive, wait this many
+# milliseconds for a new request before timing out the connection. Note
+# that infinity is a valid value but it's not recommended.
+
+keepalive_timeout = 30000
+
+
 # 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 
@@ -104,9 +136,12 @@
 # to privileged port.
 # If we use this feature, it requires fdsrv to be properly installed.
 # Doesn't yet work with SSL.
+# Read http://yaws.hyber.org/privbind.yaws for more info and a better
+# solution than fd_srv
 
 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
@@ -114,7 +149,8 @@
 
 subconfigdir = /etc/yaws/conf.d
 
-# End then a set of virtual server examples
+
+# And 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.)

Modified: yaws/branches/experimental/debian/control
===================================================================
--- yaws/branches/experimental/debian/control	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/control	2010-11-19 11:59:10 UTC (rev 1297)
@@ -7,7 +7,7 @@
  erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia,
  texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended,
  texlive-font-utils, texlive-extra-utils, ghostscript, quilt
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://yaws.hyber.org/
 Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/yaws/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/yaws/trunk/

Modified: yaws/branches/experimental/debian/patches/clean.diff
===================================================================
--- yaws/branches/experimental/debian/patches/clean.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/clean.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,7 +1,7 @@
 Patch fixes cleaning up after build process.
 
---- yaws-1.88.orig/Makefile
-+++ yaws-1.88/Makefile
+--- yaws-1.89.orig/Makefile
++++ yaws-1.89/Makefile
 @@ -37,6 +37,7 @@
  
  conf_clean:
@@ -10,8 +10,8 @@
  
  local_install: all
  	(cd scripts && $(MAKE) local_install)
---- yaws-1.88.orig/doc/Makefile
-+++ yaws-1.88/doc/Makefile
+--- yaws-1.89.orig/doc/Makefile
++++ yaws-1.89/doc/Makefile
 @@ -41,6 +41,7 @@
  
  clean:
@@ -20,8 +20,8 @@
  
  install:
  	-install -d $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN)
---- yaws-1.88.orig/applications/wiki/scripts/Makefile
-+++ yaws-1.88/applications/wiki/scripts/Makefile
+--- yaws-1.89.orig/applications/wiki/scripts/Makefile
++++ yaws-1.89/applications/wiki/scripts/Makefile
 @@ -27,7 +27,7 @@
  	chmod +x $@
  
@@ -31,8 +31,8 @@
  
  
  install:
---- yaws-1.88.orig/applications/yapp/Makefile
-+++ yaws-1.88/applications/yapp/Makefile
+--- yaws-1.89.orig/applications/yapp/Makefile
++++ yaws-1.89/applications/yapp/Makefile
 @@ -21,7 +21,7 @@
  	$(ERL) -noshell  -run edoc_run application "'$(APPNAME)'" '"."' '$(DOC_OPTS)' -s init stop
  

Modified: yaws/branches/experimental/debian/patches/ctl.diff
===================================================================
--- yaws/branches/experimental/debian/patches/ctl.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/ctl.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,9 +1,9 @@
 Patch adds processing the case when ctlfile is parsable but its
 content is invalid.
 
---- yaws-1.88.orig/src/yaws_ctl.erl
-+++ yaws-1.88/src/yaws_ctl.erl
-@@ -384,6 +384,8 @@
+--- yaws-1.89.orig/src/yaws_ctl.erl
++++ yaws-1.89/src/yaws_ctl.erl
+@@ -385,6 +385,8 @@
                  Err ->
                      Err
              end;
@@ -12,7 +12,7 @@
          Err ->
              Err
      end.
-@@ -404,6 +406,13 @@
+@@ -405,6 +407,13 @@
              io:format("No yaws system responds~n",[]),
              timer:sleep(10),
              erlang:halt(2);

Modified: yaws/branches/experimental/debian/patches/docs.diff
===================================================================
--- yaws/branches/experimental/debian/patches/docs.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/docs.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -2,8 +2,8 @@
 docs. Also, it renames \ifpdf to \ifpdfoutput to avoid clash with ifpdf
 package (sourced by geometry package in TeXLive 2009).
 
---- yaws-1.88.orig/doc/Makefile
-+++ yaws-1.88/doc/Makefile
+--- yaws-1.89.orig/doc/Makefile
++++ yaws-1.89/doc/Makefile
 @@ -17,9 +17,6 @@
  	@if [ -z "$(PDFLATEX)" ]; then \
  		echo "Need pdflatex"; exit 1; \
@@ -14,34 +14,10 @@
  
  
  
---- yaws-1.88.orig/doc/yaws.tex
-+++ yaws-1.88/doc/yaws.tex
-@@ -1,18 +1,18 @@
- \documentclass[11pt,oneside,english]{book}
--\newif\ifpdf
-+\newif\ifpdfoutput
- \ifx\pdfoutput\undefined
--   \pdffalse              % we are not running PDFLaTeX
-+   \pdfoutputfalse              % we are not running PDFLaTeX
- \else
-    \ifnum \pdfoutput=0    % we are running PDFLaTeX generating DVI
--      \pdffalse
-+      \pdfoutputfalse
-    \else
-       \ifnum \pdfoutput=1 % we are running PDFLaTeX generating PDF
--      \pdftrue
-+      \pdfoutputtrue
-       \fi
-    \fi
- \fi
+--- yaws-1.89.orig/doc/yaws.tex
++++ yaws-1.89/doc/yaws.tex
+@@ -34,7 +34,7 @@
  
--\ifpdf
-+\ifpdfoutput
-   \usepackage[pdftex]{graphicx}
-   \pdfcompresslevel=9
-   \DeclareGraphicsExtensions{.png,.jpg,.pdf,.mps}
-@@ -44,7 +44,7 @@
- 
  \usepackage[T1]{fontenc}
  \usepackage{xspace}
 -\usepackage{html}

Modified: yaws/branches/experimental/debian/patches/gnu.diff
===================================================================
--- yaws/branches/experimental/debian/patches/gnu.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/gnu.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.88.orig/configure
-+++ yaws-1.88/configure
-@@ -4099,6 +4099,16 @@
+--- yaws-1.89.orig/configure
++++ yaws-1.89/configure
+@@ -4126,6 +4126,16 @@
             FPIC=-fPIC
  
             ;;
@@ -19,8 +19,8 @@
           *cygwin*)
             # Extract the first word of "werl", so it can be a program name with args.
  set dummy werl; ac_word=$2
---- yaws-1.88.orig/configure.in
-+++ yaws-1.88/configure.in
+--- yaws-1.89.orig/configure.in
++++ yaws-1.89/configure.in
 @@ -256,6 +256,13 @@
             FPIC=-fPIC
             AC_SUBST(FPIC)

Modified: yaws/branches/experimental/debian/patches/install.diff
===================================================================
--- yaws/branches/experimental/debian/patches/install.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/install.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,8 +1,8 @@
 Patch fixes logdir and etcdir. Also yaws paths in the examples are
 corrected.
 
---- yaws-1.88.orig/scripts/Makefile
-+++ yaws-1.88/scripts/Makefile
+--- yaws-1.89.orig/scripts/Makefile
++++ yaws-1.89/scripts/Makefile
 @@ -41,7 +41,7 @@
  	@echo PREFIX is $(PREFIX)
  	cat yaws.conf.template | \
@@ -12,8 +12,8 @@
  		./Subst %vardir% "$(VARDIR)"  | \
  		./Subst %host% `hostname`  | \
  		./Subst %port% 80  | \
---- yaws-1.88.orig/scripts/Install
-+++ yaws-1.88/scripts/Install
+--- yaws-1.89.orig/scripts/Install
++++ yaws-1.89/scripts/Install
 @@ -19,7 +19,7 @@
  v=${vardir}
  
@@ -23,34 +23,3 @@
  install -d ${destdir}${vardir}/log/yaws
  
  cat yaws.template | \
---- yaws-1.88.orig/www/embed.yaws
-+++ yaws-1.88/www/embed.yaws
-@@ -186,7 +186,7 @@
-   </p>
- <div class="box">
-   <pre>
--# erl -pa /usr/local/lib/yaws/ebin -yaws embedded true -s ybed
-+# erl -pa /usr/lib/yaws/ebin -yaws embedded true -s ybed
-   </pre>
- </div>
- 
-@@ -199,7 +199,7 @@
- 
- <div class="box">
-   <verbatim>
--#  erl -pa /usr/local/lib/yaws/ebin -yaws embedded true -s ybed
-+#  erl -pa /usr/lib/yaws/ebin -yaws embedded true -s ybed
- Erlang (BEAM) emulator version 5.3.b1 [source] [hipe]
- 
- Eshell V5.3.b1  (abort with ^G)
---- yaws-1.88.orig/www/ybed.erl
-+++ yaws-1.88/www/ybed.erl
-@@ -8,7 +8,7 @@
- -module(ybed).
- -compile(export_all).
- 
---include("/usr/local/lib/yaws/include/yaws.hrl").
-+-include("/usr/lib/yaws/include/yaws.hrl").
- 
- start() ->
-     application:start(yaws),

Modified: yaws/branches/experimental/debian/patches/installapps.diff
===================================================================
--- yaws/branches/experimental/debian/patches/installapps.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/installapps.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,8 +1,8 @@
 Patch makes yaws applications installing under /usr/lib/yaws directory
 and docs installing to /usr/share/doc/yaws directory.
 
---- yaws-1.88.orig/applications/yapp/Makefile
-+++ yaws-1.88/applications/yapp/Makefile
+--- yaws-1.89.orig/applications/yapp/Makefile
++++ yaws-1.89/applications/yapp/Makefile
 @@ -24,8 +24,10 @@
  	rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
  

Modified: yaws/branches/experimental/debian/patches/installdocs.diff
===================================================================
--- yaws/branches/experimental/debian/patches/installdocs.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/installdocs.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -2,8 +2,8 @@
 yaws version number in directory name, see section 12.3 of
 Debian Policy Manual).
 
---- yaws-1.88.orig/doc/Makefile
-+++ yaws-1.88/doc/Makefile
+--- yaws-1.89.orig/doc/Makefile
++++ yaws-1.89/doc/Makefile
 @@ -44,6 +44,5 @@
  	rm  -f *.out ../www/yaws.ps ../www/yaws.pdf 2> /dev/null || true
  

Modified: yaws/branches/experimental/debian/patches/man.diff
===================================================================
--- yaws/branches/experimental/debian/patches/man.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/man.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,8 +1,8 @@
 Patch fixes erros in yaws manual pages.
 
---- yaws-1.88.orig/man/yaws.conf.5
-+++ yaws-1.88/man/yaws.conf.5
-@@ -202,11 +202,11 @@
+--- yaws-1.89.orig/man/yaws.conf.5
++++ yaws-1.89/man/yaws.conf.5
+@@ -228,11 +228,11 @@
  .SH SERVER PART
  Yaws can virthost several web servers on the same IP address as well
  as several web servers on different IP addresses. This includes SSL servers.
@@ -15,8 +15,8 @@
 +.PP
  The following directives are allowed inside a server definition.
  .TP
- \fBport = Port \fR
-@@ -260,7 +260,7 @@
+ \fBport = Port\fR
+@@ -286,7 +286,7 @@
  
  <extra_cgi_vars dir='/path/to/some/scripts'>
  var = val
@@ -25,25 +25,7 @@
  </extra_cgi_vars>
  .fi
  
-@@ -270,7 +270,7 @@
- 
- .TP
- \fBfcgi_app_server = Host:Port \fR
--The hostname and TCP port number of the FastCGI aplication server.
-+The hostname and TCP port number of the FastCGI application server.
- The TCP port number is not optional.
- There is no default value.
- 
-@@ -304,7 +304,7 @@
- \fBpartial_post_size = Integer | nolimit\fR
- When a yaws file receives large POSTs, the amount of data received
- in each chunk is determined by the this parameter.
--The deafult value is 10240.
-+The default value is 10240.
- 
- 
- .TP
-@@ -429,7 +429,7 @@
+@@ -458,7 +458,7 @@
  At startup of the server, Module:start/1 will be called.
  The #sconf{} record (defined in yaws.hrl) will be used
  as the input argument. This makes it possible for a user
@@ -52,17 +34,17 @@
  as well as getting hold of user specific configuration data,
  see the explanation for the <opaque> context.
  
-@@ -658,7 +658,7 @@
+@@ -715,7 +715,7 @@
  </server>
  .fi
  
 -.pp
 +.PP
- And this example shows a similar setup but two web servers on the same IP address
+ And this example shows a similar setup but two web servers on the same
+ IP address.
  
- .nf
---- yaws-1.88.orig/man/yaws_api.5
-+++ yaws-1.88/man/yaws_api.5
+--- yaws-1.89.orig/man/yaws_api.5
++++ yaws-1.89/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
@@ -74,7 +56,7 @@
  The Pid must typically be passed (somehow) to the producer of the stream.
  
  .TP
-@@ -609,7 +609,7 @@
+@@ -618,7 +618,7 @@
  
  .TP
  \fB{streamcontent_with_timeout, MimeType, FirstChunk, Timeout}\fR

Modified: yaws/branches/experimental/debian/patches/mime.diff
===================================================================
--- yaws/branches/experimental/debian/patches/mime.diff	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/patches/mime.diff	2010-11-19 11:59:10 UTC (rev 1297)
@@ -1,8 +1,8 @@
 Patch makes using system wide mime.types instead of possibly outdated
 mime.types, supplied by upstream.
 
---- yaws-1.88.orig/src/mime_type_c.erl
-+++ yaws-1.88/src/mime_type_c.erl
+--- yaws-1.89.orig/src/mime_type_c.erl
++++ yaws-1.89/src/mime_type_c.erl
 @@ -21,7 +21,7 @@
  
  

Modified: yaws/branches/experimental/debian/rules
===================================================================
--- yaws/branches/experimental/debian/rules	2010-11-19 06:04:29 UTC (rev 1296)
+++ yaws/branches/experimental/debian/rules	2010-11-19 11:59:10 UTC (rev 1297)
@@ -6,7 +6,7 @@
 # dh-make output file, you may use that output file without restriction.
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
-VSN=1.88
+VSN=1.89
 
 export HOME := $(CURDIR)/debian
 


