Fix to allow a working swat, patch thanks to Jared Hancock <gravydish@gmail.com> bug #283532

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 15 insertions, 6 deletions

diff --git a/net-fs/samba-server/ChangeLog b/net-fs/samba-server/ChangeLog
index d6d2fe6938bf..3f32e3e60eb1 100644
--- a/net-fs/samba-server/ChangeLog
+++ b/net-fs/samba-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.27 2009/11/30 16:04:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.28 2009/12/09 16:29:51 vostorga Exp $
+
+  09 Dec 2009; Víctor Ostorga <vostorga@gentoo.org>
+  samba-server-3.3.9.ebuild, samba-server-3.4.3-r1.ebuild:
+  Fix to allow a working swat, patch thanks to Jared Hancock
+  <gravydish@gmail.com> bug #283532
 
   30 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   samba-server-3.4.3-r1.ebuild:
diff --git a/net-fs/samba-server/Manifest b/net-fs/samba-server/Manifest
index d386cad73e79..5c8a6180c4e0 100644
--- a/net-fs/samba-server/Manifest
+++ b/net-fs/samba-server/Manifest
@@ -19,8 +19,8 @@ AUX samba-3.4.2-missing_includes.patch 293 RMD160 e32b75ddc4a35f20173db731681eae
 AUX samba-3.4.2-upgrade-tevent-version.patch 288 RMD160 3eb9bbd781d4a92e844ff36824b75f6345c11a97 SHA1 6eec152408b8c18459a7d9413134bc37a6d52b63 SHA256 9171d875322387e7b4f4905067d9310da8e82e9c17cc7d0f0df7d163cffbf414
 DIST samba-3.3.9.tar.gz 26104983 RMD160 15be6258e6e48ee5a3e2d96f5f385d6fdf7d5b6d SHA1 8e3c89ae614e4bc7575c919aac1bed199c1c0487 SHA256 41a8919e3a32cf7523c49473edb478f3a7ec7d4ae4d125297a18d48f79e17f91
 DIST samba-3.4.3.tar.gz 34989194 RMD160 5175848b36df04e52bc9ba17302bc3042d493383 SHA1 cad244c5334e6a2b46172910944a899a82f3ef4a SHA256 20bedee9dc72b3081b36f760cfbbcb47a6c8817cffab7dc46131b109585aceff
-EBUILD samba-server-3.3.9.ebuild 6456 RMD160 dea742a6cd04b0eb789c695747bfa6145fda0cb0 SHA1 b1c46b3e0c9d951560b3e953269f5f25e64cd8c8 SHA256 a9fa715d0f553c9a45447adf946ac0082c5c80ab10dedc148efd342d10a3be4d
-EBUILD samba-server-3.4.3-r1.ebuild 6609 RMD160 7de807b4d5f3fd441252cc071bbd124bee8c212e SHA1 b2662bcee352d457289ce08b210110097b9739e0 SHA256 dad110ab5201dd3bc8d956211a870a26496b7bb2aa7b452d9ba14774a9321b6f
+EBUILD samba-server-3.3.9.ebuild 6567 RMD160 2e81f387e63ce656b566091b0618b710fb45c607 SHA1 d3373ee33e42920909e459a72521c82347c962c4 SHA256 699584501ad8973fa9fb95c8c1fbf89afc0485e5c0c24ec6a61c4df20b3e7c29
+EBUILD samba-server-3.4.3-r1.ebuild 6719 RMD160 42ee340143a2cd2a316dbd3738d2bbbadeeb2f9a SHA1 be42debb324a4e3bb4203ea2216ad2e0a40870b2 SHA256 03d1f5d22106ca97ca2e3ed7003eedb041f9a9c94818d933881d24bb0a538b28
 EBUILD samba-server-3.4.3.ebuild 6569 RMD160 90fa8ec8fba9793e164c3c0608763d8e964a7b1a SHA1 6801530fde6d6776c31902b7308ec49ba3b01908 SHA256 2d3b51d391e33678b9b13e0c98fa6d32950e163bac5c4cb7829a981b62157225
-MISC ChangeLog 5017 RMD160 9e9dcafa0d79235557359c09a2ef8a69c41df7e2 SHA1 b6118fcc024faa4b17504bd4246fba02495ba26a SHA256 c76d61a035373e31d03ddc9c60849a8bb2668f61d86dd4504e87e478c0df426c
+MISC ChangeLog 5228 RMD160 5bd7d4a417ed2a35b043c2356ddd2744c95ece8f SHA1 f3eb35d17460f5c19577415fbdb07f7d21b8dfd5 SHA256 bec7fe482a143ced17b7cb5f5f38976afa40e923361c7034a04bdb970a66da24
 MISC metadata.xml 940 RMD160 9264339b756dbda92561f05627f452e19dc202f1 SHA1 a1c3233c9b9740064ea5375ccac23fef8a3ccf14 SHA256 9e7cd374d17c4122a9bfe9cb815a2f1b89c3b33ad8ada678d4f1e3b7ce5402d6
diff --git a/net-fs/samba-server/samba-server-3.3.9.ebuild b/net-fs/samba-server/samba-server-3.3.9.ebuild
index 1e4cfcf69501..731c7052038f 100644
--- a/net-fs/samba-server/samba-server-3.3.9.ebuild
+++ b/net-fs/samba-server/samba-server-3.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.9.ebuild,v 1.3 2009/11/08 03:31:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.9.ebuild,v 1.4 2009/12/09 16:29:51 vostorga Exp $
 
 EAPI="2"
 
@@ -200,6 +200,8 @@ src_install() {
 	if use swat ; then
 		insinto /etc/xinetd.d
 		newins "${CONFDIR}/swat.xinetd" swat
+		script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
+		|| die "installing swat failed"
 	fi
 
 	dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
diff --git a/net-fs/samba-server/samba-server-3.4.3-r1.ebuild b/net-fs/samba-server/samba-server-3.4.3-r1.ebuild
index 076e206ba14e..256c6d42f450 100644
--- a/net-fs/samba-server/samba-server-3.4.3-r1.ebuild
+++ b/net-fs/samba-server/samba-server-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.4.3-r1.ebuild,v 1.4 2009/11/30 16:04:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.4.3-r1.ebuild,v 1.5 2009/12/09 16:29:51 vostorga Exp $
 
 EAPI="2"
 
@@ -206,6 +206,8 @@ src_install() {
 	if use swat ; then
 		insinto /etc/xinetd.d
 		newins "${CONFDIR}/swat.xinetd" swat
+		script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
+		|| die "installing swat failed"
 	fi
 
 	dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS