Bump

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

3 files changed, 94 insertions, 13 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index c7b51b8fbed6..ddffa8adc59a 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.23 2012/06/20 20:17:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.24 2012/06/28 08:15:58 patrick Exp $
+
+*cifs-utils-5.5 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +cifs-utils-5.5.ebuild:
+  Bump
 
   20 Jun 2012; Markus Meier <maekke@gentoo.org> cifs-utils-5.4.ebuild:
   arm stable, bug #420895
@@ -94,4 +99,3 @@
   Initial import, ebuild based on work from Ewoud Kohl van Wijngaarden
   <gentoo@kohlvanwijngaarden.nl> and Sebastiaan <s.breedveld@erasmusmc.nl>
   bug 308655
-
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index f641bcd739c5..eedf2d0d1081 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST cifs-utils-5.4.tar.bz2 381416 RMD160 28066301aaa752055f1f69cc1b3d48e9c11ab93d SHA1 cbe89a4eb298113a926cb49d908a33f3484bdf73 SHA256 f6c267e4cfb111ab47a6e85a802373475edaab31d76eab4e7927ea6fe82e7f7b
+DIST cifs-utils-5.5.tar.bz2 377435 RMD160 712bd107ed39701f9a820ba0cff969cb53643c28 SHA1 355886c4b5bf9c4ac50756d6ec745aee3044d428 SHA256 82719a7988025eec87846d581a7b913368419d33deaafbecafd519fcb194d5c6
 EBUILD cifs-utils-5.4.ebuild 2525 RMD160 a170af5bbed031bc520b17faac898eccd96c5cc9 SHA1 052d6b58328b5ba63dc14765fd5ef24049024a81 SHA256 e2c6a6a87c78fa963db0a71488a6b312863d5fc50a6823b723d31f882cac5907
-MISC ChangeLog 3690 RMD160 297824dbb2a3a41bb031138e3c7c0002bc57fb20 SHA1 5d417e42d108553772af5214fbefe9ef551d17b8 SHA256 126bb388b3540bf210c25a29c460c6c2af21a38c3e5f13db4abca06b044c1c4d
+EBUILD cifs-utils-5.5.ebuild 2529 RMD160 d13ebbd977fb5e86dc3e0669c2f447b136954f5f SHA1 7718a2be3977a978eebd1222813d7c1e101d1294 SHA256 a8d23400bdeb7f81fe8578e4e87fab8ac1abfe5141aec9898f6812cccbe1ab02
+MISC ChangeLog 3803 RMD160 6c907a0372ec2b436f929628c03861fae88e4938 SHA1 1d11ae862db138a951dc1498a23f1e46a6984d3e SHA256 af2b0978ab962f94342c1117c1a83cec826b99f827606c5c124356a6e88024e6
 MISC metadata.xml 918 RMD160 861365abb0b5753f8338843672c0677137ce30f7 SHA1 6de300978e721280dcb67e7e7c55681c3b44625c SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk/iMJ0ACgkQkKaRLQcq0GIlzQCfcbAA19n+8lfxpBgElhet5Pal
-xAoAn2jNRE4oDgf/8nmTvY2iO3l09ImP
-=Z5+v
------END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.5.ebuild b/net-fs/cifs-utils/cifs-utils-5.5.ebuild
new file mode 100644
index 000000000000..54124210a8ec
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-5.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.5.ebuild,v 1.1 2012/06/28 08:15:58 patrick Exp $
+
+EAPI=4
+
+inherit eutils confutils linux-info
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="http://www.samba.org/linux-cifs/cifs-utils/"
+SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ads +caps caps-ng creds upcall"
+
+DEPEND="!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
+	caps? ( sys-libs/libcap )
+	caps-ng? ( sys-libs/libcap-ng )
+	creds? ( sys-apps/keyutils )
+	upcall? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="^^ ( caps caps-ng )"
+
+pkg_setup() {
+	confutils_use_conflict caps caps-ng
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+}
+
+src_prepare() {
+	#Getting rid of -Werror
+    sed -e "s/-Werror//" -i Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=''
+	if use "caps-ng"; then
+		myconf="${myconf} --with-libcap-ng=yes "
+	else
+		myconf="${myconf} --with-libcap-ng=no "
+	fi
+	myconf="${myconf} \
+		$(use_enable ads cifsupcall) \
+		$(use_with caps libcap) \
+		$(use_with caps-ng libcap-ng) \
+		$(use_enable creds cifscreds) \
+		$(use_enable upcall cifsupcall) \
+		--disable-cifsidmap \
+		--disable-cifsacl"
+	econf ${myconf}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc doc/linux-cifs-client-guide.odt
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use ads ; then
+		ewarn "Using mount.cifs in combination with keyutils"
+		ewarn "in order to mount DFS shares, you need to add"
+		ewarn "the following line to /etc/request-key.conf:"
+		ewarn "  create dns_resolver * * /usr/sbin/cifs.upcall %k"
+		ewarn "Otherwise, your DFS shares will not work properly."
+	fi
+}