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

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xD25D95E3

5 files changed, 39 insertions, 108 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/Manifest b/net-fs/ncpfs/Manifest
index 019f87ee2908..4fe55ca6af24 100644
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@@ -5,9 +5,8 @@ AUX ipx.confd 706 SHA256 abfefd5c3f9df2232e5d35f743ff8ce2876e887d39bd823789b54e3
 AUX ipx.init 972 SHA256 2b01a7a68110658f20c883e5045dd854389b37866e97c5f0e978034dc49dc395 SHA512 ce07fe5aa1d8f8f4b0f46454ce3461076bcb938b4f41187c4c214ee7895189995507cd9209551b1a3e4bbaf7f237228ec528d89b1dd91102fd21fb28253084f0 WHIRLPOOL bf5ac8aed0fd62bf30df495bf6d7073f9623848c35620f348d5afa28e9f7ec626bec4983045ab628626392f3391234f6a2e4a31680001a2bbafe4a14876a1595
 AUX ncpfs-2.2.5-php.patch 555 SHA256 ea32f4f6a9ac7c1d43af654982410680ca535a313f2a94efd3ddb295949d864b SHA512 2768cfe218c1fcd9e8458e28af51985a50d60d2538c61cb13f2c8db77fd111abbe8d81b040c82d51bd18fdecfacbc78e488ca7d17f8fd08af62a8b5690b37c19 WHIRLPOOL e19c931b0f440b93c8135f9b995f74852b152642778fd86eff89f081378c8b9ce99773bcedc08cfd54280d9d894d1b2e675f78f78a01bd47f9fcb1e1f9318d4c
 AUX ncpfs-2.2.6-align-fix.patch 441 SHA256 32cec9978e42326390189ec5ea936aba635afd2ea588d599b24ed0cef4e28ddb SHA512 7318f911c4f649c3320219f1ebbf9a06a287289c236235f3294f88ed95d5f09dd6d3b1b212ee4760c61407cb4bb314eafc757e8d24e8499d820dc5ff09a3d863 WHIRLPOOL b842b16fa682abc39809669a8ede8956b530da681eb43bb11b165bdabedcc72382c0ed57babdfa45ac493a1018f1c634d769d2173f273748eda878210074b2af
-AUX ncpfs-2.2.6-cve-2011-1679-1680.patch 1624 SHA256 36dbc7e43d9e1cadf21cd98b0d1fcd78d1e8fdc91c23dda7dea2ec675ccfefe5 SHA512 2e4d4830c0b9f81215f5921ac5b483b3b92d4741e6c2f9dc6030d1323cb262b5fdc7ce36383b3b16b2acd1e31b4c039f0a4f732cda70e4d81030335e0e88cc27 WHIRLPOOL 7c3a9c0b547514af9a9c35b681a83159de16bb9ad66753dcb8b5ba4905e3e99aeaed678da5eeea1f134bf19842ec6886f257d21ced4c02d027892e4a6d095a57
 AUX ncpfs-2.2.6-drop-kernel-check.patch 748 SHA256 3d62c8380c43f6ed850ce695405422d44e45aedcc48430b2fd00a323d8cb21bb SHA512 6769d1e02f0166a2f613f79da0de9aec4f25975b5951f954daed272ef8af4add151d8608c1bf8325fa771a402c2f1d9376a1ce3353b1087f35f2902da807ab1f WHIRLPOOL e052029789609ac1c397340726424efcb66458518a4014162ccf61749cff6b527cc763f1b0a721c66958ac416eb032ec1884f43c8cd39eaba40da9890d0309b6
-AUX ncpfs-2.2.6-drop-mtab-support.patch 7674 SHA256 c67a9825ea9ab885a3a68a83adfa70a2c5918f1b3bcbba654dfc9df19755ea32 SHA512 4020172319c7a13232111b67f1c6c00ade36efff712592739d255d93c20b90c545f17b2cced941d9d491f3ca07ea2d41aa6eba9f45c0e8d22e41700b189e15e4 WHIRLPOOL e870636d3380aca819018984ddc48068e5807981719f3d9db57f6ff7cb71ed38d06d342b91d37824c0fb2a0cff927cc11805a76f9701dc5e60b6e62bb2852106
+AUX ncpfs-2.2.6-drop-mtab-support.patch 7216 SHA256 23c8d4334f8c17679479ba7999d7eb794dd7c9149d8aa1c23f2a355a692d050d SHA512 594340641dc91b9b864fec30e96a8dfe6a9e8915a2062a1269a50a87be2a32aeb09ec08ff7ae99740ffa7aea3189efa2ba1f7eafc87060bce6fd4933c8839537 WHIRLPOOL 64240a86840b7094b783da97e086984513358a86eecfe54ad1debd3f017bb174cb09079c6593489ff536e79898f63a276c549fed52e59c2a502b2ab5bf90355d
 AUX ncpfs-2.2.6-gcc4.patch 1291 SHA256 8fbb8621b178aa8fb38da30639cc32afce0254445fe59c0f56c543da62d6921e SHA512 2bdce56008c2f7819c402ff00643d6602bab89922d01fefd3d42a15720cb569e6920c1ca8feaf8e927b0391ca44466df1fc91de21bcc76f53cbe7cc102e88992 WHIRLPOOL f68ece683be5e085e987891289e7605243bb37d81b357102463a3289a2a57e799ffb022fbf4470d8390540524002a478866b2809abb40aac900e00cc9cd20b9a
 AUX ncpfs-2.2.6-getuid-fix.patch 5141 SHA256 20ba3b63792af58348d18a20e80358350b189882f7ef9c9ae79ac80f7e70b461 SHA512 af6f8af66fe3bc6f9cb6188106e03307bd202fc3ca576041b8e029946a17d9d260178b38c8c81400cbd993a20b16072d3ed6241411e1f718d2148fe7b73935b6 WHIRLPOOL a57d7cfb4f36a27b9e825a66108d640d242c70615c42818c2af0dee3318318397db28ba9cb9a0773921d2d40e6e254c982f57c937e8bc289155cdc7a08cdd47f
 AUX ncpfs-2.2.6-ldflags-support.patch 5994 SHA256 0e5519d1a025d78ef08d03095acc0791bd1113f5e8c897c9e3797b7c569a9d2b SHA512 fa116074a64ca8f54f5293de5d460ddd8136bd57a222261e0469cf1464798438a9ab3bd5c9f419b9b2fe4c541e0ad8426b6812e2153d68e6405b8ce46821a013 WHIRLPOOL 80bbf8fb37e009a5cccf22120a9a81bdbb6f0b62d4c7d05548d013b15fff9b8f83429dc8600433b85f3a758da2026aaf33792d97c120b22a21b6f9384781f4fa
@@ -22,23 +21,23 @@ AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 SHA256 f1c587b329224f34f351e08b
 AUX ncpfs-2.2.6-servername-array-fix.patch 523 SHA256 8dd6be08b94259051c9cb8158a8375c4a7e35c5fc32301073ec174399458812c SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69 WHIRLPOOL ae9799b79681c8eadb5e5dc6c4c0f4e7fd4c5040fbaa84a166bf09d24e1e1fb6cdb0842acafefa3b6a9f0f6cb3e2ed1593898beb79fcee329b6a5e8f266b5d6c
 DIST ncpfs-2.2.6.tar.gz 2100545 SHA256 2837046046bcdb46d77a80c1d17dbfd15e878700e879edab4cda9f080e0337f9 SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602 WHIRLPOOL c0d4cca71fb3921e39fc6def9932d5a2500a65c7ca60f15ee09eef25637f7653df489c1947b9880f5c4eb3fab11cba663b8604fad8989170b3a74994cd4eb847
 EBUILD ncpfs-2.2.6-r2.ebuild 1953 SHA256 87189dbf1a8aff59d015f5a1f69bb1b09cdf98460211c1f314f4e6e558d912df SHA512 87457ae2c185aee7194fcec8d34d46632f7557ab10c7064b93ae696e81de75d028e9c3dacf35fbbfd57437fad6f013efb3bb09ea9b8d01353400ddbcca634a7b WHIRLPOOL 5b425c50791d4977706485db5a2dca90bc4c5d19c842b8a622b8d3c6084710f1e7c4039a233fc3595b17982ef29eec9bc20e4d7d6c4e79ca63cac736cb6bac84
-EBUILD ncpfs-2.2.6-r3.ebuild 2718 SHA256 8a58bf775d67fadbd53762406196cc6e39057d1f014429b5d5d4302e1387bed4 SHA512 30d515e867fc3c416cb0e7b0e5dd914c62650682dba924f6b39d84a727855f7eab085b40910ea670aa18bd8dc39dd5705559bf71fc23ccf8739c92cbaa80f751 WHIRLPOOL 1e37d530ecc7d28aee9e0125c0fbc4829437b4161c1d0d981304ebbc3ae7a6f81c8e0fc07e7f0394f8a8906092204f9ccb83331f504f62acb331cbf4c2e46e65
-MISC ChangeLog 5644 SHA256 6002d0dafa17fbe852b45364a3024199909026fb4bef1fbec01b9a03475348d6 SHA512 f0a8abaa965b22b1e849903477b8fc9187b4c2c67411aafb4886e97ab010038024bb957394ade92ed95af0b75f0cbfb39969d1ace3ba99bdfb35c1e0bfda982f WHIRLPOOL f7134fe22494130205a2cb1695873df34b264f86eb9c514d7bd41f1e352f70989594553b098bb8848ee9c45ad4175ef56e6fa79a7e884b7e304bdd4fbc9cf99c
+EBUILD ncpfs-2.2.6-r3.ebuild 2651 SHA256 7f0804792dac160051411e467bbafc0087f7d0dd95f839f195d9ca5b4f44c941 SHA512 13457640bfeb720d98e3dd9fbea72ea1282ccf83ed16488ad3497498fee16e37143747bb8a14e9067ef2adf4177ac5c3f86fc1164f74273924d89b9906768170 WHIRLPOOL 450ea9ac92c7f5fba11b4de71aebc9cd32317418a855b5c7520ea632f53462e8ea70c4a4035ac63d465bc742dfd5c73fa771805e18e74b365c643f291e965f39
+MISC ChangeLog 5922 SHA256 358cdcb8ed31b9e23ff3b64ef050170b8f4ebe0a6c2f2018ad282e8b9f8a0177 SHA512 ea962bae4b5f7da7c5b9511e53a182c276db46d67878b48b68acd79958b7657335fb47bc8d94532460be1139e810f41afebae543ac827c3f10f0bc3809874ba2 WHIRLPOOL c555fb679fce494c09911ed434680b646f3c084e65137040b039f0204cc6dd45428acd427c368e4b21d6f3b87f2970cb1db6b3cc2270ea5d00ab7e1f08442a8d
 MISC metadata.xml 290 SHA256 bc04d955fed7a177f63051b016c7f24451c30200e8608b70f8e63e25176a0348 SHA512 52de55e9486be04762f7ddc2dfe231e3c409ec63d3ec39dcf252540add9165a14c968fa90e281575982229791bf4a070f2285d857ca589c63e499e66e1c58d64 WHIRLPOOL a67855c335e629d78f0d54430450565c4dc3ac97184b42bcf0cbe15dfb23bdaca234feeee15773216a5243c18dd141ad9dfcc6dc0b2b95b48944ae549674545d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT6vv3AAoJENsjoH7SXZXj9XUQAILdfJejOXtsyZOTPqMHEbw0
-OVcC28FgKanK/7lp6BV62ASrvhPGMcOs0F+JYz541UpEKe5QgKm0SMurt211in+W
-KzTPLOo8OHDjww8PbdlZPV1XFb2ssTM8LUMelRvpZkNxU33E8YIe5voNnKW1lb+j
-/kmldPxnm36rgWNGCjQypm+Dto9kQOtzgZkTBMlsvhDx5V+Y2E1nBjoTfohDtb3e
-Z6u+g7vbYYwS3Y1pqH+u2SshYzw8BEHYFUS18DhlbOlzVNB6xX1bY2NFbKYa5nGo
-SCuVKm0LmOG4VL9RAyDRIQ5855r5i1/Xf8q/HJSo+0btFN1quAJWoV/bvQP2C4d6
-9gCOGp9zPZG9lfUeQwt2ezSUU8+4h8zWIEaRtOK04VrkcZVDhLqypPdWZ64aV+N0
-1UI0wpzVb4GStUEkS64FAi2Mqks84hKxIJCQF/oi+Obrb5eW8KpKV2bXAqgQ7rP0
-+gB+WrysShUrHAYdByGTNyy6zyd21NI8TIblp2IxLtULjavTm7sRMAdIZppFr3nd
-SZGvwMjE7KBDQ24u5mftTMtyn5WEQ+fA3YHsMi9slsMKBU8vHEG+MlBJkZMYmrro
-Gn6RrcscFkRGH5Enkc/v3aTDCg16YNezBvVO53MxvvqAC+kA2d/iwkE05la4EOyN
-befofS2W6KBMAJ1lcg6Z
-=LekF
+iQIcBAEBCAAGBQJT6w1hAAoJENsjoH7SXZXj3V8P/A5wDgcNmDJHbtV9RjlaJfly
+paW2+LM1KKbH8VOnrk7UDVQUU070fGkzUg5nzonq7s9WOV6MIi4yFSXIjsO0YzC9
+8fZfJufRk/8xhP7PwhyxFyzCd7iJJFKCY5JQhu0KUkoXwc7uc/NGqF7ceWS9tsQs
+/ReviOAjAL+fj3flnXnacgYQSAPcHHPikDMgmmCGmnl4oSW6Zjjc45L7O1wSx5dY
+gycSn4sjgREs56C1bOgQzPtDXqJ9mLi874mvthxiuJbbgZGyD4w9AGKo3tsU/xBI
+3Y3hE3gPPZOvObc2BN9N7tCUD4m7onQq3Duq8oXWvk/p5y3NhOfqVawzIsHBXGEa
+dKY5oc+88eygf4OEMIM5MIHgApMio6gjygPqrHC9ZcR0FPoPiavRxaLA9givSpwj
+tIofLIZI1e5Hu2yi8RCE9X/zowXhT3qmp7a1lY85SVEjd/V4pnWERqo5jD27KzS1
+xNtmWdJKGVslyL//Wtu60QLEvINn3Tgy+h6xnIC/VmCVWqBxSHvn+nBCBCu/FiSZ
+tTAlz8YA7gFriGW32l5EsOi2oJR5rlXorQ+nItf8/m2PCqQuK4WkfddedILzKM6M
+MLe53aP4nWNgQOD0hl8HDD/wPVV53rTfIM1gBE3qzT8H1KTNPo2Kqnu+ttVnvzLg
+obKSyvwXUOs1mArFI7m2
+=ZYn3
 -----END PGP SIGNATURE-----
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