Removed ncpfs-2.2.6-cve-2011-1679-1680.patch as it was made redundant by ncpfs-2.2.6-drop-mtab-support.patch.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key D25D95E3)

4 files changed, 23 insertions, 91 deletions

diff --git a/net-fs/ncpfs/ChangeLog b/net-fs/ncpfs/ChangeLog
index 0f3ad6963263..b307fd835782 100644
--- a/net-fs/ncpfs/ChangeLog
+++ b/net-fs/ncpfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/ncpfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.33 2014/08/13 05:47:27 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.34 2014/08/13 07:01:46 kumba Exp $
+
+  13 Aug 2014; Joshua Kinard <kumba@gentoo.org> ncpfs-2.2.6-r3.ebuild,
+  -files/ncpfs-2.2.6-cve-2011-1679-1680.patch,
+  files/ncpfs-2.2.6-drop-mtab-support.patch:
+  Removed ncpfs-2.2.6-cve-2011-1679-1680.patch as it was made redundant by
+  ncpfs-2.2.6-drop-mtab-support.patch.
 
 *ncpfs-2.2.6-r3 (13 Aug 2014)
 
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-cve-2011-1679-1680.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-cve-2011-1679-1680.patch
deleted file mode 100644
index 890a10a61b1f..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-cve-2011-1679-1680.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
---- ncpfs-2.2.6.orig/sutil/ncpm_common.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncpm_common.c	2014-08-12 20:55:00.349194943 -0400
-@@ -1415,6 +1415,7 @@ void add_mnt_entry(char* mount_name, cha
- 	struct mntent ment;
- 	int fd;
- 	FILE* mtab;
-+	off_t	goodoffset;
- 
- 	ment.mnt_fsname = mount_name;
- 	ment.mnt_dir = mpnt;
-@@ -1446,14 +1447,25 @@ void add_mnt_entry(char* mount_name, cha
- 
- 	if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
- 	{
-+		unlink(MOUNTED "~");
- 		errexit(59, _("Can't open %s\n"), MOUNTED);
- 	}
-+	fseek (mtab, 0, SEEK_END);
-+	goodoffset = ftell(mtab);
- 	if (addmntent(mtab, &ment) == 1)
- 	{
-+		/* restore good state */
-+		ftruncate(fileno(mtab), goodoffset);
-+		endmntent(mtab);
-+		unlink(MOUNTED "~");
- 		errexit(60, _("Can't write mount entry\n"));
- 	}
- 	if (fchmod(fileno(mtab), 0644) == -1)
- 	{
-+		/* restore good state */
-+		ftruncate(fileno(mtab), goodoffset);
-+		endmntent(mtab);
-+		unlink(MOUNTED "~");
- 		errexit(61, _("Can't set perms on %s\n"), MOUNTED);
- 	}
- 	endmntent(mtab);
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
---- ncpfs-2.2.6.orig/sutil/ncpumount.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncpumount.c	2014-08-12 20:55:00.349194943 -0400
-@@ -163,7 +163,12 @@ static int __clearMtab (const char* moun
- 			i++;
- 		}
- 		if (!found) {
--			addmntent(new_mtab, mnt);
-+			if (addmntent(new_mtab, mnt)) {
-+				eprintf(_("Can't addmntent to %s: %s\n"), MOUNTED_TMP,
-+					strerror(errno));
-+				endmntent(mtab);
-+				return 1;
-+			}
- 		}
- 	}
- 
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch
index fe52391bb091..c4588371afa9 100644
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch
@@ -1,6 +1,6 @@
 diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
---- ncpfs-2.2.6.orig/sutil/ncplogin.c	2014-08-12 22:03:48.059170406 -0400
-+++ ncpfs-2.2.6/sutil/ncplogin.c	2014-08-12 22:08:09.029168854 -0400
+--- ncpfs-2.2.6.orig/sutil/ncplogin.c	2014-08-13 02:52:56.859067273 -0400
++++ ncpfs-2.2.6/sutil/ncplogin.c	2014-08-13 02:53:42.699067001 -0400
 @@ -111,7 +111,6 @@
  #include <stdlib.h>
  #include <stdarg.h>
@@ -23,8 +23,8 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
  	if (info.echo_mnt_pnt) {
  		printf(_("mounted on:%s\n"),mount_point);
 diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
---- ncpfs-2.2.6.orig/sutil/ncpm_common.c	2014-08-12 22:03:48.149170405 -0400
-+++ ncpfs-2.2.6/sutil/ncpm_common.c	2014-08-12 22:08:09.029168854 -0400
+--- ncpfs-2.2.6.orig/sutil/ncpm_common.c	2014-08-13 02:52:56.959067273 -0400
++++ ncpfs-2.2.6/sutil/ncpm_common.c	2014-08-13 02:55:38.349066313 -0400
 @@ -104,7 +104,6 @@
  #include <stdlib.h>
  #include <stdarg.h>
@@ -33,7 +33,7 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
  #include <ncp/kernel/ipx.h>
  #include <sys/ioctl.h>
  #if MOUNT3
-@@ -1423,80 +1422,6 @@ static const struct smntflags {
+@@ -1423,68 +1422,6 @@ static const struct smntflags {
         {MS_NODIRATIME,	"nodiratime"},
         {0,		NULL}};
  
@@ -44,7 +44,6 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
 -	struct mntent ment;
 -	int fd;
 -	FILE* mtab;
--	off_t	goodoffset;
 -
 -	if (check_name(mount_name) == -1 || check_name(mpnt) == -1)
 -		errexit(107, _("Illegal character in mount entry\n"));
@@ -79,25 +78,14 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
 -
 -	if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
 -	{
--		unlink(MOUNTED "~");
 -		errexit(59, _("Can't open %s\n"), MOUNTED);
 -	}
--	fseek (mtab, 0, SEEK_END);
--	goodoffset = ftell(mtab);
 -	if (addmntent(mtab, &ment) == 1)
 -	{
--		/* restore good state */
--		ftruncate(fileno(mtab), goodoffset);
--		endmntent(mtab);
--		unlink(MOUNTED "~");
 -		errexit(60, _("Can't write mount entry\n"));
 -	}
 -	if (fchmod(fileno(mtab), 0644) == -1)
 -	{
--		/* restore good state */
--		ftruncate(fileno(mtab), goodoffset);
--		endmntent(mtab);
--		unlink(MOUNTED "~");
 -		errexit(61, _("Can't set perms on %s\n"), MOUNTED);
 -	}
 -	endmntent(mtab);
@@ -115,8 +103,8 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
  	const struct optinfo* optr;
  
 diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.h ncpfs-2.2.6/sutil/ncpm_common.h
---- ncpfs-2.2.6.orig/sutil/ncpm_common.h	2014-08-12 22:03:47.919170406 -0400
-+++ ncpfs-2.2.6/sutil/ncpm_common.h	2014-08-12 22:08:09.029168854 -0400
+--- ncpfs-2.2.6.orig/sutil/ncpm_common.h	2014-08-13 02:52:56.749067274 -0400
++++ ncpfs-2.2.6/sutil/ncpm_common.h	2014-08-13 02:53:42.699067001 -0400
 @@ -60,7 +60,6 @@ void verify_argv(int argc, char* argv[])
  int ncp_mount_specific(struct ncp_conn* conn, int pathNS, const unsigned char* NWpath, int pathlen);
  int mount_ok(struct stat *st);
@@ -126,8 +114,8 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.h ncpfs-2.2.6/sutil/ncpm_common.h
  struct ncp_mount_info {
  	struct ncp_mount_data_independent mdata;
 diff -Naurp ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c
---- ncpfs-2.2.6.orig/sutil/ncpmount.c	2014-08-12 22:03:47.919170406 -0400
-+++ ncpfs-2.2.6/sutil/ncpmount.c	2014-08-12 22:08:09.029168854 -0400
+--- ncpfs-2.2.6.orig/sutil/ncpmount.c	2014-08-13 02:52:56.749067274 -0400
++++ ncpfs-2.2.6/sutil/ncpmount.c	2014-08-13 02:53:42.699067001 -0400
 @@ -114,7 +114,6 @@
  #include <stdlib.h>
  #include <stdarg.h>
@@ -149,9 +137,9 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c
  }
  
 diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
---- ncpfs-2.2.6.orig/sutil/ncpumount.c	2014-08-12 22:03:47.949170406 -0400
-+++ ncpfs-2.2.6/sutil/ncpumount.c	2014-08-12 22:09:30.179168372 -0400
-@@ -179,113 +179,6 @@ static void enableAlarm(void) {
+--- ncpfs-2.2.6.orig/sutil/ncpumount.c	2014-08-13 02:52:56.749067274 -0400
++++ ncpfs-2.2.6/sutil/ncpumount.c	2014-08-13 02:55:10.369066480 -0400
+@@ -179,108 +179,6 @@ static void enableAlarm(void) {
  	sigprocmask(SIG_UNBLOCK, &sa.sa_mask, NULL);
  }
  
@@ -184,12 +172,7 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
 -			i++;
 -		}
 -		if (!found) {
--			if (addmntent(new_mtab, mnt)) {
--				eprintf(_("Can't addmntent to %s: %s\n"), MOUNTED_TMP,
--					strerror(errno));
--				endmntent(mtab);
--				return 1;
--			}
+-			addmntent(new_mtab, mnt);
 -		}
 -	}
 -
@@ -265,7 +248,7 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
  int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt)
  {
  	if (umount(rel_mnt) != 0) {
-@@ -622,10 +515,6 @@ static int old_ncpumount(int argc, char
+@@ -617,10 +515,6 @@ static int old_ncpumount(int argc, char
  			ret = 1;
  			continue;
  		}
@@ -276,7 +259,7 @@ diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
  	}
  	return ret;
  }
-@@ -744,7 +633,6 @@ main(int argc, char *argv[])
+@@ -739,7 +633,6 @@ main(int argc, char *argv[])
  			if (serverName || allConns) {
  				processBindServers(conns,curEntries,serverName,umountTable,&mountEntries);
  			}
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
index 247d50d1641b..8404435696a5 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild,v 1.1 2014/08/13 05:47:27 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild,v 1.2 2014/08/13 07:01:46 kumba Exp $
 
 EAPI="5"
 
@@ -32,9 +32,6 @@ src_prepare() {
 	# http://seclists.org/fulldisclosure/2010/Mar/122
 	epatch "${FILESDIR}"/${P}-multiple-vulns.patch
 
-	# Bug 371477
-	epatch "${FILESDIR}"/${P}-cve-2011-1679-1680.patch
-
 	# Add a patch that removes the __attribute__((packed)); directive
 	# from several struct members in include/ncp/ncplib.h.  This will
 	# cut down on a large number of compile warnings generated by modern