Bug #416141: User-supplied patch to respect autofs and cifs (patches also sent upstream, expected to land in 2.3.6)

Package-Manager: portage-2.1.11.2/cvs/Linux x86_64

5 files changed, 179 insertions, 5 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index ed7aaca068d4..c73316d28200 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.189 2012/05/31 02:30:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.190 2012/06/27 17:52:13 lack Exp $
+
+*gkrellm-2.3.5-r1 (27 Jun 2012)
+
+  27 Jun 2012; Jim Ramsay <jim_ramsay@gentoo.org>
+  +files/gkrellm-2.3.5-autofs.patch, +files/gkrellm-2.3.5-cifs.patch,
+  +gkrellm-2.3.5-r1.ebuild, gkrellm-2.3.5.ebuild:
+  Bug #416141: User-supplied patch to respect autofs and cifs (patches also sent
+  upstream, expected to land in 2.3.6)
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> gkrellm-2.3.2-r1.ebuild,
   gkrellm-2.3.2.ebuild, gkrellm-2.3.4.ebuild, gkrellm-2.3.5.ebuild:
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index eb6e0fe84de4..1a389616cc94 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -2,6 +2,8 @@
 Hash: SHA1
 
 AUX gkrellm-2.3.2-getline-fix.patch 736 RMD160 2c98c1c9dc427d30d28a06bc29c8da45cd7287d0 SHA1 efd4ea03565793e4e7bbdad052dce6e482a480bc SHA256 056c4e04d58a70304c1ba05a4382b29cab8e77d951162049fe922f3c242002ed
+AUX gkrellm-2.3.5-autofs.patch 363 RMD160 e2595563b8d6ffd31b1d8399451003022d74ccfa SHA1 3edf3e48687c41d11ee19f9d7e1820aa3cab58ee SHA256 9d655df4251bf58f2c160949e00d89c1b95be6b472c3c110e4a39a30e817fb1e
+AUX gkrellm-2.3.5-cifs.patch 496 RMD160 96f9841d8ca0a8de0ee200acbb7a413ac3bf37d7 SHA1 141cb03c1693de4356f50f49f6c50910f82f68c1 SHA256 3b669243b900753f0b913cd8764b0f4389c684680ade75c60eaca2820b8caedc
 AUX gkrellmd 640 RMD160 13a345a246e9f7b7895a169829e78633498a0985 SHA1 96187e80c4c04ba19cb3cbba4fc321c4bdf007cc SHA256 68eafd11f1c1ff7080a2117facd62d8a3124993fc513c050387f6f32b02dd9f1
 AUX gkrellmd.conf 250 RMD160 4bef31a2562432515dfeb0c05acbba66863aa3b9 SHA1 e7374680680bc587c3bd8a8dba57fa619f20db45 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935
 DIST gkrellm-2.3.2.tar.bz2 747697 RMD160 0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 SHA1 fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0 SHA256 a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
@@ -10,13 +12,24 @@ DIST gkrellm-2.3.5.tar.bz2 765011 RMD160 6ac017985981a8731690a54a296e673b6bf7fab
 EBUILD gkrellm-2.3.2-r1.ebuild 3218 RMD160 3e3fa40d921274cd32269a40fa6882c9ec5be803 SHA1 b8541a260c2d3ec8deb82a0f30d7b125f725bc9d SHA256 d4a217ec8819ea52b0bcb7fa43c3678a29ed643d00b3631b7ebf99a3a8e3cf4c
 EBUILD gkrellm-2.3.2.ebuild 3173 RMD160 1f548ddcee6b3d202c62a7f22afcaf806a52500a SHA1 7aee8bbe8de577753c2c3f3e317a85bba7831fa9 SHA256 7003fa2af7e90ad601156cbb64fda30fbaa795776784763722949d88fb6cd9ce
 EBUILD gkrellm-2.3.4.ebuild 3248 RMD160 52612d34f11a198e41b7ec7c5626046bb34acde2 SHA1 66b66c03bd0596357f56df5395b0f76cbae9f67c SHA256 63c526e1a7799c16b517c77249c334aaf76f1140dbe9ffbe3afcafe9ff3063fa
+EBUILD gkrellm-2.3.5-r1.ebuild 3156 RMD160 9e5e17b9e8e83c2acafe92bb81f0d04c1c68151a SHA1 534848fce085e1b60e815f4e0dba08ab2b34e688 SHA256 d200b9ecb2f3e5c6a374bacd7ca0e9c4f2d8db8b5dd4f2571bb0fb2becc041d8
 EBUILD gkrellm-2.3.5.ebuild 3206 RMD160 12ca18f576080f57e5c3b4caf5291bf5e0f5dcc5 SHA1 169f5d9f73e2bb93357148ebc35b4a90005227ed SHA256 c8c7cf7593dc4f15370ef25e0095fc173ddb31a9fda5eeb8592a61c19a11909a
-MISC ChangeLog 25856 RMD160 fdb6e88a30617547f543da71f44e29b3a87bef32 SHA1 2cd2adf1627ffeed9cbb2e5f43a8c10a5dc28f45 SHA256 fea5a56703d682906ca67c4c882e592c22ee3a90f3a6aea838d3708570373278
+MISC ChangeLog 26177 RMD160 9071a259d9d0eed4aca7437b3c0772d277cdf23a SHA1 6b4e20e0a9db0c1dfeb40a2931d98e8005d63f95 SHA256 58d6d874cd469aaa649c388d75b6628022f3630c484ce7e1f778062336aa6efd
 MISC metadata.xml 940 RMD160 e85c2b39ba9e3d4fcdf2b314e9357b17e9b2aad2 SHA1 989f5eaebb57c3d432c9b1a9ae8cdee0f0729f5a SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/G1+UACgkQ/ejvha5XGaNdgwCggel9tocDuQIq9jPlfO0TkTnp
-RUgAoI3lHNiTcOOImhSEcRo/sYg4KdBL
-=fvPa
+iQIcBAEBAgAGBQJP60hYAAoJEA8o5SF9Rr6qrNoP/jVSacUH2wa4ou36FW2BxiGc
+6Q5O1TfZ4lupRwjF+IhFktHkt+GMTQAyb0PS0ey4GlAIfAKqLofwtrsQ1xg8Kz49
+03cxlqqGoHV78B2QacEg6mDHAbR8tKAUXfQBBd0L/rw1tOucbQZZBGupHwjMD169
+7K85Rh4usz9C3oRBDF71Xl7HffzGCFT7wdrtMCZjF3Y7LUZabV+8E3ShtkkCHAPn
+aQZbnZksPVt4vfZmFj+mi7Dou9YFFoTWb2QNbXaAmPrs3CPBCbci9fRJ0Rx6HYr0
+XRJSVIAB47ATQB9pUexiup/VogJEy/d4WeOac04MIz77tXPyjImEzSPZtgnvnIJ0
+1tWGGg61QtWJz2oMZ4q9Z4e/6Fq/ZHNTvkdpQ5pkF5cAL5v3PtmCAgCqgVvxs8pw
+HtMPosXZOnEXPbH0lAHt+UxZA/MKf0XaC+5RDhRbB5KjCRC953rpER3Jp6b1107C
+O6fB1TjysFf/RdmL10s80oHbHwmapy3LJ4tN3rS2R1NrkYZjRZg8Li/tKa3ZdHBa
+f7BS9XOIjD+1Q++lqwEei81/SoVUImiuvM2+yoCfYXjkRNbCXmZqGg0AWkttWNLG
+hZtoCDtSgf7vAiHIsVVLzwRBdA2JyXt9xLAiFRp6YVxzV5FuKnEcvjH9E/C6uRCe
+Qlb9l6QA0r8f0wvB9xDo
+=bXWl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
new file mode 100644
index 000000000000..cf36a9817110
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.old/src/sysdeps/linux.c	2010-10-06 03:27:33.000000000 +1100
++++ gkrellm-2.3.5/src/sysdeps/linux.c	2011-11-24 02:07:30.926450485 +1100
+@@ -1439,6 +1439,7 @@
+ 			|| !strcmp(type, "usbdevfs")
+ 			|| !strcmp(type, "usbfs")
+ 			|| !strcmp(type, "sysfs")
++			|| !strcmp(type, "autofs")
+ 		   )
+ 			continue;
+ 		/* Strip trailing / from the directory.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
new file mode 100644
index 000000000000..fa35ef672798
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.old/server/monitor.c	2010-10-06 03:46:59.000000000 +1100
++++ gkrellm-2.3.5/server/monitor.c	2011-11-24 02:01:30.871402778 +1100
+@@ -1329,7 +1329,8 @@
+ static gchar *remote_fs_types[] =
+ 	{
+ 	"nfs",
+-	"smbfs"
++	"smbfs",
++	"cifs"
+ 	};
+ 
+ void
+--- gkrellm-2.3.5.old/src/fs.c	2010-09-15 02:25:51.000000000 +1000
++++ gkrellm-2.3.5/src/fs.c	2011-11-24 02:00:17.347088370 +1100
+@@ -163,7 +163,8 @@
+ static gchar *remote_fs_types[]	=
+ 	{
+ 	"nfs",
+-	"smbfs"
++	"smbfs",
++	"cifs"
+ 	};
+ 
+ 
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild
new file mode 100644
index 000000000000..500ddfc64df5
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild,v 1.1 2012/06/27 17:52:13 lack Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
+
+RDEPEND="dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e 's:#user\tnobody:user\tgkrellmd:' \
+		-e 's:#group\tproc:group\tgkrellmd:' \
+		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
+
+	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	epatch "${FILESDIR}/${P}-autofs.patch"
+	epatch "${FILESDIR}/${P}-cifs.patch"
+}
+
+src_compile() {
+	if use X ; then
+		local sslopt=""
+		if use gnutls; then
+			sslopt="without-ssl=yes"
+		elif use ssl; then
+			sslopt="without-gnutls=yes"
+		else
+			sslopt="without-ssl=yes without-gnutls=yes"
+		fi
+
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="/usr" \
+			INCLUDEDIR="/usr/include/gkrellm2" \
+			LOCALEDIR="/usr/share/locale" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			$(use ntlm || echo without-ntlm=yes) \
+			${sslopt} \
+		|| die "emake failed"
+	else
+		cd server
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+		|| die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake install${TARGET:+_}${TARGET} \
+			$(use nls || echo enable_nls=0) \
+			STRIP="" \
+			INSTALLDIR="${D}/usr/bin" \
+			INCLUDEDIR="${D}/usr/include" \
+			LOCALEDIR="${D}/usr/share/locale" \
+			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${D}/usr/share/man/man1" \
+		|| die "emake install failed"
+
+		dohtml *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd || die "dobin failed"
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h || die "doins failed"
+		doins shared/log.h || die "doins failed"
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf || die "doins failed"
+
+	dodoc Changelog CREDITS README
+}