Bump

2022-03-01 11:46:08 +01:00 · 2022-03-01 11:46:08 +01:00 · 1b10b30c02
parent 961e7181bf
commit 1b10b30c02
89 changed files with 2191 additions and 3390 deletions
--- a/net-fs/mars-nwe/Manifest
+++ b/net-fs/mars-nwe/Manifest
@ -1,7 +1,7 @@
-AUX mars-nwe.initd 587 SHA256 526956266e9e251050c255124b51c77646df1904c903781da6f81e8c1e577417 SHA512 a1df3ca9ec16f698c71dd12696610fc0a4f11560f03d3c1dcc557f264458fcedc74bb509b213b3659a4ae985c47782216c8923305ce3c2e54db53163f884867a WHIRLPOOL 1b456ce6fc6d2c3adf4f6cac88a75e86e4d5e9ef27b89cbf6b7a80db6410a41527bbc379fa67edb6c25a4b3f4ce52cf2026b34d609a03aa04ce013f837df653c
-AUX mars-nwe.service 197 SHA256 c7ee6a0a535ed5de71f9b8fb5093700fa3cdcc1f8200f94eda024b9f0eb15ad4 SHA512 c76956fb78fa71b94f228e41406090163d4358342267e716aa90cb6d739f5267028673bef25340c7a1597bac80a7d793e8891a173880853c3c632e59402defa9 WHIRLPOOL 30efa05b3a5cec5a155bce15785f9f8cea323fcf90747072b3a541f8d5a6b4feb059342f2dae154a28a54c650f472538ce63cef6807b5ecb5bd403f310a89fce
-AUX mars-nwe.tmpfilesd 36 SHA256 cebf1badbbb48848db7a239c0fcc7a62a4f8447886a9fa2c40234d099d3759cc SHA512 d2deb761f0b859a317798a46c512ef431bc71c55dc903980f1a10ad19e86f6e76cc7a37b2b38122e8c362c6fd182d247caa965599025383144c0a373f67f922b WHIRLPOOL 5d8491e20ddf2187c1d2d1d91ab09dc7771321ee6e64f7452e4cf28089b9c4c79045353162d287675ddb67f4f2eb675b9f6c23a14bb6561fb73c384bc3a0bfad
-DIST mars_nwe-0.99.pl23.tar.bz2 369194 SHA256 281aba1f505b9aca6d83382a41482af2ce4fe2607f0f6986067d83928ebdc5a8 SHA512 24cf78ea0091bc9414f27ac77cfa535fe611badc013f343766b88e12cc5afc2e1ae595d423ea4ec7bfb4255dd8a3f81247dcfab515044152861ea2f46380fd2d WHIRLPOOL 6e5d2684448a8cf801c5c23b30921667fc7d35914de89c1ddfdb934414812efbdc9f6b968b6bb6f7ef7a7d007de25408b141bbbd2aedecd909a71657d6701da7
-EBUILD mars-nwe-0.99_p23.ebuild 952 SHA256 92fdef82fe058025873143cdedfd6d56c9c62721ccc2ae4c2aee02d6a161e766 SHA512 76744929c94a664d14513ab6ceec3a8c4d8ee278c083256c76a30f2337912a395fcf1ce407ac4d288f01695b6eefc730f52a49cc0d338925b1570c838f726dc9 WHIRLPOOL 6155af3685c354d21145dec56710cae15e4525fefd5c70eb92f2713b8ecfbb6ab93c986258eb3a84791be2bc6891e3145ae5014db2616417639d551bf78f95a0
-MISC ChangeLog 892 SHA256 6ef99447158b54eac2ade5f7f19891afd53a73ab84ce7390b72444d53e05baf1 SHA512 2fd88f20e1834d5c7234f1b7cefced4f72006d90ba964f9cfa3233849078966d5f2a94d96821ec36b0d81f09a7e2bdab7d1d5137d3fff811b26c875e3c35bbdf WHIRLPOOL f0c92c3e0e01c2c7cc1e9c4316f6586bf2d41b04b3f10474ae1f1d3a3eeac6221e6dc1dcde8d633bc388c3df2da0463c52d775c3f71cbc3296dffe7cc199347e
-MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96
+AUX mars-nwe.initd 587 BLAKE2B c5d939ae6ffcc1dbe795ffd095e285aa14a28efd7738abe39e592a45e6d0a627bd490554c01c59fd9de0e9347517b9f012861751d64576b4107f79b1bb3c03b0 SHA512 a1df3ca9ec16f698c71dd12696610fc0a4f11560f03d3c1dcc557f264458fcedc74bb509b213b3659a4ae985c47782216c8923305ce3c2e54db53163f884867a
+AUX mars-nwe.service 197 BLAKE2B 28aa60c545fd4e00800df3f8b85736b2150039bab23da275f1145cb371eb68babfb3bb639607f81a8c23f3efa99929ed6d0d2a8f79b7a95ec9a2097505e9b287 SHA512 c76956fb78fa71b94f228e41406090163d4358342267e716aa90cb6d739f5267028673bef25340c7a1597bac80a7d793e8891a173880853c3c632e59402defa9
+AUX mars-nwe.tmpfilesd 36 BLAKE2B 2ed4cac90b4645cc583537a5fa26b6ff22738ba093d19ed92e6b0c6ca24113a3601ef3a8d1590ccd1a547c0d823ee75ff36dc2258798febf83aeb87521b2c93c SHA512 d2deb761f0b859a317798a46c512ef431bc71c55dc903980f1a10ad19e86f6e76cc7a37b2b38122e8c362c6fd182d247caa965599025383144c0a373f67f922b
+DIST mars_nwe-0.99.pl23.tar.bz2 369194 BLAKE2B 5fd2b54a4d9bf8cac13d60c1a3b0dbd54af00f506e1552a48dbc7772a52319fe688684b7dbb68a36d5e39b4363d13ec8924df357d0b9e27b42f74cb7fe94a544 SHA512 24cf78ea0091bc9414f27ac77cfa535fe611badc013f343766b88e12cc5afc2e1ae595d423ea4ec7bfb4255dd8a3f81247dcfab515044152861ea2f46380fd2d
+EBUILD mars-nwe-0.99_p23.ebuild 952 BLAKE2B 0b326cc76667438738f40934f9f80f52741b17d60c87d4b341c61f4e71cdb222080ec2d92488a80117972bb8f7da957a3224efd2a9c27729714d728f54adc19b SHA512 3f0474d5f173a62c46c86700996da51302d3051a427d968399426375cb0de1b6d142abd2fb3da347e0971817645e0c81fe1b0d4b0e716bdf12091e65839a8bdb
+MISC ChangeLog 892 BLAKE2B 83fe6de617eb13b570c91027cca299fde24de1e20e5fff13396e92a24042492e45a2f0d4dae49a113a684763c23bbbdbed5a19f065b9f1a343f1c04ac291eb99 SHA512 2fd88f20e1834d5c7234f1b7cefced4f72006d90ba964f9cfa3233849078966d5f2a94d96821ec36b0d81f09a7e2bdab7d1d5137d3fff811b26c875e3c35bbdf
+MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
--- a/net-fs/mars-nwe/mars-nwe-0.99_p23.ebuild
+++ b/net-fs/mars-nwe/mars-nwe-0.99_p23.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $

-EAPI=2
+EAPI=7

 MY_PV=${PV/_p/.pl}

@ -19,7 +19,7 @@ IUSE=""

 RDEPEND="sys-libs/glibc
 	sys-libs/gdbm
-	|| ( net-fs/ncpfs net-misc/ipx-utils )"
+	|| ( net-misc/ipx-utils net-fs/ncpfs )"
 DEPEND="${RDEPEND}"

 S="${WORKDIR}/mars_nwe-${MY_PV}"
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@ -0,0 +1,21 @@
+AUX ipx.confd 604 BLAKE2B e2a447045603c9560faf3360566cc1256cee0fb8a12952c85d7535a4d73f6cc27ba1636a00130033a1007a5781c4f8a15fc90c9bede3f1382fda4387d4b114a8 SHA512 b20a772fec2130054037f71a930e237baa33c264bf090568ad1a248c20680b994144d02d6488dad42c3643516f55da5171415b10aab9a908544f571c507d5690
+AUX ipx.init 872 BLAKE2B 304f34189fe38b055639523abde42f49be7c15c78077c2671b1b002d84ff3bff020e8d524c10b9b8f98f45b63b6131d08651d9fa557bc8d5cbd757b1819ccc6f SHA512 a64efeecfdb847ad16289ab5b5c4ebba8d6c910f50a378608db9aa0ef09210c4a054531abf2b4ee84b5c8ab440df61970172e7421ccdb4340127c2bb4c283ec5
+AUX ncpfs-2.2.5-php.patch 559 BLAKE2B eb696360cf1ed7610c8349f3ed7796a81f3ce5f464dbd66e16cba7ce0414710d51cd772df3ef367fdb2fee144a30c7a01b2284237a4ba8ffc8866798f1072748 SHA512 1c8509216b759df915f046c42dbb8a56d101ef9382f22f7830c089fc4f4310c75291c3984c1f079fe7b23f94717debb272c7d2b166619d415ea9df87168a52ca
+AUX ncpfs-2.2.6-align-fix.patch 421 BLAKE2B 6c701b37f0ed63014cbd0553189610c8bac9863721a764e6459bc405fe1a175bf4e388e3198d3b5511a2e08eb11691e6a7794af5971ed209ef5c1a6ef4aff468 SHA512 cf76a9866926048a0792e315c1296cb144432f8d576d9e7d68004f5eb7e10a19ff097ea4d450d2f36da05d97650f1a3411cb6a45bd88b44f6050d5b6df254528
+AUX ncpfs-2.2.6-drop-kernel-check.patch 728 BLAKE2B 562d33007d23f8b2792b7d3e4f77187fab364f1107c723cbf6ae8ab8698b83f4a06d18cdeb0642afff3caa5c6ff1d0c03d40c28898fa9ffcd1498736127d0219 SHA512 6433bd1df6e9d830b0e23882dd4d00afddbd9780d994de0ca480155d817e077b88ae7f46538855631e14a62cc52ec8c1fc5c230b1b64687ada5f2cccb61e392a
+AUX ncpfs-2.2.6-drop-mtab-support.patch 7196 BLAKE2B 2f932599c5dea7c071c6d29f00dd2a88bc0e961ad435b3dc3a59153e8e2643f94ccedeced389a3f73648dfe1b527c3299866a51e1ed9727941bb93a0f88a2add SHA512 a7498d8927c251f882f5d63c2250a8ef2ec72191531bd95bdd1c65aad1f8600602dd2ae54fc0ed6ca95c431fe330168abe972d3d3acad8e71733dde1452eed0b
+AUX ncpfs-2.2.6-gcc4.patch 1271 BLAKE2B 57b4cf96eeadd513b10ec4b6555ae4c73298304187b4bdef8e2f7d9315d1a56b225096ae25ed1a5744e5d6cc34e5dc86b84ff3adff9a91fde38e044648c259cd SHA512 b67b3a8267a76ef1fe3a128443fa96831896c3cac8f41136d3932816dfe9ab5a4d55258b6f19288c543015e53e41b691577484abf57f9163c0e3bebb4742cdbe
+AUX ncpfs-2.2.6-getuid-fix.patch 5121 BLAKE2B 8996154f28afeaaf4b05e0587f38bd9bb2c10b9da6b39d5d32f777355eed186f6064ea9af0e03b590c4a2f89a4e77d9478a69404796a24ceacc1002b6068f462 SHA512 46f02242198829dc615dd9d07ec7502e88d5738b5055e480758ddabe76b65432d436b24607a0131fd33724fa1cec95b90460b8b27c887d29c5c71a410d89edd8
+AUX ncpfs-2.2.6-ldflags-support.patch 5974 BLAKE2B 21fac3888dd7e2feb1322f14fcee20cd130c4d933691518ccd35d50b32d673c5799107ada5cd1e54a1646a8aaf577848173a055d8cf4990aced3ab9ed1064105 SHA512 4d9d6ed8021b9a9a64622e3b2af63616c69ba77ee8b4d83930d34071ac4a1d2f273e02a7ef7051edc5f816a860f977ba6474710e9ced91ff89560739976b10f6
+AUX ncpfs-2.2.6-makefile-fix-ldconfig.patch 421 BLAKE2B f36125214f1654968428f4b5fb396ac31870354ed791fd266b625c29d93b757b0e3eb6fc257f385a53b181e9a0be5831b14827d32e17c7c0068cf9c9f5a6ed80 SHA512 31f4be5654b2633f279425c8e601c67612ed36c523575620a5a258de0d81e767de2f2e4e2855021ead4a9c8b295cd6383ec69a0f0bd1d7350d5a280deb6be91d
+AUX ncpfs-2.2.6-makefile-fix-soname-link.patch 771 BLAKE2B b7c8e970cf1fd4416a0f211eb37bf80325521aa45efe26fae262b25ea069827eafb7abfa2401e80d3d0dca4c63e821a890260b8227c04c3627611be99102b7a9 SHA512 0f5f6143e6e66a7f2562c8db7a184df0a507cb1d19c32cda787ba989d0827175d198f400c6402ef399436fb4538ee067e432c5dd5b64509e0cddc4a4aef3f0dd
+AUX ncpfs-2.2.6-missing-includes.patch 758 BLAKE2B dd250f53198444500f15faad84b2a40a3a1d352f184b01b113e54c3d01f929200e4f2deb80534a130c851ba49653720cefa9ee5ba8a4ca304e939daa7a704a3e SHA512 4fab8be6c46d494721d6186055b03b6274d77f8e5a2e1bb1a28a73e8ec57805e4ca32b4a0ea4c853c8ebf023b88cc09a50307b04f97d42d5ecffd486c8a4892e
+AUX ncpfs-2.2.6-multiple-vulns.patch 14138 BLAKE2B 6f612b14d194b595a8c5baa5cd1e5a6af9e43873a3b437d004c212934ac2f0bbc638abe8bf0d7aef91c8d5084e2514f03bb9c0999e57dcc6bf210b7bf1cc3a8e SHA512 a58a3d5f4ff7540a880e064bfe7602d38671ddd737bc8e4a9e48ef52f0864de8e0ae51f0fea2ae0be82cc6910d4a47ff8562f9a730dd1930a37fd870bc2823c9
+AUX ncpfs-2.2.6-no-suid-root.patch 544 BLAKE2B 7e5b15d524cba691cd5266d2eaaf579c2180d870235254c8a77caa07e9c72dee36b6215a5681eef16e1a30274862d6bab01b2ca824571de3ac39ecd863c84364 SHA512 697d577aab12c94cbdb36c2f9f2cd51b82e3ab5efb4a9e8246a7c93b7004d004e7d4fdb1ec003585daf1a11f9f559fd65ea86fe8933f2a7d89b0ce810f21c975
+AUX ncpfs-2.2.6-pam_ncp_auth-fix.patch 556 BLAKE2B 66289abdd6b8adc0a53538365c03f30eda980c3eaeaf2c6d7105757b3bdb69c3a53d7b12bc7a06dc9d1f91bcdfbcdd81b4e027fdd5054979aaf872851ac8b148 SHA512 3c20c36bb2b8c72440e359bb3f66d5a91bc91132accc518bae8db0fbc77aaf966e676f494c8add959178e315513aaddc9f627a05b9e0c376cf7ece5bba0b0dde
+AUX ncpfs-2.2.6-remove-libncp_atomic-header.patch 572 BLAKE2B 17d8bf08a9cfa63a0ace4f9f3a7983ec70a7c5ed3ad5d83a61383408c8b350a0f25368bb271658a4ac7e26ed0f2ea62d82322a55d4e02f6f0d8d3b6e995367cf SHA512 07689c979e8e6a40aca410ac8211c6af9fa640679c34ab3431e70c849e9f3c42d26b204310a697ef1494f33b5296e642b977dfc56453f680527ee54d697abe1c
+AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 BLAKE2B 9fe98d402ec9e4435128ff903c6cf6eec7144cfa5ba75b1732707e5f50bcdd12ce693cb156d6a1d7c90b947ab52380bd1ff6d1ba44b282cb0f68319838030aa7 SHA512 efd11c2cf08f3b7b1458b836ee863f31e3ae470986a02a3d2db0ec6fbb7a984e2d33643765d7223b797732d80187412a907a9ca971233eb0f95ed4744ef6f44a
+AUX ncpfs-2.2.6-servername-array-fix.patch 523 BLAKE2B 6cf9c27ae7bda17722a74f550beb8a2f027517db264a4f895977c05b78609cf818d88fa79e2264a99e99ea09e6de626eb209c394d286b9cae84fd4636db3de47 SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69
+AUX ncpfs-2.2.6-zend_function_entry.patch 296 BLAKE2B 3bb6db87517e0fb086e95462e9b567628ede7fbeef77b5d6e101dec8a316f2a5185cad8846bbaf37dada789acfedf6f6bbc75dafa92f3eb140cfde4eb038e1eb SHA512 c96723a840cb1b0cdddb91ebe74620b87a32350be084f21b741bda4e399a7648fd00522e9f2ec8404d5a98835d3f5a343dd588f4279848cc031de5bed01680e0
+DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602
+EBUILD ncpfs-2.2.6-r5.ebuild 2305 BLAKE2B 09dba15aa9a61f5bafff325c53ad61a7aed9bebcdbec5b848f47bbceaa6a581bc398e57fc64e498339c136fecdb53be3cdc621f75ddf74bf480e45cf97485be9 SHA512 80441e194f657b877442109de5dea2126eb82e075d68a5c0fcae9ffdc10d66b9e5f81e368d916b4187e0d67805fffb6104571a629918f7a041aa821f4b1067a1
--- a/net-fs/ncpfs/files/ipx.confd
+++ b/net-fs/ncpfs/files/ipx.confd
@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/ipx
+
+# Automatically selecting a primary interface.
+IPX_AUTO_PRIMARY=on
+
+# Automatically creating interfaces.
+IPX_AUTO_INTERFACE=on
+
+# Interface to which IPX sockets are bound.
+IPX_DEVICE=eth0
+
+# The IPX frame type to use.
+# Valid values are: 802.2, 802.3, SNAP, & EtherII.
+IPX_FRAME=802.2
+
+# Create a special kind of IPX interface that does not
+# have a physical device or frame type.
+IPX_INTERNAL_NET=no
+
+# Network number
+IPX_NETNUM=1
+
+# Node number
+IPX_NODENUM=1
--- a/net-fs/ncpfs/files/ipx.init
+++ b/net-fs/ncpfs/files/ipx.init
@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#NB: Config is in /etc/conf.d/ipx
+
+depend() {
+	need net netmount
+}
+
+start() {
+	local retval=0
+	
+	ebegin "Bringing IPX up"
+	if [ ${IPX_INTERNAL_NET} = "yes" ]
+	then
+		/usr/bin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
+		retval=$?
+	else
+		/usr/bin/ipx_interface add -p ${IPX_DEVICE} \
+			${IPX_FRAME} ${IPX_NETNUM}
+		retval=$?
+	fi
+	
+	/usr/bin/ipx_configure \
+		--auto_primary=${IPX_AUTO_PRIMARY} \
+		--auto_interface=${IPX_AUTO_INTERFACE}
+	retval=$(( $retval + $? ))
+	eend ${retval} "Failed to bring IPX up"
+}
+
+stop() {
+	local retval=0
+	
+	ebegin "Bringing IPX down"
+	/usr/bin/ipx_configure --auto_primary=off --auto_interface=off
+	retval=$?
+	/usr/bin/ipx_interface delall
+	retval=$(( $retval + $? ))
+	eend ${retval} "Failed to down IPX"
+}
--- a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch
@ -0,0 +1,16 @@
+--- a/contrib/php/build/rules.mk.orig	2004-12-09 13:01:04.417854240 +0000
+++ b/contrib/php/build/rules.mk	2004-12-09 13:01:42.460070944 +0000
+@@ -63,10 +63,10 @@
+ 
+ install-modules:
+ 	@test -d modules && \
+-	$(mkinstalldirs) $(moduledir) && \
+-	echo "installing shared modules into $(moduledir)" && \
+	$(mkinstalldirs) $(DESTDIR)/$(moduledir) && \
+	echo "installing shared modules into $(DESTDIR)/$(moduledir)" && \
+ 	rm -f modules/*.la && \
+-	cp modules/* $(moduledir) || true
+	cp modules/* $(DESTDIR)/$(moduledir) || true
+ 
+ include $(builddir)/.deps
+ 
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch
@ -0,0 +1,12 @@
+diff -Naurp ncpfs-2.2.6.orig/lib/ndslib.c ncpfs-2.2.6/lib/ndslib.c
+--- a/lib/ndslib.c.orig	2005-01-27 12:35:59.000000000 -0500
+++ b/lib/ndslib.c	2014-08-12 21:07:35.559190454 -0400
+@@ -957,7 +957,7 @@ static NWDSCCODE nds_beginauth2(
+ 	NWDSCCODE err;
+ 	int n1, n3;
+ 	u_int16_t n3a;
+-	char rpb_b[DEFAULT_MESSAGE_LEN];
+	char rpb_b[DEFAULT_MESSAGE_LEN] __attribute__ ((aligned (4)));
+ 	Buf_T rpb;
+     	size_t k1tl;
+     
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch
@ -0,0 +1,31 @@
+Description: Drop kernel version check
+Author: Bastian Blank <waldi@debian.org>
+Bug-Debian: http://bugs.debian.org/692472
+
+--- a/sutil/ncpm_common.c.orig
+++ b/sutil/ncpm_common.c
+@@ -243,23 +243,6 @@ static int load_ncpfs(void)
+ #endif	/* MOUNT2 */
+ 
+ static int getmountver(void) {
+-	struct utsname name;
+-	int maj, mid, rev;
+-	int ver;
+-
+-	if (uname(&name)) {
+-		errexit(1, _("Cannot get kernel release\n"));
+-	}
+-	if (sscanf(name.release, "%d.%d.%d", &maj, &mid, &rev) != 3) {
+-		errexit(2, _("Cannot convert kernel release \"%s\" to number\n"), name.release);
+-	}
+-	ver = maj*0x10000 + mid*0x100 + rev;
+-	if (ver < 0x20100)
+-		return 2;
+-	if (ver < 0x20328)
+-		return 3;
+-	if (ver < 0x2051F)
+-		return 4;
+ 	return 5;
+ }
+ 
+
--- 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
@ -0,0 +1,269 @@
+diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
+--- a/sutil/ncplogin.c.orig	2014-08-13 02:52:56.859067273 -0400
+++ b/sutil/ncplogin.c	2014-08-13 02:53:42.699067001 -0400
+@@ -111,7 +111,6 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <sys/mount.h>
+-#include <mntent.h>
+ #include <ncp/kernel/ipx.h>
+ #include <sys/ioctl.h>
+ #ifdef CONFIG_NATIVE_UNIX
+@@ -935,12 +934,6 @@ ncpipx:;
+ 	}
+ 	NWCCCloseConn(conn);
+ 	NWDSFreeContext(ctx);
+-	/* ncpmap, ncplogin must write in /etc/mtab */
+-	{
+-		block_sigs();
+-		add_mnt_entry(mount_name, mount_point, info.flags);
+-		unblock_sigs();
+-	}
+ 	free(mount_name);
+ 	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-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>
+ #include <sys/mount.h>
+-#include <mntent.h>
+ #include <ncp/kernel/ipx.h>
+ #include <sys/ioctl.h>
+ #if MOUNT3
+@@ -1423,68 +1422,6 @@ static const struct smntflags {
+        {MS_NODIRATIME,	"nodiratime"},
+        {0,		NULL}};
+ 
+-void add_mnt_entry(char* mount_name, char* mpnt, unsigned long flags) {
+-	const struct smntflags* sf;
+-	char mnt_opts[80];
+-	char* p;
+-	struct mntent ment;
+-	int fd;
+-	FILE* mtab;
+-
+-	if (check_name(mount_name) == -1 || check_name(mpnt) == -1)
+-		errexit(107, _("Illegal character in mount entry\n"));
+-
+-	ment.mnt_fsname = mount_name;
+-	ment.mnt_dir = mpnt;
+-	ment.mnt_type = (char*)"ncpfs";
+-	ment.mnt_opts = mnt_opts;
+-	ment.mnt_freq = 0;
+-	ment.mnt_passno = 0;
+-
+-	p = mnt_opts;
+-	*p++ = 'r';
+-	*p++ = (flags & MS_RDONLY)?'o':'w';
+-	for (sf = mntflags; sf->flag; sf++) {
+-		if (flags & sf->flag) {
+-			*p++ = ',';
+-			strcpy(p, sf->name);
+-			p += strlen(p);
+-		}
+-	}
+-	*p = 0;
+-
+-	if (ncpm_suser()) {
+-		errexit(91, _("Cannot switch to superuser: %s\n"), strerror(errno));
+-	}
+-	if ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1)
+-	{
+-		errexit(58, _("Can't get %s~ lock file\n"), MOUNTED);
+-	}
+-	close(fd);
+-
+-	if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
+-	{
+-		errexit(59, _("Can't open %s\n"), MOUNTED);
+-	}
+-	if (addmntent(mtab, &ment) == 1)
+-	{
+-		errexit(60, _("Can't write mount entry\n"));
+-	}
+-	if (fchmod(fileno(mtab), 0644) == -1)
+-	{
+-		errexit(61, _("Can't set perms on %s\n"), MOUNTED);
+-	}
+-	endmntent(mtab);
+-
+-	if (unlink(MOUNTED "~") == -1)
+-	{
+-		errexit(62, _("Can't remove %s~\n"), MOUNTED);
+-	}
+-	if (ncpm_normal()) {
+-		errexit(90, _("Cannot relinquish superuser rights: %s\n"), strerror(EPERM));
+-	}
+-}
+-
+ static int __proc_option(const struct optinfo* opts, struct ncp_mount_info* info, const char* opt, const char* param) {
+ 	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-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);
+ void mycom_err(int, const char*, ...);
+-void add_mnt_entry(char* mount_name, char* mpoint, unsigned long flags);
+ 
+ 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-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>
+ #include <sys/mount.h>
+-#include <mntent.h>
+ #include <ncp/kernel/ipx.h>
+ #include <ncp/nwclient.h>
+ #include <sys/ioctl.h>
+@@ -719,11 +718,6 @@ ncpipx:;
+ 	}
+ 	ncp_close(conn);
+ 
+-	if (!opt_n) {
+-		block_sigs();
+-		add_mnt_entry(mount_name, mount_point, info.flags);
+-		unblock_sigs();
+-	}
+ 	return 0;
+ }
+ 
+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-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);
+ }
+ 
+-static int __clearMtab (const char* mount_points[], unsigned int numEntries) {
+-// main logic from ncpumount.c
+-	struct mntent *mnt;
+-	FILE *mtab;
+-	FILE *new_mtab;
+-
+-#define MOUNTED_TMP MOUNTED".tmp"
+-
+-	if ((mtab = setmntent(MOUNTED, "r")) == NULL){
+-		eprintf(_("Can't open %s: %s\n"), MOUNTED,
+-			strerror(errno));
+-		return 1;
+-	}
+-
+-	if ((new_mtab = setmntent(MOUNTED_TMP, "w")) == NULL){
+-		eprintf(_("Can't open %s: %s\n"), MOUNTED_TMP,
+-			strerror(errno));
+-		endmntent(mtab);
+-		return 1;
+-	}
+-	while ((mnt = getmntent(mtab)) != NULL)	{
+-		unsigned int i=0;
+-		int found=0;
+-
+-		while (i<numEntries && !found) {
+-			found=!strcmp(mnt->mnt_dir, mount_points[i]);
+-			i++;
+-		}
+-		if (!found) {
+-			addmntent(new_mtab, mnt);
+-		}
+-	}
+-
+-	endmntent(mtab);
+-
+-	if (fchmod(fileno(new_mtab), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0){
+-		eprintf(_("Error changing mode of %s: %s\n"),
+-			MOUNTED_TMP, strerror(errno));
+-		return 1;
+-	}
+-	endmntent(new_mtab);
+-
+-	if (rename(MOUNTED_TMP, MOUNTED) < 0){
+-		eprintf(_("Cannot rename %s to %s: %s\n"),
+-			MOUNTED, MOUNTED_TMP, strerror(errno));
+-		return 1;
+-	}
+-	return 0;
+-}
+-
+-static int clearMtab (const char* mount_points[], unsigned int numEntries) {
+-	int fd;
+-	int err;
+-	int retries = 10;
+-
+-	if (!numEntries)
+-		return 0; /* don't waste time ! */
+-
+-	block_sigs();
+-
+-	while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) {
+-		struct timespec tm;
+-
+-		if (errno != EEXIST || retries == 0) {
+-			unblock_sigs();
+-			eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno));
+-			return 1;
+-		}
+-		fd = open(MOUNTED "~", O_RDWR);
+-		if (fd != -1) {
+-			alarm(10);
+-			err = lockf(fd, F_LOCK, 0);
+-			alarm(0);
+-			close(fd);
+-			if (err) {
+-				unblock_sigs();
+-				eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out"));
+-				return 1;
+-			}
+-			tm.tv_sec = 0;
+-			tm.tv_nsec = 20000000;
+-			nanosleep(&tm, NULL);
+-		}
+-		retries--;
+-	}
+-	alarm(1);
+-	lockf(fd, F_LOCK, 0);
+-	alarm(0);
+-	close(fd);
+-
+-	err = __clearMtab(mount_points, numEntries);
+-
+-	if ((unlink(MOUNTED "~") == -1) && (err == 0)){
+-		unblock_sigs();
+-		eprintf(_("Can't remove %s~"), MOUNTED);
+-		return 1;
+-	}
+-	unblock_sigs();
+-	return err;
+-}
+-
+-
+ int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt)
+ {
+ 	if (umount(rel_mnt) != 0) {
+@@ -617,10 +515,6 @@ static int old_ncpumount(int argc, char
+ 			ret = 1;
+ 			continue;
+ 		}
+-		if (clearMtab(&mount_point, 1)) {
+-			ret = 1;
+-			continue;
+-		}
+ 	}
+ 	return ret;
+ }
+@@ -739,7 +633,6 @@ main(int argc, char *argv[])
+ 			if (serverName || allConns) {
+ 				processBindServers(conns,curEntries,serverName,umountTable,&mountEntries);
+ 			}
+-			clearMtab(umountTable, mountEntries);
+ 		} else if (treeName) {
+ 			eprintf(_("No NCP connections to tree %s.\n"),treeName);
+ 		} else if (serverName) {
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch
@ -0,0 +1,36 @@
+diff -ur ncpfs-2.2.6-orig/lib/ncplib.c ncpfs-2.2.6/lib/ncplib.c
+--- a/lib/ncplib.c.orig	2006-01-13 16:55:05.000000000 -0500
+++ b/lib/ncplib.c	2006-01-13 16:56:08.000000000 -0500
+@@ -2421,7 +2421,7 @@
+ 	int i = 1;
+ 	NWCCODE nwerr;
+ 
+-	static int get_argument(int arg_no, const char **target) {
+	int get_argument(int arg_no, const char **target) {
+ 		int count = 1;
+ 
+ 		if (target != NULL) {
+diff -ur ncpfs-2.2.6-orig/util/nwpjmv.c ncpfs-2.2.6/util/nwpjmv.c
+--- ncpfs-2.2.6-orig/util/nwpjmv.c	2006-01-13 16:55:05.000000000 -0500
+++ ncpfs-2.2.6/util/nwpjmv.c	2006-01-13 16:55:50.000000000 -0500
+@@ -131,7 +131,7 @@
+ 	char *s = q->command;
+ 	char *target_end = target + target_size;
+ 
+-	static void add_string(const char *str)
+	void add_string(const char *str)
+ 	{
+ 		int len = strlen(str);
+ 		if (target + len + 1 > target_end)
+diff -ur ncpfs-2.2.6-orig/util/pserver.c ncpfs-2.2.6/util/pserver.c
+--- ncpfs-2.2.6-orig/util/pserver.c	2006-01-13 16:55:05.000000000 -0500
+++ ncpfs-2.2.6/util/pserver.c	2006-01-13 16:55:36.000000000 -0500
+@@ -153,7 +153,7 @@
+ 	char *s = q->command;
+ 	char *target_end = target + target_size;
+ 
+-	static void add_string(const char *str)
+	void add_string(const char *str)
+ 	{
+ 		int len = strlen(str);
+ 		if (target + len + 1 > target_end)
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch
@ -0,0 +1,124 @@
+diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/chgpwd.c ncpfs-2.2.6/contrib/tcl-utils/chgpwd.c
+--- a/contrib/tcl-utils/chgpwd.c.orig	2005-01-27 12:35:59.000000000 -0500
+++ b/contrib/tcl-utils/chgpwd.c	2014-08-12 21:08:25.779190155 -0400
+@@ -292,12 +292,12 @@ int main(int argc, char *argv[]) {
+ 	        }
+         } else {
+                 if (!treeName[0]) {
+-                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+ 
+                 }
+                 if (!treeName[0]) {
+                         fprintf(stderr,"failed: You must specify a server or a tree\n");
+-                        dserr=114;
+                        /*dserr=114;*/
+                         goto finished;
+                 }
+ 
+diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncplist.c ncpfs-2.2.6/contrib/tcl-utils/ncplist.c
+--- ncpfs-2.2.6.orig/contrib/tcl-utils/ncplist.c	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/contrib/tcl-utils/ncplist.c	2014-08-12 21:08:25.779190155 -0400
+@@ -299,7 +299,12 @@ int main(int argc, char *argv[]) {
+         }else {
+ 
+                 if (!treeName[0]) {
+-                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+                         if (dserr){
+                            fprintf(stderr, "failed: Cannot get preffered DS tree: %s\n",
+                                    strnwerror(dserr);
+			    exit(106);
+			 }
+ 
+                 }
+                 if (!treeName[0]) {
+diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprop.c ncpfs-2.2.6/contrib/tcl-utils/ncpreadprop.c
+--- ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprop.c	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/contrib/tcl-utils/ncpreadprop.c	2014-08-12 21:08:25.779190155 -0400
+@@ -470,7 +470,7 @@ main(int argc, char *argv[])
+             }
+         } else {
+                 if (!treeName[0]) {
+-                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+ 
+                 }
+                 if (!treeName[0]) {
+diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprops.c ncpfs-2.2.6/contrib/tcl-utils/ncpreadprops.c
+--- ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprops.c	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/contrib/tcl-utils/ncpreadprops.c	2014-08-12 21:08:25.779190155 -0400
+@@ -507,7 +507,7 @@ main(int argc, char *argv[])
+             }
+         } else {
+                 if (!treeName[0]) {
+-                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
+ 
+                 }
+                 if (!treeName[0]) {
+diff -Naurp ncpfs-2.2.6.orig/lib/nwclient.c ncpfs-2.2.6/lib/nwclient.c
+--- ncpfs-2.2.6.orig/lib/nwclient.c	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/lib/nwclient.c	2014-08-12 21:08:25.779190155 -0400
+@@ -481,6 +481,10 @@ static char* readnwinfosfile (char * use
+                 *err = EACCES;
+                 return NULL;
+         }
+        if (st.st_uid != getuid()) {
+                *err = EACCES;
+                return NULL;
+        }
+         if ((st.st_mode & (S_IRWXO | S_IRWXG)) != 0) {
+                 *err = NCPLIB_INVALID_MODE;
+                 return NULL;
+@@ -560,7 +564,7 @@ NWDSCCODE NWCXGetPreferredDSTree    (NWD
+   if (!res)
+         res=readnwinfosfile (NULL,NDS_PREFERRED_TREE,NULL, &err);
+   if (!res)
+-    return -1;
+    return err;
+   if (strlen (res)+1 >maxLen)
+      return NWE_BUFFER_OVERFLOW;
+   strcpy(preferTree,res);
+@@ -581,7 +585,7 @@ NWDSCCODE NWCXGetDefaultNameContext (con
+    if (!res)
+         res=readnwinfosfile (NULL,NDS_PREFERRED_NAME_CTX,forTree,&err);
+   if (!res)
+-    return -1;
+    return err;
+   if (strlen (res)+1 >maxLen)
+      return NWE_BUFFER_OVERFLOW;
+   strcpy(nameContext,res);
+@@ -603,7 +607,7 @@ NWDSCCODE NWCXGetPreferredServer    (con
+ 
+ 		res=readnwinfosfile (NULL, NDS_PREFERRED_SERVER, forTree, &err);
+ 		if (!res) {
+-			return -1;
+			return err;
+ 		}
+ 	}
+ 	/* test that this server DO belongs to tree forTree*/
+@@ -644,7 +648,7 @@ NWDSCCODE NWCXGetDefaultUserName (const
+          if (!res)
+                 res=readnwinfosfile (NULL,NDS_USER,forTree, &err);
+          if (!res)
+-                return -1;
+                return err;
+         if (strlen (res)+1 >maxLen)
+                 return NWE_BUFFER_OVERFLOW;
+         strcpy(defaultName,res);
+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	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/sutil/ncplogin.c	2014-08-12 21:08:25.779190155 -0400
+@@ -588,7 +588,10 @@ main(int argc, char *argv[])
+ 		int flags = 0;
+ 
+ 		if (!info.tree) {
+-			NWCXGetPreferredDSTree(ntree, sizeof(ntree));
+			err=NWCXGetPreferredDSTree(ntree, sizeof(ntree));
+			if (err){
+			   errexit(104, _("Cannot get preffered DS tree: %s\n"),strnwerror(err));
+			}
+ 			info.tree = ntree;
+ 		}
+ 
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch
@ -0,0 +1,153 @@
+diff -Naurp ncpfs-2.2.6.orig/contrib/pam/Makefile.in ncpfs-2.2.6/contrib/pam/Makefile.in
+--- a/contrib/pam/Makefile.in.orig	2005-01-27 12:35:59.000000000 -0500
+++ b/contrib/pam/Makefile.in	2014-08-12 21:06:42.369190770 -0400
+@@ -17,6 +17,7 @@ PAM_LIBRARY = pam_ncp_auth.so
+ PAM_OBJECTS = pam_ncp_auth.do support.do
+ 
+ CFLAGS_pam_ncp_auth.do := -DNCPMOUNT_PATH=\"$(bindir)/ncpmount\" -DNCPUMOUNT_PATH=\"$(bindir)/ncpumount\"
+LDFLAGS = @LDFLAGS@
+ 
+ .PHONY : all install install-dev dep clean mrproper distclean
+ .PHONY : default
+@@ -45,7 +46,7 @@ $(PAM_OBJECTS): %.do: %.c
+ 
+ 
+ $(PAM_LIBRARY): $(PAM_OBJECTS)
+-	$(CC) $(CFLAGS) -shared -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS}
+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS}
+ 
+ dep:
+ 
+diff -Naurp ncpfs-2.2.6.orig/ipx-1.0/Makefile.in ncpfs-2.2.6/ipx-1.0/Makefile.in
+--- ncpfs-2.2.6.orig/ipx-1.0/Makefile.in	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/ipx-1.0/Makefile.in	2014-08-12 21:06:42.369190770 -0400
+@@ -9,6 +9,7 @@ vpath %.c ${this_srcdir}
+ vpath %.8 ${this_srcdir}
+ 
+ LIBS = @INTLLIBS@ @LIBS@
+LDFLAGS = @LDFLAGS@
+ 
+ O_UTILS = ipx_configure.o ipx_cmd.o
+ O_UTIIPX = ipx_interface.o ipx_internal_net.o ipx_route.o
+@@ -33,7 +34,7 @@ $(ALL_OBJECTS): %.o: %.c
+ 		[ -s $@ ] || rm -f $@
+ 
+ $(UTIIPX): %: %.o ipxutil.o
+-	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS}
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS}
+ 
+ $(UTILS): %: %.o
+ 	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ${LIBS}
+diff -Naurp ncpfs-2.2.6.orig/ipxdump/Makefile.in ncpfs-2.2.6/ipxdump/Makefile.in
+--- ncpfs-2.2.6.orig/ipxdump/Makefile.in	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/ipxdump/Makefile.in	2014-08-12 21:06:42.369190770 -0400
+@@ -11,6 +11,7 @@ ncp_if_ether_support = @ncp_if_ether_sup
+ OBJECTS= ipxutil.o
+ 
+ ALL_OBJECTS := $(EXEC:%=%.o) $(OBJECTS)
+LDFLAGS = @LDFLAGS@
+ 
+ .PHONY : all install dep clean mrproper distclean
+ .PHONY : dist tgz
+@@ -24,7 +25,7 @@ install: $(EXEC)
+ ifeq ($(ncp_if_ether_support),yes)
+ 
+ $(EXEC): %: %.o $(OBJECTS)
+-	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS)
+ 
+ else
+ .PHONY ipxdump ipxparse
+diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in
+--- ncpfs-2.2.6.orig/lib/Makefile.in	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/lib/Makefile.in	2014-08-12 21:06:42.369190770 -0400
+@@ -23,6 +23,7 @@ STATIC_NCPLIB_BIN := $(STATIC_NCPLIB)
+ CCFLAGS += -I.
+ PIC_FLAGS := -fPIC
+ NWCOMPAT := 1
+LDFLAGS := @LDFLAGS@
+ 
+ SHARED_VLINK :=
+ SHARED_VLINK_CFLAGS :=
+@@ -122,7 +123,7 @@ $(SHARED_NCPLIB): $(SHARED_NCPLIB_BIN)
+ 	ln -sf $< $@
+ 
+ $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers
+-	$(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc
+	$(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(LDFLAGS) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc
+ 
+ install_static: $(STATIC_NCPLIB_BIN)
+ 	$(INSTALL) -d $(DESTDIR)$(libadir)
+diff -Naurp ncpfs-2.2.6.orig/Make.rules.in ncpfs-2.2.6/Make.rules.in
+--- ncpfs-2.2.6.orig/Make.rules.in	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/Make.rules.in	2014-08-12 21:06:42.369190770 -0400
+@@ -42,6 +42,7 @@ CFLAGS_OPTIONS += $(CWARN)
+ CFLAGS_DEFINES := -DN_PLAT_LINUX -DLOCALEDIR=\"${localedir}\" -DNCPFS_VERSION=\"${VERSION}\" -DNCPFS_PACKAGE=\"${PACKAGE}\"
+ 
+ CCFLAGS := $(CFLAGS_DEFINES) $(CFLAGS_OPTIONS) $(INCLUDES)
+LDFLAGS := @LDFLAGS@
+ 
+ # If your system is ELF, either also do a 'make install', or append the util/
+ # directory where the dynamic library resides to the environment
+diff -Naurp ncpfs-2.2.6.orig/sutil/Makefile.in ncpfs-2.2.6/sutil/Makefile.in
+--- ncpfs-2.2.6.orig/sutil/Makefile.in	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/sutil/Makefile.in	2014-08-12 21:06:42.369190770 -0400
+@@ -14,6 +14,7 @@ USE_KERNEL = @USE_KERNEL@
+ NDS_SUPPORT = @NDS_SUPPORT@
+ 
+ LIBS = @INTLLIBS@ @LIBS@
+LDFLAGS := @LDFLAGS@
+ 
+ # environ in ncpmount
+ CCFLAGS += -D_GNU_SOURCE
+@@ -69,7 +70,7 @@ $(O_UTILS:.o=.d): %.d: %.c
+ 		[ -s $@ ] || rm -f $@
+ 
+ ncpmap.o: %.o: ncplogin.c
+-	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
+	$(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
+ 
+ ncpmap.d: %.d: ncplogin.c
+ 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
+@@ -85,7 +86,7 @@ ncpm_common.d mount_login.d: %.d: %.c
+ 		[ -s $@ ] || rm -f $@
+ 
+ $(UTILS): %: %.o ../lib/libncp.a ncpm_common.o mount_login.o
+-	$(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS}
+	$(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS}
+ 
+ ../lib/libncp.a:
+ 	make -C ../lib libncp.a
+diff -Naurp ncpfs-2.2.6.orig/util/Makefile.in ncpfs-2.2.6/util/Makefile.in
+--- ncpfs-2.2.6.orig/util/Makefile.in	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/util/Makefile.in	2014-08-12 21:06:42.369190770 -0400
+@@ -15,6 +15,7 @@ NDS_SUPPORT = @NDS_SUPPORT@
+ MOUNT2 = @MOUNT2@
+ 
+ LIBS = @INTLLIBS@ @LIBS@
+LDFLAGS = @LDFLAGS@
+ 
+ O_OTHER = dsqueue.o
+ O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \
+@@ -83,7 +84,7 @@ install-dev:
+ 	make -C ../lib libncp.so
+ 
+ $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c
+-	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
+	$(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
+ 
+ %.d: %.c
+ 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
+@@ -94,10 +95,10 @@ $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER)
+ pqstat nwpqjob nprint: dsqueue.o
+ 
+ $(UTILS): %: %.o $(LIBDEP)
+-	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS}
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS}
+ 
+ ipx_probe: ipx_probe.c
+-	$(CC) $(CFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS}
+	$(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS}
+ 
+ dep:
+ 
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-ldconfig.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-ldconfig.patch
@ -0,0 +1,10 @@
+--- ncpfs-2.2.6/lib/Makefile.in.orig	2022-02-25 15:54:07.588073484 +0100
+++ ncpfs-2.2.6/lib/Makefile.in	2022-02-25 15:54:21.301573681 +0100
+@@ -99,7 +99,6 @@
+ install_shared: $(SHARED_NCPLIB_BIN)
+ 	$(INSTALL) -d $(DESTDIR)$(libsodir)
+ 	$(INSTALL) $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)
+-	-ldconfig
+ 
+ install-dev: install_shared install_static
+ 	ln -sf $(SHARED_NCPLIB_SONAME) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch
@ -0,0 +1,15 @@
+diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in
+--- a/lib/Makefile.in.orig	2014-08-12 23:23:27.149141996 -0400
+++ b/lib/Makefile.in	2014-08-12 23:23:55.969141824 -0400
+@@ -99,9 +99,10 @@ distclean: mrproper
+ install_shared: $(SHARED_NCPLIB_BIN)
+ 	$(INSTALL) -d $(DESTDIR)$(libsodir)
+ 	$(INSTALL) $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)
+	ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
+	ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB_SONAME)
+ 
+ install-dev: install_shared install_static
+-	ln -sf $(SHARED_NCPLIB_SONAME) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)/ncp
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/ext
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/kernel
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch
@ -0,0 +1,22 @@
+diff -ruN ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6-fixed/contrib/pam/pam_ncp_auth.c
+--- a/contrib/pam/pam_ncp_auth.c.orig	2005-01-27 18:35:59.000000000 +0100
+++ a/contrib/pam/pam_ncp_auth.c	2007-05-11 21:38:05.143474750 +0200
+@@ -257,6 +257,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+#include <syslog.h>
+ #include <unistd.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff -ruN ncpfs-2.2.6/sutil/ncpm_common.c ncpfs-2.2.6-fixed/sutil/ncpm_common.c
+--- ncpfs-2.2.6/sutil/ncpm_common.c	2005-01-27 18:35:59.000000000 +0100
+++ ncpfs-2.2.6-fixed/sutil/ncpm_common.c	2007-05-11 21:38:29.609003750 +0200
+@@ -82,6 +82,7 @@
+ 
+ #include "ncpm_common.h"
+ 
+#include <stddef.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch
@ -0,0 +1,557 @@
+From: Dan Rosenberg <dan.j.rosenberg () gmail com>
+Date: Fri, 5 Mar 2010 12:06:01 -0500
+
+============================================
+ ncpfs, Multiple Vulnerabilities
+ March 5, 2010
+ CVE-2010-0788, CVE-2010-0790, CVE-2010-0791
+============================================
+
+==Description==
+
+The ncpmount, ncpumount, and ncplogin utilities, installed as part of the ncpfs
+package, contain several vulnerabilities.
+
+1. ncpmount, ncpumount, and ncplogin are vulnerable to race conditions that
+allow a local attacker to unmount arbitrary mountpoints, causing
+denial-of-service, or mount Netware shares to arbitrary directories,
+potentially leading to root compromise.  This issue was formerly assigned
+CVE-2009-3297, but has since been re-assigned CVE-2010-0788 to avoid overlap
+with related bugs in other packages.
+
+2. ncpumount is vulnerable to an information disclosure vulnerability that
+allows a local attacker to verify the existence of arbitrary files, violating
+directory permissions.  This issue has been assigned CVE-2010-0790.
+
+3. ncpmount, ncpumount, and ncplogin create lockfiles insecurely, allowing a
+local attacker to leave a stale lockfile at /etc/mtab~, causing other mount
+utilities to fail and creating denial-of-service conditions.  This issue has
+been assigned CVE-2010-0791.
+
+==Workaround==
+
+If unprivileged users do not need the ability to mount and unmount Netware
+shares, then the suid bit should be removed from these utilities.
+
+==Solution==
+
+A patch has been released that resolves these issues (attached to this
+advisory).  ncpfs-2.2.6.partial.patch is intended for ncpfs releases that have
+already been patched against the first vulnerability in this report
+(CVE-2010-0788, formerly CVE-2009-3297).  It has been tested against the latest
+ncpfs packages distributed by Fedora, Red Hat, and Mandriva.
+ncpfs-2.2.6.full.patch is intended for ncpfs releases that have not been
+patched against any of these vulnerabilities.  It has been tested against the
+latest ncpfs packages distributed by Debian, Ubuntu, and the upstream release
+(ftp://platan.vc.cvut.cz/pub/linux/ncpfs/).
+
+Users are advised to recompile from source, or request updated packages from
+downstream distributors.
+
+==Credits==
+
+These vulnerabilities were discovered by Dan Rosenberg
+(dan.j.rosenberg () gmail com).
+Thanks to Vitezslav Crhonek for the patch against the first issue.
+
+==References==
+
+CVE identifiers CVE-2010-0788, CVE-2010-0790, and CVE-2010-0791 have been
+assigned to these issues.
+
+http://seclists.org/fulldisclosure/2010/Mar/122
+
+
+diff -ur ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
+--- a/sutil/ncplogin.c.orig	2010-03-03 16:18:59.000000000 -0500
+++ b/sutil/ncplogin.c	2010-03-03 16:17:41.000000000 -0500
+@@ -934,7 +934,9 @@
+ 	NWDSFreeContext(ctx);
+ 	/* ncpmap, ncplogin must write in /etc/mtab */
+ 	{
+		block_sigs();
+ 		add_mnt_entry(mount_name, mount_point, info.flags);
+		unblock_sigs();
+ 	}
+ 	free(mount_name);
+ 	if (info.echo_mnt_pnt) {
+diff -ur 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	2010-03-03 16:18:59.000000000 -0500
+++ ncpfs-2.2.6/sutil/ncpm_common.c	2010-03-03 16:17:41.000000000 -0500
+@@ -360,7 +360,7 @@
+ #endif 
+ 
+ static inline int ncpm_suser(void) {
+-	return setreuid(-1, 0);
+	return setresuid(0, 0, myuid);
+ }
+ 
+ static int ncpm_normal(void) {
+@@ -368,11 +368,31 @@
+ 	int v;
+ 
+ 	e = errno;
+-	v = setreuid(-1, myuid);
+	v = setresuid(myuid, myuid, 0);
+ 	errno = e;
+ 	return v;
+ }
+ 
+void block_sigs(void) {
+
+	sigset_t mask, orig_mask;
+	sigfillset(&mask);
+
+	if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
+		errexit(-1, _("Blocking signals failed.\n"));
+	}
+}
+
+void unblock_sigs(void) {
+
+	sigset_t mask, orig_mask;
+	sigemptyset(&mask);
+
+	if (sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
+		errexit(-1, _("Un-blocking signals failed.\n"));
+	}
+}
+
+ static int proc_ncpm_mount(const char* source, const char* target, const char* filesystem, unsigned long mountflags, const void* data) {
+ 	int v;
+ 	int e;
+@@ -444,7 +464,7 @@
+ 	}
+         datav2.file_mode   = data->file_mode;
+         datav2.dir_mode    = data->dir_mode;
+-	err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav2);
+	err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav2);
+ 	if (err)
+ 		return errno;
+ 	return 0;
+@@ -508,7 +528,7 @@
+ 		exit(0);	/* Should not return from process_connection */
+ 	}
+ 	close(pp[0]);
+-	err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav3);
+	err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav3);
+ 	if (err) {
+ 		err = errno;
+ 		/* Mount unsuccesful so we have to kill daemon */
+@@ -559,7 +579,7 @@
+ 		sprintf(mountopts, "version=%u,flags=%u,owner=%u,uid=%u,gid=%u,mode=%u,dirmode=%u,timeout=%u,retry=%u,wdogpid=%u,ncpfd=%u,infofd=%u",
+ 			NCP_MOUNT_VERSION_V5, ncpflags, data->mounted_uid, data->uid, data->gid, data->file_mode,
+ 			data->dir_mode, data->time_out, data->retry_count, wdog_pid, data->ncp_fd, pp[1]);
+-		err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, mountopts);
+		err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, mountopts);
+ 	} else {
+ 		err=-1;
+ 	}
+@@ -577,7 +597,7 @@
+ 	        datav4.file_mode   = data->file_mode;
+         	datav4.dir_mode    = data->dir_mode;
+ 		datav4.wdog_pid	   = wdog_pid;
+-		err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*)&datav4);
+		err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*)&datav4);
+ 		if (err) {
+ 			err = errno;
+ 			/* Mount unsuccesful so we have to kill daemon */
+@@ -1395,6 +1415,17 @@
+ }
+ #endif /* MOUNT3 */
+ 
+static int check_name(const char *name)
+{
+	char *s;
+	for (s = "\n\t\\"; *s; s++) {
+		if (strchr(name, *s)) {
+			return -1;
+		}
+	}
+	return 0;
+}
+
+ static const struct smntflags {
+ 	unsigned int	flag;
+ 	const char*	name;
+@@ -1416,6 +1447,9 @@
+ 	int fd;
+ 	FILE* mtab;
+ 
+	if (check_name(mount_name) == -1 || check_name(mpnt) == -1)
+		errexit(107, _("Illegal character in mount entry\n"));
+
+ 	ment.mnt_fsname = mount_name;
+ 	ment.mnt_dir = mpnt;
+ 	ment.mnt_type = (char*)"ncpfs";
+diff -ur 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	2010-03-03 16:18:59.000000000 -0500
+++ ncpfs-2.2.6/sutil/ncpm_common.h	2010-03-03 16:17:41.000000000 -0500
+@@ -121,6 +121,9 @@
+ int proc_aftermount(const struct ncp_mount_info* info, NWCONN_HANDLE* conn);
+ int proc_ncpm_umount(const char* dir);
+ 
+void block_sigs(void);
+void unblock_sigs(void);
+
+ #define UNUSED(x)	x __attribute__((unused))
+ 
+ #endif	/* __NCPM_COMMON_H__ */
+diff -ur ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c
+--- ncpfs-2.2.6.orig/sutil/ncpmount.c	2010-03-03 16:18:59.000000000 -0500
+++ ncpfs-2.2.6/sutil/ncpmount.c	2010-03-03 16:17:41.000000000 -0500
+@@ -359,11 +359,17 @@
+ 		usage();
+ 		return -1;
+ 	}
+
+ 	realpath(argv[optind], mount_point);
+ 
+-	if (stat(mount_point, &st) == -1)
+	if (chdir(mount_point))
+	{
+		errexit(31, _("Could not change directory into mount target %s: %s\n"),
+			mount_point, strerror(errno));
+	}
+	if (stat(".", &st) == -1)
+ 	{
+-		errexit(31, _("Could not find mount point %s: %s\n"),
+		errexit(31, _("Mount point %s does not exist: %s\n"),
+ 			mount_point, strerror(errno));
+ 	}
+ 	if (mount_ok(&st) != 0)
+@@ -714,7 +720,9 @@
+ 	ncp_close(conn);
+ 
+ 	if (!opt_n) {
+		block_sigs();
+ 		add_mnt_entry(mount_name, mount_point, info.flags);
+		unblock_sigs();
+ 	}
+ 	return 0;
+ }
+diff -ur ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
+--- ncpfs-2.2.6.orig/sutil/ncpumount.c	2010-03-03 16:18:59.000000000 -0500
+++ ncpfs-2.2.6/sutil/ncpumount.c	2010-03-03 16:17:41.000000000 -0500
+@@ -70,13 +70,24 @@
+ #include <mntent.h>
+ #include <pwd.h>
+ 
+#include <sched.h>
+
+ #include "private/libintl.h"
+ 
+ #define _(X) X
+ 
+#ifndef MS_REC
+#define MS_REC 16384
+#endif
+#ifndef MS_SLAVE
+#define MS_SLAVE (1<<19)
+#endif
+
+ static char *progname;
+ static int is_ncplogout = 0;
+ 
+uid_t uid;
+
+ static void
+ usage(void)
+ {
+@@ -117,6 +128,40 @@
+ 	va_end(ap);
+ }
+ 
+/* Mostly copied from ncpm_common.c */
+void block_sigs(void) {
+
+	sigset_t mask, orig_mask;
+	sigfillset(&mask);
+	sigdelset(&mask, SIGALRM); /* Need SIGALRM for ncpumount */
+
+	if(setresuid(0, 0, uid) < 0) {
+		eprintf("Failed to raise privileges.\n");
+		exit(-1);
+	}
+
+	if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
+		eprintf("Blocking signals failed.\n");
+		exit(-1);
+	}
+}
+
+void unblock_sigs(void) {
+
+	sigset_t mask, orig_mask;
+	sigemptyset(&mask);
+
+	if(setresuid(uid, uid, 0) < 0) {
+		eprintf("Failed to drop privileges.\n");
+		exit(-1);
+	}
+
+	if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
+		eprintf("Un-blocking signals failed.\n");
+		exit(-1);
+	}
+}
+
+ static void alarmSignal(int sig) {
+ 	(void)sig;
+ }
+@@ -192,10 +237,13 @@
+ 	if (!numEntries)
+ 		return 0; /* don't waste time ! */
+ 
+	block_sigs();
+
+ 	while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) {
+ 		struct timespec tm;
+ 
+ 		if (errno != EEXIST || retries == 0) {
+			unblock_sigs();
+ 			eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno));
+ 			return 1;
+ 		}
+@@ -206,6 +254,7 @@
+ 			alarm(0);
+ 			close(fd);
+ 			if (err) {
+				unblock_sigs();
+ 				eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out"));
+ 				return 1;
+ 			}
+@@ -223,26 +272,205 @@
+ 	err = __clearMtab(mount_points, numEntries);
+ 
+ 	if ((unlink(MOUNTED "~") == -1) && (err == 0)){
+		unblock_sigs();
+ 		eprintf(_("Can't remove %s~"), MOUNTED);
+ 		return 1;
+ 	}
+	unblock_sigs();
+ 	return err;
+ }
+ 
+
+int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt)
+{
+	if (umount(rel_mnt) != 0) {
+		eprintf(_("Could not umount %s: %s\n"),
+			abs_mnt, strerror(errno));
+		return -1;
+	}
+	return 0;
+}
+
+
+static int check_is_mount_child(void *p)
+{
+	const char **a = p;
+	const char *last = a[0];
+	const char *mnt = a[1];
+	int res;
+	const char *procmounts = "/proc/mounts";
+	int found;
+	FILE *fp;
+	struct mntent *entp;
+
+	res = mount("", "/", "", MS_SLAVE | MS_REC, NULL);
+	if (res == -1) {
+		eprintf(_("Failed to mark mounts slave: %s\n"),
+			strerror(errno));
+		return 1;
+	}
+
+	res = mount(".", "/tmp", "", MS_BIND | MS_REC, NULL);
+	if (res == -1) {
+		eprintf(_("Failed to bind parent to /tmp: %s\n"),
+			strerror(errno));
+		return 1;
+	}
+
+	fp = setmntent(procmounts, "r");
+	if (fp == NULL) {
+		eprintf(_("Failed to open %s: %s\n"),
+			procmounts, strerror(errno));
+		return 1;
+	}
+
+	found = 0;
+	while ((entp = getmntent(fp)) != NULL) {
+		if (strncmp(entp->mnt_dir, "/tmp/", 5) == 0 &&
+		    strcmp(entp->mnt_dir + 5, last) == 0) {
+			found = 1;
+			break;
+		}
+	}
+	endmntent(fp);
+
+	if (!found) {
+		eprintf(_("%s not mounted\n"), mnt);
+		return 1;
+	}
+
+	return 0;
+}
+
+
+static int check_is_mount(const char *last, const char *mnt)
+{
+	char buf[131072];
+	pid_t pid, p;
+	int status;
+	const char *a[2] = { last, mnt };
+
+	pid = clone(check_is_mount_child, buf + 65536, CLONE_NEWNS, (void *) a);
+	if (pid == (pid_t) -1) {
+		eprintf(_("Failed to clone namespace: %s\n"),
+			strerror(errno));
+		return -1;
+	}
+	p = waitpid(pid, &status, __WCLONE);
+	if (p == (pid_t) -1) {
+		eprintf(_("Waitpid failed: %s\n"),
+			strerror(errno));
+		return -1;
+	}
+	if (!WIFEXITED(status)) {
+		eprintf(_("Child terminated abnormally (status %i)\n"),
+			status);
+		return -1;
+	}
+	if (WEXITSTATUS(status) != 0)
+		return -1;
+
+	return 0;
+}
+
+
+static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd)
+{
+	char *tmp;
+	const char *parent;
+	char buf[PATH_MAX];
+	int res;
+
+	tmp = strrchr(copy, '/');
+	if (tmp == NULL || tmp[1] == '\0') {
+		eprintf(_("Internal error: invalid abs path: <%s>\n"),
+			copy);
+		return -1;
+	}
+	if (tmp != copy) {
+		*tmp = '\0';
+		parent = copy;
+		*lastp = tmp + 1;
+	} else if (tmp[1] != '\0') {
+		*lastp = tmp + 1;
+		parent = "/";
+	} else {
+		*lastp = ".";
+		parent = "/";
+	}
+	*currdir_fd = open(".", O_RDONLY);
+	if (*currdir_fd == -1) {
+		eprintf(_("Failed to open current directory: %s\n"),
+			strerror(errno));
+		return -1;
+	}
+	res = chdir(parent);
+	if (res == -1) {
+		eprintf(_("Failed to chdir to %s: %s\n"),
+			parent, strerror(errno));
+		return -1;
+	}
+	if (getcwd(buf, sizeof(buf)) == NULL) {
+		eprintf(_("Failed to obtain current directory: %s\n"),
+			strerror(errno));
+		return -1;
+	}
+	if (strcmp(buf, parent) != 0) {
+		eprintf(_("Mountpoint moved (%s -> %s)\n"),
+			parent, buf);
+		return -1;
+
+	}
+
+	return 0;
+}
+
+
+static int unmount_ncp(const char *mount_point)
+{
+	int currdir_fd = -1;
+	char *copy;
+	const char *last;
+	int res;
+
+	copy = strdup(mount_point);
+	if (copy == NULL) {
+		eprintf(_("Failed to allocate memory\n"));
+		return -1;
+	}
+	res = chdir_to_parent(copy, &last, &currdir_fd);
+	if (res == -1)
+		goto out;
+	res = check_is_mount(last, mount_point);
+	if (res == -1)
+		goto out;
+	res = ncp_mnt_umount(mount_point, last);
+
+out:
+	free(copy);
+	if (currdir_fd != -1) {
+		fchdir(currdir_fd);
+		close(currdir_fd);
+	}
+
+	return res;
+}
+
+ static int
+ do_umount(const char *mount_point)
+ {
+ 	int fid = open(mount_point, O_RDONLY, 0);
+ 	uid_t mount_uid;
+	int res;
+ 
+ 	if (fid == -1) {
+-		eprintf(_("Could not open %s: %s\n"),
+-			mount_point, strerror(errno));
+		eprintf(_("Invalid or unauthorized mountpoint %s\n"),
+			mount_point);
+ 		return -1;
+ 	}
+ 	if (ncp_get_mount_uid(fid, &mount_uid) != 0) {
+ 		close(fid);
+-		eprintf(_("%s probably not ncp-filesystem\n"),
+		eprintf(_("Invalid or unauthorized mountpoint %s\n"),
+ 			mount_point);
+ 		return -1;
+ 	}
+@@ -253,12 +481,8 @@
+ 		return -1;
+ 	}
+ 	close(fid);
+-	if (umount(mount_point) != 0) {
+-		eprintf(_("Could not umount %s: %s\n"),
+-			mount_point, strerror(errno));
+-		return -1;
+-	}
+-	return 0;
+	res = unmount_ncp(mount_point);
+	return res;
+ }
+ 
+ 
+@@ -409,7 +633,8 @@
+ 	int allConns = 0;
+ 	const char *serverName = NULL;
+ 	const char *treeName = NULL;
+-	uid_t uid = getuid();
+	
+	uid = getuid();
+ 
+ 	progname = strrchr(argv[0], '/');
+ 	if (progname) {
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch
@ -0,0 +1,16 @@
+Description: Don't install utils as suid root
+Author: Bastian Blank <waldi@debian.org>
+Bug-Debian: http://bugs.debian.org/692929
+
+--- ncpfs-2.2.6.orig/sutil/Makefile.in
+++ ncpfs-2.2.6/sutil/Makefile.in
+@@ -51,7 +51,7 @@ all: $(UTILS)
+ install: all
+ 	${INSTALL} -d $(DESTDIR)$(bindir)
+ 	${INSTALL} -d $(DESTDIR)/sbin
+-	${INSTALL} -m 4755 $(UTILS) $(DESTDIR)$(bindir)
+	${INSTALL} $(UTILS) $(DESTDIR)$(bindir)
+ ifeq ($(USE_KERNEL),1)
+ 	ln -sf $(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncp
+ 	ln -sf $(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncpfs
+
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch
@ -0,0 +1,12 @@
+diff -Naurp ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c
+--- ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c	2014-08-12 21:02:33.229192251 -0400
+@@ -2534,7 +2534,7 @@ nw_retrieve_nds_user_info(struct nw_user
+ bailoutctx:;
+ 	NWDSFreeContext(ctx);
+ bailout:;
+-	if (!err & (ui->qflag & QF_DEBUG))
+	if ((!err) && (ui->qflag & QF_DEBUG))
+ 		syslog(LOG_NOTICE, "%u %u %s %s %s\n", ui->uid, ui->gid, ui->dir, ui->gecos, ui->shell);
+ 	return err;
+ }
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch
@ -0,0 +1,15 @@
+Description: Remove another generated file
+Author: Bastian Blank <waldi@debian.org>
+Bug-Debian: http://bugs.debian.org/692471
+
+--- ncpfs-2.2.6.orig/Makefile.in
+++ ncpfs-2.2.6/Makefile.in
+@@ -71,6 +71,7 @@ distclean:
+ 	rm -f intl/Makefile po/Makefile po/Makefile.in
+ 	rm -f lib/Makefile man/Makefile sutil/Makefile util/Makefile
+ 	rm -f include/config.h 
+	rm -f include/private/libncp-atomic.h
+ 	rm -f include/ncp/ext/socket.h include/ncp/ext/stdint.h
+ 	rm -f include/ncp/kernel/fs.h
+ 	rm -f include/ncp/kernel/if.h include/ncp/kernel/route.h include/ncp/kernel/types.h
+
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch
@ -0,0 +1,297 @@
+diff -Naurp ncpfs-2.2.6.orig//include/ncp/ipxlib.h ncpfs-2.2.6//include/ncp/ipxlib.h
+--- ncpfs-2.2.6.orig//include/ncp/ipxlib.h	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6//include/ncp/ipxlib.h	2011-02-10 02:38:18.822076000 -0500
+@@ -64,12 +64,12 @@ struct sap_query
+ struct sap_server_ident
+ {
+ 	u_int16_t	server_type __attribute__((packed));
+-	char		server_name[48] __attribute__((packed));
+	char		server_name[48];
+ 	IPXNet		server_network __attribute__((packed));
+ #ifdef SWIG
+ 	u_int8_t	server_node[6] __attribute__((packed));
+ #else
+-	IPXNode		server_node __attribute__((packed));
+	IPXNode		server_node;
+ #endif
+ 	IPXPort		server_port __attribute__((packed));
+ 	u_int16_t	intermediate_network __attribute__((packed));
+@@ -87,7 +87,7 @@ struct ipx_rt_def {
+ struct ipx_rip_packet
+ {
+ 	u_int16_t		operation __attribute__((packed));
+-	struct ipx_rt_def	rt[1] __attribute__((packed));
+	struct ipx_rt_def	rt[1];
+ };
+ 
+ #ifdef SWIG
+diff -Naurp ncpfs-2.2.6.orig//include/ncp/kernel/ncp.h ncpfs-2.2.6//include/ncp/kernel/ncp.h
+--- ncpfs-2.2.6.orig//include/ncp/kernel/ncp.h	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6//include/ncp/kernel/ncp.h	2011-02-10 02:38:18.822076000 -0500
+@@ -53,12 +53,12 @@
+ 
+ struct ncp_request_header {
+ 	u_int16_t type __attribute__((packed));
+-	u_int8_t  sequence __attribute__((packed));
+-	u_int8_t  conn_low __attribute__((packed));
+-	u_int8_t  task __attribute__((packed));
+-	u_int8_t  conn_high __attribute__((packed));
+-	u_int8_t  function __attribute__((packed));
+-	u_int8_t  data[0] __attribute__((packed));
+	u_int8_t  sequence;
+	u_int8_t  conn_low;
+	u_int8_t  task;
+	u_int8_t  conn_high;
+	u_int8_t  function;
+	u_int8_t  data[0];
+ };
+ 
+ #define NCP_REPLY                (0x3333)
+@@ -66,13 +66,13 @@ struct ncp_request_header {
+ 
+ struct ncp_reply_header {
+ 	u_int16_t type __attribute__((packed));
+-	u_int8_t sequence __attribute__((packed));
+-	u_int8_t conn_low __attribute__((packed));
+-	u_int8_t task __attribute__((packed));
+-	u_int8_t conn_high __attribute__((packed));
+-	u_int8_t completion_code __attribute__((packed));
+-	u_int8_t connection_state __attribute__((packed));
+-	u_int8_t data[0] __attribute__((packed));
+	u_int8_t sequence;
+	u_int8_t conn_low;
+	u_int8_t task;
+	u_int8_t conn_high;
+	u_int8_t completion_code;
+	u_int8_t connection_state;
+	u_int8_t data[0];
+ };
+ 
+ #define NCP_VOLNAME_LEN (16)
+@@ -230,8 +230,8 @@ struct nw_info_struct {
+ 	u_int32_t EAKeyCount __attribute__((packed));
+ 	u_int32_t EAKeySize __attribute__((packed));
+ 	u_int32_t NSCreator __attribute__((packed));
+-	u_int8_t nameLen __attribute__((packed));
+-	u_int8_t entryName[256] __attribute__((packed));
+	u_int8_t nameLen;
+	u_int8_t entryName[256];
+ };
+ #endif
+ 
+@@ -282,13 +282,13 @@ struct nw_file_info {
+ 	int opened;
+ 	int access;
+ 	u_int32_t server_file_handle __attribute__((packed));
+-	u_int8_t open_create_action __attribute__((packed));
+-	u_int8_t file_handle[6] __attribute__((packed));
+	u_int8_t open_create_action;
+	u_int8_t file_handle[6];
+ };
+ #endif
+ 
+ struct nw_search_sequence {
+-	u_int8_t volNumber __attribute__((packed));
+	u_int8_t volNumber;
+ 	u_int32_t dirBase __attribute__((packed));
+ 	u_int32_t sequence __attribute__((packed));
+ };
+diff -Naurp ncpfs-2.2.6.orig//include/ncp/ncp.h ncpfs-2.2.6//include/ncp/ncp.h
+--- ncpfs-2.2.6.orig//include/ncp/ncp.h	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6//include/ncp/ncp.h	2011-02-10 02:38:18.822076000 -0500
+@@ -95,7 +95,7 @@ struct prop_net_address {
+ #ifdef SWIG
+ 	fixedArray node[IPX_NODE_LEN];
+ #else
+-	u_int8_t node[IPX_NODE_LEN] __attribute__((packed));
+	u_int8_t node[IPX_NODE_LEN];
+ #endif
+ 	u_int16_t port __attribute__((packed));
+ };
+@@ -163,20 +163,20 @@ struct nw_queue_job_entry {
+ 	u_int32_t ClientTask __attribute__((packed));
+ 	u_int32_t ClientObjectID __attribute__((packed));
+ 	u_int32_t TargetServerID __attribute__((packed));
+-	u_int8_t TargetExecTime[6] __attribute__((packed));
+-	u_int8_t JobEntryTime[6] __attribute__((packed));
+	u_int8_t TargetExecTime[6];
+	u_int8_t JobEntryTime[6];
+ 	u_int32_t JobNumber __attribute__((packed));
+ 	u_int16_t JobType __attribute__((packed));
+ 	u_int16_t JobPosition __attribute__((packed));
+ 	u_int16_t JobControlFlags __attribute__((packed));
+-	u_int8_t FileNameLen __attribute__((packed));
+-	char JobFileName[13] __attribute__((packed));
+	u_int8_t FileNameLen;
+	char JobFileName[13];
+ 	u_int32_t JobFileHandle __attribute__((packed));
+ 	u_int32_t ServerStation __attribute__((packed));
+ 	u_int32_t ServerTaskNumber __attribute__((packed));
+ 	u_int32_t ServerObjectID __attribute__((packed));
+-	char JobTextDescription[50] __attribute__((packed));
+-	char ClientRecordArea[152] __attribute__((packed));
+	char JobTextDescription[50];
+	char ClientRecordArea[152];
+ };
+ 
+ struct queue_job {
+@@ -217,18 +217,18 @@ struct print_job_record {
+ };
+ #else
+ struct print_job_record {
+-	u_int8_t Version __attribute__((packed));
+-	u_int8_t TabSize __attribute__((packed));
+	u_int8_t Version;
+	u_int8_t TabSize;
+ 	u_int16_t Copies __attribute__((packed));
+ 	u_int16_t CtrlFlags __attribute__((packed));
+ 	u_int16_t Lines __attribute__((packed));
+ 	u_int16_t Rows __attribute__((packed));
+-	char FormName[16] __attribute__((packed));
+-	u_int8_t Reserved[6] __attribute__((packed));
+-	char BannerName[13] __attribute__((packed));
+-	char FnameBanner[13] __attribute__((packed));
+-	char FnameHeader[14] __attribute__((packed));
+-	char Path[80] __attribute__((packed));
+	char FormName[16];
+	u_int8_t Reserved[6];
+	char BannerName[13];
+	char FnameBanner[13];
+	char FnameHeader[14];
+	char Path[80];
+ };
+ #endif
+ 
+diff -Naurp ncpfs-2.2.6.orig//include/ncp/ncplib.h ncpfs-2.2.6//include/ncp/ncplib.h
+--- ncpfs-2.2.6.orig//include/ncp/ncplib.h	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6//include/ncp/ncplib.h	2011-02-10 02:38:18.822076000 -0500
+@@ -462,24 +462,24 @@ struct ncp_file_server_info
+ #else
+ struct ncp_file_server_info
+ {
+-	u_int8_t ServerName[48] __attribute__((packed));
+-	u_int8_t FileServiceVersion __attribute__((packed));
+-	u_int8_t FileServiceSubVersion __attribute__((packed));
+	u_int8_t ServerName[48];
+	u_int8_t FileServiceVersion;
+	u_int8_t FileServiceSubVersion;
+ 	u_int16_t MaximumServiceConnections __attribute__((packed));
+ 	u_int16_t ConnectionsInUse __attribute__((packed));
+ 	u_int16_t NumberMountedVolumes __attribute__((packed));
+-	u_int8_t Revision __attribute__((packed));
+-	u_int8_t SFTLevel __attribute__((packed));
+-	u_int8_t TTSLevel __attribute__((packed));
+	u_int8_t Revision;
+	u_int8_t SFTLevel;
+	u_int8_t TTSLevel;
+ 	u_int16_t MaxConnectionsEverUsed __attribute__((packed));
+-	u_int8_t AccountVersion __attribute__((packed));
+-	u_int8_t VAPVersion __attribute__((packed));
+-	u_int8_t QueueVersion __attribute__((packed));
+-	u_int8_t PrintVersion __attribute__((packed));
+-	u_int8_t VirtualConsoleVersion __attribute__((packed));
+-	u_int8_t RestrictionLevel __attribute__((packed));
+-	u_int8_t InternetBridge __attribute__((packed));
+-	u_int8_t Reserved[60] __attribute__((packed));
+	u_int8_t AccountVersion;
+	u_int8_t VAPVersion;
+	u_int8_t QueueVersion;
+	u_int8_t PrintVersion;
+	u_int8_t VirtualConsoleVersion;
+	u_int8_t RestrictionLevel;
+	u_int8_t InternetBridge;
+	u_int8_t Reserved[60];
+ };
+ #endif
+ 
+@@ -592,7 +592,7 @@ struct ncp_station_addr
+ #ifdef SWIG
+ 	fixedArray Node[6];
+ #else
+-	u_int8_t Node[6] __attribute__((packed));
+	u_int8_t Node[6];
+ #endif
+ 	u_int16_t Socket __attribute__((packed));
+ };
+@@ -602,32 +602,32 @@ struct ncp_prop_login_control
+ #ifdef SWIG
+ 	fixedArray AccountExpireDate[3];
+ #else
+-	u_int8_t AccountExpireDate[3] __attribute__((packed));
+	u_int8_t AccountExpireDate[3];
+ #endif	
+-	u_int8_t Disabled __attribute__((packed));
+	u_int8_t Disabled;
+ #ifdef SWIG
+ 	fixedArray PasswordExpireDate[3];
+ #else	
+-	u_int8_t PasswordExpireDate[3] __attribute__((packed));
+	u_int8_t PasswordExpireDate[3];
+ #endif	
+-	u_int8_t GraceLogins __attribute__((packed));
+	u_int8_t GraceLogins;
+ 	u_int16_t PasswordExpireInterval __attribute__((packed));
+-	u_int8_t MaxGraceLogins __attribute__((packed));
+-	u_int8_t MinPasswordLength __attribute__((packed));
+	u_int8_t MaxGraceLogins;
+	u_int8_t MinPasswordLength;
+ 	u_int16_t MaxConnections __attribute__((packed));
+ #ifdef SWIG
+ 	fixedArray ConnectionTimeMask[42] __attribute__((packed));
+ 	fixedArray LastLogin[6] __attribute__((packed));
+ #else	
+-	u_int8_t ConnectionTimeMask[42] __attribute__((packed));
+-	u_int8_t LastLogin[6] __attribute__((packed));
+	u_int8_t ConnectionTimeMask[42];
+	u_int8_t LastLogin[6];
+ #endif	
+-	u_int8_t RestrictionMask __attribute__((packed));
+-	u_int8_t reserved __attribute__((packed));
+	u_int8_t RestrictionMask;
+	u_int8_t reserved;
+ 	u_int32_t MaxDiskUsage __attribute__((packed));
+ 	u_int16_t BadLoginCount __attribute__((packed));
+ 	u_int32_t BadLoginCountDown __attribute__((packed));
+-	struct ncp_station_addr LastIntruder __attribute__((packed));
+	struct ncp_station_addr LastIntruder;
+ };
+ 
+ NWCCODE NWReadPropertyValue(NWCONN_HANDLE conn, const char *objName,
+diff -Naurp ncpfs-2.2.6.orig//ipx-1.0/ipx_cmd.c ncpfs-2.2.6//ipx-1.0/ipx_cmd.c
+--- ncpfs-2.2.6.orig//ipx-1.0/ipx_cmd.c	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6//ipx-1.0/ipx_cmd.c	2011-02-10 02:40:19.222076002 -0500
+@@ -63,8 +63,8 @@
+ /* we are doing EthernetII... Any objections? */
+ struct {
+ 	u_int16_t	unknown	__attribute__((packed));
+-	u_int8_t	dst[6]	__attribute__((packed));
+-	u_int8_t	src[6]	__attribute__((packed));
+	u_int8_t	dst[6];
+	u_int8_t	src[6];
+ 	u_int16_t	type	__attribute__((packed));
+ 	u_int8_t	ipx[16384];
+ 	} buffer;
+diff -Naurp ncpfs-2.2.6.orig//lib/ncplib.c ncpfs-2.2.6//lib/ncplib.c
+--- ncpfs-2.2.6.orig//lib/ncplib.c	2011-02-10 02:38:05.000000000 -0500
+++ ncpfs-2.2.6//lib/ncplib.c	2011-02-10 02:38:18.822076000 -0500
+@@ -2584,13 +2584,13 @@ ncp_request(struct ncp_conn *conn, int f
+ 
+ struct nw_time_buffer
+ {
+-	u_int8_t year __attribute__((packed));
+-	u_int8_t month __attribute__((packed));
+-	u_int8_t day __attribute__((packed));
+-	u_int8_t hour __attribute__((packed));
+-	u_int8_t minute __attribute__((packed));
+-	u_int8_t second __attribute__((packed));
+-	u_int8_t wday __attribute__((packed));
+	u_int8_t year;
+	u_int8_t month;
+	u_int8_t day;
+	u_int8_t hour;
+	u_int8_t minute;
+	u_int8_t second;
+	u_int8_t wday;
+ };
+ 
+ static time_t
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch
@ -0,0 +1,15 @@
+diff -Naurp ncpfs-2.2.6.orig/include/ncp/ncplib.h ncpfs-2.2.6/include/ncp/ncplib.h
+--- ncpfs-2.2.6.orig/include/ncp/ncplib.h	2005-01-27 12:35:59.000000000 -0500
+++ ncpfs-2.2.6/include/ncp/ncplib.h	2014-08-12 21:01:01.159192798 -0400
+@@ -485,9 +485,9 @@ struct ncp_file_server_info
+ 
+ struct ncp_file_server_info_2 {
+ #ifdef SWIG
+-	fixedArray ServerName[49];
+	fixedArray ServerName[50];
+ #else
+-	u_int8_t ServerName[49];
+	u_int8_t ServerName[50];
+ #endif	
+ 	u_int8_t FileServiceVersion;
+ 	u_int8_t FileServiceSubVersion;
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch
@ -0,0 +1,11 @@
+--- a/contrib/php/php_auth_nds.c
+++ b/contrib/php/php_auth_nds.c
+@@ -1102,7 +1102,7 @@
+ 	php_info_print_table_end();
+ }
+ 
+-function_entry auth_nds_functions[] = {
+zend_function_entry auth_nds_functions[] = {
+ 	PHP_FE(auth_bindery,			NULL)
+ 	PHP_FE(auth_nds,			NULL)
+ 	PHP_FE(auth_tree,			NULL)
--- a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam
+
+DESCRIPTION="Provides access to Netware services using the NCP protocol"
+HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/"
+SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="nls pam"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Build fixes.
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+
+	# Add a patch to fix multiple vulnerabilities.
+	# CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791.
+	# http://seclists.org/fulldisclosure/2010/Mar/122
+	"${FILESDIR}"/${P}-multiple-vulns.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
+	# gcc releases.
+	"${FILESDIR}"/${P}-remove-packed-attrib.patch
+
+	# Misc patches borrowed from Mageia.
+	"${FILESDIR}"/${P}-align-fix.patch
+	"${FILESDIR}"/${P}-getuid-fix.patch
+	"${FILESDIR}"/${P}-pam_ncp_auth-fix.patch
+	"${FILESDIR}"/${P}-servername-array-fix.patch
+
+	# Misc patches borrowed from Debian.
+	# Fixes Bug #497278
+	"${FILESDIR}"/${P}-drop-kernel-check.patch
+	"${FILESDIR}"/${P}-drop-mtab-support.patch
+	"${FILESDIR}"/${P}-no-suid-root.patch
+	"${FILESDIR}"/${P}-remove-libncp_atomic-header.patch
+
+	# Support LDFLAGS.
+	"${FILESDIR}"/${P}-ldflags-support.patch
+
+	# Bug 446696.  This might need re-diffing if additional Makefile
+	# fixes are added.
+	"${FILESDIR}"/${P}-makefile-fix-soname-link.patch
+)
+
+DOCS=( FAQ README )
+
+src_prepare() {
+	# Bug #273484.
+	sed -i '/ldconfig/d' lib/Makefile.in || die
+
+	default
+}
+
+src_configure() {
+	# PHP integration no longer supported in Gentoo, per Bug #582516.
+	econf \
+		$(use_enable nls) \
+		$(use_enable pam pam "$(getpam_mod_dir)") \
+		--disable-php
+}
+
+src_install() {
+	dodir $(getpam_mod_dir) /usr/sbin /sbin
+
+	# Install main software and headers.
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install-dev
+
+	# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
+	newconfd "${FILESDIR}"/ipx.confd ipx
+	newinitd "${FILESDIR}"/ipx.init ipx
+
+	einstalldocs
+}
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@ -1,964 +0,0 @@
-# ChangeLog for net-fs/nfs-utils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.215 2013/04/13 20:02:02 vapier Exp $
-
-  17 Jan 2014; Mario Fetka <mario.fetka@gmail.com> nfs-utils-1.2.9-r1.ebuild:
-  correct heimdal config options
-
-*nfs-utils-1.2.9-r1 (17 Jan 2014)
-
-  17 Jan 2014; Mario Fetka <mario.fetka@gmail.com> +files/rpc-statd.service-r1,
-  +nfs-utils-1.2.9-r1.ebuild, files/nfs-utils-1.2.9-heimdal-1.patch:
-  Bump to upsteam
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> -nfs-utils-1.2.9.ebuild:
-  downgrade to 1.2.8 waiting for 1.2.9 heimdal patch
-
-*nfs-utils-1.2.9 (21 Nov 2013)
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +nfs-utils-1.2.9.ebuild:
-  update to 1.2.9
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> nfs-utils-1.2.8-r2.ebuild:
-  detect correct kerberos implementation
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> nfs-utils-1.2.8-r2.ebuild:
-  use older patch
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> metadata.xml:
-  update mteadata
-
-*nfs-utils-1.2.8-r2 (21 Nov 2013)
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com>
-  +files/0001-mountd-Fix-is_subdirectory-again.patch,
-  +files/0001-statd-exit-if-a-statd-is-already-running.patch,
-  +nfs-utils-1.2.8-r2.ebuild, -nfs-utils-1.2.8-r1.ebuild,
-  -nfs-utils-1.2.9.ebuild:
-  downgrade to 1.2.8 waiting for 1.2.9 heimdal patch
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com>
-  +files/nfs-utils-1.2.7-heimdal.patch, +files/nfs-utils-1.2.9-heimdal-1.patch,
-  nfs-utils-1.2.9.ebuild:
-  Bump heimdal patch
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com>
-  +files/nfs-utils-1.2.8-heimdal.patch, -files/nfs-utils-1.2.7-heimdal.patch,
-  nfs-utils-1.2.8-r1.ebuild, nfs-utils-1.2.9.ebuild:
-  Bump kernel patch to 1.2.8
-
-*nfs-utils-1.2.9 (21 Nov 2013)
-
-  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +nfs-utils-1.2.9.ebuild,
-  -files/0001-mountd-Fix-is_subdirectory-again.patch,
-  -files/0001-statd-exit-if-a-statd-is-already-running.patch:
-  update with heimdal fix
-
-*nfs-utils-1.2.8-r1 (16 Aug 2013)
-
-  16 Aug 2013; Mario Fetka <mario.fetka@gmail.com>
-  +files/0001-mountd-Fix-is_subdirectory-again.patch,
-  +files/0001-statd-exit-if-a-statd-is-already-running.patch,
-  +files/nfs-utils-1.2.7-heimdal.patch,
-  +files/nfs-utils-1.2.8-cross-build.patch, +files/nfsd.service,
-  +files/rpc-mountd.service, +files/rpc-statd.service,
-  +nfs-utils-1.2.8-r1.ebuild, -files/nfs-utils-1.2.6-cross-build.patch,
-  -files/nfs-utils-1.2.7-heomdal.patch, -files/nfs-utils-1.2.7-libio.patch,
-  -files/nfs-utils-1.2.7-nfsiostat-python3.patch, -nfs-utils-1.2.7.ebuild:
-  Bump the patch
-
-  13 Apr 2013; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.6.ebuild,
-  nfs-utils-1.2.7.ebuild:
-  Force sqlite test to work even when cross-compiling #465576 by Dennis
-  Schridde.
-
-  24 Mar 2013; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.2.7-libio.patch, nfs-utils-1.2.6.ebuild,
-  nfs-utils-1.2.7.ebuild:
-  Fix uClibc build w/missing libio.h #459200 by Mark Reiche.
-
-*nfs-utils-1.2.7 (24 Mar 2013)
-
-  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.7.ebuild,
-  metadata.xml:
-  Version bump #445288 by teidakankan.
-
-  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> +files/nfsmount.confd,
-  files/nfsmount.initd, nfs-utils-1.2.6.ebuild:
-  Move net usage to conf.d (defaults are unchanged) #439660 by Matthew Schultz.
-
-  24 Mar 2013; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.2.7-nfsiostat-python3.patch, nfs-utils-1.2.6.ebuild:
-  Make nfsiostat work under python 3 #458934 by Jim Faulkner.
-
-  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Process /etc/exports.d/*.exports too #459600 by Joakim Tjernlund.
-
-  01 Jan 2013; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Stable for HPPA (bug #445564).
-
-  01 Jan 2013; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.2.6.ebuild:
-  s390/sh stable wrt #445564
-
-  30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Stable for alpha, wrt bug #445564
-
-  29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Stable for sparc, wrt bug #445564
-
-  18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Stable for ia64, wrt bug #445564
-
-  06 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> nfs-utils-1.2.6.ebuild:
-  x86 stable wrt bug #445564
-
-  04 Dec 2012; Anthony G. Basile <blueness@gentoo.org> nfs-utils-1.2.6.ebuild:
-  stable arm ppc ppc64, bug #445564
-
-  02 Dec 2012; Markos Chandras <hwoarang@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Stable on amd64 wrt bug #445564
-
-  16 Sep 2012; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Pull in sqlite when USE=nfsdcld #433062 by Guillaume Castagnino.
-
-  18 May 2012; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.6.ebuild:
-  Update request-key.d config settings #415625 by Maciej Szmigiero.
-
-  17 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
-  +files/nfs-utils-1.2.6-conditionals.patch, nfs-utils-1.2.6.ebuild:
-  Fix build with USE=-nfsv4.
-
-*nfs-utils-1.2.6 (17 May 2012)
-
-  17 May 2012; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.2.6-cross-build.patch,
-  +files/nfs-utils-1.2.6-osd-install.patch, +nfs-utils-1.2.6.ebuild,
-  metadata.xml:
-  Version bump #416189 by teidakankan.
-
-  03 May 2012; Jeff Horelick <jdhore@gentoo.org> nfs-utils-1.2.4.ebuild,
-  nfs-utils-1.2.5.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  16 Jan 2012; Justin Lecher <jlec@gentoo.org> nfs-utils-1.2.5.ebuild:
-  Don't use default src_install function, in order to install only valid docs,
-  thanks ssuominen
-
-  16 Jan 2012; Justin Lecher <jlec@gentoo.org> nfs-utils-1.2.5.ebuild:
-  Add missing dep on sys-fs/lvm2, #399051; corrected target path in src install
-  $ED to $D
-
-  14 Jan 2012; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.5.ebuild:
-  Require newer version of libgssglue #398901 by Marien Zwart.
-
-*nfs-utils-1.2.5 (14 Jan 2012)
-
-  14 Jan 2012; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.5.ebuild:
-  Version bump #384465 by teidakankan with updates by Justin Lecher.
-
-  28 Dec 2011; <swift@gentoo.org> nfs-utils-1.2.4.ebuild:
-  Add selinux triggered dependencies on selinux-rpc and selinux-rpcbind
-
-  08 Dec 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild,
-  +files/nfs-utils-1.2.4-no-nfsctl.patch:
-  Fix building with arches that do not support nfsctl syscalls.
-
-  17 Oct 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild:
-  Pull in pkg-config since we use it #387365 by bay.
-
-  18 Sep 2011; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Convert to extra_started_commands #381887 by teidakankan.
-
-  02 Sep 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild,
-  +files/nfs-utils-1.2.4-cross-build.patch:
-  Fix cross-compiling with native helper tools.
-
-  02 Sep 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild,
-  +files/nfs-utils-1.2.4-nfsidmap.patch, metadata.xml:
-  Add USE="nfsidmap nfsv41" to control new deps and features #381459 by
-  Krzysztof Pawlik.
-
-  01 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> nfs-utils-1.2.4.ebuild,
-  +files/nfs-utils-1.2.4-conditional.patch:
-  Fix build with USE=-nfsv4, by importing two (folded) patches from git.
-
-*nfs-utils-1.2.4 (01 Sep 2011)
-
-  01 Sep 2011; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.4.ebuild,
-  +files/nfs-utils-1.2.4-exportfs-skip-dir.patch,
-  +files/nfs-utils-1.2.4-exportfs-xlog.patch:
-  Version bump #373651 by teidakankan.
-
-  01 Sep 2011; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Drop --oknodo usage #377765 by Michael Mair-Keimberger.
-
-  19 Jun 2011; Mike Frysinger <vapier@gentoo.org> files/rpc.pipefs.initd:
-  Remove shortcuts that result in silent errors #372297 by Sebastian Pipping.
-
-  29 May 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.3-r1.ebuild:
-  Make sure /var/lib/nfs exists before copying into it #368505 by William
-  Throwe.
-
-  24 Apr 2011; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.2.3-r1.ebuild:
-  sparc stable wrt #358509
-
-  06 Apr 2011; Mike Frysinger <vapier@gentoo.org> files/nfs.confd,
-  files/nfs.initd:
-  Add conf.d option for tweaking nfsd settings #361473 by John Feuerstein.
-
-  24 Mar 2011; Thomas Kahle <tomka@gentoo.org> nfs-utils-1.2.3-r1.ebuild:
-  x86 stable per bug 358509
-
-  18 Mar 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.3-r1.ebuild:
-  Mark alpha/arm/hppa/ia64/s390/sh stable #358509.
-
-  14 Mar 2011; Markos Chandras <hwoarang@gentoo.org> nfs-utils-1.2.3-r1.ebuild:
-  Stable on amd64 wrt bug #358509
-
-  13 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  nfs-utils-1.2.3-r1.ebuild:
-  ppc/ppc64 stable wrt #358509
-
-*nfs-utils-1.2.3-r1 (14 Nov 2010)
-
-  14 Nov 2010; Mike Frysinger <vapier@gentoo.org>
-  +nfs-utils-1.2.3-r1.ebuild,
-  +files/nfs-utils-1.2.3-ti-rpc-static-ports.patch:
-  Add fix from upstream for ti-rpc static port bindings #340797 by John J.
-  Aylward.
-
-*nfs-utils-1.2.3 (08 Oct 2010)
-
-  08 Oct 2010; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.3.ebuild:
-  Version bump #339288.
-
-  19 Sep 2010; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.2-r2.ebuild:
-  Fix multilib dir handling with backed up /var/lib/nfs.
-
-  07 Aug 2010; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Port logic over for detecting rpc.gssd needs in nfs init.d script #330795 by
-  Jared.
-
-  02 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> files/nfs.initd:
-  Only require rpc.svcgssd if sec=krb is used rather than sec=sys (default).
-  Thanks to Jared in bug #330795.
-
-  26 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> files/nfs.initd:
-  Fix nfs init script dependency generation for kerberos exports.
-
-*nfs-utils-1.2.2-r2 (23 Jul 2010)
-
-  23 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  +nfs-utils-1.2.2-r2.ebuild, +files/nfs-utils-1.2.2-nfsv4.patch:
-  Fix configure script when enabling NFSv4 and Kerberos, some tests would
-  have been skipped.
-
-  28 Jun 2010; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd:
-  Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил.
-
-*nfs-utils-1.2.2-r1 (20 Apr 2010)
-
-  20 Apr 2010; Mike Frysinger <vapier@gentoo.org>
-  +nfs-utils-1.2.2-r1.ebuild, +files/nfs-utils-1.2.2-optional-libcap.patch:
-  Make libcap support optional via USE=caps #314777.
-
-  20 Apr 2010; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.2.ebuild:
-  Disable tests since they require no rpc.statd to be running on the system
-  beforehand #315573 by Pacho Ramos.
-
-*nfs-utils-1.2.2 (11 Apr 2010)
-
-  11 Apr 2010; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.2.ebuild:
-  Version bump #314603 by Tim Harder.
-
-  31 Mar 2010; <solar@gentoo.org> nfs-utils-1.1.4-r1.ebuild,
-  nfs-utils-1.1.5.ebuild, nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild,
-  nfs-utils-1.2.0.ebuild, nfs-utils-1.2.1.ebuild:
-  - elibc_glibc has to be defined in IUSE= for profiles that are unable to
-  use.force that flag bug #312085
-
-  22 Nov 2009; Sven Wegener <swegener@gentoo.org> nfs-utils-1.2.1.ebuild:
-  Use src_configure and src_prepare for EAPI-2 compliance, this should fix
-  bug #294082.
-
-*nfs-utils-1.2.1 (22 Nov 2009)
-
-  22 Nov 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.1.ebuild:
-  Version bump #293523 by Florian Manschwetus and update kerberos depends
-  #274793 by Andrew Savchenko.
-
-  11 Sep 2009; Zac Medico <zmedico@gentoo.org> nfs-utils-1.2.0.ebuild:
-  Move !net-nds/portmap out of DEPEND, as per bug #108449, comment #4.
-
-  25 Aug 2009; Mike Frysinger <vapier@gentoo.org>
-  -files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.4-r1.ebuild,
-  +files/nfs-utils-1.1.4-rpcgen-ioctl.patch, nfs-utils-1.1.5.ebuild,
-  nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild:
-  Update rpcgen ioctl patch to reflect changes in upstream.
-
-*nfs-utils-1.2.0 (02 Jun 2009)
-
-  02 Jun 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.0.ebuild:
-  Version bump.
-
-  30 May 2009; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.6-r1.ebuild,
-  files/nfs.confd, files/nfs.initd:
-  Have nfs init.d depend on rpc.idmapd by default when USE=nfsv4, but allow
-  people to disable it via conf.d #234132 by roger.
-
-  30 May 2009; Mike Frysinger <vapier@gentoo.org>
-  +nfs-utils-1.1.6-r1.ebuild, metadata.xml:
-  Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch
-  to libtirpc all the time, and make nfs3/nfs4 optional.
-
-*nfs-utils-1.1.6-r1 (30 May 2009)
-
-  30 May 2009; Mike Frysinger <vapier@gentoo.org>
-  +nfs-utils-1.1.6-r1.ebuild:
-  Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch
-  to libtirpc all the time, and make nfs3/nfs4 optional.
-
-*nfs-utils-1.1.6 (09 May 2009)
-
-  09 May 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.1.6.ebuild:
-  Version bump.
-
-  25 Mar 2009; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
-  arm/ia64/s390/sh/sparc stable wrt #261334
-
-  18 Mar 2009; Joseph Jezak <josejx@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
-  Marked ppc stable for bug #261334.
-
-  15 Mar 2009; Markus Meier <maekke@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
-  x86 stable, bug #261334
-
-  15 Mar 2009; Brent Baude <ranger@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
-  Marking nfs-utils-1.1.4-r1 ppc64 for bug 261334
-
-  14 Mar 2009; Mike Frysinger <vapier@gentoo.org> files/rpc.idmapd.initd:
-  Add a warning upon failure that DNOTIFY is needed #261697 by Pacho Ramos.
-
-  11 Mar 2009; Tobias Klausmann <klausman@gentoo.org>
-  nfs-utils-1.1.4-r1.ebuild:
-  Stable on alpha, bug #261334
-
-  10 Mar 2009; Dawid Węgliński <cla@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
-  Stable on amd64 (bug #261334)
-
-*nfs-utils-1.1.5 (06 Mar 2009)
-
-  06 Mar 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.1.5.ebuild:
-  Version bump.
-
-  06 Mar 2009; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
-  Stable for HPPA (bug #261334).
-
-  27 Feb 2009; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Fixup bashism in init.d script #260149 by Timothy Redaelli.
-
-*nfs-utils-1.1.4-r1 (31 Jan 2009)
-
-  31 Jan 2009; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.1.4-ascii-man.patch,
-  +files/nfs-utils-1.1.4-mtab-sym.patch,
-  +files/nfs-utils-1.1.4-no-exec.patch, +nfs-utils-1.1.4-r1.ebuild:
-  Add some fixes from Debian and push out init.d fixes.
-
-  31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Also use rpc.nfsd to try to shutdown nfsd #228127 by Maurice Volaski.
-
-  31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/rpc.statd.initd:
-  Make sure stop() works even if rpc.statd is dead so init.d doesnt fake
-  stop silently.
-
-  31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Add /proc/fs/nfs -> /proc/fs/nfsd fix again.
-
-  31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
-  Restart rpc.idmapd if nfsd is a module #220747 by Jochen Radmacher.
-
-  30 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
-  nfs-utils-1.1.3.ebuild:
-  Stable on sparc, security bug #242696
-
-  09 Nov 2008; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.4.ebuild:
-  Always own /etc/exports from now on #246021 by Ian Kelling.
-
-  08 Nov 2008; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.1.3.ebuild:
-  alpha/ia64 stable wrt #242696
-
-  02 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  nfs-utils-1.1.3.ebuild:
-  ppc stable, bug #242696
-
-  30 Oct 2008; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.1.3.ebuild:
-  Stable for HPPA (bug #242696).
-
-  28 Oct 2008; Brent Baude <ranger@gentoo.org> nfs-utils-1.1.3.ebuild:
-  Marking nfs-utils-1.1.3 ppc64 for bug 242696
-
-  27 Oct 2008; Markus Meier <maekke@gentoo.org> nfs-utils-1.1.3.ebuild:
-  amd64/x86 stable, bug #242696
-
-  26 Oct 2008; Mike Frysinger <vapier@gentoo.org> files/rpc.gssd.initd,
-  files/rpc.idmapd.initd, +files/rpc.pipefs.initd, files/rpc.svcgssd.initd,
-  nfs-utils-1.0.12-r5.ebuild, nfs-utils-1.1.0-r1.ebuild,
-  nfs-utils-1.1.1.ebuild, nfs-utils-1.1.1-r1.ebuild, nfs-utils-1.1.2.ebuild,
-  nfs-utils-1.1.2-r1.ebuild, nfs-utils-1.1.3.ebuild, nfs-utils-1.1.4.ebuild:
-  Split rpc.pipefs mounting into its own init.d script so we handle parallel
-  execution properly #238593 by Michele Schiavo.
-
-  26 Oct 2008; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.4.ebuild:
-  Force newer libnfsidmap as it provides idmapd.conf #243066.
-
-*nfs-utils-1.1.4 (18 Oct 2008)
-
-  18 Oct 2008; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.1.4.ebuild:
-  Version bump.
-
-*nfs-utils-1.1.3 (16 Aug 2008)
-
-  16 Aug 2008; Mike Frysinger <vapier@gentoo.org> files/rpc.gssd.initd,
-  files/rpc.svcgssd.initd, +nfs-utils-1.1.3.ebuild:
-  Version bump. Fix arg passing for gssd binaries #232387 by Michele
-  Schiavo. Depend on e2fsprogs-libs for libblkid #221773 by Triffid Hunter.
-
-  16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-*nfs-utils-1.1.2-r1 (04 May 2008)
-
-  04 May 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.1.2-mount-eacces.patch, files/nfs.initd,
-  files/nfsmount.initd, files/rpc.gssd.initd, files/rpc.idmapd.initd,
-  files/rpc.svcgssd.initd, +nfs-utils-1.1.2-r1.ebuild:
-  Dont bother checking for config anymore #219495 by Davide Pesavento. Load
-  sunrpc module if rpc_pipefs is not available #219566 by Martin von Gagern.
-  Add change from Fedora to exit immediately upon perm denied errors when
-  mounting #219729 by Stefaan De Roeck.
-
-  21 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd:
-  Use non-common awk exit values so that the default exit values dont trigger
-  false positives #218713 by Paolo Pedroni.
-
-  21 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/rpc.gssd.initd,
-  files/rpc.svcgssd.initd:
-  Fix typo in start() func in new gssd init.d scripts as pointed out by Ryan
-  Tandy #218665.
-
-  20 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> nfs-utils-1.1.2.ebuild:
-  Fix building without kerberos and with nonfsv4 USE flag enabled. See bug
-  #218595.
-
-  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.2.ebuild:
-  Make sure rpcgen includes sys/ioctl.h #174393.
-
-*nfs-utils-1.1.2 (20 Apr 2008)
-
-  20 Apr 2008; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.1.2.ebuild:
-  Version bump.
-
-*nfs-utils-1.1.1-r1 (20 Apr 2008)
-
-  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
-  +nfs-utils-1.1.1-r1.ebuild:
-  Push out accumulated changes.
-
-  20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
-  files/rpc.gssd.initd, +files/rpc.svcgssd.initd,
-  nfs-utils-1.0.12-r5.ebuild, nfs-utils-1.1.0-r1.ebuild,
-  nfs-utils-1.1.1.ebuild:
-  Split the gssd and svcgssd init.d scripts #186037 by Paul B. Henson.
-
-  20 Apr 2008; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.1.ebuild:
-  Only leverage kerberos when USE="-nonfsv4" #212160.
-
-  20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd:
-  Fix nfs4/idmapd detection #213384 by Marek Szuba.
-
-  14 Jan 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
-  files/nfsmount.initd:
-  Until newer baselayout stabilizes, only use config() when it exists #203906.
-
-  08 Jan 2008; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.1.0-r1.ebuild:
-  alpha/ia64/sparc stable wrt #201552
-
-  08 Jan 2008; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.1.0-r1.ebuild:
-  Stable for HPPA (bug #201552).
-
-  30 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
-  files/nfsmount.initd:
-  Make sure /etc/exports and /etc/fstab exist to account for the stupid cases
-  of running these init.d scripts without anything useful to do.
-
-  30 Dec 2007; Samuli Suominen <drac@gentoo.org> nfs-utils-1.1.0-r1.ebuild:
-  amd64 stable wrt #201552
-
-  29 Dec 2007; nixnut <nixnut@gentoo.org> nfs-utils-1.1.0-r1.ebuild:
-  Stable on ppc wrt bug 201552
-
-  29 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd:
-  Make sure we check for "nfs" and not "nfsd" when doing client filesystem setup.
-
-*nfs-utils-1.1.1 (29 Dec 2007)
-
-  29 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
-  files/rpc.gssd.initd, files/rpc.idmapd.initd, files/rpc.statd.initd,
-  +nfs-utils-1.1.1.ebuild:
-  Version bump #197336 by Francisco Javier. Tweak nfs init.d needs based on
-  exportfs #172431. Only mount nfsd fs in nfs init.d script. Mount rpc_pipefs
-  in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by
-  Maurice Volaski.
-
-  29 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/rpc.statd.initd:
-  Look up the full path of rpc.statd to avoid matching the init.d script
-  #203646 by legate.
-
-  15 Oct 2007; Markus Rothe <corsair@gentoo.org> nfs-utils-1.1.0-r1.ebuild:
-  Stable on ppc64
-
-  21 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
-  nfs-utils-1.1.0-r1.ebuild:
-  stable x86, bug 190182
-
-*nfs-utils-1.1.0-r1 (15 Sep 2007)
-*nfs-utils-1.0.12-r1 (15 Sep 2007)
-*nfs-utils-1.0.12-r5 (15 Sep 2007)
-
-  15 Sep 2007; Mike Frysinger <vapier@gentoo.org>
-  +nfs-utils-1.0.12-r1.ebuild, +nfs-utils-1.0.12-r5.ebuild,
-  +nfs-utils-1.1.0-r1.ebuild:
-  Force bumpage for versions to clean up libgssglue nightmare #191746.
-
-  23 Aug 2007; Joshua Kinard <kumba@gentoo.org> nfs-utils-1.0.12-r3.ebuild:
-  Stable on mips.
-
-*nfs-utils-1.0.12-r4 (16 Aug 2007)
-
-  16 Aug 2007; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
-  files/nfsmount.initd, +nfs-utils-1.0.12-r4.ebuild:
-  Only force kerb init.d scripts when the NFSv4 mount needs it #180428 by
-  Maurice Volaski. Load the nfs module in the nfsmount client script, not
-  nfsd.
-
-  13 May 2007; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.0.ebuild:
-  Make sure we pull in >=app-crypt/libgssapi-0.11 #178217 by Markus Ullmann.
-
-*nfs-utils-1.1.0 (12 May 2007)
-
-  12 May 2007; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
-  files/nfsmount.initd, files/rpc.gssd.initd, files/rpc.idmapd.initd,
-  files/rpc.statd.initd, +nfs-utils-1.1.0.ebuild:
-  Version bump.
-
-  06 May 2007; Marius Mauch <genone@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Replacing einfo with elog
-
-  07 Apr 2007; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.0.12-r3.ebuild:
-  Bind rpc.gssd install to USE=kerberos rather than USE=!nonfsv4
-  #172431 by emerald.
-
-*nfs-utils-1.0.12-r3 (02 Apr 2007)
-
-  02 Apr 2007; Roy Marples <uberlord@gentoo.org> files/nfs.initd,
-  files/rpc.gssd.initd, files/rpc.idmapd.initd, files/rpc.statd.initd,
-  +nfs-utils-1.0.12-r3.ebuild:
-  Remove some bashisms and support baselayout-2 restart option.
-
-  27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  nfs-utils-1.0.12.ebuild:
-  Stable on alpha/amd64 wrt bug #172133.
-
-  26 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  nfs-utils-1.0.12.ebuild:
-  Stable on sparc wrt #172133
-
-  26 Mar 2007; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.0.12.ebuild:
-  Stable for HPPA (bug #172133).
-
-  26 Mar 2007; Alec Warner <antarus@gentoo.org> nfs-utils-1.0.6-r6.ebuild,
-  nfs-utils-1.0.7-r2.ebuild, nfs-utils-1.0.9.ebuild,
-  nfs-utils-1.0.10.ebuild, nfs-utils-1.0.12.ebuild,
-  nfs-utils-1.0.12-r1.ebuild, nfs-utils-1.0.12-r2.ebuild:
-  Remove dependency on portage: ref bug 162516
-
-*nfs-utils-1.0.12-r2 (25 Mar 2007)
-
-  25 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/nfs.confd,
-  +files/nfs.initd, +files/nfsmount.initd, +files/rpc.gssd.initd,
-  +files/rpc.idmapd.initd, +files/rpc.statd.initd,
-  +nfs-utils-1.0.12-r2.ebuild:
-  Split init.d scripts up so client/server configurations are handled properly
-  #101624 by Tim Hobbs. Special thanks to Daniel Burr and Thomas Bettler.
-
-  25 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  nfs-utils-1.0.12.ebuild:
-  Stable on ppc wrt bug #172133.
-
-  25 Mar 2007; Andrej Kacian <ticho@gentoo.org> nfs-utils-1.0.12.ebuild:
-  Stable on x86, bug #172133.
-
-  25 Mar 2007; Markus Rothe <corsair@gentoo.org> nfs-utils-1.0.12.ebuild:
-  Stable on ppc64; bug #172133
-
-  24 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/nfs:
-  Mount nfsd filesystem at /proc/fs/nfsd rather than /proc/fs/nfs #172019.
-
-*nfs-utils-1.0.12-r1 (24 Mar 2007)
-
-  24 Mar 2007; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.0.12-mountd-memleak.patch, +nfs-utils-1.0.12-r1.ebuild:
-  Grab fix from upstream for memleak in mountd #172014 by Bardur Arantsson.
-
-  21 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  nfs-utils-1.0.10.ebuild:
-  Stable on amd64 wrt bug #167664.
-
-  16 Mar 2007; nixnut <nixnut@gentoo.org> nfs-utils-1.0.10.ebuild:
-  Stable on ppc wrt bug 167664
-
-*nfs-utils-1.0.12 (27 Feb 2007)
-
-  27 Feb 2007; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.0.12.ebuild:
-  Version bump.
-
-  23 Feb 2007; Markus Rothe <corsair@gentoo.org> nfs-utils-1.0.10.ebuild:
-  Stable on ppc64; bug #167664
-
-  23 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  nfs-utils-1.0.10.ebuild:
-  stable x86; bug 167664
-
-  10 Jan 2007; Roy Marples <uberlord@gentoo.org> files/nfs:
-  Use --name for s-s-d starting nfsd so baselayout-1.13 correctly finds it.
-
-  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
-  nfs-utils-1.0.6-r6.ebuild:
-  Remove gnuconfig inherit.
-
-  28 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  nfs-utils-1.0.10.ebuild:
-  Stable on sparc
-
-  04 Dec 2006; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.0.10.ebuild:
-  Stable for HPPA.
-
-  23 Oct 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.0.10-uts-release.patch, nfs-utils-1.0.10.ebuild:
-  Fix building with linux-headers-2.6.18+.
-
-  21 Oct 2006; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.10.ebuild:
-  Mark 1.0.10 stable on alpha/ia64
-
-*nfs-utils-1.0.10 (22 Aug 2006)
-
-  22 Aug 2006; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.0.10.ebuild:
-  Version bump.
-
-*nfs-utils-1.0.9 (16 Jul 2006)
-
-  16 Jul 2006; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.0.9.ebuild:
-  Version bump.
-
-*nfs-utils-1.0.8 (10 Jun 2006)
-
-  10 Jun 2006; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.0.8.ebuild:
-  Version bump #136038 by Mario Fetka.
-
-  09 Mar 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.0.7-no-stripping.patch, nfs-utils-1.0.7-r2.ebuild:
-  Let portage strip binaries.
-
-  29 Jan 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.0.6-usn36.patch, -files/nfs-utils-1.0.6-usn36.patch.gz,
-  nfs-utils-1.0.6-r6.ebuild:
-  Uncompress patch #120673 by Simon Stelling.
-
-*nfs-utils-1.0.7-r2 (08 Oct 2005)
-
-  08 Oct 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/nfs-utils-1.0.7-man-pages.patch, files/nfs, files/nfs.confd,
-  +nfs-utils-1.0.7-r2.ebuild:
-  Add support for starting/stopping gssd daemons #108276 and installing their
-  config files. Also tweak the man-pages SEE ALSO #107991.
-
-  23 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> files/nfsmount:
-  Corrected init script to use 'svc_stop; svc_start' and not 'stop; start'.
-
-  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
-  nfs-utils-1.0.7-r1.ebuild:
-  add kerberos to IUSE
-
-*nfs-utils-1.0.7-r1 (15 Mar 2005)
-
-  15 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/nfs,
-  files/nfs.confd, -nfs-utils-1.0.7.ebuild, +nfs-utils-1.0.7-r1.ebuild:
-  Add support for integrated idmapd #71607 by Keith M Wesolowski.
-
-*nfs-utils-1.0.7 (04 Feb 2005)
-
-  04 Feb 2005; Aron Griffis <agriffis@gentoo.org> +nfs-utils-1.0.7.ebuild:
-  Bump to 1.0.7. New local USE-flag nfsv4 since that pulls in mit-krb5 which
-  has its own problems
-
-  15 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> :
-  Fix digest, bug #78168.
-
-  15 Jan 2005; <solar@gentoo.org> +files/nfs-utils-1.0.6-uclibc.patch,
-  nfs-utils-1.0.6-r6.ebuild:
-  - getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc
-
-  11 Dec 2004; Markus Rothe <corsair@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Stable on ppc64; bug #72113
-
-  11 Dec 2004; Joseph Jezak <josejx@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Marked ppc stable for bug #72113.
-
-  10 Dec 2004; Guy Martin <gmsoft@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Stable on hppa.
-
-  07 Dec 2004; Hardave Riar <hardave@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Stable on mips, bug #72113
-
-  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
-  nfs-utils-1.0.6-r6.ebuild:
-  Stable on alpha, bug 72113.
-
-  06 Dec 2004; Karol Wojtaszek <sekretarz@gentoo.org>
-  nfs-utils-1.0.6-r6.ebuild:
-  Stable on amd64, bug #72113
-
-  06 Dec 2004; Olivier Crete <tester@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Stable on x86 wrt security bug 72113
-
-  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  nfs-utils-1.0.6-r6.ebuild:
-  Stable on sparc wrt #72113
-
-  06 Dec 2004; <rphillips@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
-  Added ubuntu's DOS vulnerability patch. fixes #72113
-
-  05 Dec 2004; Jason Wever <weeve@gentoo.org> nfs-utils-1.0.6-r5.ebuild:
-  Stable on sparc wrt security bug #72113.
-
-  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
-  nfs-utils-1.0.6-r5.ebuild:
-  Stable on alpha, bug 72113.
-
-  04 Dec 2004; Hardave Riar <hardave@gentoo.org> nfs-utils-1.0.6-r5.ebuild:
-  Stable on mips, bug #72113
-
-  04 Dec 2004; Markus Rothe <corsair@gentoo.org> nfs-utils-1.0.6-r5.ebuild:
-  Stable on ppc64; bug #72113
-
-  04 Dec 2004; Mike Doty <kingtaco@gentoo.org> nfs-utils-1.0.6-r5.ebuild:
-  stable on amd64 per #72113
-
-*nfs-utils-1.0.6-r5 (22 Nov 2004)
-
-  22 Nov 2004; <solar@gentoo.org>
-  +files/nfs-utils-0.3.3-rquotad-overflow.patch, +nfs-utils-1.0.6-r5.ebuild:
-  Security bump for 64bit arches bug #72113 - CAN-2004-0946
-
-  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> nfs-utils-1.0.6-r4.ebuild:
-  Marked stable on mips.
-
-  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
-  nfs-utils-1.0.6-r4.ebuild:
-  Stable on alpha.
-
-  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
-  nfs-utils-1.0.6-r4.ebuild:
-  Stable on amd64.
-
-  09 Oct 2004; Christian Birchinger <joker@gentoo.org>
-  nfs-utils-1.0.6-r4.ebuild:
-  Added sparc stable keyword
-
-  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> files/nfsmount:
-  Added 'use ypbind' to nfsmount script to close bug #28195.
-
-*nfs-utils-1.0.6-r4 (07 Jul 2004)
-
-  07 Jul 2004; Aron Griffis <agriffis@gentoo.org> files/nfs-5,
-  -nfs-utils-1.0.6-r3.ebuild, +nfs-utils-1.0.6-r4.ebuild:
-  Set a default timeout of 30 seconds in case EXPORTFSTIMEOUT is unset in
-  conf.d/nfs
-
-  25 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> nfs-utils-1.0.6.ebuild:
-  Marked stable on amd64.
-
-*nfs-utils-1.0.6-r3 (11 Jun 2004)
-
-  11 Jun 2004; Mike Frysinger <vapier@gentoo.org> :
-  While i'm here, might as well fix more things :P.
-  Run make for the depend target so that we can then build everything 
-  else in parallel.  Add tweakable exportfs timeout to nfs init script 
-  #37004 by Vlastimil Holer.  Enable the '--enable-secure-statd' option 
-  by default (seems to work fine on my nfs3 machines) #49444 by Juergen 
-  Nagel.  Make sure the emtpy state dirs dont get autocleaned #30522 by 
-  Brave Cobra.
-
-*nfs-utils-1.0.6-r2 (08 Jun 2004)
-
-  08 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/nfs-4,
-  +nfs-utils-1.0.6-r2.ebuild:
-  Add support for NFSv4 #25106 by Michael Locher.
-
-  11 May 2004; Michael McCabe <randy@gentoo.org> nfs-utils-1.0.6-r1.ebuild:
-  Added s390 keywords
-
-  13 Apr 2004; Joshua Kinard <kumba@gentoo.org> nfs-utils-1.0.6-r1.ebuild:
-  Marked stable on mips.
-
-  11 Mar 2004; Lars Weiler <pylon@gentoo.org> nfs-utils-1.0.6.ebuild:
-  stable on ppc
-
-  07 Mar 2004; Tom Gall <tgall@gentoo.org> nfs-utils-1.0.6-r1.ebuild:
-  stable on ppc64
-
-  06 Mar 2004; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com> :
-  mark as ~mips
-
-  06 Mar 2004; Joshua Kinard <kumba@gentoo.org> nfs-utils-1.0.5-r1.ebuild,
-  nfs-utils-1.0.6-r1.ebuild:
-  Added ~mips to KEYWORDS.
-
-*nfs-utils-1.0.6-r1 (30 Jan 2004)  
-  
-  30 Jan 2004; Daniel Robbins <drobbins@gentoo.org> nfs-utils-1.0.6-r1.ebuild:
-  Add a new ebuild (currently unmasked for ~x86 and ~amd64 only) that mounts
-  the nfsd filesystem to /proc/fs/nfs to provide robust exports handling for
-  2.6 kernels. (See /usr/src/linux/Documentation/Changes in a 2.6 kernel source
-  tree for more information on this.) I needed this fix for mountd to support
-  nfs version 3 on my server with a 2.6 kernel. Also changed default
-  "restarting" behavior to "yes," which seems to be what most users will want.
-  This ebuild is not in stable on any arch, so nfs-team, please let me know
-  what you think of these changes.
-  
-  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.6.ebuild: 
-  Fix bug 30486 by refraining from overwriting /var/lib/nfs/*
-
-  14 Jan 2004; Martin Holzer <mholzer@gentoo.org> files/nfs.confd:
-  removing quota entry from conf.d
-
-  05 Jan 2004; zhen <zhen@gentoo.org> metadata.xml:
-  adding to net-fs herd
-
-  28 Dec 2003; Guy Martin <gmsoft@gentoo.org> nfs-utils-1.0.6.ebuild:
-  Marked stable on hppa.
-
-  02 Nov 2003; Daniel Robbins <drobbins@gentoo.org> nfs-utils-1.0.6.ebuild:
-  added util-linux RDEPEND to ensure "mount" command it up-to-date. (See
-  nfs-utils README.)
-  
-  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> nfs-utils-1.0.5-r1.ebuild,
-  nfs-utils-1.0.6.ebuild:
-  adding RESTRICT="nomirror"
-
-  03 Oct 2003; Christian Birchinger <joker@gentoo.org> nfs-utils-1.0.6.ebuild:
-  Added sparc stable keyword
-
-*nfs-utils-1.0.6 (18 Sep 2003)
-
-  18 Sep 2003; Martin Holzer <mholzer@gentoo.org> nfs-utils-1.0.6.ebuild:
-  Version bumped.
-
-*nfs-utils-1.0.5-r1 (19 Jul 2003)
-
-  26 Jul 2003; Stefan Jones <cretin@gentoo.org> files/nfs-2:
-  Fixed waiting on exportfs to finish. Use wait $pidofexportfs ( let kill
-  finish in background ) Speedups of 29secs!
-
-  19 Jul 2003; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.5-r1.ebuild,
-  files/nfs-2:
-  Change exportfs timeouts from 5 seconds to 30 seconds to prevent prematurely
-  killing exportfs
-
-  19 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> nfs-utils-1.0.5.ebuild :
-  Security update, unmasking.
-
-*nfs-utils-1.0.5 (19 Jul 2003)
-
-  19 Jul 2003; Don Seiler <rizzo@gentoo.org>; nfs-utils-1.0.4.ebuild,
-  nfs-utils-1.0.5.ebuild:
-  Version bumped and v1.0.4 deleted due to bugs that are fixed in 1.0.5
-
-*nfs-utils-1.0.4 (17 Jul 2003)
-
-  17 Jul 2003; Martin Holzer <mholzer@gentoo.org> nfs-utils-1.0.4.ebuild:
-  Version bumped.
-
-  21 May 2003; Christian Birchinger <joker@gentoo.org> nfs-utils-1.0.3.ebuild:
-  Added sparc stable keyword
-
-  16 May 2003; Martin Holzer <mholzer@gentoo.org> nfs-utils-1.0.3.ebuild:
-  Marked as stable
-
-*nfs-utils-1.0.3 (27 Mar 2003)
-
-  21 Jun 2003; Guy martin <gmsoft@gentoo.org> nfs-utils-1.0.3.ebuild :
-  Marked stable on hppa.
-
-  17 Apr 2003; Guy Martin <gmsoft@gentoo.org> nfs-utils-1.0.3.ebuild :
-  Added ~hppa to KEYWORDS.
-
-  27 Mar 2003; Brandon Low <lostlogic@gentoo.org> nfs-utils-1.0.3.ebuild:
-  Bump to latest released today
-
-*nfs-utils-1.0.1-r1 (03 Mar 2003)
-
-  30 Mar 2003; Christian Birchinger <joker@gentoo.org>
-  nfs-utils-1.0.1-r1.ebuild:
-  Added sparc stable keyword
-
-  13 Mar 2003; Zach Welch <zwelch@gentoo.org> nfs-utils-1.0.1-r1.ebuild:
-  add arm keyword
-
-  03 Mar 2003; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.1-r1.ebuild,
-  files/nfs-1:
-  Fix bug 16075 by installing server binaries into /usr/sbin (thanks Tero
-  Pelander for the clue and the updated ebuild). Fix bug 13838 by using
-  rpc.rquotad from the quota package instead of the nfs-utils version (thanks
-  Andrea Barisani for the heads-up). Finally, mark stable on x86 and alpha
-  where I can test as part of the package upgrade phase.
-
-*nfs-utils-1.0.1 (12 Dec 2002)
-
-  12 Dec 2002; Brad Cowan <bcowan@gentoo.org> :
-  
-  Added options to config file thanks to Cardoe and j2ee.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*nfs-utils-1.0.1 (13 Oct 2002)
- 
-  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> nfs-utils-1.0.1.ebuild :
-  Changed ~sparc64 to ~sparc keyword
-
-  13 Oct 2002; Brad Cowan <bcowan@gentoo.org> nfs-utils-1.0.1.ebuild,
-  files/digest-nfs-utils-1.0.1 :
-  
-  Version bump thanks to j2ee<maurizio@iridium.aetheric.org>.
-
-*nfs-utils-0.3.3-r1 (24 Apr 2002)
-
-  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> nfs-utils-0.3.3-r1.ebuild :
-  Adding sparc/sparc64 keywords.
-
-  22 Jul 2002; Kyle Manna <nitro@gentoo.org> nfs-utils-0.3.3-r1.ebuild :
-  Parallel make fails sometimes.  Replaced emake with make.
-  
-  24 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: Some rc script fixes
-  (removal of NFSSERVER) and cleanups in the ebuild, removal of old ebuilds and
-  old files in /files
-
-*nfs-utils-0.3.3 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@ -1,27 +0,0 @@
-AUX 0001-mountd-Fix-is_subdirectory-again.patch 2704 SHA256 1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7 SHA512 59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86 WHIRLPOOL fc0c806c3c68f6d215f24a418b92b94188e23cc9249a8e0cea6ec22a1139747ab05cccab253bddff6787a15301225792658dadc8d6d1c4c6aba5543ea893d600
-AUX 0001-statd-exit-if-a-statd-is-already-running.patch 3593 SHA256 d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb SHA512 e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c WHIRLPOOL fdf6de89a5ae3f26c1091f8b314684ba0cac3aab68731d3d56e5a909a2211b8f84b8212fbf0f7179427f98bdb102b9bb3d1c3828e66e283bc70abddc9ef3964d
-AUX exports 66 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 WHIRLPOOL 7cc6b59c1f7013a0ad98518623b03d1cba784ecaf6d6a085b85282192c6f41ac1c649a39dc6e1b42ff38a571c00a85aed6e04ea57d6339a072cc4f2c41d5d74e
-AUX nfs-utils-1.1.4-mtab-sym.patch 1020 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3 SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 WHIRLPOOL c16ecee3228ad4522cf4ede1d05ca50cece3910955314c96eb88a61cfe07b7f6a95c42bb15a7f7f9fd211fa62cdcbb02925e68702d5066338b4543baf56fb2df
-AUX nfs-utils-1.2.7-heimdal.patch 6643 SHA256 f8845cb5471313516ebd389a1fb692b984f5f9f663923488a539d8adec8de247 SHA512 dea96554579dcb1b2404724ddcf68a27034cef7f5a0c3d4b6838e46abfcd9a05af3cd56c28f0878f1ec777ea0a2c43fb7c795adf74aa2080c8feb26e7e83d938 WHIRLPOOL cd783ee2b91332753abbf8de8125f6cebd36dd4852ce804d8822fd5cfc28d6d4f608634fcd00b4a30be5aeba9be97c2c122e3beb1d2961182f1bfce8c652e7d2
-AUX nfs-utils-1.2.8-cross-build.patch 1323 SHA256 281ae4f2af4d28adc936be961c2ab4aa4f77c4fb74ba08f2cef1038c6e03b30e SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a WHIRLPOOL 52f5704ec8b88eeb3fab37e4aa9a7ca64ca76f0665c66347ab663624cb3b70309a262d86b21882dc5f687741c73974dc6efbc01d6c386e3ea607bbdb89619edb
-AUX nfs-utils-1.2.8-heimdal.patch 2424 SHA256 a41cc8771cae79fd9c7689cb7d32ebe83fbd008d8d0a429411f758671c7b8c09 SHA512 e23e280292fecd4ba52f4e4f050fe7f547f7c0b8df564a1b9fac0eda5bf22bd313c0b76dea7ef95e849751fe0c4bdafd1b9500d3d9c57fdd1c42c913e14d0284 WHIRLPOOL 8406b2273da365bc88eab7cc4efcaacb9ce520d9380a2230cfc955c5af79e1c3da81cfa61c8208aa8e3c4f440bc92b0f4a5690a6e173a0f2fc063d07ded430c2
-AUX nfs-utils-1.2.9-heimdal-1.patch 2424 SHA256 a41cc8771cae79fd9c7689cb7d32ebe83fbd008d8d0a429411f758671c7b8c09 SHA512 e23e280292fecd4ba52f4e4f050fe7f547f7c0b8df564a1b9fac0eda5bf22bd313c0b76dea7ef95e849751fe0c4bdafd1b9500d3d9c57fdd1c42c913e14d0284 WHIRLPOOL 8406b2273da365bc88eab7cc4efcaacb9ce520d9380a2230cfc955c5af79e1c3da81cfa61c8208aa8e3c4f440bc92b0f4a5690a6e173a0f2fc063d07ded430c2
-AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
-AUX nfs.initd 4378 SHA256 8df22f253770a24c6a53ce332d821ab680d0ede18d0e968c1c5d8b3796cb74be SHA512 1577a43b47ebf12261504dd1c9ae564e19d80edc424c4b1e308ac46b12907f6684242284f18a6cd2edafec88c815debf895b6c29d13b9bca59d6d7c883bc1f38 WHIRLPOOL da3762c3467af7d46aef1890aa9c95a85e759c6cab09a5590a00c8f6a37b600a6cf3d4c17b1593a3bc7556ad25bfe001ccabcad70bdc1a2848aa9f842e349d48
-AUX nfsd.service 339 SHA256 fada3d017779466e28a6b84c5adda1d9ef7c9b9e9458884f4456efc7e85a87c7 SHA512 4accd4aa77b3f91b1472b24ba5303cb5442aee1ecc1b813605bb4815320144cfe6505265659f8ec79ba6259c8e41ee968462d67b71981cc46dd830764fe786eb WHIRLPOOL 3fca5f83bf62f4d06854066940592cad2a3d636adf6a20e103c6344f8f3abdedfc94aeed280fa285b195b461f78674a07a334215048f83655c1f1bd17bbfc55a
-AUX nfsmount.confd 326 SHA256 b9389e143c2c4f95c11f97a8a379e007f140559016f60011c9d2ff0935758bcb SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 WHIRLPOOL 97939b074a9b5717184512088388c9c22a31f37009996b69137023a0f8a97ce6eb41f7cb0a25843ea088f00d37cb45f6b3bd1ba0f801de7cb8f6dc2e5d374dfb
-AUX nfsmount.initd 1126 SHA256 b57637c7eb8e40b5cc1655e8afa69dc0aaecbd3186bdca3301586d1e9b797357 SHA512 e2c4d2bf9690b092d7062d95f4242e2591e3ed0aa8b9b36eae977d5d0350b0d90d339f7e75bdcc794abef27cf1541642a8a6dbbaed90e58cc823db4c92af9336 WHIRLPOOL 54a2bdb24015a6d8184fdde3351b152c5625cb6e4ff17876d592a1600fedec1724081b4ff233711ad9d290ea761827067c40ba8ae21121fc6066ba7ed230e483
-AUX rpc-mountd.service 251 SHA256 d48a2bedfc62e20a21e2b55b822290ca849cc43bd8aafafd72687a389956e44b SHA512 6d9d163d35ebfeb2cd2d00f4d3c4d7973c6f6b9615c59e1e05e5431b91e0ade3cdd414896245f53ad0bf897ad70dcb0d06eb94c71d52c9ea3787df08483f2e1b WHIRLPOOL 5aa94ae3d682919790e485a5c00b8b396674e8059b563472dd007e8be0084ab6a8aadf9a72f0a01ee68260d71e51075cbd9c86de36b713495a7beb275a3f4cab
-AUX rpc-statd.service 268 SHA256 f6e9479410ea3c41949ef8c552c0246cfc4324d60a69900fa14d10c50dc2c305 SHA512 6e0ff528f98b669c33e810082c772161c9750b626e755f0bc07e2134e43ab26eb3b73d92d1da5e05926a88c1ddbd44c2670c9388de470d2a90a82c7f34253775 WHIRLPOOL 97d1fff09f4dbda3a54a88c2323df594c6170fb3891d8e542370757bd80916b0e8b027358e81fdf08ae4a8e2a79ca1c0361320fc552221626fbcbb17a4ece937
-AUX rpc-statd.service-r1 295 SHA256 f6bf14cc4ad506b4af6eae332f1befa1ec837fb0a4431a02f4ab3593dc1f55ad SHA512 fc5ef04ddcd7c4fdf041d7b45e92c84f10d264e767f5c9f8f3b8e989f792e605de9177449d4c267fd1cf1ffdae1d0f9faebf33bd0de2fdf8fd9cc4262374f86c WHIRLPOOL 17ba4cc83a2e93052c424154efdb4d82c1a9b1fdd1127613c4b4440ce631648b24710144e840e1d5e4356b403d379b48fc1fea85ea6fb50003c518bf967d4ce6
-AUX rpc.gssd.initd 567 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d SHA512 cd4f763c7cced0eecb03e2d4c8fb1d5fbbddd119a014dee4e9cb881d3750fb01a50daa4475700914785cb1313ceef638b7de4d8dddac90cbab63888cc81938f6 WHIRLPOOL d9f4c381f18b76a2c5b1c0c2adb56b0005264a3230c436d4556c45e13372bea09cf1fc35f02d734cac7081322f72873e46d2b2d451334ad908f14ad7fcd54acc
-AUX rpc.idmapd.initd 595 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef SHA512 624ac8c5a381a0ccc1bb7dfd06c080a9de85a9e94e1d4071a6ef401e1b20f0d05d767be5e85eea374c3a4c29218b3db6013383afa0bdd1a7f61b77260675bfdb WHIRLPOOL f25787957ec201bc97754c7864ada3e2c9be05bda054fc8ebdc29e6ebfa2280419d3dc44f54f71a1adf195f257e6e8292645b55e76006341bff101e5bddec94f
-AUX rpc.pipefs.initd 822 SHA256 6503951b3c200ccf3f46396f7b9274f0a565807f7f6e561c17bed6b0133ae49a SHA512 d711406b29f6634fcde0f21157eb6b2230574e535c261c4478194c3c2c3ffa4bce7b326cbfa0e9f8e816c48b95a306a5cdbc94422db2acf64b48593637df133b WHIRLPOOL 4dec97b8883efdf03ef3692606baa430029e71e35cf34857f8dde287dba3d071a442ae03924c6a478f7fdf6fa79b211d39b08f16e241cbd0cfa31f763c028439
-AUX rpc.statd.initd 818 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf80684616f79be6c304 SHA512 e7c85a5437f65c82bcab6818fa3aa27fdf746ce745b41987d0e59d620b59529b7a8613aad59e831a5b46fee1fe4410d6982a3e76e7834c79675c4c271b0db3b0 WHIRLPOOL b3c6c4147634f3db39f0a50307a7433e0d28f8cf2d89452d90f9db1b56d55c41add68336640a442508ebfc75270dd627154af787b00f603659a5c730ab724340
-AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 SHA512 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157 WHIRLPOOL f1e4a38168c112ce07e40432527a77e17aa80b4a37aeccb8b01a9e655f0437e67e4c12998d62ea7c162319cca956c18edd3cb3c64cfd8e17370782ea30fef677
-DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
-DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
-EBUILD nfs-utils-1.2.8-r2.ebuild 4609 SHA256 1dff97354a8fbc097d27b667dbf33e6743e519a367c3068a6d7f0df4b41263e0 SHA512 4a8eb8bf234ac09f8189b4bf10f4e6331a250876838f99eb718cde79416ff17cb429bcc3193e778123e95bfdaf575a280c5cca963842430f4024957fb6a967b6 WHIRLPOOL 203daea6f3e2dc32c2fa987973187a768d3db99d2a8264cbfc69922a0d32190448d8a20b800bdc4c0538ee7de12d2d5c438a33055fc6375a1de0023f6778172d
-EBUILD nfs-utils-1.2.9-r1.ebuild 4610 SHA256 e9cb241d9d09daf52d5184876da6fced81f2dc750a120bb3972e71272c0ba388 SHA512 173b23c630729764aaf63ef016d5ec365df7c2ff8654d7841c922227925cb8ee283b895abf92797c6786819d40f58b73d5ba259f4654018302950d30e4a53014 WHIRLPOOL 8e4fcf542190419387032b84f9aae2193cdcff54f3bb5c4da124ddb30bc7a6e25d58465abdd9c104cab17052869c591ad8dc767e3d7033cf5ccf9137f98a1d12
-MISC ChangeLog 36374 SHA256 1955c6b3c7d17befec22ee24649c851e8047861eb9b320459c4c0d33c476d54e SHA512 345d634d853e305532c5c67b75e88ce01033269b7a79a345ab4eb7cf8443f148cf3b1267b813ce3228aa592a24ccd51b11be70df5b1824f696ab8d2cb790e4b4 WHIRLPOOL bce305b088bb39d085fdfd2bd5b59f9617fe86a22c52cc47614315891d5e3b656a0b03d2b1ffb0db4a33baba2ba75a8b5685458b371789e2e9ecba0fa48658e5
-MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f
--- a/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch
+++ b/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch
@ -1,81 +0,0 @@
-From 23d3980b6cfea4e9056d9b7b81e48b4fefc645e0 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Tue, 7 May 2013 11:46:18 -0400
-Subject: [PATCH] mountd: Fix is_subdirectory again
-
-The problem was that is_subdirectory() would also succeed if the two
-directories were the same.  This is needed for path_matches() which
-needs to see if the child is same-or-descendant.
-
-So this patch rearranges path_matches() to do the "are they the same"
-test itself and only bother with is_subdirectory() if it they are not
-the same.
-
-So now is_subdirectory() can be strict, and so can be usable for
-subexport(), which needs a strong 'in subdirectory - not the same' test.
-
-Acked-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
---
- utils/mountd/cache.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
-index 737927c..517aa62 100644
--- a/utils/mountd/cache.c
-+++ b/utils/mountd/cache.c
-@@ -347,20 +347,26 @@ static char *next_mnt(void **v, char *p)
- 
- static int is_subdirectory(char *child, char *parent)
- {
-+	/* Check is child is strictly a subdirectory of
-+	 * parent or a more distant descendant.
-+	 */
- 	size_t l = strlen(parent);
- 
-	if (strcmp(parent, "/") == 0)
-+	if (strcmp(parent, "/") == 0 && child[1] != 0)
- 		return 1;
- 
-	return strcmp(child, parent) == 0
-		|| (strncmp(child, parent, l) == 0 && child[l] == '/');
-+	return (strncmp(child, parent, l) == 0 && child[l] == '/');
- }
- 
- static int path_matches(nfs_export *exp, char *path)
- {
-	if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
-		return is_subdirectory(path, exp->m_export.e_path);
-	return strcmp(path, exp->m_export.e_path) == 0;
-+	/* Does the path match the export?  I.e. is it an
-+	 * exact match, or does the export have CROSSMOUNT, and path
-+	 * is a descendant?
-+	 */
-+	return strcmp(path, exp->m_export.e_path) == 0
-+		|| ((exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
-+		    && is_subdirectory(path, exp->m_export.e_path));
- }
- 
- static int
-@@ -369,15 +375,13 @@ export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
- 	return path_matches(exp, path) && client_matches(exp, dom, ai);
- }
- 
-/* True iff e1 is a child of e2 and e2 has crossmnt set: */
-+/* True iff e1 is a child of e2 (or descendant) and e2 has crossmnt set: */
- static bool subexport(struct exportent *e1, struct exportent *e2)
- {
- 	char *p1 = e1->e_path, *p2 = e2->e_path;
-	size_t l2 = strlen(p2);
- 
- 	return e2->e_flags & NFSEXP_CROSSMOUNT
-		&& strncmp(p1, p2, l2) == 0
-		&& p1[l2] == '/';
-+		&& is_subdirectory(p1, p2);
- }
- 
- struct parsed_fsid {
-- 
-1.8.3.2
-
--- a/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch
+++ b/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch
@ -1,126 +0,0 @@
-From 342446a4a624d4ee8254af859bb7f1de6d268679 Mon Sep 17 00:00:00 2001
-From: Weston Andros Adamson <dros@netapp.com>
-Date: Tue, 7 May 2013 11:25:29 -0400
-Subject: [PATCH] statd: exit if a statd is already running
-
-Moves nfs_probe_statd from mount to nfs support lib to share with statd.
-
-Acked-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Weston Andros Adamson <dros@netapp.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
---
- support/include/nfsrpc.h |  5 +++++
- support/nfs/getport.c    | 22 ++++++++++++++++++++++
- utils/mount/network.c    | 17 -----------------
- utils/statd/statd.c      |  7 +++++++
- 4 files changed, 34 insertions(+), 17 deletions(-)
-
-diff --git a/support/include/nfsrpc.h b/support/include/nfsrpc.h
-index a0b80e1..1bfae7a 100644
--- a/support/include/nfsrpc.h
-+++ b/support/include/nfsrpc.h
-@@ -156,6 +156,11 @@ extern unsigned long	nfs_pmap_getport(const struct sockaddr_in *,
- 				const struct timeval *);
- 
- /*
-+ * Use nfs_pmap_getport to see if statd is running locally
-+ */
-+extern int nfs_probe_statd(void);
-+
-+/*
-  * Contact a remote RPC service to discover whether it is responding
-  * to requests.
-  */
-diff --git a/support/nfs/getport.c b/support/nfs/getport.c
-index 3331ad4..081594c 100644
--- a/support/nfs/getport.c
-+++ b/support/nfs/getport.c
-@@ -1102,3 +1102,25 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,
- 
- 	return port;
- }
-+
-+static const char *nfs_ns_pgmtbl[] = {
-+        "status",
-+        NULL,
-+};
-+
-+/*
-+ * nfs_probe_statd - use nfs_pmap_getport to see if statd is running locally
-+ *
-+ * Returns non-zero if statd is running locally.
-+ */
-+int nfs_probe_statd(void)
-+{
-+        struct sockaddr_in addr = {
-+                .sin_family             = AF_INET,
-+                .sin_addr.s_addr        = htonl(INADDR_LOOPBACK),
-+        };
-+        rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
-+
-+        return nfs_getport_ping((struct sockaddr *)(char *)&addr, sizeof(addr),
-+                                program, (rpcvers_t)1, IPPROTO_UDP);
-+}
-diff --git a/utils/mount/network.c b/utils/mount/network.c
-index 4be48cd..e2cdcaf 100644
--- a/utils/mount/network.c
-+++ b/utils/mount/network.c
-@@ -65,11 +65,6 @@ extern int nfs_mount_data_version;
- extern char *progname;
- extern int verbose;
- 
-static const char *nfs_ns_pgmtbl[] = {
-	"status",
-	NULL,
-};
-
- static const char *nfs_mnt_pgmtbl[] = {
- 	"mount",
- 	"mountd",
-@@ -761,18 +756,6 @@ int probe_bothports(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server)
- 					&nfs_server->pmap);
- }
- 
-static int nfs_probe_statd(void)
-{
-	struct sockaddr_in addr = {
-		.sin_family		= AF_INET,
-		.sin_addr.s_addr	= htonl(INADDR_LOOPBACK),
-	};
-	rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
-
-	return nfs_getport_ping(SAFE_SOCKADDR(&addr), sizeof(addr),
-				program, (rpcvers_t)1, IPPROTO_UDP);
-}
-
- /**
-  * start_statd - attempt to start rpc.statd
-  *
-diff --git a/utils/statd/statd.c b/utils/statd/statd.c
-index 652546c..8c51bcc 100644
--- a/utils/statd/statd.c
-+++ b/utils/statd/statd.c
-@@ -28,6 +28,7 @@
- 
- #include "statd.h"
- #include "nfslib.h"
-+#include "nfsrpc.h"
- #include "nsm.h"
- 
- /* Socket operations */
-@@ -237,6 +238,12 @@ int main (int argc, char **argv)
- 	/* Set hostname */
- 	MY_NAME = NULL;
- 
-+	/* Refuse to start if another statd is running */
-+	if (nfs_probe_statd()) {
-+		fprintf(stderr, "Statd service already running!\n");
-+		exit(1);
-+	}
-+
- 	/* Process command line switches */
- 	while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:L", longopts, NULL)) != EOF) {
- 		switch (arg) {
-- 
-1.8.3.2
-
--- a/net-fs/nfs-utils/files/exports
+++ b/net-fs/nfs-utils/files/exports
@ -1 +0,0 @@
-# /etc/exports: NFS file systems being exported.  See exports(5).
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch
@ -1,39 +0,0 @@
-ripped from Debian
-
--- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- 	return var_mtab_does_not_exist;
- }
- 
-static int
-+int
- mtab_is_a_symlink(void) {
-         get_mtab_info();
-         return var_mtab_is_a_symlink;
--- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
--- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- 	int flags;
- 	mntFILE *mfp;
- 
-+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+	   that would create a file /proc/mounts in case the proc filesystem
-+	   is not mounted, and the fchmod below would also fail. */
-+	if (mtab_is_a_symlink()) {
-+		return EX_SUCCESS;
-+	}
-+
- 	lock_mtab();
- 
- 	mfp = nfs_setmntent (MOUNTED, "a+");
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.7-heimdal.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.7-heimdal.patch
@ -1,180 +0,0 @@
--- nfs-utils-1.2.3.dist/aclocal/rpcsec_vers.m4.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/rpcsec_vers.m4	2010-10-03 14:53:06.379424854 +0200
-@@ -1,7 +1,10 @@
- dnl Checks librpcsec version
- AC_DEFUN([AC_RPCSEC_VERSION], [
- 
-  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
-+  dnl libgssglue is needed only for MIT Kerberos
-+  if test "$gssapi_lib" = gssapi_krb5; then
-+    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
-+  fi
- 
-   dnl TI-RPC replaces librpcsecgss
-   if test "$enable_tirpc" = no; then
--- nfs-utils-1.2.3.dist/aclocal/kerberos5.m4~	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/kerberos5.m4	2010-10-03 14:13:17.274424855 +0200
-@@ -32,14 +32,14 @@
-     fi
-     if test "$K5CONFIG" != ""; then
-       KRBCFLAGS=`$K5CONFIG --cflags`
-      KRBLIBS=`$K5CONFIG --libs`
-      K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-+      KRBLIBS=`$K5CONFIG --libs gssapi`
-       AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
-       if test -f $dir/include/gssapi/gssapi_krb5.h -a \
-                 \( -f $dir/lib/libgssapi_krb5.a -o \
-                    -f $dir/lib64/libgssapi_krb5.a -o \
-                    -f $dir/lib64/libgssapi_krb5.so -o \
-                    -f $dir/lib/libgssapi_krb5.so \) ; then
-+         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
-          KRBDIR="$dir"
-   dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
-@@ -56,7 +56,11 @@
-       dnl of Heimdal Kerberos on SuSe
-       elif test \( -f $dir/include/heim_err.h -o\
-       		 -f $dir/include/heimdal/heim_err.h \) -a \
-                -f $dir/lib/libroken.a; then
-+                \( -f $dir/lib/libroken.a -o \
-+                   -f $dir/lib64/libroken.a -o \
-+                   -f $dir/lib64/libroken.so -o \
-+                   -f $dir/lib/libroken.so \) ; then
-+         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-          AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-          KRBDIR="$dir"
-          gssapi_lib=gssapi
--- nfs-utils-1.2.3.dist/utils/gssd/context_lucid.c.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/context_lucid.c	2010-10-03 14:31:31.150424854 +0200
-@@ -267,8 +267,13 @@
- 	int retcode = 0;
- 
- 	printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
-+#ifdef HAVE_HEIMDAL
-+	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
-+						1, &return_ctx);
-+#else
- 	maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
- 						1, &return_ctx);
-+#endif
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		pgsserr("gss_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
-@@ -303,7 +308,11 @@
- 	else
- 		retcode = prepare_krb5_rfc4121_buffer(lctx, buf, endtime);
- 
-+#ifdef HAVE_HEIMDAL
-+	maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, return_ctx);
-+#else
- 	maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
-+#endif
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		pgsserr("gss_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
--- nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c	2010-10-03 14:33:07.992424854 +0200
-@@ -115,7 +115,7 @@
- #include <errno.h>
- #include <time.h>
- #include <gssapi/gssapi.h>
-#ifdef USE_PRIVATE_KRB5_FUNCTIONS
-+#ifdef HAVE_HEIMDAL
- #include <gssapi/gssapi_krb5.h>
- #endif
- #include <krb5.h>
-@@ -927,9 +927,37 @@ 
- {
- 	krb5_error_code ret;
- 	krb5_creds creds;
-	krb5_cc_cursor cur;
- 	int found = 0;
- 
-+#ifdef HAVE_HEIMDAL
-+	krb5_creds pattern;
-+	krb5_const_realm client_realm;
-+
-+	krb5_cc_clear_mcred(&pattern);
-+
-+	client_realm = krb5_principal_get_realm (context, principal);
-+
-+	ret = krb5_make_principal (context, &pattern.server,
-+				   client_realm, KRB5_TGS_NAME, client_realm,
-+				   NULL);
-+	if (ret)
-+	  krb5_err (context, 1, ret, "krb5_make_principal");
-+	pattern.client = principal;
-+
-+	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
-+	krb5_free_principal (context, pattern.server);
-+	if (ret) {
-+	  if (ret == KRB5_CC_END)
-+            return 1;
-+	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
-+	}
-+
-+	found = creds.times.endtime > time(NULL);
-+
-+	krb5_free_cred_contents (context, &creds);
-+#else
-+	krb5_cc_cursor cur;
-+
- 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
- 	if (ret) 
- 		return 0;
-@@ -949,6 +977,7 @@ 
- 		krb5_free_cred_contents(context, &creds);
- 	}
- 	krb5_cc_end_seq_get(context, ccache, &cur);
-+#endif
- 
- 	return found;
- }
-@@ -995,6 +1024,9 @@ 
- 	}
- 	krb5_free_principal(context, principal);
- err_princ:
-+#ifdef HAVE_HEIMDAL
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+#endif
- 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
- 	krb5_cc_close(context, ccache);
- err_cache:
-@@ -1316,12 +1316,21 @@
- 	 * If we failed for any reason to produce global
- 	 * list of supported enctypes, use local default here.
- 	 */
-+#ifdef HAVE_HEIMDAL
-+	if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
-+		maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+					num_enctypes, enctypes);
-+	else
-+		maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+					num_krb5_enctypes, krb5_enctypes);
-+#else
- 	if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
- 		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- 					&krb5oid, num_enctypes, enctypes);
- 	else
- 		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- 					&krb5oid, num_krb5_enctypes, krb5_enctypes);
-+#endif
- 
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		pgsserr("gss_set_allowable_enctypes",
--- nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c~	2011-06-30 15:00:42.000000000 +0200
-+++ nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c	2011-08-03 12:40:53.865782009 +0200
-@@ -186,8 +186,13 @@
- 		num_enctypes = default_num_enctypes;
- 	}
- 
-+#ifdef HAVE_HEIMDAL
-+	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds,
-+			num_enctypes, enctypes);
-+#else
- 	maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds,
- 			&krb5oid, num_enctypes, enctypes);
-+#endif
- 	if (maj_stat != GSS_S_COMPLETE) {
- 		printerr(1, "WARNING: gss_set_allowable_enctypes failed\n");
- 		pgsserr("svcgssd_limit_krb5_enctypes: gss_set_allowable_enctypes",
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
@ -1,48 +0,0 @@
-this is kind of hacky, but automake doesn't make this easy
-for us atm, so hack away :(
-
-(recent autotools will always add $(CFLAGS)/etc... to the compile)
-
--- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
-LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
--- a/tools/rpcgen/Makefile.am
-+++ b/tools/rpcgen/Makefile.am
-@@ -1,7 +1,9 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
-LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- noinst_PROGRAMS = rpcgen
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
-@@ -9,10 +11,6 @@
- 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
- 		 rpc_scan.h rpc_util.h
- 
-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-rpcgen_LDADD=$(LIBTIRPC)
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
- EXTRA_DIST = rpcgen.new.1
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.8-heimdal.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.8-heimdal.patch
@ -1,74 +0,0 @@
--- nfs-utils-1.2.3.dist/aclocal/kerberos5.m4~	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/kerberos5.m4	2010-10-03 14:13:17.274424855 +0200
-@@ -56,7 +56,11 @@
-       dnl of Heimdal Kerberos on SuSe
-       elif test \( -f $dir/include/heim_err.h -o\
-       		 -f $dir/include/heimdal/heim_err.h \) -a \
-                -f $dir/lib/libroken.a; then
-+                \( -f $dir/lib/libroken.a -o \
-+                   -f $dir/lib64/libroken.a -o \
-+                   -f $dir/lib64/libroken.so -o \
-+                   -f $dir/lib/libroken.so \) ; then
-+         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-          AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-          KRBDIR="$dir"
-          gssapi_lib=gssapi
--- nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c	2010-10-03 14:33:07.992424854 +0200
-@@ -927,9 +927,37 @@ 
- {
- 	krb5_error_code ret;
- 	krb5_creds creds;
-	krb5_cc_cursor cur;
- 	int found = 0;
- 
-+#ifdef HAVE_HEIMDAL
-+	krb5_creds pattern;
-+	krb5_const_realm client_realm;
-+
-+	krb5_cc_clear_mcred(&pattern);
-+
-+	client_realm = krb5_principal_get_realm (context, principal);
-+
-+	ret = krb5_make_principal (context, &pattern.server,
-+				   client_realm, KRB5_TGS_NAME, client_realm,
-+				   NULL);
-+	if (ret)
-+	  krb5_err (context, 1, ret, "krb5_make_principal");
-+	pattern.client = principal;
-+
-+	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
-+	krb5_free_principal (context, pattern.server);
-+	if (ret) {
-+	  if (ret == KRB5_CC_END)
-+            return 1;
-+	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
-+	}
-+
-+	found = creds.times.endtime > time(NULL);
-+
-+	krb5_free_cred_contents (context, &creds);
-+#else
-+	krb5_cc_cursor cur;
-+
- 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
- 	if (ret) 
- 		return 0;
-@@ -949,6 +977,7 @@ 
- 		krb5_free_cred_contents(context, &creds);
- 	}
- 	krb5_cc_end_seq_get(context, ccache, &cur);
-+#endif
- 
- 	return found;
- }
-@@ -995,6 +1024,9 @@ 
- 	}
- 	krb5_free_principal(context, principal);
- err_princ:
-+#ifdef HAVE_HEIMDAL
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+#endif
- 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
- 	krb5_cc_close(context, ccache);
- err_cache:
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.9-heimdal-1.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.9-heimdal-1.patch
@ -1,74 +0,0 @@
--- nfs-utils-1.2.3.dist/aclocal/kerberos5.m4~	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/kerberos5.m4	2010-10-03 14:13:17.274424855 +0200
-@@ -56,7 +56,11 @@
-       dnl of Heimdal Kerberos on SuSe
-       elif test \( -f $dir/include/heim_err.h -o\
-       		 -f $dir/include/heimdal/heim_err.h \) -a \
-                -f $dir/lib/libroken.a; then
-+                \( -f $dir/lib/libroken.a -o \
-+                   -f $dir/lib64/libroken.a -o \
-+                   -f $dir/lib64/libroken.so -o \
-+                   -f $dir/lib/libroken.so \) ; then
-+         K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-          AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-          KRBDIR="$dir"
-          gssapi_lib=gssapi
--- nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c.orig	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c	2010-10-03 14:33:07.992424854 +0200
-@@ -927,9 +927,37 @@ 
- {
- 	krb5_error_code ret;
- 	krb5_creds creds;
-	krb5_cc_cursor cur;
- 	int found = 0;
- 
-+#ifdef HAVE_HEIMDAL
-+	krb5_creds pattern;
-+	krb5_const_realm client_realm;
-+
-+	krb5_cc_clear_mcred(&pattern);
-+
-+	client_realm = krb5_principal_get_realm (context, principal);
-+
-+	ret = krb5_make_principal (context, &pattern.server,
-+				   client_realm, KRB5_TGS_NAME, client_realm,
-+				   NULL);
-+	if (ret)
-+	  krb5_err (context, 1, ret, "krb5_make_principal");
-+	pattern.client = principal;
-+
-+	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
-+	krb5_free_principal (context, pattern.server);
-+	if (ret) {
-+	  if (ret == KRB5_CC_END)
-+            return 1;
-+	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
-+	}
-+
-+	found = creds.times.endtime > time(NULL);
-+
-+	krb5_free_cred_contents (context, &creds);
-+#else
-+	krb5_cc_cursor cur;
-+
- 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
- 	if (ret) 
- 		return 0;
-@@ -949,6 +977,7 @@ 
- 		krb5_free_cred_contents(context, &creds);
- 	}
- 	krb5_cc_end_seq_get(context, ccache, &cur);
-+#endif
- 
- 	return found;
- }
-@@ -995,6 +1024,9 @@ 
- 	}
- 	krb5_free_principal(context, principal);
- err_princ:
-+#ifdef HAVE_HEIMDAL
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+#endif
- 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
- 	krb5_cc_close(context, ccache);
- err_cache:
--- a/net-fs/nfs-utils/files/nfs.confd
+++ b/net-fs/nfs-utils/files/nfs.confd
@ -1,38 +0,0 @@
-# /etc/conf.d/nfs
-
-# If you wish to set the port numbers for lockd,
-# please see /etc/sysctl.conf
-
-# Optional services to include in default `/etc/init.d/nfs start`
-# For NFSv4 users, you'll want to add "rpc.idmapd" here.
-NFS_NEEDED_SERVICES=""
-
-# Number of servers to be started up by default
-OPTS_RPC_NFSD="8"
-
-# Options to pass to rpc.mountd
-# ex. OPTS_RPC_MOUNTD="-p 32767"
-OPTS_RPC_MOUNTD=""
-
-# Options to pass to rpc.statd
-# ex. OPTS_RPC_STATD="-p 32765 -o 32766"
-OPTS_RPC_STATD=""
-
-# Options to pass to rpc.idmapd
-OPTS_RPC_IDMAPD=""
-
-# Options to pass to rpc.gssd
-OPTS_RPC_GSSD=""
-
-# Options to pass to rpc.svcgssd
-OPTS_RPC_SVCGSSD=""
-
-# Options to pass to rpc.rquotad (requires sys-fs/quota)
-OPTS_RPC_RQUOTAD=""
-
-# Timeout (in seconds) for exportfs
-EXPORTFS_TIMEOUT=30
-
-# Options to set in the nfsd filesystem (/proc/fs/nfsd/).
-# Format is <option>=<value>.  Multiple options are allowed.
-#OPTS_NFSD="nfsv4leasetime=30 max_block_size=4096"
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@ -1,163 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.27 2013/03/24 19:37:22 vapier Exp $
-
-extra_started_commands="reload"
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
-# The binary locations
-exportfs=/usr/sbin/exportfs
-  mountd=/usr/sbin/rpc.mountd
-    nfsd=/usr/sbin/rpc.nfsd
-smnotify=/usr/sbin/sm-notify
-
-depend() {
-	local myneed=""
-	# XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
-	myneed="${myneed} $(
-		awk '!/^[[:space:]]*#/ {
-			# clear the path to avoid spurious matches
-			$1 = "";
-			if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
-				print "rpc.svcgssd"
-				exit 0
-			}
-		}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
-	)"
-	config /etc/exports /etc/exports.d/*.exports
-	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
-	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
-	after quota
-}
-
-mkdir_nfsdirs() {
-	local d
-	for d in rpc_pipefs v4recovery v4root ; do
-		d="/var/lib/nfs/${d}"
-		[ ! -d "${d}" ] && mkdir -p "${d}"
-	done
-}
-
-waitfor_exportfs() {
-	local pid=$1
-	( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) &
-	wait $1
-}
-
-mount_nfsd() {
-	if [ -e /proc/modules ] ; then
-		# Make sure nfs support is loaded in the kernel #64709
-		if ! grep -qs nfsd /proc/filesystems ; then
-			modprobe -q nfsd
-		fi
-		# Restart idmapd if needed #220747
-		if grep -qs nfsd /proc/modules ; then
-			killall -q -HUP rpc.idmapd
-		fi
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfsd" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd
-			eend $?
-		fi
-
-		local o
-		for o in ${OPTS_NFSD} ; do
-			echo "${o#*=}" > "/proc/fs/nfsd/${o%%=*}"
-		done
-	fi
-}
-
-start_it() {
-	ebegin "Starting NFS $1"
-	shift
-	"$@"
-	eend $?
-	ret=$((ret + $?))
-}
-start() {
-	mount_nfsd
-	mkdir_nfsdirs
-
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
-		ebegin "Exporting NFS directories"
-		${exportfs} -r &
-		waitfor_exportfs $!
-		eend $?
-	fi
-
-	local ret=0
-	start_it mountd ${mountd} ${OPTS_RPC_MOUNTD}
-	start_it daemon ${nfsd} ${OPTS_RPC_NFSD}
-	[ -x "${smnotify}" ] && start_it smnotify ${smnotify} ${OPTS_SMNOTIFY}
-	return ${ret}
-}
-
-stop() {
-	local ret=0
-
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --exec ${mountd}
-	eend $?
-	ret=$((ret + $?))
-
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --name nfsd --user root --signal 2
-	eend $?
-	ret=$((ret + $?))
-	# in case things don't work out ... #228127
-	rpc.nfsd 0
-
-	# When restarting the NFS server, running "exportfs -ua" probably
-	# isn't what the user wants.  Running it causes all entries listed
-	# in xtab to be removed from the kernel export tables, and the
-	# xtab file is cleared. This effectively shuts down all NFS
-	# activity, leaving all clients holding stale NFS filehandles,
-	# *even* when the NFS server has restarted.
-	#
-	# That's what you would want if you were shutting down the NFS
-	# server for good, or for a long period of time, but not when the
-	# NFS server will be running again in short order.  In this case,
-	# then "exportfs -r" will reread the xtab, and all the current
-	# clients will be able to resume NFS activity, *without* needing
-	# to umount/(re)mount the filesystem.
-	if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then
-		ebegin "Unexporting NFS directories"
-		# Exportfs likes to hang if networking isn't working.
-		# If that's the case, then try to kill it so the
-		# shutdown process can continue.
-		${exportfs} -ua &
-		waitfor_exportfs $!
-		eend $?
-	fi
-
-	return ${ret}
-}
-
-reload() {
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	ebegin "Reloading /etc/exports"
-	${exportfs} -r 1>&2 &
-	waitfor_exportfs $!
-	eend $?
-}
-
-restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
-	svc_stop
-	svc_start
-}
--- a/net-fs/nfs-utils/files/nfsd.service
+++ b/net-fs/nfs-utils/files/nfsd.service
@ -1,16 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.nfsd $OPTS_RPC_NFSD
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
--- a/net-fs/nfs-utils/files/nfsmount.confd
+++ b/net-fs/nfs-utils/files/nfsmount.confd
@ -1,7 +0,0 @@
-# You will need to set the dependencies in the nfsmount script to match
-# the network configuration tools you are using. This should be done in
-# this file by following the examples below, and not by changing the
-# service script itself.  See /etc/conf.d/netmount for more examples.
-#
-# This is a safe default.
-rc_after="net"
--- a/net-fs/nfs-utils/files/nfsmount.initd
+++ b/net-fs/nfs-utils/files/nfsmount.initd
@ -1,48 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.15 2013/03/24 20:29:48 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	local myneed=""
-	if [ -e /etc/fstab ] ; then
-		myneed="${myneed} $(
-			awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") {
-					if ($3 == "nfs4")
-						idmapd = "rpc.idmapd"
-					if ($4 ~ /sec=(krb|spkm)/)
-						gssd = "rpc.gssd"
-				}
-				END { print idmapd " " gssd }
-				' /etc/fstab
-			)"
-	fi
-	config /etc/fstab
-	need portmap rpc.statd ${myneed}
-	use ypbind dns rpc.idmapd rpc.gssd
-}
-
-start() {
-	if [ -x /usr/sbin/sm-notify ] ; then
-		ebegin "Starting NFS sm-notify"
-		/usr/sbin/sm-notify ${OPTS_SMNOTIFY}
-		eend $?
-	fi
-
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then
-		modprobe -q nfs
-	fi
-
-	ebegin "Mounting NFS filesystems"
-	mount -a -t nfs,nfs4
-	eend $?
-}
-
-stop() {
-	ebegin "Unmounting NFS filesystems"
-	umount -a -t nfs,nfs4
-	eend $?
-}
--- a/net-fs/nfs-utils/files/rpc-mountd.service
+++ b/net-fs/nfs-utils/files/rpc-mountd.service
@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.mountd $OPTS_RPC_MOUNTD
-
-[Install]
-WantedBy=multi-user.target
--- a/net-fs/nfs-utils/files/rpc-statd.service
+++ b/net-fs/nfs-utils/files/rpc-statd.service
@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
--- a/net-fs/nfs-utils/files/rpc-statd.service-r1
+++ b/net-fs/nfs-utils/files/rpc-statd.service-r1
@ -1,14 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	use ypbind net
-	need portmap rpc.pipefs
-	after quota
-}
-
-start() {
-	ebegin "Starting gssd"
-	start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping gssd"
-	start-stop-daemon --stop --exec /usr/sbin/rpc.gssd
-	eend $?
-}
--- a/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ b/net-fs/nfs-utils/files/rpc.idmapd.initd
@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.8 2009/03/14 18:43:18 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-rpc_bin=/usr/sbin/rpc.idmapd
-
-depend() {
-	use ypbind net
-	need portmap rpc.pipefs
-	after quota
-}
-
-start() {
-	ebegin "Starting idmapd"
-	${rpc_bin} ${OPTS_RPC_IDMAPD}
-	eend $? "make sure DNOTIFY support is enabled ..."
-}
-
-stop() {
-	ebegin "Stopping idmapd"
-	start-stop-daemon --stop --exec ${rpc_bin}
-	eend $?
-}
--- a/net-fs/nfs-utils/files/rpc.pipefs.initd
+++ b/net-fs/nfs-utils/files/rpc.pipefs.initd
@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.2 2011/06/19 23:04:36 vapier Exp $
-
-mount_pipefs() {
-	local fstype=rpc_pipefs mntpoint=/var/lib/nfs/rpc_pipefs
-
-	# if things are already mounted, nothing to do
-	mountinfo -q ${mntpoint} && return 0
-
-	# if rpc_pipefs is not available, try to load sunrpc for it #219566
-	grep -qs ${fstype} /proc/filesystems || modprobe -q sunrpc
-	# if still not available, the `mount` will issue an error for the user
-
-	# now just do it for kicks
-	mkdir -p ${mntpoint}
-	mount -t ${fstype} ${fstype} ${mntpoint}
-}
-
-start() {
-	ebegin "Setting up RPC pipefs"
-	mount_pipefs
-	eend $? "make sure you have NFS/SUNRPC enabled in your kernel"
-}
--- a/net-fs/nfs-utils/files/rpc.statd.initd
+++ b/net-fs/nfs-utils/files/rpc.statd.initd
@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-rpc_bin=/sbin/rpc.statd
-rpc_pid=/var/run/rpc.statd.pid
-
-depend() {
-	use ypbind net
-	need portmap
-	after quota
-}
-
-start() {
-	# Don't start rpc.statd if already started by someone else ...
-	# Don't try and kill it if it's already dead ...
-	if killall -q -0 ${rpc_bin} ; then
-		return 0
-	fi
-
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid
-	eend $?
-}
--- a/net-fs/nfs-utils/files/rpc.svcgssd.initd
+++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd
@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	use ypbind net
-	need portmap rpc.pipefs
-	after quota
-}
-
-start() {
-	ebegin "Starting svcgssd"
-	start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping svcgssd"
-	start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd
-	eend $?
-}
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-fs</herd>
-	<longdescription>NFS client and server daemons</longdescription>
-	<use>
-		<flag name='libmount'>Link mount.nfs with libmount</flag>
-		<flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag>
-		<flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag>
-		<flag name='nfsv3'>Enable support for NFSv3</flag>
-		<flag name='nfsv4'>Enable support for NFSv4</flag>
-		<flag name='nfsv41'>Enable support for NFSv4.1</flag>
-		<flag name='nonfsv4'>Disable support for NFSv4</flag>
-		<flag name='uuid'>Support UUID lookups in rpc.mountd</flag>
-	</use>
-</pkgmetadata>
--- a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
@ -1,159 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild,v 1.1 2013/08/27 07:00:20 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.0-r1
-	net-libs/libtirpc
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			virtual/krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
-	epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-heimdal.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-
-        if has_version app-crypt/heimdal ; then
-		econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		--without-gssglue \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos krb5)" "--without-krb5")
-        else
-		econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
-        fi
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_dounit "${FILESDIR}"/rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	mkdir -p "${ROOT}"/var/lib/nfs #368505
-	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
-		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
-	done
-}
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
@ -1,159 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild,v 1.1 2013/12/22 09:50:02 pacho Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.0-r1
-	net-libs/libtirpc
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			virtual/krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	epatch "${FILESDIR}"/${PN}-1.2.9-heimdal-1.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	if has_version app-crypt/heimdal ; then
-		econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		--without-gssglue \
-		$(use_enable libmount libmount-mount) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos krb5)" "--without-krb5")
-        else
-		econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_enable libmount libmount-mount) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
-        fi
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_newunit "${FILESDIR}"/rpc-statd.service-r1 rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	mkdir -p "${ROOT}"/var/lib/nfs #368505
-	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
-		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
-	done
-}
--- a/net-misc/rasclient/Manifest
+++ b/net-misc/rasclient/Manifest
@ -2,9 +2,12 @@ DIST RASClient-15.5.16465_i386.tar.bz2 14857037 BLAKE2B c54e82bd88fa76e30d7cce12
 DIST RASClient-17.1.21954_x86_64.tar.bz2 20587770 BLAKE2B 417fdd67db9d2e567623b9b839da9180409decfee2ace192a20b61cd7750d5b3a81cc17374031e7faa9bd6f4c545817f47fc5099f295883a8bf742fc71fcfb91 SHA512 d50dbfe85b48694cef49f0c95ebe99bc3c17cf48888948fabe81dab1143deb584b74b69ddce201a97ce46a83063e7d2c2ace309a89350923ad6c4ad7f865962e
 DIST RASClient-18.1.22712_x86_64.tar.bz2 17756569 BLAKE2B 42687554d012c80819674eeebbc86013fed09428ab94af85e232ea9d2974020f4b2afea687e70d136c9a43e04c768d74bd7c59727688582381e93ef4110a0701 SHA512 2441b718b12764713cb93b9ba647be91a68dad77ee5433b9d9a5cf724d3b3112298cd3e21bc78d707203ffa1246727d46b269f27f452c9022937b7f5ab031ab0
 DIST RASClient-18.2.22861_x86_64.tar.bz2 17879385 BLAKE2B 473f17eac9e4cb270f6359919cdbdedbf1e20a93fc8e3d1ba5f05316bcda01c80bd361bb651c5786528272de74759364bb5475232122d8889cc8a66e198656ee SHA512 8c5b378e8915ef46dc5447479e6836615ba8d156ba2f53f945df5d0be7069b84632b7ec5a6d73beb82bac998d1e15388ba94346f058d68017145dceb7b04b2e1
+DIST RASClient-18.3.22907_x86_64.tar.bz2 17878587 BLAKE2B 793d82914f9bbbb39a3cc2511c6480b9115d870bde549847446a95e4464626e77ebc4ccc6f6cff35e2d34b1ac2d12a65bd3013130ccc6c3bfe5f28443ac7a561 SHA512 3ce576d9c36b1a3b654c4366d5e6b15b462ab2eee28c059e529d48f6c201e77be65a42d30c3451f6ee0d9fbea785fb49bf5265b3678ea322f86ef1fd40421d0f
 DIST RASClient-sso-18.1.22712_x86_64.tar.bz2 9263 BLAKE2B 85a00e54eb2e5f512b7fb4132308be2a4e126000e964f5285462dcf60eab07027682937f363fd5b5ade8058ff1fc30cc99a1a861821b6c25789aa7c1e381ee1f SHA512 097d8a6e1dc9ae191546f32671dbce696fc88d9dc20cd0ac226ca09ec60fe62946ecead02d42564e75a82170625ccb40e38c2db8489ae46568df395fbda06965
 DIST RASClient-sso-18.2.22861_x86_64.tar.bz2 9276 BLAKE2B 6219e91e8abaa0f1efb371df848b0191695611566e463cf25d0c2ca8ed722e4b4568eb8a0d282c6ae6b2b8750fe3d709cc332f78ef4469a9bfd1e4e3a332c3e4 SHA512 107835d46bdf2410280a0f013c49adaf1c68666cb37e24fe9bf67c0089e438c23e38cbd11445dea97cd7b02ea80655ffe2facd7ab191cccf933762453a4d957c
+DIST RASClient-sso-18.3.22907_x86_64.tar.bz2 9263 BLAKE2B defe8d386a34acc9bfcfd9684c0562b8ab1f929693436d1a2fae86e57f0ef6a673a1e42e06acf73b0aec5cb532b848c1ac7c688495e8cf39b4acce91bc246816 SHA512 24642ab5ca8a3a8d6a8acefd609f65fc604ca3aacad277da9a7060c5c1f85a61671623f35dbaae973cde332d25d9544a4610e9f881f4e3e30b08ecd2b24898fe
 EBUILD rasclient-15.5.4.16465.ebuild 2769 BLAKE2B 260d13736ce153d85227fd22f44bed41f3cc1e3fb43da7d8fc61d002d2c61aaf2a6cfce5651feff172afe13b8dd34fc09938623550a1fd94b35f36adb382a032 SHA512 657f944eb1d17fe8b7807ab575dc096f5c3637900dd67631d977541c0d4bcc1a5375d691362a6b095a8fd5f052bcf0a5b19009871807a6270277713850cd917b
 EBUILD rasclient-17.1.3.21954.ebuild 2643 BLAKE2B a788a1ba714faf03021f6002b3d8b9cd7d70b10a20c68740cd83d6e62ceecf7438cfff744ac250e5f81b8e14214906db36f2ffa82dd871a1dabcfa333e39cdd1 SHA512 9c50ee01c3b9dbd9ad2a30433b713cceb0380767bf959791156ad3221a9082e9b983db9df8b972fccaf87edc46d381b6ca56af7159fef89e1ac9bd2d1039ce5d
 EBUILD rasclient-18.1.0.22712.ebuild 2699 BLAKE2B b21db356e4207eb689ea16fffcea1e103cbb1333e7b8706b6d758e53600b4468fc516ac3aee2b2a5b825cb53446bcb4e387f6df1710bd16caf581d475b60aeaa SHA512 955514e4d96a40baa470bca410dc12970b7caaeee9ced5822f41f1f8afa17efc3d87f6a9c0af174fc08678877cb57f7a417dc7c8ba9de60f4943927f08a95c3d
 EBUILD rasclient-18.2.0.22861.ebuild 2699 BLAKE2B b21db356e4207eb689ea16fffcea1e103cbb1333e7b8706b6d758e53600b4468fc516ac3aee2b2a5b825cb53446bcb4e387f6df1710bd16caf581d475b60aeaa SHA512 955514e4d96a40baa470bca410dc12970b7caaeee9ced5822f41f1f8afa17efc3d87f6a9c0af174fc08678877cb57f7a417dc7c8ba9de60f4943927f08a95c3d
+EBUILD rasclient-18.3.1.22907.ebuild 2699 BLAKE2B b21db356e4207eb689ea16fffcea1e103cbb1333e7b8706b6d758e53600b4468fc516ac3aee2b2a5b825cb53446bcb4e387f6df1710bd16caf581d475b60aeaa SHA512 955514e4d96a40baa470bca410dc12970b7caaeee9ced5822f41f1f8afa17efc3d87f6a9c0af174fc08678877cb57f7a417dc7c8ba9de60f4943927f08a95c3d
--- a/net-misc/rasclient/rasclient-18.3.1.22907.ebuild
+++ b/net-misc/rasclient/rasclient-18.3.1.22907.ebuild
@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils xdg-utils versionator desktop
+
+PV_MAJ=$(get_major_version )
+PV_MIN=$(get_version_component_range 2)
+PV_SUB=$(get_version_component_range 3)
+PV_DIF=$(get_version_component_range 4)
+MY_PV="${PV_MAJ}.${PV_MIN}.${PV_DIF}"
+
+DESCRIPTION="Parallels Remote Application Client"
+HOMEPAGE="https://www.parallels.com/eu/products/ras/download/links/#lin"
+SRC_URI="amd64? ( http://download.parallels.com/ras/v${PV_MAJ}/${PV}/RASClient-${MY_PV}_x86_64.tar.bz2
+		http://download.parallels.com/ras/v${PV_MAJ}/${PV}/RASClient-sso-${MY_PV}_x86_64.tar.bz2 )"
+
+LICENSE="no-source-code"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+RESTRICT="mirror bindist strip" #299368
+
+
+DEPEND="dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib
+	net-print/cups
+	|| ( sys-devel/base-gcc sys-devel/gcc )
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	dev-libs/libusb
+	sys-apps/pcsc-lite
+	sys-libs/glibc
+	x11-libs/libXpm
+	"
+
+RDEPEND="${DEPEND}"
+
+
+#pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	#has_multilib_profile && ABI="x86"
+#}
+
+src_install() {
+	into /opt/2X/Client/
+	dobin opt/2X/Client/bin/*
+	dolib.so opt/2X/Client/lib/*
+	ln -sf $(get_libdir) "${D}/opt/2X/Client/lib"
+
+	dodoc opt/2X/Client/doc/*
+
+	doicon opt/2X/Client/share/2X.png
+
+	domenu opt/2X/Client/share/rasclient.desktop
+	domenu opt/2X/Client/share/tuxclient.desktop
+	domenu opt/2X/Client/share/rassession.desktop
+
+	insinto /usr/share/mime-info
+	doins opt/2X/Client/share/mime/*.{keys,mime}
+
+	insinto /usr/share/application-registry
+	doins opt/2X/Client/share/mime/2XSession.applications
+
+	insinto /usr/share/mime/packages/
+	doins opt/2X/Client/share/sharedmimeinfo/2XClient.xml
+
+	insinto /opt/2X/Client/share
+	doins opt/2X/Client/share/*.{conf,qm,qss,pem}
+	doins opt/2X/Client/share/installed
+
+
+#	if use pax_kernel; then
+#		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
+#		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+#		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+#		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+#		eqawarn "you suspect that ${PN} is being broken by this modification,"
+#		eqawarn "please open a bug."
+#	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/net-vpn/openvpn3/Manifest
+++ b/net-vpn/openvpn3/Manifest
@ -1 +1 @@
-EBUILD openvpn3-16_beta.ebuild 1313 BLAKE2B c13bfcb819cf86d5f13a38093464da433f0e3551bb81fc4597d672e1cc302020046a93d36c8077034d21d88c658fe57d15e9102e82068a53d23a08d42199d65c SHA512 b92b680aa9d065dafd9413e917f2079089d322870b4d5c5683aba4ed70f4ad17ba22915553e39d0edc47628be63555a06af5e36e10afdefd27342a7941f7e554
+EBUILD openvpn3-17_beta.ebuild 1313 BLAKE2B c96f0d30eaacee57651a4928d5731b97b84dc7f21ac0ae73f86bb4fb55ed2fba57eb60a1e2f1fcdd5ab14898f24465c4ea272ff68aaca8b8c95f6310aad08cdd SHA512 2536949f444052fa4fcd4697ed798a7086285dcefdc05d90596e0f3e02733c20d586b9d157f1f810e633aaa81a3444f1ca1276346488e4e22f24ac3529ea097b
--- a/net-vpn/openvpn3/openvpn3-17_beta.ebuild
+++ b/net-vpn/openvpn3/openvpn3-17_beta.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://openvpn.net"
 LICENSE="GNU Affero General Public License v3.0"

 EGIT_REPO_URI="https://github.com/OpenVPN/openvpn3-linux.git"
-EGIT_COMMIT="v16_beta"
+EGIT_COMMIT="v17_beta"
 EGIT_SUBMODULES=( '*' )


--- a/sci-electronics/galasm/Manifest
+++ b/sci-electronics/galasm/Manifest
@ -0,0 +1,2 @@
+DIST galasm-2.1_p20211123.tar.gz 65199 BLAKE2B fd3ca47267e8f9cb600bd368f8c1807f108d4dda64dab4003badb65b9e75786d2869d9f21082fff0e2a20d4c7a1414d8a7f9c07f0a2229f40371e44789386854 SHA512 738413329f06bb0c576814900d9f7275ba72b4adf34298d28be6ab609ff829cfae85140ac3d931d5b2d382236f90a8c99b5215bb19e072f0ae964bc9d7a32ddc
+EBUILD galasm-2.1_p20211123.ebuild 592 BLAKE2B 3f0bb32713f9f5cf3138f2f550d70474610de94ee8814d3819a53be5da372d6d2202d3e373e82f1e4f4923d5e678f954892ca369e34b9605f11acd37b96b2690 SHA512 1abaf7a0bb75326ebe1722c2adc6bc47259e9dcc429b0f4b33cc70cd75d66966577f7f49c37172c5a95af2139a34045a3746e37c7d50d87b87291a39f09fac0c
--- a/sci-electronics/galasm/galasm-2.1_p20211123.ebuild
+++ b/sci-electronics/galasm/galasm-2.1_p20211123.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SHA="3e6c7a5e8b0cefe4128f4bdb2550209dc38b5756"
+
+inherit bash-completion-r1 udev
+
+DESCRIPTION="Portable GAL Assembler"
+HOMEPAGE="https://github.com/daveho/GALasm"
+SRC_URI="https://github.com/daveho/GALasm/archive/${SHA}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/GALasm-${SHA}
+
+src_compile() {
+	emake -C src
+}
+
+src_install() {
+	dobin src/galasm
+	HTML_DOCS=( "${S}"/galer/* )
+	dodoc -r examples
+	einstalldocs
+}
--- a/sys-fs/fatresize/ChangeLog
+++ b/sys-fs/fatresize/ChangeLog
@ -1,11 +0,0 @@
-# ChangeLog for sys-fs/fatresize
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*fatresize-1.0.2 (23 Nov 2013)
-
-  23 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +fatresize-1.0.2.ebuild,
-  +files/fatresize-1.0.2-libparted_ver_check.patch,
-  +files/fatresize-1.0.2-ped_assert.patch,
-  +files/fatresize-1.0.2-ped_free.patch:
-  initial commit
--- a/sys-fs/fatresize/Manifest
+++ b/sys-fs/fatresize/Manifest
@ -1,6 +0,0 @@
-AUX fatresize-1.0.2-libparted_ver_check.patch 731 BLAKE2B 76b0316cb8543319663d96e9a61b3307c3b06d99bcce2b89d565f90ee9883c5f52bf660f3e8a0eb3f9a03cff7997c2ac079ea21b925a65d2e091ed4bf60581d1 SHA512 289187be8b080052266ad869e683e48c48197884d28636849434bb01e49edeff009008779ec05b4daa64c429e0931c12c9eadb87496a72d01b46bed05c41866d
-AUX fatresize-1.0.2-ped_assert.patch 818 BLAKE2B b664350adba26afc74ef78e4b10559afbf95dee17abef4b80c3df705469fdbffa77a750e331ba07cd57971e88924299af639ea07075a40396efcc1b67116d4ed SHA512 3cf781a32beb29b3a799fc8fb642f31bc0464394d5923632438addbb239d8973b649ddfef68bdafc8570b85d788a255023f23c11d7f5b2a36bf995bed838e38a
-AUX fatresize-1.0.2-ped_free.patch 816 BLAKE2B d1eee895f7bb2225a86f584af807e54e164f8275d76e275910a1fe489aa8b3f7949d1f13c9471bfb5dd2c3f33c74172e7e8926f3e639d352b1195a6b8258a1cf SHA512 b84edb452086e7a9f1fe8b069721c8387ff720377392b71219ddc4751b915a03f382ad5536834f390a31844be6c932a60584f33645a0f7d3e706ae30978f24cb
-DIST fatresize-1.0.2.tar.bz2 88352 BLAKE2B b3349cc16bd82ad31f91847b1cf3fb0aa8ddd1b464bb0904312949416f7392d4a8ba340e98d8f8a0251b356da8fc084c62747fc61bd16a21f1ab0ed55a860427 SHA512 3792e110a393fcee51ef5a12c3e09f3a0792470dc3609a262bc0d4b3186ea96922d51db445c3ec7e7eb02741f29f631c94476990914bf4822e2eac0a1e3373f7
-EBUILD fatresize-1.0.2.ebuild 820 BLAKE2B 1e7050c15c95107077a97129d3daaeeb5a4076a0a9363924fca41c6ddae2ca5ed0e9b9428c33ef5a332e701cffe76888b50c7f2131ccf10e3e3aa2150f544e6a SHA512 7a1bc9446ecb1e0bd47335fe4b4dafeccf0be74e1322d2ca45ff2f54ea879f08cea518533963e195b1912790873abfe62089dbc59bb0bf30056acaba4323e449
-MISC ChangeLog 378 BLAKE2B fd72a8b317e3468041a6978c48ccc4480c04d2e3ccbde04ec3535522bb607991b9ab9d4cb5b4d10110caf1d86b54eacb6a6fbd65f0dfb8e34b579cb7062ab3c3 SHA512 abcf7d702d697dd572588062b9a5f14c19e4bdd5a6c346505424b7d0f868a86d302d85eb62bc01f9341dddc7b41f5cd9d38967826f797189c7dce3a251dfa23f
--- a/sys-fs/fatresize/fatresize-1.0.2.ebuild
+++ b/sys-fs/fatresize/fatresize-1.0.2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.1 2013/06/11 03:07:21 vapier Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The FAT16/FAT32 non-destructive resizer"
-HOMEPAGE="http://sourceforge.net/projects/fatresize/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=">=sys-block/parted-3.1"
-RDEPEND="${DEPEND}"
-
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libparted_ver_check.patch
-	epatch "${FILESDIR}"/${P}-ped_assert.patch
-	epatch "${FILESDIR}"/${P}-ped_free.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-}
--- a/sys-fs/fatresize/files/fatresize-1.0.2-libparted_ver_check.patch
+++ b/sys-fs/fatresize/files/fatresize-1.0.2-libparted_ver_check.patch
@ -1,14 +0,0 @@
-diff -up fatresize-1.0.2/configure.ac.orig fatresize-1.0.2/configure.ac
--- fatresize-1.0.2/configure.ac.orig	2005-09-20 10:30:35.000000000 +0200
-+++ fatresize-1.0.2/configure.ac	2012-12-17 23:33:06.238862845 +0100
-@@ -29,8 +29,8 @@ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=${ac
- dnl libparted
- # hack
- LIBS="$LIBS -ldl"
-PARTED_CHECK_LIBPARTED(1.6.0, ,
-	[AC_MSG_ERROR([*** libparted >= 1.6.0 not installed - please install first ***])])
-+AC_CHECK_LIB(parted, ped_malloc,  [], AC_MSG_ERROR([*** libparted >= 3.1.0 not installed - please install first ***]))
-+AC_CHECK_LIB(parted-fs-resize, ped_file_system_open,  [], AC_MSG_ERROR([*** libparted-fs-resize >= 3.1.0 not installed - please install first ***]))
- 
- AC_SUBST(PARTED_LIBS)
- 
--- a/sys-fs/fatresize/files/fatresize-1.0.2-ped_assert.patch
+++ b/sys-fs/fatresize/files/fatresize-1.0.2-ped_assert.patch
@ -1,21 +0,0 @@
-diff -up fatresize-1.0.2/fatresize.c.orig fatresize-1.0.2/fatresize.c
--- fatresize-1.0.2/fatresize.c.orig	2005-09-20 10:29:08.000000000 +0200
-+++ fatresize-1.0.2/fatresize.c	2012-12-18 00:07:00.000000000 +0100
-@@ -217,7 +217,7 @@ fatresize_handler(PedException *ex)
- static int
- snap(PedSector* sector, PedSector new_sector, PedGeometry* range)
- {
-    PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0);
-+    PED_ASSERT(ped_geometry_test_sector_inside (range, *sector));
-     if (!ped_geometry_test_sector_inside(range, new_sector))
- 	return 0;
- 
-@@ -281,7 +281,7 @@ snap_to_boundaries (PedGeometry* new_geo
- 			  end_part->geom.end, end_part->geom.start - 1, -1);
- 	}
- 
-	PED_ASSERT (start <= end, return);
-+	PED_ASSERT (start <= end);
- 	ped_geometry_set (new_geom, start, end - start + 1);
- }
-
--- a/sys-fs/fatresize/files/fatresize-1.0.2-ped_free.patch
+++ b/sys-fs/fatresize/files/fatresize-1.0.2-ped_free.patch
@ -1,29 +0,0 @@
-diff -up fatresize-1.0.2/fatresize.c.orig fatresize-1.0.2/fatresize.c
--- fatresize-1.0.2/fatresize.c.orig	2005-09-20 10:29:08.000000000 +0200
-+++ fatresize-1.0.2/fatresize.c	2012-12-18 00:19:45.061745003 +0100
- 
-@@ -320,11 +320,11 @@ partition_warn_busy(PedPartition* part)
- 			("Partition %s is being used.  You must unmount it "
- 			 "before you modify it with Parted."),
- 			path);
-	ped_free(path);
-+	free(path);
- 	return 0;
-     }
- 
-    ped_free(path);
-+    free(path);
-     return 1;
- }
- 
-@@ -507,8 +507,8 @@ main(int argc, char **argv)
-     }
-     else if (!ped_unit_parse(def_str, dev, &end, &range_end))
- 	return 1;
-    ped_free(old_str);
-    ped_free(def_str);
-+    free(old_str);
-+    free(def_str);
- 
-     printd(3, "ped_geometry_duplicate()\n");
-     old_geom = ped_geometry_duplicate(&part->geom);
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@ -1,6 +1,10 @@
-AUX jfsutils-1.1.12-libjfs.patch 2776 SHA256 4aa6726db09692e54c2d214f333dc8554b98531fb764825b0bde4a6ad103cf5b SHA512 0377319e16f8ed4100abfb69dfba152114cb92640d53f5f8e985fbb048a5fee36c6f69575af8f1f32eb8e859da2a7337f0db5b0f3af11073c3889c67178049cd WHIRLPOOL dbba78a64475f45502eeccaa0111b0ac500f64e12c5607c974c84d1ce64a94f32b73e8c486ec60fb6bd4f6528c99404c4cc13fbb1f9f773bbaf917e199ffb4f0
-AUX jfsutils-1.1.15-linux-headers.patch 386 SHA256 561c10a49be14a69698b07a12bca3cb5b6ac4af3893b2ea47cee7a01b532c2e0 SHA512 da36f4fe9d9faef5fd1ca5a863dd67c0beb539fcb819b56273c9a8ee0dc428b3278b86ef430a1c9b4ee64dfedeba05d877ad8db9d5d59f1cc4b2ecd1a2c03346 WHIRLPOOL 45f19f273f0134ca06c91bb49694c831047a1a3bcac5a39e8dae059823c4783f7f290db3f65586de6232376a5106ad083f499e154518ede7ff7435556531a052
-DIST jfsutils-1.1.15.tar.gz 539148 SHA256 244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858 WHIRLPOOL 8a62c037601999f616041250e06adc10fceb48fc80b319003383ac08b2e1fbb2aaaca781848be2845d6e99f05d1d7a884f9af89e2a6236d64cc4387be02222e8
-EBUILD jfsutils-1.1.15.ebuild 1083 SHA256 92f4ccb0ea94c48d91157ea173b42255a8f4166e00d704dfced256ba8b6bdd81 SHA512 1f4467f55aff51917de9b5d0daf8b7f1df894407b0f362b71aced462b350279c871bf501e8e284c99d2d8a8b686c0ef8af7c75e426dd8eeb1510770dadf8304d WHIRLPOOL cc9993af510140b7a51afa53954e4c1cf83154b446f21d708ad6b6aba3eda45f8acef7a7ff4ef0a0aabab881c26707a07efbd125183c63025160a02575deb5c7
-MISC ChangeLog 12020 SHA256 876891c9b690a4a8875897f8b19b6a68ea7689bedad01cc58b1d9eb5697919d3 SHA512 f13f78c64d91bf4cc545a5f2f02d3daa2031af78740c1b2c91a964cf46447298d30e02b936f7a461ed59095286b81f1db7d97772432fab77cde0409e91ade3b4 WHIRLPOOL 50eb21e705d3b9066fecf584faa11e38c13ced6591af07509ac7f20229ffe0db3f2bfda8e200246586d225b009e64a5f2aeccce2c5e5637699f34e168842e279
-MISC metadata.xml 262 SHA256 adf3f9badc5b8533930b52fb0547fd1b6d4218c0412771c1041c6c27adb05ab4 SHA512 055d4a2fc3cd08c3f98c261d4f2ecfec1014d2b719e87c9a0a780fe6b34c8961c28d2ed60ef1e4c6c9df7e84696fcd1fb2b72347d666f66e475db518e6c962f0 WHIRLPOOL 858ffb591081ef929cb4997b724bac740564ef5866d86d5a8b93e773b68c461c23a4c7d1c7baef230c0f1ad1ac9cdc2a52627d115298a7b2198d6bffd0e32bde
+AUX jfsutils-1.1.12-libjfs.patch 2776 BLAKE2B 34d5422f2cafe9c396f0dfcdbe008289933412ed1642ec5eb3fb2b1e2746b8374997ef46dcaa722c686f854e67b6fad4cc0d327cb7e54c9dd83ddb8a85634145 SHA512 0377319e16f8ed4100abfb69dfba152114cb92640d53f5f8e985fbb048a5fee36c6f69575af8f1f32eb8e859da2a7337f0db5b0f3af11073c3889c67178049cd
+AUX jfsutils-1.1.15-check-for-ar.patch 207 BLAKE2B 52f709e4ddf5899245fe3cb2485124672ae7549f2fa9d39e5dc8eef1a5e5fe8f8accfddaab96b0502b19c3dc4119cb76602fff384c3a03604c7330098d52e3f3 SHA512 2596252cccc0c5cc3f570949c26d6b7dad0889e9afa0713276daf996141a184e1ac9f36e4875f5f95096d01628ba87989b7a1a0ccdaa333c8a38bf36100f0f90
+AUX jfsutils-1.1.15-format-security-errors.patch 1057 BLAKE2B c5283e945fe5db2fdc87f35c21adb5d7135f04a80e3dd8f4a9ea29ce44a58ec718e7aa8334bcda0c42a5ae764242442fc41fa91aba004904e0cf7804a1851122 SHA512 10e0baed287338826e3ba5c73aa4f16e55892390e252d2874de9e39b5bcb63ff18cc6019af36de64bece5dd2c6c04566bb8a3a5bd6d2656da9b9f116dcce02d2
+AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3bd18f74653486ea178b4d97c358c894f4eeb87380408f5e12c998d9462520cb124a63c38c3c4880155a634a8f00bb SHA512 e1804d55afd57a758247902e0e31f93406712e9ce42541b88e7c1126b949eb46ca44f47f191f032225cd57b01736296bfbb72034ad49fc18d5ad6e57050fd0f2
+AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
+AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
+DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
+EBUILD jfsutils-1.1.15-r1.ebuild 1270 BLAKE2B fd9664939207cb63db891bb71b8c468bc376a5e8b4976dd9220224f4512616651174bd36daab43f08e50e55a74ab1a60315b7ee924d6dc8b0352385f99bbe245 SHA512 bc7dc8ce7922f930f0bd83d480d4ed08716ffbbe69d40278da25c8d38820775d37fdc5ab452c2faa27b15c9986b6264e1806f8e1635025764f317a7ce6a03ec6
+MISC ChangeLog 12020 BLAKE2B bbd821c52cff6d99a2a7114f55a4adcc2a5ed18b9b670b3668eee710a10004853197f97a2f790380f53f912da79b87746c5dff829f58d355a3b3ada94546c8ec SHA512 f13f78c64d91bf4cc545a5f2f02d3daa2031af78740c1b2c91a964cf46447298d30e02b936f7a461ed59095286b81f1db7d97772432fab77cde0409e91ade3b4
+MISC metadata.xml 684 BLAKE2B 71d427e0a1162565c4f80686a6aa79773ca773159b457e1301d294f0c6ab0ee45d540df797c0ce98309d21a444f488a0d94353a8a66881801ab108799ab0c42c SHA512 bb82a7efa250c1c2d328b54b8bd0548a6ecad5e3e448dba9bdc3a22ebd10e34578417cb1acf3909feddcc445bb3bf73d14b6af2fec7648aae4f6edf23e485543
--- a/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
@ -0,0 +1,10 @@
+--- a/configure.in
+++ b/configure.in
+@@ -9,6 +9,7 @@ dnl Don't include maintainer make-rules by default
+ AM_MAINTAINER_MODE
+ 
+ dnl Checks for programs.
+AM_PROG_AR
+ AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_INSTALL
--- a/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch
@ -0,0 +1,40 @@
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/format-security-errors.patch/
+
+--- a/fscklog/display.c
+++ b/fscklog/display.c
+@@ -182,7 +182,7 @@ void dump_service_log()
+ 				} else {
+ 					/* the record looks ok */
+ 					msg_txt = &log_entry[log_entry_pos];
+-					printf(msg_txt);
+					printf("%s", msg_txt);
+ 					/*
+ 					 * set up for the next record
+ 					 */
+--- a/fscklog/fscklog.c
+++ b/fscklog/fscklog.c
+@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int line_number, ...) {
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
+	printf("%s", msg_string);
+	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+--- a/logdump/helpers.c
+++ b/logdump/helpers.c
+@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int line_number, ...) {
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
+	printf("%s", msg_string);
+	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+ 
--- a/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
@ -0,0 +1,71 @@
+Fix building with GCC 10
+
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/gcc10_fix-1.patch/
+
+--- jfsutils-1.1.15.old/fscklog/display.c
+++ jfsutils-1.1.15.new/fscklog/display.c
+@@ -54,7 +54,7 @@
+  * output: fsck extracted service log I/O buffer
+  *
+  */
+-char xchklog_buffer[XCHKLOG_BUFSIZE];
+static char xchklog_buffer[XCHKLOG_BUFSIZE];
+ 
+ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+  *
+--- jfsutils-1.1.15.old/libfs/logredo.c
+++ jfsutils-1.1.15.new/libfs/logredo.c
+@@ -87,9 +87,9 @@
+  *    S T U F F    F O R    T H E    L O G
+  *
+  */
+-struct logsuper logsup;		/* log super block */
+-int32_t numdoblk;		/* number of do blocks used     */
+-int32_t numnodofile;		/* number of nodo file blocks used  */
+static struct logsuper logsup;		/* log super block */
+static int32_t numdoblk;		/* number of do blocks used     */
+static int32_t numnodofile;		/* number of nodo file blocks used  */
+ int32_t numExtDtPg = 0;		/* number of extended dtpage blocks used  */
+ 
+ /*
+@@ -129,7 +129,7 @@
+  */
+ 
+ /* buffer header table */
+-struct bufhdr {
+static struct bufhdr {
+ 	int16_t next;		/* 2: next on free/lru list */
+ 	int16_t prev;		/* 2: previous on free/lru list */
+ 	int16_t hnext;		/* 2: next on hash chain */
+@@ -142,7 +142,7 @@
+ } bufhdr[NBUFPOOL];		/* (24) */
+ 
+ /* buffer table */
+-struct bufpool {
+static struct bufpool {
+ 	char bytes[PSIZE];
+ } buffer[NBUFPOOL - 1];
+ 
+@@ -151,15 +151,16 @@
+  *
+  * log has its own 4 page buffer pool.
+  */
+-uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
+static uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
+ 
+ /*
+  * Miscellaneous
+  */
+-caddr_t prog;			/* Program name */
+-int32_t mntcnt, bufsize;
+-char *mntinfo;
+-int32_t retcode;		/* return code from logredo    */
+static caddr_t prog;			/* Program name */
+extern int32_t mntcnt;
+static int32_t bufsize;
+static char *mntinfo;
+static int32_t retcode;		/* return code from logredo    */
+ int end_of_transaction = 0;
+ 
+ /*
+ 
--- a/sys-fs/jfsutils/files/jfsutils-1.1.15-linux-headers.patch
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-linux-headers.patch
@ -1,7 +1,8 @@
-Index: jfsutils-1.1.15/libfs/devices.h
-===================================================================
--- jfsutils-1.1.15.orig/libfs/devices.h
-+++ jfsutils-1.1.15/libfs/devices.h
+https://sourceforge.net/p/jfs/bugs/286/
+https://bugs.gentoo.org/448844
+
+--- a/libfs/devices.h
+++ b/libfs/devices.h
@@ -42,6 +42,7 @@
 
 struct stat;
--- a/sys-fs/jfsutils/files/jfsutils-1.1.15-sysmacros.patch
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-sysmacros.patch
@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580056
+
+--- a/libfs/devices.c
+++ b/libfs/devices.c
+@@ -30,6 +30,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+#if HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
+ #ifdef HAVE_SYS_MOUNT_H
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
+HOMEPAGE="http://jfs.sourceforge.net/"
+SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+IUSE="static"
+
+LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )"
+
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-headers.patch #448844
+	"${FILESDIR}"/${P}-sysmacros.patch #580056
+	"${FILESDIR}"/${P}-check-for-ar.patch #726032
+	"${FILESDIR}"/${P}-gcc10.patch #707314
+	"${FILESDIR}"/${P}-format-security-errors.patch #557140
+        "${FILESDIR}"/jfsutils-1.1.12-libjfs.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use static && append-ldflags -static
+	econf --sbindir=/sbin
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/sbin/{mkfs,fsck}.jfs || die
+	dosym jfs_mkfs /sbin/mkfs.jfs
+	dosym jfs_fsck /sbin/fsck.jfs
+}
--- a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.15.ebuild,v 1.8 2013/02/21 10:28:53 scarabeus Exp $
-
-EAPI=5
-
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
-HOMEPAGE="http://jfs.sourceforge.net/"
-SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE="static"
-
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-linux-headers.patch"
-	epatch "${FILESDIR}/jfsutils-1.1.12-libjfs.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use static && append-ldflags -static
-	econf --sbindir=/sbin
-}
-
-src_install () {
-	default
-
-	rm -f "${ED}"/sbin/{mkfs,fsck}.jfs || die
-	dosym /sbin/jfs_mkfs /sbin/mkfs.jfs
-	dosym /sbin/jfs_fsck /sbin/fsck.jfs
-}
--- a/sys-fs/jfsutils/metadata.xml
+++ b/sys-fs/jfsutils/metadata.xml
@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kernel-misc</herd>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<longdescription>
-		Utilities for working with IBM's journaled file system
+		The jfsutils package contains administration and debugging
+		tools for IBM's journaled file system.
+
+		IBM's journaled file system technology, currently used in IBM enterprise servers,
+		is designed for high-throughput server environments, key to running intranet and
+		other high-performance e-business file servers.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jfs</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/sys-fs/progsreiserfs/Manifest
+++ b/sys-fs/progsreiserfs/Manifest
@ -1,6 +1,6 @@
-AUX progsreiserfs-0.3.0.5-autotools.patch 271 SHA256 565f88d2bbb468200764c25be64dee03b94db438d4f33cab779dda793f1a0eeb SHA512 5db538c3bdcd4463879fc267288f76e50603d8693fa8009ef33247be7d1b89f9cd526a73e47e717f92e1217795a215690263400755ae13de2f636111f67d075f WHIRLPOOL ad552c3561a35f8a7ef8be354f98e068387ab70d2eead00b9fa40355e4718c29fd6514a5de88f298adcac84c0e0a8c3eeb6d95b6870ae658b219fbca11b5a073
-AUX progsreiserfs_0.3.0.5-1.diff 1382691 SHA256 9ffd8b79ca3ef69b0390ad331b142f1cd1aabe3fee78179b7561e20d4caf2ecb SHA512 6dda4381f8227ce9c8d56788c71fdaa4223f70d92f54a29b0faef48256ea3f24e74b69ab836d08467021a95e2979e01422bcf62bfbebdf11ce3e3c09510f1a3f WHIRLPOOL a6e8a4168d510ffc2718a1bffaca352bac0c1f0eee6b399e575b8708def7186013d4128ade5b13cfddb11164b0f4d581f126b1b33a4f63b0082f9fe43ca17a88
-DIST progsreiserfs-0.3.0.5.tar.gz 446099 SHA256 72500420d5dd2799dd9b67c9b64e3c3f1e7e5dc89d5bf254694b76dd17c54c3d SHA512 e2b94c778796492e66578b3dde8601d8670c11344dca2082eccf648f8bf26a226d07c26333d91357b081c50b09aed4b7f9a5bb1a6c985808c55db02c83e24ce3 WHIRLPOOL d07325c7d6543a3fa1f1a18a97cc273cb4805d504f985bfed90113a4360272cad3a15691b1ac7bffbb694c96885b88ccdf607b519300c18e17d951766f10cf02
-EBUILD progsreiserfs-0.3.0.5.ebuild 1486 SHA256 8f9d2aa0f8eb24629c3ac643cec5089e1e50cddcf008fc188c55697bfd5286cc SHA512 2ff68e7749f2e0309a42680e107f08adb28d61cff786e4f827b12cdb533fc7ccb47ddcd57c272ece1e2d1685e3e82bad66d95cb7ada9a0e2390ed90150f92897 WHIRLPOOL 75ee6f5880fd497832b6505d4f757a1fa027bda44c8dccb2222a5768a0d7145d404741e4f81c6db8d0b4dd8bb4684faaf7043f1e79f1cd7cda6d9fa2c7e99805
-MISC ChangeLog 477 SHA256 ab4708b404ad0ff6cfe7dd39d8b0c40bc873900747a9958f1edf99d3a7d0cbf2 SHA512 fc6552d165c68c3946ed9c6c6a1a75a5ee2736269404bef555d21a64322452d90244cb7e0282a32d18a5458ca277c3bf683dac212bfe3fa0568702c664d04922 WHIRLPOOL 0a5a48831ef86754625587780ac4fcf688b54ee9b9e71df4a68fecf20a1729e82975a87982fdd5f5318542d77bac020adc712fe288fe9759173508a6a310eaf0
-MISC metadata.xml 324 SHA256 c04c2d8f91d98f875f7a4dfa095eba5542373654748e5a64f78fb27fb6ed86e8 SHA512 4c2759854c282ad20e98a75082fcad6c2262f20d86f40f0189fb9d693f3701667c17440535bb4773e653eda71dfbb29419b5cd7a1e3b037872a787e26dcc1543 WHIRLPOOL 38e09948438a7d9a77d7e5b263811175a4fa93766e50ee18acc2e1ca86adaf339b118061edb5478c7d4fa65e3190ac93d09059ea065a75bb354ed3bb67bb3fd9
+AUX progsreiserfs-0.3.0.5-autotools.patch 315 BLAKE2B f8233f5a35c696dccd672287562fe2286b4413dc6e0e6cf65eded5f9e3ed36861298b632e64e284f0f0be9ae156d83dafa73b1a18d83dc63ccfeb76b5a9745b6 SHA512 bbb8f0e4932fd9d67744b86e83e28f18068860256288b8bc7c85ddfbb193265127e38aa3be84a8a04f5d6470271c9c282e76d2b4ac8894d0d1c683b9bed1745b
+AUX progsreiserfs-0.3.0.5-lib.patch 1382691 BLAKE2B 7ce2b8c58883a8399f9361f72b0ba4b1fed8efe33dd16aa8eaa991ba79ed05e768ebbb104400362e10482bd7f54e1173a5955ab85a154f17b36980f70aa5491b SHA512 6dda4381f8227ce9c8d56788c71fdaa4223f70d92f54a29b0faef48256ea3f24e74b69ab836d08467021a95e2979e01422bcf62bfbebdf11ce3e3c09510f1a3f
+DIST progsreiserfs-0.3.0.5.tar.gz 446099 BLAKE2B 8b13193c6b27ad868db5f898dee4dd25e8fee91f72bb69799c745afe292a89300bef3670b22da02b8941ace04fbcda5e0a5038994cb1091a4334bf3295b60b76 SHA512 e2b94c778796492e66578b3dde8601d8670c11344dca2082eccf648f8bf26a226d07c26333d91357b081c50b09aed4b7f9a5bb1a6c985808c55db02c83e24ce3
+EBUILD progsreiserfs-0.3.0.5.ebuild 1415 BLAKE2B ad1619acd10d2a493a403ef4e259799032d4db16a0d67d735605bee892ee2457a9ee85ee067d9261472683a0645fc384bd8d3af2763a50f091e03f6bfcf770ba SHA512 304b3681d2348e2d0143527d5d34ef3e278cc20f0692530acf2d128b9794b26613f7434f53b641b0ee40f526b2bb9fa8be47ce72339c38f67aa4ad7c0efe0df0
+MISC ChangeLog 477 BLAKE2B 623c47066457afa41202c32e3e14b16be60f0dcc5c1fe20993fc1c6e2e63bf7705643211fb0fde6546073cfead9fabee7d09ac85375b235d2d85d6fe0d3e39bb SHA512 fc6552d165c68c3946ed9c6c6a1a75a5ee2736269404bef555d21a64322452d90244cb7e0282a32d18a5458ca277c3bf683dac212bfe3fa0568702c664d04922
+MISC metadata.xml 324 BLAKE2B e0442e30aa6d9ef9fae7ce9c1ce190316f7700d74786a671cc70a6cc5cdb7964ac5c635d4398c6d2df8711f5043c73664e86239677681761a530732624cd4c19 SHA512 4c2759854c282ad20e98a75082fcad6c2262f20d86f40f0189fb9d693f3701667c17440535bb4773e653eda71dfbb29419b5cd7a1e3b037872a787e26dcc1543
--- a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-autotools.patch
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-autotools.patch
@ -1,7 +1,7 @@
 http://bugs.gentoo.org/442226

--- progsreiserfs.m4
-+++ progsreiserfs.m4
+--- progsreiserfs-0.3.0.5/progsreiserfs.m4
+++ progsreiserfs-0.3.0.5/progsreiserfs.m4
@@ -10,7 +10,7 @@
 dnl Adds the required libraries to $REISERFS_LIBS and does an
 dnl AC_SUBST(REISERFS_LIBS)
--- a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-lib.patch
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-lib.patch
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.0.5.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.0.5.ebuild
@ -1,32 +1,38 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild,v 1.10 2012/11/19 10:02:54 ssuominen Exp $

-EAPI=5
+EAPI=7

-inherit eutils flag-o-matic libtool
+inherit flag-o-matic libtool

 MY_P=${PN}-${PV/_/-}

 DESCRIPTION="Library for accessing and manipulating reiserfs partitions"
 HOMEPAGE="http://reiserfs.linux.kiev.ua/"
-SRC_URI="ftp://ftp.archlinux.org/other/progsreiserfs/${P}.tar.gz"
+SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz
+	https://ftp.mizar.org/pub/Linux/reiserfs/libreiserfs/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="debug examples nls static-libs"

-RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
 	sys-apps/util-linux
-	nls? ( sys-devel/gettext )"
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+"

-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-lib.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)

 src_prepare() {
-	epatch "${FILESDIR}"/progsreiserfs_0.3.0.5-1.diff
-	epatch "${FILESDIR}"/progsreiserfs-0.3.0.5-autotools.patch
+	default

 	elibtoolize
 }
@ -49,8 +55,9 @@ src_install() {
 		dodoc demos/*.c
 	fi

+	find "${ED}" -name '*.la' -delete || die
+
 	rm -r "${ED}"/usr/{sbin,share/man} || die
-	prune_libtool_files
 }

 pkg_postinst() {
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@ -1,201 +0,0 @@
-# ChangeLog for sys-fs/reiser4progs
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.41 2010/07/11 00:34:26 ranger Exp $
-
-  17 Feb 2015; Mario Fetka <mario.fetka@gmail.com> reiser4progs-1.0.9.ebuild:
-  Bump
-
-*reiser4progs-1.0.9 (14 Jul 2014)
-
-  14 Jul 2014; Mario Fetka <mario.fetka@gmail.com>
-  +files/reiser4progs-1.0.7-readline-6.3.patch, +reiser4progs-1.0.9.ebuild,
-  -files/reiser4progs-1.0.7-gcc-4.4.patch, -reiser4progs-1.0.8.ebuild:
-  Bump
-
-*reiser4progs-1.0.8 (31 Oct 2013)
-
-  31 Oct 2013; Mario Fetka <mario.fetka@gmail.com> +reiser4progs-1.0.8.ebuild,
-  -reiser4progs-1.0.7.ebuild:
-  Bump
-
-*reiser4progs-1.0.7 (28 Nov 2012)
-
-  28 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
-  +files/reiser4progs_1.0.7-6.diff, +reiser4progs-1.0.7.ebuild,
-  -files/reiser4progs-libreiser4-no-libmisc.patch,
-  -reiser4progs-1.0.7-r1.ebuild:
-  add drbl patch for partclone
-
-  11 Jul 2010; Brent Baude <ranger@gentoo.org> reiser4progs-1.0.7.ebuild:
-  stable ppc64, bug 302479
-
-  18 Apr 2010; <nixnut@gentoo.org> reiser4progs-1.0.7.ebuild:
-  ppc stable #302479
-
-  12 Apr 2010; Markus Meier <maekke@gentoo.org> reiser4progs-1.0.7.ebuild:
-  arm/x86 stable, bug #302479
-
-  11 Mar 2010; Markos Chandras <hwoarang@gentoo.org>
-  reiser4progs-1.0.7.ebuild:
-  Stable on amd64 wrt bug #302479
-
-  11 May 2009; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.7.ebuild,
-  +files/reiser4progs-1.0.7-gcc-4.4.patch:
-  Add fix by Victor Ostorga for build failure with gcc-4.4 #269240 by 404
-  Error.
-
-*reiser4progs-1.0.7 (18 Jan 2009)
-
-  18 Jan 2009; Mike Frysinger <vapier@gentoo.org>
-  +reiser4progs-1.0.7.ebuild:
-  Version bump #255300 by Mathieu Belanger.
-
-*reiser4progs-1.0.6-r2 (26 Oct 2008)
-
-  26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
-  files/reiser4progs-1.0.6-preen.patch, -reiser4progs-1.0.6-r1.ebuild,
-  +reiser4progs-1.0.6-r2.ebuild:
-  Fix by Anders Aagaard for -p (preen) operation #237393.
-
-*reiser4progs-1.0.6-r1 (31 May 2008)
-
-  31 May 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/reiser4progs-1.0.6-preen.patch, +reiser4progs-1.0.6-r1.ebuild:
-  Change the meaning of -p to --preen #195988 by Radu Benea and Roy Marples.
-
-  31 May 2008; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.6.ebuild:
-  Add arm love #203718 by Shvetsov Alexey.
-
-  24 Nov 2007; Samuli Suominen <drac@gentoo.org> reiser4progs-1.0.6.ebuild:
-  amd64 stable wrt #199308
-
-  19 Nov 2007; Markus Meier <maekke@gentoo.org> reiser4progs-1.0.6.ebuild:
-  x86 stable, bug #199308
-
-  18 Nov 2007; Markus Rothe <corsair@gentoo.org> reiser4progs-1.0.6.ebuild:
-  Stable on ppc64; bug #199308
-
-  17 Nov 2007; nixnut <nixnut@gentoo.org> reiser4progs-1.0.6.ebuild:
-  Stable on ppc wrt bug 199308
-
-*reiser4progs-1.0.6 (16 Mar 2007)
-
-  16 Mar 2007; Mike Frysinger <vapier@gentoo.org>
-  +reiser4progs-1.0.6.ebuild:
-  Version bump #170973 by Roel Brook.
-
-  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
-  reiser4progs-1.0.5.ebuild:
-  Fix broken autotools handling.
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org>
-  reiser4progs-1.0.4_p1.ebuild:
-  Stable on ppc64
-
-*reiser4progs-1.0.5 (12 Aug 2005)
-
-  12 Aug 2005; Mike Frysinger <vapier@gentoo.org>
-  +reiser4progs-1.0.5.ebuild:
-  Version bump #102292 by Ingo Bormuth.
-
-*reiser4progs-1.0.4_p1 (29 Jul 2005)
-
-  29 Jul 2005; Mike Frysinger <vapier@gentoo.org>
-  files/reiser4progs-1.0.4-gcc4.patch, +reiser4progs-1.0.4_p1.ebuild:
-  Version bump #100447 by Ingo Bormuth.
-
-  27 Jun 2005; Markus Rothe <corsair@gentoo.org> reiser4progs-1.0.4.ebuild:
-  Stable on ppc64
-
-  26 Jun 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/reiser4progs-1.0.4.pset.patch, reiser4progs-1.0.4.ebuild:
-  Add upstream patch for newer kernel support #97048 by Sander Sweers.
-
-  22 May 2005; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.4.ebuild:
-  Add fix for broken libtool relinking by Simone Gotti #74817.
-
-  15 May 2005; Markus Rothe <corsair@gentoo.org> reiser4progs-1.0.4.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-*reiser4progs-1.0.4 (12 Mar 2005)
-
-  12 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
-  +files/reiser4progs-1.0.4-gcc4.patch, +reiser4progs-1.0.4.ebuild:
-  Version bump, GCC4 patch ported by Mark Loeser. Closes bug #82865.
-
-  10 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
-  +files/reiser4progs-1.0.3-gcc4.patch, reiser4progs-1.0.3.ebuild:
-  GCC 4 compat fix by Bret Towe <magnade@gmail.com>, closes bug #81054.
-
-*reiser4progs-1.0.3 (16 Dec 2004)
-
-  16 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  +reiser4progs-1.0.3.ebuild:
-  Version bump #74570 by infirit (Sander Sweers).
-
-*reiser4progs-1.0.2_pre1 (30 Oct 2004)
-
-  30 Oct 2004; Mike Frysinger <vapier@gentoo.org>
-  +reiser4progs-1.0.2.ebuild, -reiser4progs-1.0.2_pre1.ebuild:
-  Version bump #69446 by Stefan Schweizer.
-
-  19 Sep 2004; Mike Frysinger <vapier@gentoo.org> :
-  Version bump #64539 by Stefan Schweizer.
-
-*reiser4progs-1.0.0 (08 Sep 2004)
-
-  08 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> reiser4progs-1.0.0.ebuild,
-  reiser4progs-1.0.1.ebuild:
-  Totally broken on sparc, see wli's posts in "silent semantic changes with
-  reiser4" LKML thread
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  reiser4progs-1.0.1.ebuild:
-  Masked reiser4progs-1.0.1.ebuild stable for ppc
-
-*reiser4progs-1.0.1 (24 Aug 2004)
-
-  24 Aug 2004; Mike Frysinger <vapier@gentoo.org> +reiser4progs-1.0.1.ebuild:
-  Version bump #61563 by Daniel Webert.
-
-*reiser4progs-0.5.6 (14 Jul 2004)
-
-  14 Jul 2004; Mike Frysinger <vapier@gentoo.org> +files/0.5.6-guage.patch,
-  +reiser4progs-0.5.6.ebuild:
-  Version bump #57073 by Stefan Schweizer.
-
-*reiser4progs-0.5.5 (17 Jun 2004)
-
-  17 Jun 2004; Mike Frysinger <vapier@gentoo.org> +reiser4progs-0.5.5.ebuild:
-  Version bump #53990 by Redeeman.
-
-*reiser4progs-0.5.4 (17 May 2004)
-
-  17 May 2004; <coxj@gentoo.org> reiser4progs-0.5.4.ebuild:
-  Version Bump
-
-  12 Apr 2004; Travis Tilley <lv@gentoo.org> reiser4progs-0.5.3.ebuild:
-  added ~amd64 keyword
-
-  12 Apr 2004; David Holm <dholm@gentoo.org> reiser4progs-0.5.3.ebuild:
-  Added to ~ppc.
-
-*reiser4progs-0.5.3 (11 Apr 2004)
-
-  11 Apr 2004; <coxj@gentoo.org> reiser4progs-0.5.3.ebuild:
-  Version bump
-
-*reiser4progs-0.5.0 (06 Feb 2004)
-
-  06 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
-  Version bump.
-
-*reiser4progs-0.4.20-r1 (30 Jan 2004)
-
-  30 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
-  Upstream released new tarballs with a few fixes #39443.
-
-*reiser4progs-0.4.20 (10 Jan 2004)
-
-  10 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
-  Initial import.  Ebuild submitted by Bret Towe <btowe@gbis.com> #34340.
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@ -1,7 +0,0 @@
-AUX reiser4progs-1.0.7-gcc-4.4.patch 311 SHA256 5d0fc888af703911457f42b16d4da76cfdcb5c38c08387c21f5f5e4e111160bf SHA512 940fc154fadec21a701ef7914a6b4ef1067fc954101219b2949bf8721e97deb8d832ae288c930a59060ba3171f94bfed5924c8ac6b8c30c655fd0ca09f0bff1a WHIRLPOOL 94f00f3e9a876c990b42a7eec3793d7f31696c2e689b70a411bb6cbe639e6ef69fa431db9e5f01ad20a0beb78eff54c185b669287922f9299dd090e906cc35db
-AUX reiser4progs-1.0.7-readline-6.3.patch 472 SHA256 764f820b7f933270ab00138610243ad11926a326c5d9668d8566e758dc220b49 SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788 WHIRLPOOL fe6fda5bea8535ceac3a066896a2836419d04595d1f538d97bb29d5d2e01b60943a0acac0f34990cd333ebef3c7a5a8b3281c90584b5d7c86e9263d779030aa0
-AUX reiser4progs_1.0.7-6.diff 898 SHA256 2720a6f288f405779f9c7d4084756f673ca694716a6eb694602a6368c0813ecd SHA512 917a332f466eb3b51bced189a7ffb3e4b2be87a6aa07bd5874091bbbb4a7c84ff6b3292785cc04fedc433fe7a44b62e1b1b83d890e90d733b2f2d4ec8a3df9bc WHIRLPOOL 125d9ecc02698e949c91a2f86412c9c7f65a1ffdfd0e04238abe1a8bc75c67d12c87b9095d22f0625bd9d187e84420c159165e45795cc5bc28bb1df5f87e1f20
-DIST reiser4progs-1.0.9.tar.gz 913470 SHA256 ffb027c83b0080e86f7cbe238c1e185ab09225f962a171245e7f4b7e9a97cd34 SHA512 1aa3cc1a59081d4987c94fc0dda42b9b64329e8187483809968438d2c7b1152eed23d3d6682aabe2216e1aee50f9653120a0bc4fe798195d6a1cf9c43c9508b0 WHIRLPOOL 6cd385b506ac52fe44f7b8cca3a0c4815b59c22e200a25898eba5c5a5e6491b16d7e1fedd074ac58e748437df084e40a4e92059081a51a6a30b4e0e4a9945a17
-EBUILD reiser4progs-1.0.9.ebuild 1405 SHA256 e7249c3d70f9679ad82affcc91700f3a7757abfa07e62f70baf9e49744c63a56 SHA512 ec2c6da00146e1a941f016f0744f3b8e28305264d3bf19fae7a29f41e426da50c2a16dbde065e2c8cc71148725d556918714d9ff1442e47a7aa18a90810c1954 WHIRLPOOL 3d4e069cfa0c0ea4536518ba66cf7a6456d3be3a15cf4bb39037efb0c85526f23a4147bb8b9a322f5b2fc099dccddb3d3822cf7edeb76f702196fed1e4fcec56
-MISC ChangeLog 6571 SHA256 36a48c60a75a0747ded999587134c6c0f0fe4667ef16fbc0be154752c2ef0e13 SHA512 4afae1f3ddd59ba4fbe2394f2c348a223296d784f99fda9419d1e0d31ec4cccaef57a745f7427ae0f3b0cbb15fefd98e8574a51ce5dc6f408997cc2d70379133 WHIRLPOOL 58c692978f46cad3b3f5fa210d6c3b1f9adb74eaa90be7d0c5e429875ee57322b3fff7981cf8b136e6f8977f1b5938da75166a3135358c9223b4cfd87ffd9b83
-MISC metadata.xml 267 SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b SHA512 9c577b7491c6865a0010947f6be695e1c8c31a03e0b14fee4d21ccde81229f981a57f95ac6d59eaf496c0b1a3ff117375733dd93bdc3228f097c31da4bb64ae9 WHIRLPOOL 94c08b3e4a38b8085b090d73f27645470d22d324fdf5d8f764c22b9e69b13f2bfefe89ceb76fcf59f29f4851ca13001877f9b3acce718f3bcfd6d4db362063f6
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch
@ -1,15 +0,0 @@
-http://bugs.gentoo.org/269240
-
-fix build failure when using gcc-4.4
-
--- reiser4progs-1.0.7/plugin/node/node40/node40.c
-+++ reiser4progs-1.0.7/plugin/node/node40/node40.c
-@@ -994,7 +994,7 @@
- 	func = cb_comp_key3;
- #elif defined(ENABLE_LARGE_KEYS)
- 	func = cb_comp_key4;
-#elif
-+#else
- 	func = NULL;
- #endif
- 	
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch
@ -1,16 +0,0 @@
-https://bugs.gentoo.org/504472
-
-fix building w/readline-6.3 -- the old CPPFunction define has been deleted
-
--- a/libmisc/ui.c
-+++ b/libmisc/ui.c
-@@ -256,8 +256,7 @@ static void _init(void) {
- 	
- #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H)
- 	rl_initialize();
-	rl_attempted_completion_function = 
-		(CPPFunction *)misc_complete;
-+	rl_attempted_completion_function = misc_complete;
- #endif
-     
- 	aal_exception_set_handler(misc_exception_handler);
--- a/sys-fs/reiser4progs/files/reiser4progs_1.0.7-6.diff
+++ b/sys-fs/reiser4progs/files/reiser4progs_1.0.7-6.diff
@ -1,30 +0,0 @@
--- reiser4progs-1.0.7.orig/libreiser4/profile.c
-+++ reiser4progs-1.0.7/libreiser4/profile.c
-@@ -5,7 +5,8 @@
- 
- 
- #include <reiser4/libreiser4.h>
-#include <misc/misc.h>
-+#include <stdlib.h>
-+#include <errno.h>
- 
- /* All default plugin ids. This is used for getting plugin id if it cannot be
-    obtained by usual way (get from disk structures, etc.). All these may be
-@@ -332,6 +333,7 @@
- 	reiser4_plug_t *plug;
- 	long long int val;
- 	uint8_t i;
-+	char *error;
- 	
- 	aal_assert("umka-924", slot != NULL);
- 	aal_assert("umka-923", name != NULL);
-@@ -354,7 +356,8 @@
- 	}
- 	
- 	if (defprof.pid[i].id.type == PARAM_PLUG_TYPE)  {
-		if ((val = misc_str2long((char *)name, 10)) == INVAL_DIG) {
-+		val = strtol((char *)name, &error, 10);
-+		if (errno == ERANGE || *error) {
- 			aal_error("Invalid value \"%s\" is provided for the "
- 				  "profile slot \"%s\".", (char *)name,
- 				  defprof.pid[i].name);
--- a/sys-fs/reiser4progs/metadata.xml
+++ b/sys-fs/reiser4progs/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<longdescription>
-This is a library for reiser4 filesystem access and manipulation.
-</longdescription>
-</pkgmetadata>
--- a/sys-fs/reiser4progs/reiser4progs-1.0.9.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.9.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.9.ebuild,v 1.6 2014/12/04 08:29:11 ago Exp $
-
-EAPI="4"
-
-inherit multilib eutils toolchain-funcs
-
-DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
-HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 -sparc x86"
-IUSE="debug readline static static-libs"
-
-LIB_DEPEND="~sys-libs/libaal-1.0.6[static-libs(+)]
-	readline? ( sys-libs/readline[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ~sys-libs/libaal-1.0.6[static-libs(+)] )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	printf '#!/bin/sh\ntrue\n' > run-ldconfig
-	# Delete hardcoded link/compile flags.
-	sed -i -r \
-		-e '/CFLAGS=/s: -static":":' \
-		-e '/CFLAGS/s: (-O[123s]|-g)\>::g' \
-		configure || die
-
-	epatch "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch #504472
-	epatch "${FILESDIR}"/reiser4progs_1.0.7-6.diff
-}
-
-src_configure() {
-	econf \
-		$(use_enable static full-static) \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with readline) \
-		--disable-Werror \
-		--enable-libminimal \
-		--sbindir=/sbin
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a reiser4{,-minimal} repair
-}
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@ -1,31 +0,0 @@
-# ChangeLog for sys-fs/xfsprogs
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*xfsprogs-3.2.2 (17 Feb 2015)
-
-  17 Feb 2015; Mario Fetka <mario.fetka@gmail.com>
-  +files/xfsprogs-3.2.2-sharedlibs.patch, +xfsprogs-3.2.2.ebuild:
-  Bump
-
-*xfsprogs-3.1.11-r1 (25 Dec 2013)
-
-  25 Dec 2013; Mario Fetka <mario.fetka@gmail.com>
-  +files/xfsprogs-3.1.11-sharedlibs.patch, +xfsprogs-3.1.11-r1.ebuild,
-  -files/xfsprogs-3.1.10-sharedlibs.patch, -xfsprogs-3.1.11.ebuild:
-  add extra headers for partclone
-
-*xfsprogs-3.1.11 (31 Oct 2013)
-
-  31 Oct 2013; Mario Fetka <mario.fetka@gmail.com>
-  +files/xfsprogs-3.1.10-sharedlibs.patch, +xfsprogs-3.1.11.ebuild,
-  -files/xfsprogs-3.1.1-sharedlibs.patch, -files/xfsprogs-3.1.8-readline.patch,
-  -xfsprogs-3.1.8.ebuild:
-  Bump the patch
-
-*xfsprogs-3.1.8 (28 Nov 2012)
-
-  28 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
-  +files/xfsprogs-3.1.1-sharedlibs.patch, +files/xfsprogs-3.1.8-readline.patch,
-  +files/xfsprogs_3.1.7-1drbl.patch, +metadata.xml, +xfsprogs-3.1.8.ebuild:
-  add drbl patch for partclone
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@ -1,9 +0,0 @@
-AUX xfsprogs-3.1.11-sharedlibs.patch 2534 SHA256 a38ac3d02a16f5e836aa097096352bc5522f8570c40acd96f391a05612fc392d SHA512 75b33b79b1819d33f1a6a4fca6527f94eb4f37d98c468d6837c26183a9cdce8e62624494325ddca79b569cc7936f5749980e7e22d87c08cb8bb4eb77feb81640 WHIRLPOOL 9fa6e548928bcab9b9daa95c9c59b1f76682b029ca24290d9ee1c9a28a8fd3536b3a952c8648a5ccaee6e5ef800dc7f69e83dc5078c59ba7f649f1273a85e4ad
-AUX xfsprogs-3.2.2-sharedlibs.patch 2776 SHA256 a687cbd95bdd3948ab50a2d945b5c73197dbf6f2a2b5190071dd67003753fa8b SHA512 cb54e4e1a15e45b801788d0a189c3cdb4a02ff8ad9e3d31814c73532e33a0c47e3b0226179142c9f79a87511eaa89387c30794c1651718e36bf6cd4efbba5f6a WHIRLPOOL 0c42f6194a99372acbc914f71a73217cd29fc9256cd39ae832f245d2526f9bfa7ff3e76c2e2bc0ce6d39d05744c4f8ef8e9b7a6624c0a258014f5c99471a04a2
-AUX xfsprogs_3.1.7-1drbl.patch 501 SHA256 f8256ff0499556830ba5c2ae3bec58a1434c075b59efbd0a1fe4275f70d652e7 SHA512 d78a9d81850996ccb812ebb13663e5579742ac64e406b6777b2c588a3db8cf6d1ae0ba5445808bc7546f47edfffbb8095c1c2df400186a8408bda4f7ca2bc240 WHIRLPOOL 9431760beaca2a597ed1adf4b3755163fbcc763a951afff5e5bfc9fa4f5852e7c2b35d30c15315385f71643b7db974a232d1f200d800f91a300f6b08c0baccd4
-DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
-DIST xfsprogs-3.2.2.tar.gz 1477667 SHA256 1a525ce21dc39d4ad3d775fa3c12c2dd4fb7a85e1e05ddd4530dcf773ed65fab SHA512 6316ce6da87bc3d70c1a887b7c5558b594fa6960105d6a51ad0e8072d5533444f69da174f370907738a15bd50f785f715f71947de916940daf0df2845f4a700e WHIRLPOOL a3e1d57e3dd77f91361ff710306a5579a5d99204849291d6730f672e65febe18a5957646cfcda60d02684a24333dca45f742637256b423a7756d4f28556594cf
-EBUILD xfsprogs-3.1.11-r1.ebuild 2704 SHA256 3b66513c792a8bcf7923eb9aab891027f9c41cc8a3dddfebb008cf4d160f6a46 SHA512 fe9ca286786e21c1f0bc1b3a6dfb9a242fbc70c1015f6c6ccfa98d4b65d31346ada9d282356bd04a408d66ce280c592783b0ccc7448c612ffc29e0c86e9798c9 WHIRLPOOL 7ab3c4d48ff2aa23f9e14e74b2962d7f453377674e0fde1368a502cd4e5592c73e783a99cad9289efead5b9aa9ffe6edc81b77a3c5aea1e945627a6d4d0b358c
-EBUILD xfsprogs-3.2.2.ebuild 2798 SHA256 870e9b7c067c964168e4434aaea81baf08c2cd2b0ab2a888e3b0eb18216169bc SHA512 4143794cba4a7200dca5dc62248f9ab244e6c6ae27a785f729f4f46c1d27ed21990e2a02f60f8fb09c2efdfe5fa336c30cdd6abdf6be4bfa0f186a84553bebf1 WHIRLPOOL e0d11623df605a6b9234d78291995309a2c09c6f0ccf02c4166dcd86180b3cbbcdc8878bffd6997836ab13002cff38744c64a710e65fb4edaf9eb197fd86d362
-MISC ChangeLog 1076 SHA256 4e0c81177f3945823413ac7813a84c77e5465ebab36e7047ebd978a943b2d8de SHA512 fa20cfe68afd33f9ee0fd59cc0d1ec1356eaacecb4ac8710232657886e4c0e148c41a6767a79bb361883327a646ad4381c886df2b1c576c7f79a787081e4cc23 WHIRLPOOL b19326c0dcc8b477c53ec97ae8ac8e53c100cd47f1c0e7c3baf5887a20fc1cbafebb13afbbe5c8d1208ccefbf529c7e538767e8b267f43d088821214b6f2b934
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch
@ -1,106 +0,0 @@
-use libtool to do all installing.  do not use the manual file install as
-that'll copy files directly from the .libs/ subdir which might have rpaths
-that we do not want.
-
--- a/libdisk/Makefile
-+++ b/libdisk/Makefile
-@@ -25,6 +25,7 @@
- install: default
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
- 
--- a/libhandle/Makefile
-+++ b/libhandle/Makefile
-@@ -20,7 +20,6 @@
- include $(BUILDRULES)
- 
- install: default
-	$(INSTALL_LTLIB)
- 
- install-dev: default
- 	$(INSTALL_LTLIB_DEV)
--- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -32,6 +32,11 @@
- 
- include $(BUILDRULES)
- 
-install install-dev install-qa: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .dep
--- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -41,5 +41,6 @@
- install: default
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: default
--- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -12,6 +12,8 @@
- 
- CFILES = xfs_log_recover.c util.c
- 
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
-@@ -19,6 +21,11 @@
- 
- include $(BUILDRULES)
- 
-install install-dev install-qa: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .dep
--- a/Makefile
-+++ b/Makefile
-@@ -66,6 +66,8 @@
- mkfs: libxfs
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- ifneq ($(ENABLE_BLKID), yes)
- mkfs: libdisk
--- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -71,17 +71,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-	if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-	../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-	fi
-+	set -e; cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
--- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
@ -1,108 +0,0 @@
-use libtool to do all installing.  do not use the manual file install as
-that'll copy files directly from the .libs/ subdir which might have rpaths
-that we do not want.
-
--- xfsprogs-3.2.2/include/buildmacros
-+++ xfsprogs-3.2.2/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-	fi
-+	set -e; cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
--- xfsprogs-3.2.2/libdisk/Makefile
-+++ xfsprogs-3.2.2/libdisk/Makefile
-@@ -31,6 +31,7 @@
- install: default
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
- 
--- xfsprogs-3.2.2/libhandle/Makefile
-+++ xfsprogs-3.2.2/libhandle/Makefile
-@@ -20,7 +20,6 @@
- include $(BUILDRULES)
- 
- install: default
-	$(INSTALL_LTLIB)
- 
- install-dev: default
- 	$(INSTALL_LTLIB_DEV)
--- xfsprogs-3.2.2/libxcmd/Makefile
-+++ xfsprogs-3.2.2/libxcmd/Makefile
-@@ -34,6 +34,11 @@
- 
- include $(BUILDRULES)
- 
-install install-dev install-qa: default
-+install: default
-+
-+ install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .ltdep
--- xfsprogs-3.2.2/libxfs/Makefile
-+++ xfsprogs-3.2.2/libxfs/Makefile
-@@ -86,6 +86,7 @@
- install: default
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: default
- 
--- xfsprogs-3.2.2/libxlog/Makefile
-+++ xfsprogs-3.2.2/libxlog/Makefile
-@@ -12,6 +12,8 @@
- 
- CFILES = xfs_log_recover.c util.c
- 
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
-@@ -19,6 +21,11 @@
- 
- include $(BUILDRULES)
- 
-install install-dev install-qa: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .ltdep
--- xfsprogs-3.2.2/Makefile
-+++ xfsprogs-3.2.2/Makefile
-@@ -63,6 +63,8 @@
- mkfs: libxfs
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- ifneq ($(ENABLE_BLKID), yes)
- mkfs: libdisk
--- a/sys-fs/xfsprogs/files/xfsprogs_3.1.7-1drbl.patch
+++ b/sys-fs/xfsprogs/files/xfsprogs_3.1.7-1drbl.patch
@ -1,11 +0,0 @@
-diff -uNr xfsprogs-3.1.7.orig/include/Makefile xfsprogs-3.1.7/include/Makefile
--- xfsprogs-3.1.7.orig/include/Makefile	2011-11-18 00:30:24.000000000 +0100
-+++ xfsprogs-3.1.7/include/Makefile	2011-11-23 11:25:30.000000000 +0100
-@@ -53,6 +53,7 @@
- 	$(INSTALL) -m 755 -d $(PKG_INC_DIR)
- 	$(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR)
- 	$(INSTALL) -m 644 platform_defs.h $(PKG_INC_DIR)
-+	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
- 
- install-qa: install-dev
- 	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
--- a/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild
@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild,v 1.1 2013/12/25 08:49:36 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.11-sharedlibs.patch
-	epatch "${FILESDIR}"/${PN}_3.1.7-1drbl.patch
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-	sed -i \
-		-e '1iLLDFLAGS = -static' \
-		{estimate,fsr}/Makefile || die
-	sed -i \
-		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
-		$(find -name Makefile) || die
-
-	# libdisk has broken blkid conditional checking
-	sed -i \
-		-e '/LIB_SUBDIRS/s:libdisk::' \
-		Makefile || die
-
-	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|\0 -lncurses|' \
-			-e 's|-lblkid|\0 -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf
-	if use static || use static-libs ; then
-		myconf+=" --enable-static"
-	else
-		myconf+=" --disable-static"
-	fi
-
-	econf \
-		--bindir=/usr/bin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		$(use_enable readline) \
-		$(usex readline --disable-editline $(use_enable libedit editline)) \
-		${myconf}
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install install-{dev,qa}
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
--- a/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild,v 1.1 2014/12/15 10:01:52 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
-	epatch "${FILESDIR}"/${PN}_3.1.7-1drbl.patch
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-	sed -i \
-		-e '1iLLDFLAGS = -static' \
-		{estimate,fsr}/Makefile || die
-	sed -i \
-		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
-		$(find -name Makefile) || die
-
-	# libdisk has broken blkid conditional checking
-	sed -i \
-		-e '/LIB_SUBDIRS/s:libdisk::' \
-		Makefile || die
-
-	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|\0 -lncurses|' \
-			-e 's|-lblkid|\0 -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf
-	if use static || use static-libs ; then
-		myconf+=" --enable-static"
-	else
-		myconf+=" --disable-static"
-	fi
-
-	econf \
-		--bindir=/usr/bin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		$(use_enable readline) \
-		$(usex readline --disable-editline $(use_enable libedit editline)) \
-		${myconf}
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on these targets for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
				`@ -1 +0,0 @@`
				`# /etc/exports: NFS file systems being exported. See exports(5).`