Version bump on behalf of Christian Affolter.

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

4 files changed, 322 insertions, 1 deletions

diff --git a/www-apps/webdavcgi/ChangeLog b/www-apps/webdavcgi/ChangeLog
index 5aca92390b2a..43dcc3979954 100644
--- a/www-apps/webdavcgi/ChangeLog
+++ b/www-apps/webdavcgi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/webdavcgi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/ChangeLog,v 1.4 2013/03/17 17:45:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/ChangeLog,v 1.5 2013/04/05 16:03:32 dev-zero Exp $
+
+*webdavcgi-0.8.4 (30 Mar 2013)
+
+  30 Mar 2013; Christian Affolter <c.affolter@stepping-stone.ch>
+  +webdavcgi-0.8.4.ebuild, +files/apache-webdavcgi-0.8-example.conf,
+  +files/webdav-0.8.conf:
+  Version bump to 0.8.4. Complete rewrite with droped webapp eclass, as there's
+  no need to install WebDAV CGI via webapp-config. All the files can be
+  centrally installed and shared by multiple instances, without a single file
+  residing within the web server's document root.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
new file mode 100644
index 000000000000..58bef75eadb1
--- /dev/null
+++ b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
@@ -0,0 +1,59 @@
+# Example Apache HTTP server configuration snippet for WebDAV CGI
+#
+# Add the following lines to the Apache HTTP virtual host which should run
+# WebDAV CGI.
+#
+# WebDAV CGI will be accessible via http://www.example.com/webdav/ and uses
+# basic HTTP authentication (by default). For this to work, you need to add all
+# valid users to the AuthUserFile with the help of the htpasswd command:
+#
+# htpasswd -c /etc/webdavcgi-0.8/default/users.htpasswd user1
+# htpasswd /etc/webdavcgi-0.8/default/users.htpasswd user2
+#
+# Note, that if you have the UID/GID wrapper enabled (USE=suid), WebDAV CGI will
+# switch to the login user after a successful login, thus the users within the
+# AuthType need to present on the system as well.
+#
+# You probably want to review and change the following settings:
+# - /webdavcgi should point to your desired webdavwrapper, which is either
+#   webdavwrapper, webdavwrapper-afs, webdavwrapper-krb or in case you disabled
+#   the UID/GID wrapper (USE=-suid), webdav.pl
+#
+# - The /webdav location
+#   If you change this location, make sure to reflect the new path within the
+#   WebDAV CGI configuration (WEBDAVCONF -> $VIRTUAL_BASE) as well.
+#
+# - The authentication provider and/or AuthUserFile
+#
+# - The HOMEURL environment variable. After a user logs out, the browser will
+#   be redirected to this URL.
+#
+# - The WEBDAVCONF environment variable has to point to your configuration
+#
+# For further informations and other configuration possibilities consult the
+# WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
+# and the Apache HTTP server documentation at http://httpd.apache.org/docs/
+#
+    ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-0.8/cgi-bin/webdavwrapper"
+    ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-0.8/cgi-bin/logout"
+
+    <Location /webdav>
+        Order Allow,Deny
+        Allow from all
+    </Location>
+
+    <Location /webdavcgi>
+        AuthType Basic
+        AuthName "WebDAV-CGI"
+        AuthUserFile /etc/webdavcgi-0.8/default/users.htpasswd
+        Require valid-user
+        Order Allow,Deny
+        Allow from all
+    </Location>
+
+
+    RewriteEngine On
+
+    RewriteRule ^/webdav/logout -  [L,E=REALM:WebDAV-CGI,E=HOMEURL:/webdav,E=TIMEOUT:5]
+
+    RewriteRule ^/webdav        /webdavcgi [PT,L,E=WEBDAVCONF:/etc/webdavcgi-0.8/default/webdav.conf,E=PERLLIB:/usr/share/webdavcgi-0.8/lib/perl,E=LOGOUTURL:/webdav/logout]
diff --git a/www-apps/webdavcgi/files/webdav-0.8.conf b/www-apps/webdavcgi/files/webdav-0.8.conf
new file mode 100644
index 000000000000..8563df7ad617
--- /dev/null
+++ b/www-apps/webdavcgi/files/webdav-0.8.conf
@@ -0,0 +1,88 @@
+## -- INSTALL_BASE
+## folder path to the webdav.conf, .css, .js, and. msg files for the Web
+## interface
+## (don't forget the trailing slash)
+$INSTALL_BASE='/usr/share/webdavcgi-0.8/';
+
+## -- VIRTUAL_BASE
+## only neccassary if you use redirects or rewrites from a VIRTUAL_BASE to
+## the DOCUMENT_ROOT;
+## regular expressions are allowed
+## EXAMPLE: $VIRTUAL_BASE = '/';
+$VIRTUAL_BASE = '/webdav';
+
+## -- DOCUMENT_ROOT
+## by default the server document root
+## (don't forget a trailing slash '/'):
+$DOCUMENT_ROOT = '/home/';
+
+## -- UMASK
+## mask for file/folder creation 
+## (it does not change permission of existing files/folders):
+$UMASK = 0007;
+
+## -- ENABLE_DAVMOUNT
+## enables DAV mount button in the folder navigation of the Web interface
+$ENABLE_DAVMOUNT = 1;
+
+## -- ENABLE_COMPRESSION
+## enables/disables gzip content encoding for the Web interface
+$ENABLE_COMPRESSION = 0;
+
+## -- PAGE_LIMIT
+## limits number of files/folders shown in the Web interface
+$PAGE_LIMIT=100;
+
+## -- PAGE_LIMITS
+## allowed selectable limits (-1 = show all)
+@PAGE_LIMITS = ( 5, 10, 15, 20, 30, 50, 100, -1);
+
+## -- DBI_(SRC/USER/PASS)
+## database setup for LOCK/UNLOCK/PROPPATCH/PROPFIND data
+##
+## SQLite config
+## If users share the same folder they should use the same database
+## in this case you have to use a single file writeable for all users.
+#$DBI_SRC='dbi:SQLite:dbname=/var/lib/webdavcgi/0.8/default/webdav.db';
+#$DBI_USER='';
+#$DBI_PASS='';
+#$CREATE_DB = !-e '/var/lib/webdavcgi/0.8/default/webdav.db';
+
+## MySQL config
+#$DBI_SRC='DBI:mysql:database=webdavcgi;host=localhost;port=3306';
+#$DBI_USER='mysqluser';
+#$DBI_PASS='changeme';
+#$CREATE_DB=0;
+
+## PostgreSQL config
+#$DBI_SRC='dbi:Pg:dbname=webdavcgi;host=localhost;port=5432';
+#$DBI_USER='pguser';
+#$DBI_PASS='changeme';
+#$CREATE_DB = 0;
+
+## -- HEADER
+## content after body tag in the Web interface
+$HEADER = '<div class="header">WebDAV CGI - Web interface: You are logged in as <span title=.`id -a`.>' .$ENV{REMOTE_USER}.'</span> (<a href="'.$ENV{LOGOUTURL}.'">Logout</a>).</div>';
+
+## -- ENABLE_CALDAV
+## Disable CalDAV support for Lightning/Sunbird/iCal/iPhone calender/task
+## support
+$ENABLE_CALDAV = 0;
+
+## -- ENABLE_GROUPDAV
+## Disables GroupDAV (http://groupdav.org/draft-hess-groupdav-01.txt)
+$ENABLE_GROUPDAV = 0;
+
+## -- ENABLE_THUMBNAIL
+## Disable image thumbnail support and media rss feed for folder listings of the
+## Web interface.
+## If enabled the default icons for images will be replaced by thumbnails
+## and if the mouse is over a icon the icon will be zoomed to the size of
+## $THUMBNAIL_WIDTH.
+$ENABLE_THUMBNAIL = 0;
+
+## -- THUMBNAIL_CACHEDIR
+## defines the path to a cache directory for image thumbnails
+## this is neccessary if you enable the thumbnail cache ($ENABLE_THUMBNAIL_CACHE)
+## EXAMPLE: $THUMBNAIL_CACHEDIR=".thumbs";
+$THUMBNAIL_CACHEDIR="/var/cache/webdavcgi/0.8/default/thumbnails";
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
new file mode 100644
index 000000000000..01671ee16cd4
--- /dev/null
+++ b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild,v 1.1 2013/04/05 16:03:32 dev-zero Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator
+
+DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV."
+HOMEPAGE="http://webdavcgi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+
+# Provide slotting on minor versions. WebDAV CGI is a web application which
+# can be shared by multiple instances and thus major updates shouldn't be
+# enforced to all users/instances at the same time.
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~amd64"
+IUSE="afs kerberos mysql postgres rcs samba +sqlite +suid"
+
+DEPEND=""
+RDEPEND="!www-apps/webdavcgi:0
+	afs? ( net-fs/openafs )
+	dev-lang/perl
+	dev-perl/Archive-Zip
+	dev-perl/File-Copy-Link
+	dev-perl/PerlIO-gzip
+	dev-perl/Quota
+	dev-perl/TimeDate
+	dev-perl/URI
+	dev-perl/UUID-Tiny
+	dev-perl/XML-Simple
+	kerberos? ( virtual/krb5 )
+	media-gfx/graphicsmagick[perl]
+	mysql? ( dev-perl/DBD-mysql )
+	perl-core/Module-Load
+	postgres? ( dev-perl/DBD-Pg )
+	rcs? ( dev-perl/Rcs )
+	samba? ( dev-perl/Filesys-SmbClient )
+	sqlite? ( dev-perl/DBD-SQLite )
+	virtual/perl-CGI
+	virtual/perl-File-Spec
+	|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CGIBINDIR="cgi-bin"
+
+src_compile() {
+	if use suid; then
+		WEBDAVWRAPPERS="webdavwrapper" # Standard UID/GID wrapper
+
+		use afs      && WEBDAVWRAPPERS+=" webdavwrapper-afs"
+		use kerberos && WEBDAVWRAPPERS+=" webdavwrapper-krb"
+
+		export WEBDAVWRAPPERS
+
+		local wrapper
+		for wrapper in ${WEBDAVWRAPPERS}; do
+			$(tc-getCC) ${LDFLAGS} ${CFLAGS} \
+				-o "${CGIBINDIR}/${wrapper}" \
+				"helper/${wrapper}.c" || die "compile ${wrapper} failed"
+		done
+	fi
+}
+
+src_install() {
+	exeinto "/usr/libexec/${PN}-${SLOT}/${CGIBINDIR}"
+	newexe "${CGIBINDIR}/logout-dist" "logout"
+	doexe "${CGIBINDIR}/webdav.pl"
+
+	use afs   && doexe "${CGIBINDIR}/afswrapper"
+	use samba && doexe "${CGIBINDIR}/smbwrapper"
+
+	if use suid; then
+	    # In order to change the user and group ID at runtime, the webdavwrapper
+	    # needs to be run as root (set-user-ID and set-group-ID bit)
+		exeopts -o root -g root -m 6755
+
+	    local wrapper
+		for wrapper in ${WEBDAVWRAPPERS}; do
+			einfo "Installing UID/GID wrapper ${wrapper}"
+			doexe "${CGIBINDIR}/${wrapper}"
+		done
+
+		# reset install opts
+		exeopts
+	else
+		ewarn "You have the 'suid' USE flag disabled"
+		ewarn "WebDAV CGI won't be able to switch user ids"
+	fi
+
+	local confDir='etc'
+	local webdavConfDir="/etc/${PN}-${SLOT}/default"
+
+	export WEBDAVCONFIG="${webdavConfDir}/webdav.conf"
+
+	insinto "${webdavConfDir}"
+	doins "${confDir}/mime.types"
+	newins "${FILESDIR}/webdav-${SLOT}.conf" "webdav.conf"
+
+	local installBaseDir="/usr/share/${PN}-${SLOT}"
+	local currentDir
+	for currentDir in htdocs lib locale; do
+		insinto "${installBaseDir}/${currentDir}"
+		doins -r "${currentDir}"/*
+	done
+
+	if use mysql || use postgres; then
+		local sqlDir='sql'
+		insinto "${installBaseDir}/${sqlDir}"
+		use mysql    && "${sqlDir}/mysql.sql"
+		use postgres && "${sqlDir}/postgresql.sql"
+	fi
+
+	if use sqlite; then
+		# Directory where the SQLite database resides
+		local sqliteRootDir="/var/lib/${PN}/${SLOT}"
+		keepdir "${sqliteRootDir}"
+
+		# Default database directory where all users are able to create and
+		# share the databases, this can be changed within the config file and
+		# restricted to user/group only access if required.
+		export SQLITEDIR="${sqliteRootDir}/default"
+		keepdir "${SQLITEDIR}"
+		fperms 1777 "${SQLITEDIR}"
+	fi
+
+	# Default thumbnail directory, writable by all users
+	export THUMBNAILDIR="/var/cache/${PN}/${SLOT}/default/thumbnails"
+	keepdir "${THUMBNAILDIR}"
+	fperms 1777 "${THUMBNAILDIR}"
+
+	export APACHEEXAMPLECONFIG="apache-webdavcgi-${SLOT}-example.conf"
+	dodoc CHANGELOG TODO
+	dodoc "${FILESDIR}/${APACHEEXAMPLECONFIG}"
+	dohtml -r doc/*
+}
+
+pkg_postinst() {
+	ewarn "In order to allow different users to create and share files,"
+	ewarn "some directories were installed with world write access by default."
+	ewarn "To set restrictive permissions, add all WebDAV CGI users to a"
+	ewarn "common group, and allow access to the following directories by this"
+	ewarn "group only."
+	ewarn "Thumbnail directory: ${THUMBNAILDIR}"
+	use sqlite && ewarn "SQLite directory:    ${SQLITEDIR}"
+
+	ewarn
+	ewarn "Until bug #456180 is fixed, you probably have to re-emerge"
+	ewarn "media-gfx/graphicsmagick"
+
+	elog
+	elog "The WebDAV CGI config is located at ${WEBDAVCONFIG}."
+	elog
+	elog "An example Apache HTTP server configuration snippet is available in"
+	elog "/usr/share/doc/${PF} in the file ${APACHEEXAMPLECONFIG}"
+
+	einfo
+	einfo "Detailed installation and configuration instructions can be found at"
+	einfo "http://webdavcgi.sourceforge.net/"
+}