[gentoo-commits] gentoo-x86 commit in sys-apps/util-linux: ChangeLog util-linux-2.19.1-r1.ebuild

["Lars Wendler (polynomial-c)" <polynomial-c@gentoo.org>]

polynomial-c    11/11/12 22:16:56

  Modified:             ChangeLog util-linux-2.19.1-r1.ebuild
  Log:
  Really fixed bug #375165 with solution suggested by Jiří Moravec
  
  (Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

Revision  Changes    Path
1.361                sys-apps/util-linux/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.361&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.361&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?r1=1.360&r2=1.361

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- ChangeLog	12 Nov 2011 20:49:10 -0000	1.360
+++ ChangeLog	12 Nov 2011 22:16:56 -0000	1.361
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.360 2011/11/12 20:49:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.361 2011/11/12 22:16:56 polynomial-c Exp $
+
+  12 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  util-linux-2.19.1-r1.ebuild,
+  -files/util-linux-2.19.1-remove-useless-if-stuff-from-loopaes-patchset.diff:
+  non-maintainer commit: Really fixed bug #375165 with solution suggested by
+  Jiří Moravec.
 
   12 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
   util-linux-2.19.1-r1.ebuild,



1.9                  sys-apps/util-linux/util-linux-2.19.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild?r1=1.8&r2=1.9

Index: util-linux-2.19.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- util-linux-2.19.1-r1.ebuild	12 Nov 2011 20:49:10 -0000	1.8
+++ util-linux-2.19.1-r1.ebuild	12 Nov 2011 22:16:56 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.8 2011/11/12 20:49:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.9 2011/11/12 22:16:56 polynomial-c Exp $
 
 EAPI="3"
 
@@ -45,14 +45,16 @@
 		autopoint --force
 		eautoreconf
 	else
-		if use loop-aes ; then
-			epatch "${WORKDIR}"/util-linux-*.diff \
-				"${FILESDIR}"/${P}-remove-useless-if-stuff-from-loopaes-patchset.diff
-		fi
-			
+		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
 	fi
 	epatch "${FILESDIR}"/${P}-mount-a-segv.patch #366213
-	epatch "${FILESDIR}"/${P}-umount-l-nfs.patch #370051
+	if ! use loop-aes ; then
+		epatch "${FILESDIR}"/${P}-umount-l-nfs.patch #370051
+	else
+		ewarn "loop-aes is incompatible with current solution of #370051 bug!"
+		ewarn "Therefore you're vulnerable to that bug now!"
+		ewarn "Look at https://bugs.gentoo.org/show_bug.cgi?id=370051."
+	fi
 	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
 	elibtoolize
 }