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.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xAE9C1E30!

3 files changed, 22 insertions, 14 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/Manifest b/www-apps/webdavcgi/Manifest
index e62d55f84e7c..652c47d0e6e3 100644
--- a/www-apps/webdavcgi/Manifest
+++ b/www-apps/webdavcgi/Manifest
@@ -7,13 +7,13 @@ AUX postinstall-webdavwrapper-en.txt 1279 SHA256 d3aafde60e52fe3506cc5c6d3fdc5d4
 AUX reconfig 784 SHA256 4a5a7689b82e55fd9abf25f2abd52e26d3396b67c15360923695ed4791fee854 SHA512 415c692c26693296fc23161d70521d233543f37aeadfc12992cf4b36ee0f25c7c2eed354831767ccf2a386d4479c53534c23800c756cc7b678ef1f5ed60e32f4 WHIRLPOOL 2786c586fd1931c57548c60146c29c3acf35b781e6ec80f69e004a92cdf60ded6e9db78e0079f29fbb5e2ce6bedd981b6fc5b514eaa794910c46c1f75d3a8485
 AUX reconfig-suid 602 SHA256 dcb3e341cfd4bffe52adfa687b603043d73c989724a3a25b9abcd72166372759 SHA512 aa1563edce254668fb43110dc7d24293e926a6d5083da4a3879bcd5b4d205f1f9feae7bd6e0e00bda5303143346f6951e65318276720013ed7744a6d2c609eb2 WHIRLPOOL e09f6845fd0550a781845d5b0a5d8280e647531fa5c61c7184a1c4dd01734c999bcca9d175342559a50eaa3eb47f2325775eef85114ceb4394a83b4b37385eee
 DIST webdavcgi-0.8.3.tar.bz2 1190975 SHA256 d8ca7feb1f25f6acce67a5ea769a089edd404660c85633dfbd6303696f1cd294 SHA512 f50e6bb1e78a88ab6bc6452c04f2e5d0cec86f6641d1813556ae3b06c33e2c9250e623926bf1a71ea10f6ca3912e708cb54cd0956b344329de1499887e48e784 WHIRLPOOL e05d0b2e5d6905d3c86e807c1f6b7544c1fa9629f310496648088c2a1a5bb491e507e492b80fa4beb6ab43f9f1d1bbfd095d1b670e3ca88e89b3605f5d790743
-EBUILD webdavcgi-0.8.3.ebuild 2759 SHA256 4d69d5e57ac1636759d79eb76c572fad57f14692c396f52c300d56c9e9efa8bf SHA512 0e3e5117f23837f0a58cac24a79fc2c2ceed0043b22e4e08cbb7b15ba739738ef615621269f6232283e26f0aedc8be5454ad02acbd1a04ce3292b1a24341f491 WHIRLPOOL 2aa78f521a97d0487094d32c205e9e8e2626a21425801edebc2f742fe837037916d2ddb18a6ea7e244123881f065f27a1a2dfee26c5d785c853fd21c9d1d4377
-MISC ChangeLog 644 SHA256 999f6d8c98293e39c4e7d843a85d2b5b590c6e31e60cb9e26f2facf619b14aab SHA512 d13339a8ac86104d02d6a05746e436ced9459efac4e182e3e7a961133ad23a5b2d2418d98f72ec559753b2233027cf39d2895ab77327ec9d534eaa932095d71d WHIRLPOOL c93295a5fee7b2c89b1e91331ff61738e80f09e08b8a949caf9712f62bf78f572a1a6f3b319fc5159e5fdc0d3a7e66524abaae778b1f62f47942baf9ec9ec4c3
+EBUILD webdavcgi-0.8.3.ebuild 2886 SHA256 fe6f32a68a1551054d90bd9f4b107c06ae3f2e7b31f64cbb5a5c6d9d51ffe35e SHA512 8c1be7dcb7a446079c861e08f0e0675afdf7e08113080244df1e029e1daef2e57adb965e6520c7476e7fc8ff14e9f4fa4ea49ddae88d644497321a28575f95b3 WHIRLPOOL 600bf539d495370f28b69c03d7b30d4db4f0cb6b7484703385ae8e60eddff34e9dda9b06a64941b2ec4be4f648f5eb90a7bf392c55f6e3242a882c4ab9224208
+MISC ChangeLog 913 SHA256 3f81c7b4a014338ccb5330cbb2c551273a85cc2f131077c93920164380a43040 SHA512 0743d021f3c77deaaaa8beb3999492925f2a1df696e34165411b5913273ddc3756540bdf1400e1f352cfa3c4a772928925dae2426dbb71c138075dc8dcdcfb76 WHIRLPOOL 4ca0e364a82f1cb0caaecfe452a610726515cfcf3ae2c257edfbc0cbe94f37d4ad31a5683315de73ea284c07d9cfab462d94bc4665c0e9b76179dac8a3ff7b49
 MISC metadata.xml 1073 SHA256 9bbf62c3df434496846c49187700cd328e5b4637d77c36653090bc9fbe54d0cf SHA512 0e89f6dd40c70db6e3824ca14257d08ec791c136b3015600f1d8d30bb0bfee77123cfaaa26cf1895cffc76d3cb0d8578efec118228e0ac8e0a91735f6bbb3695 WHIRLPOOL 4c027846f92bd39d03d287f41929d61da9d38950d5eeb0fe360fa8db9235e0232587e3ebf09244701fc5b4c1ba32522ca7f83bb1ae8e68ed3fd58c27a3b27aaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDv7tUACgkQGwVqY66cHjCIVwCgguFI4/Go1/hQZ6ulTYb9+3O8
-rmQAnid2Y4XMt9uWtjcR6E4+w87YXywt
-=gxKv
+iEYEAREIAAYFAlDzwE0ACgkQGwVqY66cHjA8PACfUTNFmx22YtS6/mbN0qxJJ82x
+rE8An3DBKmkFxrHD8DS37JIC4dcDbjqf
+=fbB6
 -----END PGP SIGNATURE-----
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"