diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2013-01-14 08:22:33 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2013-01-14 08:22:33 +0000 |
| commit | ffbe3d7af72a93eb2e961b43f4bf68d65fb96dd1 (patch) | |
| tree | 71029d4512d69b2a207ae835ab1d411fc687fe15 /www-apps/webdavcgi | |
| parent | dev-util/nvidia-cuda-toolkit: Version Bump, #446072 and #451972; fine grad wh... (diff) | |
| download | gentoo-2-ffbe3d7af72a93eb2e961b43f4bf68d65fb96dd1.tar.gz gentoo-2-ffbe3d7af72a93eb2e961b43f4bf68d65fb96dd1.tar.bz2 gentoo-2-ffbe3d7af72a93eb2e961b43f4bf68d65fb96dd1.zip | |
Reintroduce the WEBDAVWRAPPER variable as initially present to make it configureable in the next version. Thanks to Christian Affolter (ebuild maintainer) for all the work and testing.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 0xAE9C1E30!)
Diffstat (limited to 'www-apps/webdavcgi')
| -rw-r--r-- | www-apps/webdavcgi/ChangeLog | 7 | ||||
| -rw-r--r-- | www-apps/webdavcgi/webdavcgi-0.8.3.ebuild | 19 |
2 files changed, 17 insertions, 9 deletions
diff --git a/www-apps/webdavcgi/ChangeLog b/www-apps/webdavcgi/ChangeLog index b16ef6c86a00..2bfbd183584a 100644 --- a/www-apps/webdavcgi/ChangeLog +++ b/www-apps/webdavcgi/ChangeLog @@ -1,6 +1,11 @@ # 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.2 2013/01/11 10:52:04 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/ChangeLog,v 1.3 2013/01/14 08:22:33 dev-zero Exp $ + + 14 Jan 2013; Tiziano Müller <dev-zero@gentoo.org> webdavcgi-0.8.3.ebuild: + Reintroduce the WEBDAVWRAPPER variable as initially present to make it + configureable in the next version. Thanks to Christian Affolter (ebuild + maintainer) for all the work and testing. 11 Jan 2013; Tiziano Müller <dev-zero@gentoo.org> metadata.xml: Add missing upstream remote-ids. diff --git a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild index 20f27cd6735d..3eee8c8a2c46 100644 --- a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild +++ b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild @@ -1,6 +1,6 @@ # 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.3.ebuild,v 1.1 2013/01/11 10:43:38 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild,v 1.2 2013/01/14 08:22:33 dev-zero Exp $ EAPI=4 @@ -47,9 +47,12 @@ src_prepare() { src_compile() { if use suid; then + # There are several webdavwrappers, TODO: make it configureable + export WEBDAVWRAPPER="webdavwrapper" + $(tc-getCC) ${LDFLAGS} ${CFLAGS} \ - -o "${CGIBINDIR}/webdavwrapper" \ - helper/webdavwrapper.c || die "compile webdavwrapper failed" + -o "${CGIBINDIR}/${WEBDAVWRAPPER}" \ + helper/webdavwrapper.c || die "compile ${WEBDAVWRAPPER} failed" fi } @@ -68,7 +71,7 @@ src_install() { newexe "${CGIBINDIR}/logout-dist" logout doexe "${CGIBINDIR}/webdav.pl" - use suid && doexe "${CGIBINDIR}/webdavwrapper" + use suid && doexe "${CGIBINDIR}/${WEBDAVWRAPPER}" local currentDir for currentDir in ${installDirs}; do @@ -92,10 +95,10 @@ src_install() { # 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) if use suid; then - einfo "Setting SUID and SGID bit for webdavwrapper" - fowners root:root "${MY_CGIBINDIR}/webdavwrapper" - fperms 6755 "${MY_CGIBINDIR}/webdavwrapper" - webapp_postinst_txt en "${FILESDIR}/postinstall-webdavwrapper-en.txt" + einfo "Setting SUID and SGID bit for ${WEBDAVWRAPPER}" + fowners root:root "${MY_CGIBINDIR}/${WEBDAVWRAPPER}" + fperms 6755 "${MY_CGIBINDIR}/${WEBDAVWRAPPER}" + webapp_postinst_txt en "${FILESDIR}/postinstall-${WEBDAVWRAPPER}-en.txt" webapp_hook_script "${FILESDIR}/reconfig-suid" else ewarn "You have the 'suid' USE flag disabled" |