[Pkg-erlang-commits] r1170 - in yaws/trunk/debian: . conf patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Jan 15 20:32:01 UTC 2010
Author: sgolovan
Date: 2010-01-15 20:32:01 +0000 (Fri, 15 Jan 2010)
New Revision: 1170
Added:
yaws/trunk/debian/yaws-doc.dirs
yaws/trunk/debian/yaws-doc.install
yaws/trunk/debian/yaws-doc.links
yaws/trunk/debian/yaws.README.Debian
yaws/trunk/debian/yaws.lintian-overrides
Removed:
yaws/trunk/debian/yaws.files
yaws/trunk/debian/yaws.lintian-override
Modified:
yaws/trunk/debian/changelog
yaws/trunk/debian/conf/yaws.conf
yaws/trunk/debian/control
yaws/trunk/debian/patches/install.diff
yaws/trunk/debian/patches/man.diff
yaws/trunk/debian/rules
yaws/trunk/debian/yaws.dirs
yaws/trunk/debian/yaws.init
yaws/trunk/debian/yaws.install
Log:
[yaws]
* New upstream release.
* Moved Yaws binaries to /usr/lib/yaws directory to follow upstream closer
and to make sure that private Yaws modules don't clash with any other
application. The drawback is that now one has to add -pa /usr/lib/yaws/ebin
to the command line if he wants to use Yaws in embedded mode.
* Split out yaws-doc package which contains documentation in PDF and
examples.
* Added README.Debian in which clarified how to change epam permissions in
case when it has to be suid or sgid binary.
* Don't create /var/run/yaws in Yaws init script because this directory is
no longer used. Also, change working dir to /var/cache/yaws before starting
the daemon because Erlang issues warnings about inaccessible modules if
the current dir isn't readable by yaws user.
Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/changelog 2010-01-15 20:32:01 UTC (rev 1170)
@@ -1,8 +1,20 @@
-yaws (1.86-3) UNRELEASED; urgency=low
+yaws (1.87-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Moved Yaws binaries to /usr/lib/yaws directory to follow upstream closer
+ and to make sure that private Yaws modules don't clash with any other
+ application. The drawback is that now one has to add -pa /usr/lib/yaws/ebin
+ to the command line if he wants to use Yaws in embedded mode.
+ * Split out yaws-doc package which contains documentation in PDF and
+ examples.
+ * Added README.Debian in which clarified how to change epam permissions in
+ case when it has to be suid or sgid binary.
+ * Don't create /var/run/yaws in Yaws init script because this directory is
+ no longer used. Also, change working dir to /var/cache/yaws before starting
+ the daemon because Erlang issues warnings about inaccessible modules if
+ the current dir isn't readable by yaws user.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 13 Dec 2009 16:21:57 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 15 Jan 2010 23:27:01 +0300
yaws (1.86-2) unstable; urgency=low
Modified: yaws/trunk/debian/conf/yaws.conf
===================================================================
--- yaws/trunk/debian/conf/yaws.conf 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/conf/yaws.conf 2010-01-15 20:32:01 UTC (rev 1170)
@@ -15,16 +15,22 @@
# beam code can be placed. The daemon will add this
# directory to its search path
-ebin_dir = /usr/lib/yaws/ebin
+ebin_dir = /usr/lib/yaws/custom/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
+include_dir = /usr/lib/yaws/custom/include
+# Set this to an integer value to control
+# max number of connections from clients into the server
+
+max_connections = nolimit
+
+
# 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
Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/control 2010-01-15 20:32:01 UTC (rev 1170)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Erlang Packagers <pkg-erlang-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev,
- erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia, mime-support, libpam0g-dev,
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, mime-support, libpam0g-dev,
+ 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.8.3
@@ -15,8 +15,10 @@
Package: yaws
Architecture: any
Provides: httpd, httpd-cgi
-Depends: ${erlang-abi:Depends}, ${erlang:Depends}, adduser, openssl, ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${erlang-dev:Depends}, yaws-chat, yaws-mail, yaws-wiki, yaws-yapp, zip, bzip2
+Depends: ${erlang-abi:Depends}, ${erlang:Depends}, adduser, openssl,
+ ${shlibs:Depends}, ${misc:Depends}
+Suggests: ${erlang-dev:Depends}, yaws-doc, 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
@@ -27,24 +29,30 @@
.
Embedded mode where Yaws runs as an embedded webserver in another Erlang
application.
+
+Package: yaws-doc
+Section: doc
+Architecture: all
+Suggests: yaws
+Replaces: yaws (<< 1.87)
+Description: Documentation and examples for Yaws web server
+ 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.
.
- 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.
+ This package includes Yaws documentation and examples.
Package: yaws-chat
Section: web
Architecture: all
-Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0)
+Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
Description: Chat application for Yaws web server
Yaws-chat allows to create a very simple web-based chatroom.
Package: yaws-mail
Section: web
Architecture: all
-Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0)
+Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
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.
@@ -52,7 +60,7 @@
Package: yaws-wiki
Section: web
Architecture: all
-Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0)
+Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
Description: Wiki application for Yaws web server
Yaws-wiki is a small wiki application, written in Erlang for Yaws
web server.
@@ -60,7 +68,7 @@
Package: yaws-yapp
Section: web
Architecture: all
-Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), yaws (<< ${binary:Version}.0)
+Depends: ${erlang:Depends}, yaws (>= ${binary:Version}), ${misc:Depends}
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
Modified: yaws/trunk/debian/patches/install.diff
===================================================================
--- yaws/trunk/debian/patches/install.diff 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/patches/install.diff 2010-01-15 20:32:01 UTC (rev 1170)
@@ -1,102 +1,20 @@
-Patch makes yaws installing into /usr/lib/erlang/lib hierarchy to
-make its use more convenient. Also yaws paths in the examples are
+Patch fixes logdir and etcdir. Also yaws paths in the examples are
corrected.
---- yaws-1.86.orig/src/Makefile
-+++ yaws-1.86/src/Makefile
-@@ -101,15 +101,15 @@
- rm -f $(EBIN_FILES) yaws_generated.erl charset.def mime_types.erl yaws_configure.hrl ../ebin/*.beam
-
- 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.86.orig/Makefile
-+++ yaws-1.86/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
-@@ -77,7 +77,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.86.orig/c_src/Makefile
-+++ yaws-1.86/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.86.orig/scripts/Makefile
+++ yaws-1.86/scripts/Makefile
-@@ -1,5 +1,5 @@
- include ../include.mk
--
-+include ../vsn.mk
-
- all debug: ../bin/yaws yaws.conf
-
-@@ -40,8 +40,8 @@
- yaws.conf:
+@@ -41,7 +41,7 @@
@echo PREFIX is $(PREFIX)
cat yaws.conf.template | \
-- ./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \
+ ./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \
- ./Subst %logdir% "$(PREFIX)/var/log/yaws" | \
-+ ./Subst %yawsdir% "$(PREFIX)/lib/erlang/lib/yaws-$(YAWS_VSN)" | \
+ ./Subst %logdir% "/var/log/yaws" | \
./Subst %vardir% "$(VARDIR)" | \
./Subst %host% `hostname` | \
./Subst %port% 80 | \
--- yaws-1.86.orig/scripts/Install
+++ yaws-1.86/scripts/Install
-@@ -19,11 +19,11 @@
+@@ -19,7 +19,7 @@
v=${vardir}
install -d ${destdir}${prefix}/bin
@@ -105,22 +23,6 @@
install -d ${destdir}${vardir}/log/yaws
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" | \
-@@ -32,8 +32,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.86.orig/www/embed.yaws
+++ yaws-1.86/www/embed.yaws
@@ -186,7 +186,7 @@
@@ -128,7 +30,7 @@
<div class="box">
<pre>
-# erl -pa /usr/local/lib/yaws/ebin -yaws embedded true -s ybed
-+# erl -yaws embedded true -s ybed
++# erl -pa /usr/lib/yaws/ebin -yaws embedded true -s ybed
</pre>
</div>
@@ -137,7 +39,7 @@
<div class="box">
<verbatim>
-# erl -pa /usr/local/lib/yaws/ebin -yaws embedded true -s ybed
-+# erl -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)
@@ -148,7 +50,7 @@
-compile(export_all).
--include("/usr/local/lib/yaws/include/yaws.hrl").
-+-include_lib("yaws/include/yaws.hrl").
++-include("/usr/lib/yaws/include/yaws.hrl").
start() ->
application:start(yaws),
Modified: yaws/trunk/debian/patches/man.diff
===================================================================
--- yaws/trunk/debian/patches/man.diff 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/patches/man.diff 2010-01-15 20:32:01 UTC (rev 1170)
@@ -25,6 +25,33 @@
</extra_cgi_vars>
.fi
+@@ -266,7 +266,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.
+
+@@ -420,7 +420,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
+-application to syncronize the startup with the yaws server
++application to synchronize the startup with the yaws server
+ as well as getting hold of user specific configuration data,
+ see the explanation for the <opaque> context.
+
+@@ -589,7 +589,7 @@
+ pair.
+
+ The usage of User:Password in the actual config file is deprecated
+-as of release 1.51. It is prefered to have the users in a file called
++as of release 1.51. It is preferred to have the users in a file called
+ \fI.yaws_auth\fR in the actual directory. The .yaws_auth file has to be
+ file parseable by \fIfile:consult/1\fR
+
@@ -646,7 +646,7 @@
</server>
.fi
Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/rules 2010-01-15 20:32:01 UTC (rev 1170)
@@ -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.86
+VSN=1.87
export HOME := $(CURDIR)/debian
@@ -20,6 +20,7 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DESTDIR=$(CURDIR)/debian/yaws
+TMPDIR=$(CURDIR)/debian/tmp
-include vsn.mk
@@ -68,6 +69,7 @@
dh_testdir
#
# Compile the package.
+ mkdir -p examples/ebin
TYPE="$(TYPE)" $(MAKE) DLL_LIBS=-lc
$(MAKE) docs
#
@@ -80,7 +82,7 @@
# Build applications included into yaws distribution
for appdir in applications/* ; do \
(cd $$appdir ; \
- mkdir ebin ; \
+ mkdir -p ebin ; \
TYPE="$(TYPE)" $(MAKE) || exit 1) \
done
#
@@ -114,48 +116,29 @@
install-arch: build-arch
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs -a
#
# Install the package into debian/yaws.
- $(MAKE) install DESTDIR=$(DESTDIR)
+ $(MAKE) install DESTDIR=$(TMPDIR)
#
# Fix location of epam binary
- mv $(DESTDIR)/usr/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/lib/epam \
- $(DESTDIR)/usr/lib/erlang/lib/yaws-$(YAWS_VSN)/priv/
+ mv $(TMPDIR)/usr/lib/yaws/priv/lib/epam $(TMPDIR)/usr/lib/yaws/priv/
#
# Fix permissions on examples
- chmod a-x $(DESTDIR)/var/yaws/www/testdir/index.html
+ chmod a-x $(TMPDIR)/var/yaws/www/testdir/index.html
#
- # Remove init script shipped with yaws
- rm -rf $(DESTDIR)/etc/yaws/init.d
- #
- # Remove errant .xvpics directory
- rm -rf $(DESTDIR)/var/yaws/www/.xvpics
- #
# Remove duplicated headers
- rm -f $(DESTDIR)/usr/lib/erlang/lib/yaws-$(YAWS_VSN)/*.hrl
+ rm -f $(TMPDIR)/usr/lib/yaws/*.hrl
#
- # Remove useless empty files
- find $(DESTDIR) -type f -name '.*' -print -exec rm -f \{\} \;
+ # Remove useless .empty files and .xvpics directory
+ find $(TMPDIR) -type f -name '.*' -print -exec rm -rf \{\} \;
#
- # Remove SSL certificates
- rm -f $(DESTDIR)/etc/yaws/*.pem
- #
- # Move /var/yaws into the examples directory
- mv $(DESTDIR)/var/yaws/* $(DESTDIR)/usr/share/doc/yaws/examples/
- rmdir $(DESTDIR)/var/yaws
- #
# Remove empty directories
- rm -rf $(DESTDIR)/usr/lib/erlang/lib/yaws-$(YAWS_VSN)/examples/
- #
- # Remove /var/run/yaws
- rm -rf $(DESTDIR)/var/run
+ rm -rf $(TMPDIR)/usr/lib/yaws/examples/
install-indep: build-indep
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs -i
#
# Install applications (and READMEs) included into yaws distribution
@@ -193,30 +176,18 @@
done
# Build architecture-independent files here.
-binary-indep: install-indep
+binary-indep: install-arch install-indep
dh_testdir -i
dh_testroot -i
dh_installchangelogs -i ChangeLog
dh_installdocs -i
dh_installexamples -i
dh_install -i
-# dh_installmenu -i
-# dh_installdebconf -i
-# dh_installlogrotate -i
-# dh_installemacsen -i
-# dh_installpam -i
-# dh_installmime -i
-# dh_installinit -i
-# dh_installcron -i
-# dh_installinfo -i
dh_installman -i
dh_link -i
dh_strip -i
dh_compress -i -X.erl -X.beam -X.yaws -X.pdf -X .ps
dh_fixperms -i
-# dh_perl -i
-# dh_python -i
-# dh_makeshlibs -i
dh_installdeb -i
dh_shlibdeps -i
erlang-depends -i
@@ -232,25 +203,14 @@
dh_installdocs -a
dh_installexamples -a
dh_install -a
- install -m 644 debian/yaws.lintian-override \
+ install -m 644 debian/yaws.lintian-overrides \
$(DESTDIR)/usr/share/lintian/overrides/yaws
-# dh_installmenu -a
-# dh_installdebconf -a
-# dh_installlogrotate -a
-# dh_installemacsen -a
-# dh_installpam -a
-# dh_installmime -a
dh_installinit -a
-# dh_installcron -a
-# dh_installinfo -a
dh_installman -a
dh_link -a
dh_strip -a
dh_compress -a -X.erl -X.beam -X.yaws -X.pdf -X.ps
dh_fixperms -a
-# dh_perl -a
-# dh_python -a
-# dh_makeshlibs -a
dh_installdeb -a
dh_shlibdeps -a
erlang-depends -a
Added: yaws/trunk/debian/yaws-doc.dirs
===================================================================
--- yaws/trunk/debian/yaws-doc.dirs (rev 0)
+++ yaws/trunk/debian/yaws-doc.dirs 2010-01-15 20:32:01 UTC (rev 1170)
@@ -0,0 +1 @@
+/usr/share/doc/yaws-doc/examples
Added: yaws/trunk/debian/yaws-doc.install
===================================================================
--- yaws/trunk/debian/yaws-doc.install (rev 0)
+++ yaws/trunk/debian/yaws-doc.install 2010-01-15 20:32:01 UTC (rev 1170)
@@ -0,0 +1 @@
+debian/tmp/var/yaws/* usr/share/doc/yaws-doc/examples/
Added: yaws/trunk/debian/yaws-doc.links
===================================================================
--- yaws/trunk/debian/yaws-doc.links (rev 0)
+++ yaws/trunk/debian/yaws-doc.links 2010-01-15 20:32:01 UTC (rev 1170)
@@ -0,0 +1 @@
+usr/share/doc/yaws-doc/examples/www/yaws.pdf usr/share/doc/yaws-doc/yaws.pdf
Added: yaws/trunk/debian/yaws.README.Debian
===================================================================
--- yaws/trunk/debian/yaws.README.Debian (rev 0)
+++ yaws/trunk/debian/yaws.README.Debian 2010-01-15 20:32:01 UTC (rev 1170)
@@ -0,0 +1,17 @@
+Yaws allows to use PAM for authentication purposes. Though epam binary
+which is used for that isn't suid root (this doesn't allow to authenticate
+using shadow system passwords). The local administrator may want to
+override permissions for /usr/lib/yaws/priv/epam.
+
+To make it sgid shadow run
+
+dpkg-statoverride --add root shadow 02755 /usr/lib/yaws/priv/epam
+
+To make it suid root run
+
+dpkg-statoverride --add root yaws 04750 /usr/lib/yaws/priv/epam
+
+In the latter case only yaws (in fact, all users in group yaws) will be
+able to execute the binary.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 15 Jan 2010 14:30:39 +0300
Property changes on: yaws/trunk/debian/yaws.README.Debian
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: yaws/trunk/debian/yaws.dirs
===================================================================
--- yaws/trunk/debian/yaws.dirs 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/yaws.dirs 2010-01-15 20:32:01 UTC (rev 1170)
@@ -1,8 +1,7 @@
etc/yaws/conf.avail
etc/yaws/conf.d
usr/bin
-usr/lib/yaws/ebin
-usr/lib/yaws/include
-usr/share/doc/yaws/examples
+usr/lib/yaws/custom/ebin
+usr/lib/yaws/custom/include
usr/share/lintian/overrides
usr/share/yaws
Deleted: yaws/trunk/debian/yaws.files
===================================================================
--- yaws/trunk/debian/yaws.files 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/yaws.files 2010-01-15 20:32:01 UTC (rev 1170)
@@ -1,4 +0,0 @@
-usr/bin/*
-usr/lib/erlang/*
-usr/share/doc/yaws/*
-usr/share/man/*
Modified: yaws/trunk/debian/yaws.init
===================================================================
--- yaws/trunk/debian/yaws.init 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/yaws.init 2010-01-15 20:32:01 UTC (rev 1170)
@@ -25,6 +25,7 @@
NAME="yaws web server"
DESC=yaws
YAWS_USER=yaws
+YAWS_USER_HOME=/var/cache/yaws
YAWS_ID=debian_yaws
test -x $DAEMON || exit 0
@@ -34,12 +35,9 @@
. /etc/default/yaws
fi
-if [ ! -d /var/run/yaws ] ; then
- install -o yaws -g yaws -m 750 -d /var/run/yaws
-fi
-
daemon()
{
+ cd $YAWS_USER_HOME
script="$DAEMON -I $YAWS_ID $@"
su $YAWS_USER -c "$script"
}
Modified: yaws/trunk/debian/yaws.install
===================================================================
--- yaws/trunk/debian/yaws.install 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/yaws.install 2010-01-15 20:32:01 UTC (rev 1170)
@@ -1,3 +1,6 @@
+debian/tmp/usr/bin /usr/
+debian/tmp/usr/lib /usr/
+debian/tmp/usr/share/man /usr/share/
debian/conf/yaws.conf /etc/yaws/
debian/conf/localhost.conf /etc/yaws/conf.avail/
debian/conf/localhost-ssl.conf /etc/yaws/conf.avail/
Deleted: yaws/trunk/debian/yaws.lintian-override
===================================================================
--- yaws/trunk/debian/yaws.lintian-override 2010-01-13 19:37:40 UTC (rev 1169)
+++ yaws/trunk/debian/yaws.lintian-override 2010-01-15 20:32:01 UTC (rev 1170)
@@ -1,3 +0,0 @@
-yaws: package-contains-empty-directory usr/lib/yaws/ebin/
-yaws: package-contains-empty-directory usr/lib/yaws/include/
-yaws: virtual-package-depends-without-real-package-depends
Copied: yaws/trunk/debian/yaws.lintian-overrides (from rev 1071, yaws/trunk/debian/yaws.lintian-override)
===================================================================
--- yaws/trunk/debian/yaws.lintian-overrides (rev 0)
+++ yaws/trunk/debian/yaws.lintian-overrides 2010-01-15 20:32:01 UTC (rev 1170)
@@ -0,0 +1,3 @@
+yaws: package-contains-empty-directory usr/lib/yaws/custom/ebin/
+yaws: package-contains-empty-directory usr/lib/yaws/custom/include/
+yaws: virtual-package-depends-without-real-package-depends
Property changes on: yaws/trunk/debian/yaws.lintian-overrides
___________________________________________________________________
Added: svn:mergeinfo
+
More information about the Pkg-erlang-commits
mailing list