add heimdal files

dev-libs/openssl/Manifest

@@ -0,0 +1,12 @@
+AUX gentoo.config-1.0.0 4748 SHA256 67ae024ebb87a8236a358a081f2d9b038eef2d0f432705d05063274e7af28b4e SHA512 c68b7eb3d07a3b619f6c3e5f508e594efe2991aef91d8904019f967c20a7e9e9604d8fce1271b5bc247856411e81a800eed7710da46645b9d5d9e5cb184ab99b WHIRLPOOL a849c1ea7d7d0dfeac675636e801dd050c66866f6327e6619f233ede0fc0e59f5f2f554f7812a0c33bd40d76a7ba85ca3aab0a00f964e971de97f5af11a527bc
+AUX openssl-1.0.0a-ldflags.patch 891 SHA256 f04cef1b912681393236f9631792cd404783586c2fd8e0f011ace6236cc6dc4a SHA512 8ced9f22e413f81ff0563793bd6b765912af16671a0d10bff0c518c44bced0177dbcd6536359ff5b6bd5d49fa5032de47c719198444254d4814e4b21301f606c WHIRLPOOL f9b2641b8df926ff5d9d5cf5a7737f5cb4a3a2be2225911ebebd944f13219acfac07d496eec9a8e91af3f50ac1275dc7b0652354e8e958a0d3f6708e641f8970
+AUX openssl-1.0.0d-windres.patch 2890 SHA256 27664cfab4852f1a301c4020375eba029c8a1728d58829c831a36d3aa2fbe9f4 SHA512 32187d0a04c85118cc763ff1fe8c4635622294fe629b920c47e16408aa720fee2bcc42f97120f6750b59996878e0a3d249143d728a5b5775ec3a022f81bc230a WHIRLPOOL d5979143f7e637b0072f7d5f214d80f5cc0e53f54358781d7f10c0cdb15c2b52813e12d2aa07dde2b40e7a88fcb26d1d619443a8012530d90789609cf5ac4083
+AUX openssl-1.0.0h-pkg-config.patch 1289 SHA256 542dea12747b1cb667707250e3eb3803cbdd396bd0d8e836e48a8018417dc1b8 SHA512 4d1f66dc8615cdf7c96719c8cc909c7d908089e91b0cfe2dd08ae7a332c525b5384e2eb8eb3922e89cbc035167f581eaa606ba826fca6253f16f89f66a9ef225 WHIRLPOOL cdd63a06205b0237ddef1f56df2accf29e5f43f886aed01f95711b49a3af07d87afd0953cb3c12c7e97d4a3392f7c691257dcb7ad3e97cc6fbf1cf399a8a6394
+AUX openssl-1.0.1-parallel-build.patch 9918 SHA256 bd56e5fe1b6fe594ab93f34d25fef0b7372633bad8532f81da998f3e6655d221 SHA512 7255b3315133e415631b2ecadc8f5c50a705b9db507c46efded0190363ce9eb31ffbfe01c500669c060878e5202f858b1d2475c64948426fbf70820b4c798ba1 WHIRLPOOL 8a8c71c3806db85d6c6b355717cb4aa1e421fa1777aa7dcd7ee817ac1e552d4b671cdd7cceef9aee1a7dc1b305eb722b1ba0219832c7a6c1b808a0c49212df05
+AUX openssl-1.0.1-x32.patch 3273 SHA256 a4f05b8757e225a05a9c5a3ea485159066760d878c9ee54c4eaf61760e33c6cf SHA512 6bed57fe2fbe2d0ced1279b53804d94426a679d5d6b80ad7d0ed18523a7fda397e02038032c08cdd4e6034f9ff6e82cad365ff2a724d49d91467cf2b77f47752 WHIRLPOOL 1366632e7dc1c6e54efc5b9791bf24833d20e7a61ca29aa38d31b5b9629febf926a29742e370b7cd6767c810c0a1676100ca9169f0d836dfd19ff0b2c29e49c1
+AUX openssl-1.0.1e-ipv6.patch 18596 SHA256 430d15f2f62c2d7b9bbb968d3c1d3cea51c97d549e01683fd6befb20e2b60946 SHA512 15bfcafc8c173d2875954a43db19d15956619528a0fc356b6d36877f7434321071cf707d950767491261adc1e6403e56b3e014e3d0ffb6cef563daca00a128bd WHIRLPOOL d1dd63d00b166efb1ca9e5d8da931a47e571f5784e3b47780355553b4d0cf656885375e3fe7fc1554b6c5eb749371efeb370c7462e4fcc52c0dd85c6e2318ad8
+DIST openssl-1.0.1e.tar.gz 4459777 SHA256 f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 SHA512 c76857e439431b2ef6f2aa123997e53f82b9c3c964d4d765d7cc6c0c20b37a21adf578f9b759b2b65ae3925454c432a01b7de0cd320ece7181dc292e00d3244e WHIRLPOOL e85cca98d9525935977bab00a1309682c0571973a1472cdd75ea1c96a1b12d8b86d1b51a501bc24a6fdbf3257b047a569b5d24d6164a903af689b01d46a7e428
+DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
+EBUILD openssl-1.0.1e.ebuild 7375 SHA256 bce6c27f73f02456408e58f39f612ebbaab3d3a173dc7cbc96e276dd41884d74 SHA512 9002cc8497187d6fcdc90862e5397c40de94845d4bf66649d046dd0fd3608101a3115cad3a1a1f8c07d80919a175c63536dcb9b376a814788d628e4372a9aaaa WHIRLPOOL 51ce965e202b1e1b612c9cdd31f82a6f512e57b58e0f99560f7725113eb7abf767fe07f4fb98fb97ce67cb1551576fab3b1aecf42abbd2b86102ca5bec981340
+MISC ChangeLog 71499 SHA256 ea0d71a270dc4abeffe427b5f86d5324c98dcf1ab5c2e2d723acf0d406ebba38 SHA512 4b92831551cea9b088b7307d03b10ec8313837021cdeee5f7266e2b1dd1d1b600aa00948b80302c17a86643e54041ddcfb36a394cf689d464ea44030af362815 WHIRLPOOL 784c57e24e87b8a36e792830fa92569f30f88733cf37ec80d6f14cf93be89ca494e8f712cd8720e0643620e2ba87ff3b098a43c4ecc95aa40017601082e41eb0
+MISC metadata.xml 374 SHA256 ce29618473c02511695f6767087277e246b2d252ef6e662dbc65e9df44722f5b SHA512 af8240564be62abad18e8f928694ac2836fc445ae186d5ac3b11dae060e5088dbcbbcac625fffe888de1df0e75934cf1484e54c113c00a25a55d57c39563d430 WHIRLPOOL 197464700dbd530c26a50055e98c1008cd1fd6f4f34ba2e9b4070fca6b87201599c3187b5e4689b6360a1311f1de6b96ae6a0050eb9677c648d8eaf28b0880b9

dev-libs/openssl/files/gentoo.config-1.0.0

@@ -0,0 +1,159 @@
+#!/usr/bin/env bash
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.5 2012/05/25 17:41:21 vapier Exp $
+#
+# Openssl doesn't play along nicely with cross-compiling
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+	for c in \
+		"arm-gentoo-linux-uclibc      |linux-generic32 -DL_ENDIAN" \
+		"armv5b-linux-gnu             |linux-armv4 -DB_ENDIAN" \
+		"x86_64-pc-linux-gnu          |linux-x86_64" \
+		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+		"i686-pc-linux-gnu            |linux-elf" \
+		"whatever-gentoo-freebsdX.Y   |BSD-generic32" \
+		"i686-gentoo-freebsdX.Y       |BSD-x86-elf" \
+		"sparc64-alpha-freebsdX.Y     |BSD-sparc64" \
+		"ia64-gentoo-freebsd5.99234   |BSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |BSD-x86_64" \
+		"hppa64-aldsF-linux-gnu5.3    |linux-generic32 -DB_ENDIAN" \
+		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
+		"powerpc64-unk-linux-gnu      |linux-ppc64" \
+		"x86_64-apple-darwinX         |darwin64-x86_64-cc" \
+		"powerpc64-apple-darwinX      |darwin64-ppc-cc" \
+		"i686-apple-darwinX           |darwin-i386-cc" \
+		"i386-apple-darwinX           |darwin-i386-cc" \
+		"powerpc-apple-darwinX        |darwin-ppc-cc" \
+		"i586-pc-winnt                |winnt-parity" \
+		"s390-ibm-linux-gnu           |linux-generic32 -DB_ENDIAN" \
+		"s390x-linux-gnu              |linux-s390x" \
+	;do
+		CHOST=${c/|*}
+		ret_want=${c/*|}
+		ret_got=$(CHOST=${CHOST} "$0")
+
+		if [[ ${ret_want} == "${ret_got}" ]] ; then
+			echo "PASS: ${CHOST}"
+		else
+			echo "FAIL: ${CHOST}"
+			echo -e "\twanted: ${ret_want}"
+			echo -e "\twe got: ${ret_got}"
+		fi
+	done
+	exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+	*-aix*)          system="aix";;
+	*-darwin*)       system="darwin";;
+	*-freebsd*)      system="BSD";;
+	*-hpux*)         system="hpux";;
+	*-linux*)        system="linux";;
+	*-solaris*)      system="solaris";;
+	*-winnt*)        system="winnt";;
+	x86_64-*-mingw*) system="mingw64";;
+	*mingw*)         system="mingw";;
+	*)               exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+	case ${chost_machine}:${ABI} in
+		alphaev56*)   machine=alpha+bwx-${compiler};;
+		alphaev[678]*)machine=alpha+bwx-${compiler};;
+		alpha*)       machine=alpha-${compiler};;
+		armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
+		armv[4-9]*)   machine="armv4 -DL_ENDIAN";;
+		arm*b*)       machine="generic32 -DB_ENDIAN";;
+		arm*)         machine="generic32 -DL_ENDIAN";;
+		avr*)         machine="generic32 -DL_ENDIAN";;
+		bfin*)        machine="generic32 -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine="generic32 -DB_ENDIAN";;
+		i[0-9]86*|\
+		x86_64*:x86)  machine=elf;;
+		ia64*)        machine=ia64;;
+		m68*)         machine="generic32 -DB_ENDIAN";;
+		mips*el*)     machine="generic32 -DL_ENDIAN";;
+		mips*)        machine="generic32 -DB_ENDIAN";;
+		powerpc64*)   machine=ppc64;;
+		powerpc*)     machine=ppc;;
+	#	sh64*)        machine=elf;;
+		sh*b*)        machine="generic32 -DB_ENDIAN";;
+		sh*)          machine="generic32 -DL_ENDIAN";;
+		sparc*v7*)    machine="generic32 -DB_ENDIAN";;
+		sparc64*)     machine=sparcv9;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x;;
+		s390*)        machine="generic32 -DB_ENDIAN";;
+		x86_64*:x32)  machine=x32;;
+		x86_64*)      machine=x86_64;;
+	esac
+	;;
+BSD)
+	case ${chost_machine} in
+		alpha*)       machine=generic64;;
+		i[6-9]86*)    machine=x86-elf;;
+		ia64*)        machine=ia64;;
+		sparc64*)     machine=sparc64;;
+		x86_64*)      machine=x86_64;;
+		*)            machine=generic32;;
+	esac
+	;;
+aix)
+	machine=${compiler}
+	;;
+darwin)
+	case ${chost_machine} in
+		powerpc64)    machine=ppc-cc; system=${system}64;;
+		powerpc)      machine=ppc-cc;;
+		i?86*)        machine=i386-cc;;
+		x86_64)       machine=x86_64-cc; system=${system}64;;
+	esac
+	;;
+hpux)
+	case ${chost_machine} in
+		ia64)	machine=ia64-${compiler} ;;
+	esac
+	;;
+solaris)
+	case ${chost_machine} in
+		i386)         machine=x86-${compiler} ;;
+		x86_64*)      machine=x86_64-${compiler}; system=${system}64;;
+		sparcv9*)     machine=sparcv9-${compiler}; system=${system}64;;
+		sparc*)       machine=sparcv8-${compiler};;
+	esac
+	;;
+winnt)
+	machine=parity
+	;;
+mingw*)
+	# special case ... no xxx-yyy style name
+	echo ${system}
+	;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}

dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch

@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/327421
+
+--- Makefile.org
++++ Makefile.org
+@@ -189,6 +189,7 @@
+ 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
+ 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
+ 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
++		LDFLAGS='${LDFLAGS}'				\
+ 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
+ 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
+ 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
+--- Makefile.shared
++++ Makefile.shared
+@@ -153,7 +153,7 @@
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to

dev-libs/openssl/files/openssl-1.0.0d-windres.patch

@@ -0,0 +1,76 @@
+URL: http://rt.openssl.org/Ticket/Display.html?id=2558
+Subject: make windres controllable via build env var settings
+
+atm, the windres code in openssl is only usable via the cross-compile prefix 
+option unlike all the other build tools. so add support for the standard $RC 
+/ $WINDRES env vars as well.
+
+Index: Configure
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v
+retrieving revision 1.621.2.40
+diff -u -p -r1.621.2.40 Configure
+--- Configure	30 Nov 2010 22:19:26 -0000	1.621.2.40
++++ Configure	4 Jul 2011 23:12:32 -0000
+@@ -1094,6 +1094,7 @@ my $shared_extension = $fields[$idx_shar
+ my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
+ my $ar = $ENV{'AR'} || "ar";
+ my $arflags = $fields[$idx_arflags];
++my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres";
+ my $multilib = $fields[$idx_multilib];
+ 
+ # if $prefix/lib$multilib is not an existing directory, then
+@@ -1511,12 +1512,14 @@ while (<IN>)
+ 		s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
+ 		s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
+ 		s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
++		s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/;
+ 		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc";
+ 		}
+ 	else	{
+ 		s/^CC=.*$/CC= $cc/;
+ 		s/^AR=\s*ar/AR= $ar/;
+ 		s/^RANLIB=.*/RANLIB= $ranlib/;
++		s/^WINDRES=.*/WINDRES= $windres/;
+ 		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+ 		}
+ 	s/^CFLAG=.*$/CFLAG= $cflags/;
+Index: Makefile.org
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v
+retrieving revision 1.295.2.10
+diff -u -p -r1.295.2.10 Makefile.org
+--- Makefile.org	27 Jan 2010 16:06:58 -0000	1.295.2.10
++++ Makefile.org	4 Jul 2011 23:13:08 -0000
+@@ -66,6 +66,7 @@ EXE_EXT= 
+ ARFLAGS=
+ AR=ar $(ARFLAGS) r
+ RANLIB= ranlib
++WINDRES= windres
+ NM= nm
+ PERL= perl
+ TAR= tar
+@@ -180,6 +181,7 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESS
+ 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
+ 		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
+ 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
++		WINDRES='$(WINDRES)'				\
+ 		CROSS_COMPILE='$(CROSS_COMPILE)'	\
+ 		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
+ 		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\
+Index: Makefile.shared
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v
+retrieving revision 1.72.2.4
+diff -u -p -r1.72.2.4 Makefile.shared
+--- Makefile.shared	21 Aug 2010 11:36:49 -0000	1.72.2.4
++++ Makefile.shared	4 Jul 2011 23:13:52 -0000
+@@ -293,7 +293,7 @@ link_a.cygwin:
+ 	fi; \
+ 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+ 	$(PERL) util/mkrc.pl $$dll_name | \
+-		$(CROSS_COMPILE)windres -o rc.o; \
++		$(WINDRES) -o rc.o; \
+ 	extras="$$extras rc.o"; \
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch

@@ -0,0 +1,32 @@
+depend on other pc files rather than encoding library info directly in
+every pkg-config file
+
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -335,11 +335,11 @@ libssl.pc: Makefile
+ 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+-	    echo 'Name: OpenSSL'; \
++	    echo 'Name: OpenSSL-libssl'; \
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+-	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Requires.private: libcrypto'; \
++	    echo 'Libs: -L$${libdir} -lssl'; \
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
+@@ -352,10 +353,7 @@ openssl.pc: Makefile
+ 	    echo 'Name: OpenSSL'; \
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+ 	    echo 'Version: '$(VERSION); \
+-	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+-	    echo 'Libs.private: $(EX_LIBS)'; \
+-	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
++	    echo 'Requires: libssl libcrypto' ) > openssl.pc
+ 
+ Makefile: Makefile.org Configure config
+ 	@echo "Makefile is older than Makefile.org, Configure or config."

dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch

@@ -0,0 +1,337 @@
+http://rt.openssl.org/Ticket/Display.html?id=2084
+
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -247,17 +247,17 @@
+ build_libs: build_crypto build_ssl build_engines
+ 
+ build_crypto:
+-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
++	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
+-build_ssl:
++build_ssl: build_crypto
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
++	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
++build_engines: build_crypto
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
++	+@dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
++build_apps: build_libs
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
++	+@dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
++build_tests: build_libs
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
++	+@dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
++build_tools: build_libs
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
++	+@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -497,9 +497,9 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: install_docs install_sw
+ 
+-install_sw:
++install_dirs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -508,6 +508,13 @@
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++	@$(PERL) $(TOP)/util/mkdir-p.pl \
++		$(INSTALL_PREFIX)$(MANDIR)/man1 \
++		$(INSTALL_PREFIX)$(MANDIR)/man3 \
++		$(INSTALL_PREFIX)$(MANDIR)/man5 \
++		$(INSTALL_PREFIX)$(MANDIR)/man7
++
++install_sw: install_dirs
+ 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -511,7 +511,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
++	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+ 	do \
+ 		if [ -f "$$i" ]; then \
+@@ -593,12 +600,7 @@
+ 		done; \
+ 	done
+ 
+-install_docs:
+-	@$(PERL) $(TOP)/util/mkdir-p.pl \
+-		$(INSTALL_PREFIX)$(MANDIR)/man1 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man3 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man5 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man7
++install_docs: install_dirs
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+--- a/Makefile.shared
++++ b/Makefile.shared
+@@ -105,6 +105,7 @@ LINK_SO=	\
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+ 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +124,7 @@ SYMLINK_SO=	\
+ 			done; \
+ 		fi; \
+ 		if [ -n "$$SHLIB_SOVER" ]; then \
++			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+ 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+ 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+ 		fi; \
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -85,11 +85,11 @@
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ 
+ subdirs:
+-	@target=all; $(RECURSIVE_MAKE)
++	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+-	@target=files; $(RECURSIVE_MAKE)
++	+@target=files; $(RECURSIVE_MAKE)
+ 
+ links:
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -100,7 +100,7 @@
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:	$(LIB)
+ 	@touch lib
+-$(LIB):	$(LIBOBJ)
++$(LIB):	$(LIBOBJ) | subdirs
+ 	$(AR) $(LIB) $(LIBOBJ)
+ 	$(RANLIB) $(LIB) || echo Never mind.
+ 
+@@ -110,7 +110,7 @@
+ 	fi
+ 
+ libs:
+-	@target=lib; $(RECURSIVE_MAKE)
++	+@target=lib; $(RECURSIVE_MAKE)
+ 
+ install:
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -119,7 +119,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@target=install; $(RECURSIVE_MAKE)
++	+@target=install; $(RECURSIVE_MAKE)
+ 
+ lint:
+ 	@target=lint; $(RECURSIVE_MAKE)
+--- a/engines/Makefile
++++ b/engines/Makefile
+@@ -72,7 +72,7 @@
+ 
+ all:	lib subdirs
+ 
+-lib:	$(LIBOBJ)
++lib:	$(LIBOBJ) | subdirs
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+ 		for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@
+ 
+ subdirs:
+ 	echo $(EDIRS)
+-	@target=all; $(RECURSIVE_MAKE)
++	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
+ 	fi
+-	@target=install; $(RECURSIVE_MAKE)
++	+@target=install; $(RECURSIVE_MAKE)
+ 
+ tags:
+ 	ctags $(SRC)
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -123,7 +123,7 @@
+ tags:
+ 	ctags $(SRC)
+ 
+-tests:	exe apps $(TESTS)
++tests:	exe $(TESTS)
+ 
+ apps:
+ 	@(cd ..; $(MAKE) DIRS=apps all)
+@@ -365,109 +365,109 @@
+ 		link_app.$${shlib_target}
+ 
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-	@target=$(RSATEST); $(BUILD_CMD)
++	+@target=$(RSATEST); $(BUILD_CMD)
+ 
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-	@target=$(BNTEST); $(BUILD_CMD)
++	+@target=$(BNTEST); $(BUILD_CMD)
+ 
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-	@target=$(ECTEST); $(BUILD_CMD)
++	+@target=$(ECTEST); $(BUILD_CMD)
+ 
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-	@target=$(EXPTEST); $(BUILD_CMD)
++	+@target=$(EXPTEST); $(BUILD_CMD)
+ 
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-	@target=$(IDEATEST); $(BUILD_CMD)
++	+@target=$(IDEATEST); $(BUILD_CMD)
+ 
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-	@target=$(MD2TEST); $(BUILD_CMD)
++	+@target=$(MD2TEST); $(BUILD_CMD)
+ 
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-	@target=$(SHATEST); $(BUILD_CMD)
++	+@target=$(SHATEST); $(BUILD_CMD)
+ 
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA1TEST); $(BUILD_CMD)
++	+@target=$(SHA1TEST); $(BUILD_CMD)
+ 
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA256TEST); $(BUILD_CMD)
++	+@target=$(SHA256TEST); $(BUILD_CMD)
+ 
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA512TEST); $(BUILD_CMD)
++	+@target=$(SHA512TEST); $(BUILD_CMD)
+ 
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-	@target=$(RMDTEST); $(BUILD_CMD)
++	+@target=$(RMDTEST); $(BUILD_CMD)
+ 
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-	@target=$(MDC2TEST); $(BUILD_CMD)
++	+@target=$(MDC2TEST); $(BUILD_CMD)
+ 
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-	@target=$(MD4TEST); $(BUILD_CMD)
++	+@target=$(MD4TEST); $(BUILD_CMD)
+ 
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-	@target=$(MD5TEST); $(BUILD_CMD)
++	+@target=$(MD5TEST); $(BUILD_CMD)
+ 
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-	@target=$(HMACTEST); $(BUILD_CMD)
++	+@target=$(HMACTEST); $(BUILD_CMD)
+ 
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-	@target=$(WPTEST); $(BUILD_CMD)
++	+@target=$(WPTEST); $(BUILD_CMD)
+ 
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-	@target=$(RC2TEST); $(BUILD_CMD)
++	+@target=$(RC2TEST); $(BUILD_CMD)
+ 
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-	@target=$(BFTEST); $(BUILD_CMD)
++	+@target=$(BFTEST); $(BUILD_CMD)
+ 
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-	@target=$(CASTTEST); $(BUILD_CMD)
++	+@target=$(CASTTEST); $(BUILD_CMD)
+ 
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-	@target=$(RC4TEST); $(BUILD_CMD)
++	+@target=$(RC4TEST); $(BUILD_CMD)
+ 
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-	@target=$(RC5TEST); $(BUILD_CMD)
++	+@target=$(RC5TEST); $(BUILD_CMD)
+ 
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-	@target=$(DESTEST); $(BUILD_CMD)
++	+@target=$(DESTEST); $(BUILD_CMD)
+ 
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-	@target=$(RANDTEST); $(BUILD_CMD)
++	+@target=$(RANDTEST); $(BUILD_CMD)
+ 
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-	@target=$(DHTEST); $(BUILD_CMD)
++	+@target=$(DHTEST); $(BUILD_CMD)
+ 
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-	@target=$(DSATEST); $(BUILD_CMD)
++	+@target=$(DSATEST); $(BUILD_CMD)
+ 
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-	@target=$(METHTEST); $(BUILD_CMD)
++	+@target=$(METHTEST); $(BUILD_CMD)
+ 
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
++	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ 
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-	@target=$(ENGINETEST); $(BUILD_CMD)
++	+@target=$(ENGINETEST); $(BUILD_CMD)
+ 
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-	@target=$(EVPTEST); $(BUILD_CMD)
++	+@target=$(EVPTEST); $(BUILD_CMD)
+ 
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-	@target=$(ECDSATEST); $(BUILD_CMD)
++	+@target=$(ECDSATEST); $(BUILD_CMD)
+ 
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-	@target=$(ECDHTEST); $(BUILD_CMD)
++	+@target=$(ECDHTEST); $(BUILD_CMD)
+ 
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-	@target=$(IGETEST); $(BUILD_CMD)
++	+@target=$(IGETEST); $(BUILD_CMD)
+ 
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-	@target=$(JPAKETEST); $(BUILD_CMD)
++	+@target=$(JPAKETEST); $(BUILD_CMD)
+ 
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-	@target=$(ASN1TEST); $(BUILD_CMD)
++	+@target=$(ASN1TEST); $(BUILD_CMD)
+ 
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-	@target=$(SRPTEST); $(BUILD_CMD)
++	+@target=$(SRPTEST); $(BUILD_CMD)
+ 
+ #$(AESTEST).o: $(AESTEST).c
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
+@@ -480,7 +480,7 @@
+ #	fi
+ 
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-	@target=dummytest; $(BUILD_CMD)
++	+@target=dummytest; $(BUILD_CMD)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+ 

dev-libs/openssl/files/openssl-1.0.1-x32.patch

@@ -0,0 +1,79 @@
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721
+
+UpstreamStatus: Pending
+
+Received from H J Liu @ Intel
+Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
+
+ported the patch to the 1.0.0e version
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
+Index: openssl-1.0.0e/Configure
+===================================================================
+--- openssl-1.0.0e.orig/Configure
++++ openssl-1.0.0e/Configure
+@@ -393,6 +393,7 @@ my %table=(
+ "debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-x32",	"gcc:-DL_ENDIAN 	-DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "dist",		"cc:-O::(unknown)::::::",
+ 
+ # Basic configs that should work on any (32 and less bit) box
+Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
++++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+@@ -55,7 +55,7 @@
+  *    machine.
+  */
+ 
+-#ifdef _WIN64
++#if defined _WIN64 || !defined __LP64__
+ #define BN_ULONG unsigned long long
+ #else
+ #define BN_ULONG unsigned long
+@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	adcq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	adcq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	sbbq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	sbbq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+Index: openssl-1.0.0e/crypto/bn/bn.h
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/bn.h
++++ openssl-1.0.0e/crypto/bn/bn.h
+@@ -172,6 +172,13 @@ extern "C" {
+ # endif
+ #endif
+ 
++/* Address type.  */
++#ifdef _WIN64
++#define BN_ADDR unsigned long long
++#else
++#define BN_ADDR unsigned long
++#endif
++
+ /* assuming long is 64bit - this is the DEC Alpha
+  * unsigned long long is only 64 bits :-(, don't define
+  * BN_LLONG for the DEC Alpha */

dev-libs/openssl/files/openssl-1.0.1e-ipv6.patch

@@ -0,0 +1,656 @@
+http://rt.openssl.org/Ticket/Display.html?id=2051
+user/pass: guest/guest
+
+Index: apps/s_apps.h
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_apps.h,v
+retrieving revision 1.21.2.1
+diff -u -r1.21.2.1 s_apps.h
+--- apps/s_apps.h	4 Sep 2009 17:42:04 -0000	1.21.2.1
++++ apps/s_apps.h	28 Dec 2011 00:28:14 -0000
+@@ -148,7 +148,7 @@
+ #define PORT_STR        "4433"
+ #define PROTOCOL        "tcp"
+ 
+-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
++int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
+ #ifdef HEADER_X509_H
+ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+ #endif
+@@ -156,7 +156,7 @@
+ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
+ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
+ #endif
+-int init_client(int *sock, char *server, int port, int type);
++int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
+ int should_retry(int i);
+ int extract_port(char *str, short *port_ptr);
+ int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
+Index: apps/s_client.c
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_client.c,v
+retrieving revision 1.123.2.6.2.10
+diff -u -r1.123.2.6.2.10 s_client.c
+--- apps/s_client.c	14 Dec 2011 22:18:02 -0000	1.123.2.6.2.10
++++ apps/s_client.c	28 Dec 2011 00:28:14 -0000
+@@ -285,6 +285,10 @@
+ 	{
+ 	BIO_printf(bio_err,"usage: s_client args\n");
+ 	BIO_printf(bio_err,"\n");
++	BIO_printf(bio_err," -4             - use IPv4 only\n");
++#if OPENSSL_USE_IPV6
++	BIO_printf(bio_err," -6             - use IPv6 only\n");
++#endif
+ 	BIO_printf(bio_err," -host host     - use -connect instead\n");
+ 	BIO_printf(bio_err," -port port     - use -connect instead\n");
+ 	BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
+@@ -564,6 +567,7 @@
+ 	int sbuf_len,sbuf_off;
+ 	fd_set readfds,writefds;
+ 	short port=PORT;
++	int use_ipv4, use_ipv6;
+ 	int full_log=1;
+ 	char *host=SSL_HOST_NAME;
+ 	char *cert_file=NULL,*key_file=NULL;
+@@ -609,7 +613,11 @@
+ #endif
+ 	char *sess_in = NULL;
+ 	char *sess_out = NULL;
+-	struct sockaddr peer;
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage peer;
++#else
++	struct sockaddr_in peer;
++#endif
+ 	int peerlen = sizeof(peer);
+ 	int enable_timeouts = 0 ;
+ 	long socket_mtu = 0;
+@@ -630,6 +638,12 @@
+ 	meth=SSLv2_client_method();
+ #endif
+ 
++	use_ipv4 = 1;
++#if OPENSSL_USE_IPV6
++	use_ipv6 = 1;
++#else
++	use_ipv6 = 0;
++#endif
+ 	apps_startup();
+ 	c_Pause=0;
+ 	c_quiet=0;
+@@ -951,6 +961,18 @@
+ 			jpake_secret = *++argv;
+ 			}
+ #endif
++		else if (strcmp(*argv,"-4") == 0)
++			{
++			use_ipv4 = 1;
++			use_ipv6 = 0;
++			}
++#if OPENSSL_USE_IPV6
++		else if (strcmp(*argv,"-6") == 0)
++			{
++			use_ipv4 = 0;
++			use_ipv6 = 1;
++			}
++#endif
+ #ifndef OPENSSL_NO_SRTP
+ 		else if (strcmp(*argv,"-use_srtp") == 0)
+ 			{
+@@ -1259,7 +1276,7 @@
+ 
+ re_start:
+ 
+-	if (init_client(&s,host,port,socket_type) == 0)
++	if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
+ 		{
+ 		BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
+ 		SHUTDOWN(s);
+@@ -1285,7 +1302,7 @@
+ 		{
+ 
+ 		sbio=BIO_new_dgram(s,BIO_NOCLOSE);
+-		if (getsockname(s, &peer, (void *)&peerlen) < 0)
++		if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
+ 			{
+ 			BIO_printf(bio_err, "getsockname:errno=%d\n",
+ 				get_last_socket_error());
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v
+retrieving revision 1.136.2.15.2.13
+diff -u -r1.136.2.15.2.13 s_server.c
+--- apps/s_server.c	27 Dec 2011 14:23:22 -0000	1.136.2.15.2.13
++++ apps/s_server.c	28 Dec 2011 00:28:14 -0000
+@@ -558,6 +558,10 @@
+ # endif
+         BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
+ #endif
++	BIO_printf(bio_err," -4            - use IPv4 only\n");
++#if OPENSSL_USE_IPV6
++	BIO_printf(bio_err," -6            - use IPv6 only\n");
++#endif
+ 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
+ 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
+ 	}
+@@ -943,6 +947,7 @@
+ 	int state=0;
+ 	const SSL_METHOD *meth=NULL;
+ 	int socket_type=SOCK_STREAM;
++	int use_ipv4, use_ipv6;
+ 	ENGINE *e=NULL;
+ 	char *inrand=NULL;
+ 	int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
+@@ -981,6 +986,12 @@
+   /*  #error no SSL version enabled */
+ #endif
+ 
++	use_ipv4 = 1;
++#if OPENSSL_USE_IPV6
++	use_ipv6 = 1;
++#else
++	use_ipv6 = 0;
++#endif
+ 	local_argc=argc;
+ 	local_argv=argv;
+ 
+@@ -1329,6 +1340,18 @@
+ 			jpake_secret = *(++argv);
+ 			}
+ #endif
++		else if (strcmp(*argv,"-4") == 0)
++			{
++			use_ipv4 = 1;
++			use_ipv6 = 0;
++			}
++#if OPENSSL_USE_IPV6
++		else if (strcmp(*argv,"-6") == 0)
++			{
++			use_ipv4 = 0;
++			use_ipv6 = 1;
++			}
++#endif
+ #ifndef OPENSSL_NO_SRTP
+ 		else if (strcmp(*argv,"-use_srtp") == 0)
+ 			{
+@@ -1884,9 +1907,9 @@
+ 	BIO_printf(bio_s_out,"ACCEPT\n");
+ 	(void)BIO_flush(bio_s_out);
+ 	if (www)
+-		do_server(port,socket_type,&accept_socket,www_body, context);
++		do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
+ 	else
+-		do_server(port,socket_type,&accept_socket,sv_body, context);
++		do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
+ 	print_stats(bio_s_out,ctx);
+ 	ret=0;
+ end:
+Index: apps/s_socket.c
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_socket.c,v
+retrieving revision 1.43.2.3.2.2
+diff -u -r1.43.2.3.2.2 s_socket.c
+--- apps/s_socket.c	2 Dec 2011 14:39:40 -0000	1.43.2.3.2.2
++++ apps/s_socket.c	28 Dec 2011 00:28:14 -0000
+@@ -97,16 +97,16 @@
+ #include "netdb.h"
+ #endif
+ 
+-static struct hostent *GetHostByName(char *name);
++static struct hostent *GetHostByName(char *name, int domain);
+ #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+ static void ssl_sock_cleanup(void);
+ #endif
+ static int ssl_sock_init(void);
+-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
+-static int init_server(int *sock, int port, int type);
+-static int init_server_long(int *sock, int port,char *ip, int type);
++static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
++static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
+ static int do_accept(int acc_sock, int *sock, char **host);
+-static int host_ip(char *str, unsigned char ip[4]);
++static int host_ip(char *str, unsigned char *ip, int domain);
+ 
+ #ifdef OPENSSL_SYS_WIN16
+ #define SOCKET_PROTOCOL	0 /* more microsoft stupidity */
+@@ -234,38 +234,68 @@
+ 	return(1);
+ 	}
+ 
+-int init_client(int *sock, char *host, int port, int type)
++int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
+ 	{
++#if OPENSSL_USE_IPV6
++	unsigned char ip[16];
++#else
+ 	unsigned char ip[4];
++#endif
+ 
+-	memset(ip, '\0', sizeof ip);
+-	if (!host_ip(host,&(ip[0])))
+-		return 0;
+-	return init_client_ip(sock,ip,port,type);
+-	}
+-
+-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+-	{
+-	unsigned long addr;
++	if (use_ipv4)
++		if (host_ip(host,ip,AF_INET))
++			return(init_client_ip(sock,ip,port,type,AF_INET));
++#if OPENSSL_USE_IPV6
++	if (use_ipv6)
++		if (host_ip(host,ip,AF_INET6))
++			return(init_client_ip(sock,ip,port,type,AF_INET6));
++#endif
++	return 0;
++	}
++
++static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
++	{
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage them;
++	struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
++	struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
++#else
+ 	struct sockaddr_in them;
++	struct sockaddr_in *them_in = &them;
++#endif
++	socklen_t addr_len;
+ 	int s,i;
+ 
+ 	if (!ssl_sock_init()) return(0);
+ 
+ 	memset((char *)&them,0,sizeof(them));
+-	them.sin_family=AF_INET;
+-	them.sin_port=htons((unsigned short)port);
+-	addr=(unsigned long)
+-		((unsigned long)ip[0]<<24L)|
+-		((unsigned long)ip[1]<<16L)|
+-		((unsigned long)ip[2]<< 8L)|
+-		((unsigned long)ip[3]);
+-	them.sin_addr.s_addr=htonl(addr);
++	if (domain == AF_INET)
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in);
++		them_in->sin_family=AF_INET;
++		them_in->sin_port=htons((unsigned short)port);
++#ifndef BIT_FIELD_LIMITS
++		memcpy(&them_in->sin_addr.s_addr, ip, 4);
++#else
++		memcpy(&them_in->sin_addr, ip, 4);
++#endif
++		}
++	else
++#if OPENSSL_USE_IPV6
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in6);
++		them_in6->sin6_family=AF_INET6;
++		them_in6->sin6_port=htons((unsigned short)port);
++		memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
++		}
++#else
++		return(0);
++#endif
+ 
+ 	if (type == SOCK_STREAM)
+-		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
++		s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
+ 	else /* ( type == SOCK_DGRAM) */
+-		s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
++		s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
+ 			
+ 	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+ 
+@@ -277,29 +315,27 @@
+ 		if (i < 0) { perror("keepalive"); return(0); }
+ 		}
+ #endif
+-
+-	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
++	if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
+ 		{ closesocket(s); perror("connect"); return(0); }
+ 	*sock=s;
+ 	return(1);
+ 	}
+ 
+-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
++int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
+ 	{
+ 	int sock;
+ 	char *name = NULL;
+ 	int accept_socket = 0;
+ 	int i;
+ 
+-	if (!init_server(&accept_socket,port,type)) return(0);
+-
++	if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
+ 	if (ret != NULL)
+ 		{
+ 		*ret=accept_socket;
+ 		/* return(1);*/
+ 		}
+-  	for (;;)
+-  		{
++	for (;;)
++		{
+ 		if (type==SOCK_STREAM)
+ 			{
+ 			if (do_accept(accept_socket,&sock,&name) == 0)
+@@ -322,41 +358,88 @@
+ 		}
+ 	}
+ 
+-static int init_server_long(int *sock, int port, char *ip, int type)
++static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
+ 	{
+ 	int ret=0;
++	int domain;
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage server;
++	struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
++	struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
++#else
+ 	struct sockaddr_in server;
++	struct sockaddr_in *server_in = &server;
++#endif
++	socklen_t addr_len;
+ 	int s= -1;
+ 
++	if (!use_ipv4 && !use_ipv6)
++		goto err;
++#if OPENSSL_USE_IPV6
++	/* we are fine here */
++#else
++	if (use_ipv6)
++		goto err;
++#endif
+ 	if (!ssl_sock_init()) return(0);
+ 
+-	memset((char *)&server,0,sizeof(server));
+-	server.sin_family=AF_INET;
+-	server.sin_port=htons((unsigned short)port);
+-	if (ip == NULL)
+-		server.sin_addr.s_addr=INADDR_ANY;
+-	else
+-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
+-#ifndef BIT_FIELD_LIMITS
+-		memcpy(&server.sin_addr.s_addr,ip,4);
++#if OPENSSL_USE_IPV6
++	domain = use_ipv6 ? AF_INET6 : AF_INET;
+ #else
+-		memcpy(&server.sin_addr,ip,4);
++	domain = AF_INET;
+ #endif
+-	
+-		if (type == SOCK_STREAM)
+-			s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
+-		else /* type == SOCK_DGRAM */
+-			s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
++	if (type == SOCK_STREAM)
++		s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
++	else /* type == SOCK_DGRAM */
++		s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
+ 
+ 	if (s == INVALID_SOCKET) goto err;
+ #if defined SOL_SOCKET && defined SO_REUSEADDR
++	{
++	int j = 1;
++	setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
++		   (void *) &j, sizeof j);
++	}
++#endif
++#if OPENSSL_USE_IPV6
++	if ((use_ipv4 == 0) && (use_ipv6 == 1))
+ 		{
+-		int j = 1;
+-		setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+-			   (void *) &j, sizeof j);
++		const int on = 1;
++
++		setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
++		           (const void *) &on, sizeof(int));
+ 		}
+ #endif
+-	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
++	if (domain == AF_INET)
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in);
++		memset(server_in, 0, sizeof(struct sockaddr_in));
++		server_in->sin_family=AF_INET;
++		server_in->sin_port = htons((unsigned short)port);
++		if (ip == NULL)
++			server_in->sin_addr.s_addr = htonl(INADDR_ANY);
++		else
++/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
++#ifndef BIT_FIELD_LIMITS
++			memcpy(&server_in->sin_addr.s_addr, ip, 4);
++#else
++			memcpy(&server_in->sin_addr, ip, 4);
++#endif
++		}
++#if OPENSSL_USE_IPV6
++	else
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in6);
++		memset(server_in6, 0, sizeof(struct sockaddr_in6));
++		server_in6->sin6_family = AF_INET6;
++		server_in6->sin6_port = htons((unsigned short)port);
++		if (ip == NULL)
++			server_in6->sin6_addr = in6addr_any;
++		else
++			memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
++		}
++#endif
++	if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
+ 		{
+ #ifndef OPENSSL_SYS_WINDOWS
+ 		perror("bind");
+@@ -375,16 +458,23 @@
+ 	return(ret);
+ 	}
+ 
+-static int init_server(int *sock, int port, int type)
++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
+ 	{
+-	return(init_server_long(sock, port, NULL, type));
++	return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
+ 	}
+ 
+ static int do_accept(int acc_sock, int *sock, char **host)
+ 	{
+ 	int ret;
+ 	struct hostent *h1,*h2;
+-	static struct sockaddr_in from;
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage from;
++	struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
++	struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
++#else
++	struct sockaddr_in from;
++	struct sockaddr_in *from_in = &from;
++#endif
+ 	int len;
+ /*	struct linger ling; */
+ 
+@@ -431,13 +521,23 @@
+ */
+ 
+ 	if (host == NULL) goto end;
++#if OPENSSL_USE_IPV6
++	if (from.ss_family == AF_INET)
++#else
++	if (from.sin_family == AF_INET)
++#endif
+ #ifndef BIT_FIELD_LIMITS
+-	/* I should use WSAAsyncGetHostByName() under windows */
+-	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
+-		sizeof(from.sin_addr.s_addr),AF_INET);
++		/* I should use WSAAsyncGetHostByName() under windows */
++		h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
++		                 sizeof(from_in->sin_addr.s_addr), AF_INET);
+ #else
+-	h1=gethostbyaddr((char *)&from.sin_addr,
+-		sizeof(struct in_addr),AF_INET);
++		h1=gethostbyaddr((char *)&from_in->sin_addr,
++		                 sizeof(struct in_addr), AF_INET);
++#endif
++#if OPENSSL_USE_IPV6
++	else
++		h1=gethostbyaddr((char *)&from_in6->sin6_addr,
++		                 sizeof(struct in6_addr), AF_INET6);
+ #endif
+ 	if (h1 == NULL)
+ 		{
+@@ -454,15 +554,23 @@
+ 			}
+ 		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
+ 
+-		h2=GetHostByName(*host);
++#if OPENSSL_USE_IPV6
++		h2=GetHostByName(*host, from.ss_family);
++#else
++		h2=GetHostByName(*host, from.sin_family);
++#endif
+ 		if (h2 == NULL)
+ 			{
+ 			BIO_printf(bio_err,"gethostbyname failure\n");
+ 			return(0);
+ 			}
+-		if (h2->h_addrtype != AF_INET)
++#if OPENSSL_USE_IPV6
++		if (h2->h_addrtype != from.ss_family)
++#else
++		if (h2->h_addrtype != from.sin_family)
++#endif
+ 			{
+-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
++			BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
+ 			return(0);
+ 			}
+ 		}
+@@ -477,7 +585,7 @@
+ 	char *h,*p;
+ 
+ 	h=str;
+-	p=strchr(str,':');
++	p=strrchr(str,':');
+ 	if (p == NULL)
+ 		{
+ 		BIO_printf(bio_err,"no port defined\n");
+@@ -485,7 +593,7 @@
+ 		}
+ 	*(p++)='\0';
+ 
+-	if ((ip != NULL) && !host_ip(str,ip))
++	if ((ip != NULL) && !host_ip(str,ip,AF_INET))
+ 		goto err;
+ 	if (host_ptr != NULL) *host_ptr=h;
+ 
+@@ -496,48 +604,58 @@
+ 	return(0);
+ 	}
+ 
+-static int host_ip(char *str, unsigned char ip[4])
++static int host_ip(char *str, unsigned char *ip, int domain)
+ 	{
+-	unsigned int in[4]; 
++	unsigned int in[4];
++	unsigned long l;
+ 	int i;
+ 
+-	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
++	if ((domain == AF_INET) &&
++	    (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
+ 		{
++		
+ 		for (i=0; i<4; i++)
+ 			if (in[i] > 255)
+ 				{
+ 				BIO_printf(bio_err,"invalid IP address\n");
+ 				goto err;
+ 				}
+-		ip[0]=in[0];
+-		ip[1]=in[1];
+-		ip[2]=in[2];
+-		ip[3]=in[3];
+-		}
++		l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
++		memcpy(ip, &l, 4);
++		return 1;
++		}
++#if OPENSSL_USE_IPV6
++	else if ((domain == AF_INET6) &&
++	         (inet_pton(AF_INET6, str, ip) == 1))
++	         return 1;
++#endif
+ 	else
+ 		{ /* do a gethostbyname */
+ 		struct hostent *he;
+ 
+ 		if (!ssl_sock_init()) return(0);
+ 
+-		he=GetHostByName(str);
++		he=GetHostByName(str,domain);
+ 		if (he == NULL)
+ 			{
+ 			BIO_printf(bio_err,"gethostbyname failure\n");
+ 			goto err;
+ 			}
+ 		/* cast to short because of win16 winsock definition */
+-		if ((short)he->h_addrtype != AF_INET)
++		if ((short)he->h_addrtype != domain)
+ 			{
+-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
++			BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
+ 			return(0);
+ 			}
+-		ip[0]=he->h_addr_list[0][0];
+-		ip[1]=he->h_addr_list[0][1];
+-		ip[2]=he->h_addr_list[0][2];
+-		ip[3]=he->h_addr_list[0][3];
++		if (domain == AF_INET)
++			memset(ip, 0, 4);
++#if OPENSSL_USE_IPV6
++		else
++			memset(ip, 0, 16);
++#endif
++		memcpy(ip, he->h_addr_list[0], he->h_length);
++		return 1;
+ 		}
+-	return(1);
+ err:
+ 	return(0);
+ 	}
+@@ -574,7 +692,7 @@
+ static unsigned long ghbn_hits=0L;
+ static unsigned long ghbn_miss=0L;
+ 
+-static struct hostent *GetHostByName(char *name)
++static struct hostent *GetHostByName(char *name, int domain)
+ 	{
+ 	struct hostent *ret;
+ 	int i,lowi=0;
+@@ -589,14 +707,20 @@
+ 			}
+ 		if (ghbn_cache[i].order > 0)
+ 			{
+-			if (strncmp(name,ghbn_cache[i].name,128) == 0)
++			if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
++			    (ghbn_cache[i].ent.h_addrtype == domain))
+ 				break;
+ 			}
+ 		}
+ 	if (i == GHBN_NUM) /* no hit*/
+ 		{
+ 		ghbn_miss++;
+-		ret=gethostbyname(name);
++		if (domain == AF_INET)
++			ret=gethostbyname(name);
++#if OPENSSL_USE_IPV6
++		else
++			ret=gethostbyname2(name, AF_INET6);
++#endif
+ 		if (ret == NULL) return(NULL);
+ 		/* else add to cache */
+ 		if(strlen(name) < sizeof ghbn_cache[0].name)

dev-libs/openssl/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<use>
+ <flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented)</flag>
+ <flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
+</use>
+</pkgmetadata>

dev-libs/openssl/openssl-1.0.1e.ebuild

@@ -0,0 +1,221 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e.ebuild,v 1.1 2013/02/20 19:14:48 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+REV="1.7"
+DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+	kerberos? ( virtual/krb5 )"
+# The blocks are temporary just to make sure people upgrade to a
+# version that lack runtime version checking.  We'll drop them in
+# the future.
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<net-misc/openssh-5.9_p1-r4
+	!<net-libs/neon-0.29.6-r1"
+DEPEND="${RDEPEND}
+	sys-apps/diffutils
+	>=dev-lang/perl-5
+	test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	SSL_CNF_DIR="/etc/ssl"
+	sed \
+		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
+		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
+		> "${WORKDIR}"/c_rehash || die #416717
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+		epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1e-ipv6.patch
+		epatch_user #332661
+	fi
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		enable-idea \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		enable-tlsext \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake INSTALL_PREFIX="${D}" install
+	dobin "${WORKDIR}"/c_rehash #333117
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r doc/*
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}

net-fs/nfs-utils/ChangeLog

@@ -0,0 +1,899 @@
+# ChangeLog for net-fs/nfs-utils
+# Copyright 1999-2013 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 $
+
+  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.

net-fs/nfs-utils/Manifest

@@ -0,0 +1,19 @@
+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.6-cross-build.patch 1909 SHA256 847f22436f8f389c390beb9bc99195cad182910eff68769317a5dd9902f8c0ab SHA512 ea2fd45ad9f526a72cbc669cb748268aaed5b4e5f01eec8bdeb143226795a09c305732433958261d1b65302eddb68c104eb89d1ad34718038d8b3b06817ae799 WHIRLPOOL 71e398dc619e2971a0f7a3c9c24d9cc2b3a99c4d49568c3a51ac363265e89a13534b73f8e5a744884aff32c8bfebdbfb78b2635dc19caa527bbd3801dc02cac7
+AUX nfs-utils-1.2.7-heomdal.patch 6643 SHA256 f8845cb5471313516ebd389a1fb692b984f5f9f663923488a539d8adec8de247 SHA512 dea96554579dcb1b2404724ddcf68a27034cef7f5a0c3d4b6838e46abfcd9a05af3cd56c28f0878f1ec777ea0a2c43fb7c795adf74aa2080c8feb26e7e83d938 WHIRLPOOL cd783ee2b91332753abbf8de8125f6cebd36dd4852ce804d8822fd5cfc28d6d4f608634fcd00b4a30be5aeba9be97c2c122e3beb1d2961182f1bfce8c652e7d2
+AUX nfs-utils-1.2.7-libio.patch 1601 SHA256 788b6bcca6ec03a8690b5cbabef06ad325211ab79a332b33d17708e8b0b63093 SHA512 a9643fd3689c95bf82c28a6aa5a82540459e0e6eafbb1a774ff74ad69b4f3f28bc0624f84913a78405cbdcb3321a02f912ace2407bb5534c292f5fdd930b68c3 WHIRLPOOL cb382521d1bbfb2ab823d5d44f788f1e9f1a608f7cdd632f84c046787920237569bd57fda8f298ed255254e6bdb56ef8a845cf3013ba1766e9636ce71e63c788
+AUX nfs-utils-1.2.7-nfsiostat-python3.patch 11260 SHA256 c71f3d53c3b076e609ba2de1a1565deacc7a797a2b8c8325341bd6c5b08de6ac SHA512 778640c90ab5a751b9613c02a13a4332e994620c4ff2301bd141edd563bed00ebd1fed7d850adc9d72b3eb3a64d44d7791fef4501fbe0772e7aeb0b14d7d1daa WHIRLPOOL 7c89f6152fe6e1f20c1c57168f98d872cfb55ad34ea8940b5a737c57f21adddf0be5be9a696141e3f45a5848a29c5990a02dba25c804b472848d24b944fc4fc6
+AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
+AUX nfs.initd 4378 SHA256 8df22f253770a24c6a53ce332d821ab680d0ede18d0e968c1c5d8b3796cb74be SHA512 1577a43b47ebf12261504dd1c9ae564e19d80edc424c4b1e308ac46b12907f6684242284f18a6cd2edafec88c815debf895b6c29d13b9bca59d6d7c883bc1f38 WHIRLPOOL da3762c3467af7d46aef1890aa9c95a85e759c6cab09a5590a00c8f6a37b600a6cf3d4c17b1593a3bc7556ad25bfe001ccabcad70bdc1a2848aa9f842e349d48
+AUX nfsmount.confd 326 SHA256 b9389e143c2c4f95c11f97a8a379e007f140559016f60011c9d2ff0935758bcb SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 WHIRLPOOL 97939b074a9b5717184512088388c9c22a31f37009996b69137023a0f8a97ce6eb41f7cb0a25843ea088f00d37cb45f6b3bd1ba0f801de7cb8f6dc2e5d374dfb
+AUX nfsmount.initd 1126 SHA256 b57637c7eb8e40b5cc1655e8afa69dc0aaecbd3186bdca3301586d1e9b797357 SHA512 e2c4d2bf9690b092d7062d95f4242e2591e3ed0aa8b9b36eae977d5d0350b0d90d339f7e75bdcc794abef27cf1541642a8a6dbbaed90e58cc823db4c92af9336 WHIRLPOOL 54a2bdb24015a6d8184fdde3351b152c5625cb6e4ff17876d592a1600fedec1724081b4ff233711ad9d290ea761827067c40ba8ae21121fc6066ba7ed230e483
+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.7.tar.bz2 2902130 SHA256 7ef8e0a8b22cd7ff33f3afd28e770d45643fae303468a180640c2967833fe75e SHA512 c63b28be8e7b9cbc3ccb4950f31fd30f3ddc9c8707dcad4c3f2ee78fb464df9e0f1f58dc0c47e530c5afaa604712b4dc5e15af795810374e833c09a19dfd32e1 WHIRLPOOL 785511e2eb03649027977d81f11d7a5b1f960d4fdc57b790af5a3d441aa63858d8c2876e851049ea1b799a93796b209c9a3d22837f3aa3744ba17395a4fc8dbc
+EBUILD nfs-utils-1.2.7.ebuild 3776 SHA256 f383993ed7516032e11389b9b22251c831a235787830d0a1efb8f90e362bad26 SHA512 3987b65bf44276b4612d93c59ca302157abc21077a49aa87e10d7f4f6003199aad782215bdece20643997e7972297eddf2a0c87fc1803e5515bdc0dc4d2b17ac WHIRLPOOL 285e8ff734267ac8e9ba73d786f18814af5fc2043e733108af40c412e95b56c7783bfeaa0020d865087c6524e8b832dacd9f04cd0d63e28e211ed2f20f4c8f7d
+MISC ChangeLog 33915 SHA256 ce464a74e4ba54679eb1afba7ccde1fe026026abaed116e69d268c428ee54261 SHA512 0843cc5a8452ebc4d52339a0b46269a7d96c0c032c6897b98eb8763fbdf79c9b6a1abceae24efa6024d44f4f34f2eabd2313767b840b8e531fa68bf3735e9e86 WHIRLPOOL b444df4809543e45cf4491d69638ac62752e4ac915d49f81a8c3e3320abcf6fc14c1e50116802b2598133e972012ce72010723c4087da8f84a3f68e439dea5d4
+MISC metadata.xml 668 SHA256 d9ecc29c31ebf779ec222513db190cc0e9d0737f806aea26913d097b09bbfa47 SHA512 2b269153829d1d8df6e97871814479af8fbe18a48cf0b6a33947212264875a4002feda4163b465b4a67e253e5f27e47badc53d414ebb9f3281253f813fa1dacd WHIRLPOOL a53c14f8e6f7cce4f75a7fda60d8b9f96a57eb3a877470906fa1c40befcd9791411934e7ab610ce612f6d42d4d953e0a2a78ffc9e21e9b98328a395c4de7daa8

net-fs/nfs-utils/files/exports

@@ -0,0 +1 @@
+# /etc/exports: NFS file systems being exported.  See exports(5).

net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch

@@ -0,0 +1,39 @@
+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+");

net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch

@@ -0,0 +1,69 @@
+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/rpcdebug/Makefile.am
++++ b/tools/rpcdebug/Makefile.am
+@@ -1,15 +1,14 @@
+ ## 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)
+ 
+ man8_MANS = rpcdebug.man
+ EXTRA_DIST = $(man8_MANS)
+ 
+ sbin_PROGRAMS = rpcdebug
+ rpcdebug_SOURCES = rpcdebug.c
+-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
+-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
+-rpcdebug_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

net-fs/nfs-utils/files/nfs-utils-1.2.7-heomdal.patch

@@ -0,0 +1,180 @@
+--- 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",

net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch

@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/459200
+
+From 2d9fb08c588970b842ce2a609088079181e6aafb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 24 Mar 2013 17:41:19 -0400
+Subject: [PATCH [nfs-utils]] check for libio.h availability
+
+On some systems (like uClibc), there isn't a libio.h header.  But it
+isn't also needed on them.  So check for the header first.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac               | 2 +-
+ support/include/sockaddr.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f461219..cc7f3b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -358,7 +358,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
+                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
+                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
+                  syslog.h unistd.h com_err.h et/com_err.h \
+-                 ifaddrs.h nfs-plugin.h])
++                 ifaddrs.h nfs-plugin.h libio.h])
+ 
+ dnl *************************************************************
+ dnl Checks for typedefs, structures, and compiler characteristics
+diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
+index 72766db..a1c30f9 100644
+--- a/support/include/sockaddr.h
++++ b/support/include/sockaddr.h
+@@ -20,7 +20,13 @@
+ #ifndef NFS_UTILS_SOCKADDR_H
+ #define NFS_UTILS_SOCKADDR_H
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_LIBIO_H
+ #include <libio.h>
++#endif
+ #include <stdbool.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+-- 
+1.8.1.2
+

net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch

@@ -0,0 +1,287 @@
+From b0e3dc0c1332884a82f509f98434abd78358c7ed Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 24 Mar 2013 15:59:12 -0400
+Subject: [PATCH] nfsiostat: make it work w/python3
+
+Simple fixes here to work with python 2 & 3:
+ - use print() everywhere
+ - dict.iteritems() -> dict.items()
+ - file() -> open()
+ - sys.maxint -> sys.maxsize
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tools/nfs-iostat/nfs-iostat.py | 130 +++++++++++++++++++++--------------------
+ 1 file changed, 66 insertions(+), 64 deletions(-)
+
+diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
+index d909632..dfbef87 100644
+--- a/tools/nfs-iostat/nfs-iostat.py
++++ b/tools/nfs-iostat/nfs-iostat.py
+@@ -3,6 +3,8 @@
+ """Emulate iostat for NFS mount points using /proc/self/mountstats
+ """
+ 
++from __future__ import print_function
++
+ __copyright__ = """
+ Copyright (C) 2005, Chuck Lever <cel@netapp.com>
+ 
+@@ -201,9 +203,9 @@ class DeviceData:
+         result = DeviceData()
+ 
+         # copy self into result
+-        for key, value in self.__nfs_data.iteritems():
++        for key, value in self.__nfs_data.items():
+             result.__nfs_data[key] = value
+-        for key, value in self.__rpc_data.iteritems():
++        for key, value in self.__rpc_data.items():
+             result.__rpc_data[key] = value
+ 
+         # compute the difference of each item in the list
+@@ -233,9 +235,9 @@ class DeviceData:
+             client_bytes_read = float(nfs_stats['serverreadbytes'] - nfs_stats['directreadbytes'])
+             ratio = ((app_bytes_read - client_bytes_read) * 100) / app_bytes_read
+ 
+-            print
+-            print 'app bytes: %f  client bytes %f' % (app_bytes_read, client_bytes_read)
+-            print 'Data cache hit ratio: %4.2f%%' % ratio
++            print()
++            print('app bytes: %f  client bytes %f' % (app_bytes_read, client_bytes_read))
++            print('Data cache hit ratio: %4.2f%%' % ratio)
+ 
+     def __print_attr_cache_stats(self, sample_time):
+         """Print attribute cache efficiency stats
+@@ -255,13 +257,13 @@ class DeviceData:
+             data_invalidates = float(nfs_stats['datainvalidates'])
+             attr_invalidates = float(nfs_stats['attrinvalidates'])
+ 
+-            print
+-            print '%d inode revalidations, hitting in cache %4.2f%% of the time' % \
+-                (revalidates, ratio)
+-            print '%d open operations (mandatory GETATTR requests)' % opens
++            print()
++            print('%d inode revalidations, hitting in cache %4.2f%% of the time' % \
++                (revalidates, ratio))
++            print('%d open operations (mandatory GETATTR requests)' % opens)
+             if getattr_ops != 0:
+-                print '%4.2f%% of GETATTRs resulted in data cache invalidations' % \
+-                   ((data_invalidates * 100) / getattr_ops)
++                print('%4.2f%% of GETATTRs resulted in data cache invalidations' % \
++                   ((data_invalidates * 100) / getattr_ops))
+ 
+     def __print_dir_cache_stats(self, sample_time):
+         """Print directory stats
+@@ -277,13 +279,13 @@ class DeviceData:
+         lookups = nfs_stats['vfslookup']
+         getdents = nfs_stats['vfsreaddir']
+ 
+-        print
+-        print '%d open operations (pathname lookups)' % opens
+-        print '%d dentry revalidates and %d vfs lookup requests' % \
+-            (dentry_revals, lookups),
+-        print 'resulted in %d LOOKUPs on the wire' % lookup_ops
+-        print '%d vfs getdents calls resulted in %d READDIRs on the wire' % \
+-            (getdents, readdir_ops)
++        print()
++        print('%d open operations (pathname lookups)' % opens)
++        print('%d dentry revalidates and %d vfs lookup requests' % \
++            (dentry_revals, lookups))
++        print('resulted in %d LOOKUPs on the wire' % lookup_ops)
++        print('%d vfs getdents calls resulted in %d READDIRs on the wire' % \
++            (getdents, readdir_ops))
+ 
+     def __print_page_stats(self, sample_time):
+         """Print page cache stats
+@@ -297,33 +299,33 @@ class DeviceData:
+         vfswritepages = nfs_stats['vfswritepages']
+         pages_written = nfs_stats['writepages']
+ 
+-        print
+-        print '%d nfs_readpage() calls read %d pages' % \
+-            (vfsreadpage, vfsreadpage)
+-        print '%d nfs_readpages() calls read %d pages' % \
+-            (vfsreadpages, pages_read - vfsreadpage),
++        print()
++        print('%d nfs_readpage() calls read %d pages' % \
++            (vfsreadpage, vfsreadpage))
++        print('%d nfs_readpages() calls read %d pages' % \
++            (vfsreadpages, pages_read - vfsreadpage))
+         if vfsreadpages != 0:
+-            print '(%.1f pages per call)' % \
+-                (float(pages_read - vfsreadpage) / vfsreadpages)
++            print('(%.1f pages per call)' % \
++                (float(pages_read - vfsreadpage) / vfsreadpages))
+         else:
+-            print
+-
+-        print
+-        print '%d nfs_updatepage() calls' % nfs_stats['vfsupdatepage']
+-        print '%d nfs_writepage() calls wrote %d pages' % \
+-            (vfswritepage, vfswritepage)
+-        print '%d nfs_writepages() calls wrote %d pages' % \
+-            (vfswritepages, pages_written - vfswritepage),
++            print()
++
++        print()
++        print('%d nfs_updatepage() calls' % nfs_stats['vfsupdatepage'])
++        print('%d nfs_writepage() calls wrote %d pages' % \
++            (vfswritepage, vfswritepage))
++        print('%d nfs_writepages() calls wrote %d pages' % \
++            (vfswritepages, pages_written - vfswritepage))
+         if (vfswritepages) != 0:
+-            print '(%.1f pages per call)' % \
+-                (float(pages_written - vfswritepage) / vfswritepages)
++            print('(%.1f pages per call)' % \
++                (float(pages_written - vfswritepage) / vfswritepages))
+         else:
+-            print
++            print()
+ 
+         congestionwaits = nfs_stats['congestionwait']
+         if congestionwaits != 0:
+-            print
+-            print '%d congestion waits' % congestionwaits
++            print()
++            print('%d congestion waits' % congestionwaits)
+ 
+     def __print_rpc_op_stats(self, op, sample_time):
+         """Print generic stats for one RPC op
+@@ -351,15 +353,15 @@ class DeviceData:
+             exe_per_op = 0.0
+ 
+         op += ':'
+-        print '%s' % op.lower().ljust(15),
+-        print '  ops/s\t\t   kB/s\t\t  kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)'
++        print('%s' % op.lower().ljust(15))
++        print('  ops/s\t\t   kB/s\t\t  kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)')
+ 
+-        print '\t\t%7.3f' % (ops / sample_time),
+-        print '\t%7.3f' % (kilobytes / sample_time),
+-        print '\t%7.3f' % kb_per_op,
+-        print ' %7d (%3.1f%%)' % (retrans, retrans_percent),
+-        print '\t%7.3f' % rtt_per_op,
+-        print '\t%7.3f' % exe_per_op
++        print('\t\t%7.3f' % (ops / sample_time))
++        print('\t%7.3f' % (kilobytes / sample_time))
++        print('\t%7.3f' % kb_per_op)
++        print(' %7d (%3.1f%%)' % (retrans, retrans_percent))
++        print('\t%7.3f' % rtt_per_op)
++        print('\t%7.3f' % exe_per_op)
+ 
+     def ops(self, sample_time):
+         sends = float(self.__rpc_data['rpcsends'])
+@@ -384,14 +386,14 @@ class DeviceData:
+         else:
+             backlog = 0.0
+ 
+-        print
+-        print '%s mounted on %s:' % \
+-            (self.__nfs_data['export'], self.__nfs_data['mountpoint'])
+-        print
++        print()
++        print('%s mounted on %s:' % \
++            (self.__nfs_data['export'], self.__nfs_data['mountpoint']))
++        print()
+ 
+-        print '   op/s\t\trpc bklog'
+-        print '%7.2f' % (sends / sample_time), 
+-        print '\t%7.2f' % backlog
++        print('   op/s\t\trpc bklog')
++        print('%7.2f' % (sends / sample_time))
++        print('\t%7.2f' % backlog)
+ 
+         if which == 0:
+             self.__print_rpc_op_stats('READ', sample_time)
+@@ -424,7 +426,7 @@ def parse_stats_file(filename):
+     ms_dict = dict()
+     key = ''
+ 
+-    f = file(filename)
++    f = open(filename)
+     for line in f.readlines():
+         words = line.split()
+         if len(words) == 0:
+@@ -494,7 +496,7 @@ def list_nfs_mounts(givenlist, mountstats):
+             if stats.is_nfs_mountpoint():
+                 list += [device]
+     else:
+-        for device, descr in mountstats.iteritems():
++        for device, descr in mountstats.items():
+             stats = DeviceData()
+             stats.parse_stats(descr)
+             if stats.is_nfs_mountpoint():
+@@ -527,7 +529,7 @@ client are listed.
+         usage="usage: %prog [ <interval> [ <count> ] ] [ <options> ] [ <mount point> ]",
+         description=mydescription,
+         version='version %s' % Iostats_version)
+-    parser.set_defaults(which=0, sort=False, list=sys.maxint)
++    parser.set_defaults(which=0, sort=False, list=sys.maxsize)
+ 
+     statgroup = OptionGroup(parser, "Statistics Options",
+                             'File I/O is displayed unless one of the following is specified:')
+@@ -572,29 +574,29 @@ client are listed.
+             try:
+                 interval = int(arg)
+             except:
+-                print 'Illegal <interval> value %s' % arg
++                print('Illegal <interval> value %s' % arg)
+                 return
+             if interval > 0:
+                 interval_seen = True
+             else:
+-                print 'Illegal <interval> value %s' % arg
++                print('Illegal <interval> value %s' % arg)
+                 return
+         elif not count_seen:
+             try:
+                 count = int(arg)
+             except:
+-                print 'Ilegal <count> value %s' % arg
++                print('Ilegal <count> value %s' % arg)
+                 return
+             if count > 0:
+                 count_seen = True
+             else:
+-                print 'Illegal <count> value %s' % arg
++                print('Illegal <count> value %s' % arg)
+                 return
+ 
+     # make certain devices contains only NFS mount points
+     devices = list_nfs_mounts(origdevices, mountstats)
+     if len(devices) == 0:
+-        print 'No NFS mount points were found'
++        print('No NFS mount points were found')
+         return
+ 
+ 
+@@ -616,7 +618,7 @@ client are listed.
+             # we need to recheck the devices list when reparsing
+             devices = list_nfs_mounts(origdevices,mountstats)
+             if len(devices) == 0:
+-                print 'No NFS mount points were found'
++                print('No NFS mount points were found')
+                 return
+             count -= 1
+     else: 
+@@ -630,7 +632,7 @@ client are listed.
+             # we need to recheck the devices list when reparsing
+             devices = list_nfs_mounts(origdevices,mountstats)
+             if len(devices) == 0:
+-                print 'No NFS mount points were found'
++                print('No NFS mount points were found')
+                 return
+ 
+ #
+@@ -641,7 +643,7 @@ prog = os.path.basename(sys.argv[0])
+ try:
+     iostat_command(prog)
+ except KeyboardInterrupt:
+-    print 'Caught ^C... exiting'
++    print('Caught ^C... exiting')
+     sys.exit(1)
+ 
+ sys.exit(0)
+-- 
+1.8.1.2
+

net-fs/nfs-utils/files/nfs.confd

@@ -0,0 +1,38 @@
+# /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"

net-fs/nfs-utils/files/nfs.initd

@@ -0,0 +1,163 @@
+#!/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
+}

net-fs/nfs-utils/files/nfsmount.confd

@@ -0,0 +1,7 @@
+# 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"

net-fs/nfs-utils/files/nfsmount.initd

@@ -0,0 +1,48 @@
+#!/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 $?
+}

net-fs/nfs-utils/files/rpc.gssd.initd

@@ -0,0 +1,24 @@
+#!/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 $?
+}

net-fs/nfs-utils/files/rpc.idmapd.initd

@@ -0,0 +1,26 @@
+#!/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 $?
+}

net-fs/nfs-utils/files/rpc.pipefs.initd

@@ -0,0 +1,25 @@
+#!/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"
+}

net-fs/nfs-utils/files/rpc.statd.initd

@@ -0,0 +1,33 @@
+#!/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 $?
+}

net-fs/nfs-utils/files/rpc.svcgssd.initd

@@ -0,0 +1,24 @@
+#!/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 $?
+}

net-fs/nfs-utils/metadata.xml

@@ -0,0 +1,15 @@
+<?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='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>

net-fs/nfs-utils/nfs-utils-1.2.7.ebuild

@@ -0,0 +1,131 @@
+# 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.7.ebuild,v 1.3 2013/04/13 20:02:02 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib autotools
+
+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
+	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/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.6-cross-build.patch
+	epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
+	epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
+	epatch "${FILESDIR}"/${PN}-1.2.7-heomdal.patch
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	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")
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs ChangeLog 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
+}
+
+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
+}

net-libs/c-client/ChangeLog

@@ -0,0 +1,402 @@
+# ChangeLog for net-libs/c-client
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.107 2013/01/04 08:33:23 eras Exp $
+
+  04 Jan 2013; Eray Aslan <eras@gentoo.org> -c-client-2007e-r2.ebuild,
+  -c-client-2007f-r1.ebuild, -c-client-2007f-r2.ebuild,
+  -c-client-2007f-r3.ebuild, -files/2002d-Makefile.patch,
+  -files/c-client-2007e-ldflags.patch:
+  Remove old
+
+  30 Dec 2012; Raúl Porcel <armin76@gentoo.org> c-client-2007f-r4.ebuild:
+  s390/sh/sparc stable wrt #445063
+
+  30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for alpha, wrt bug #445063
+
+  29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for sparc, wrt bug #445063
+
+  21 Dec 2012; Ulrich Müller <ulm@gentoo.org> c-client-2007e-r2.ebuild,
+  c-client-2007f-r1.ebuild, c-client-2007f-r2.ebuild, c-client-2007f-r3.ebuild,
+  c-client-2007f-r4.ebuild:
+  Fix LICENSE, see README file, bug 446380.
+
+  18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for ia64, wrt bug #445063
+
+  16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for x86, wrt bug #445063
+
+  09 Dec 2012; Agostino Sarubbo <ago@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for ppc64, wrt bug #445063
+
+  02 Dec 2012; Markus Meier <maekke@gentoo.org> c-client-2007f-r4.ebuild:
+  arm stable, bug #445063
+
+  29 Nov 2012; Brent Baude <ranger@gentoo.org> c-client-2007f-r4.ebuild:
+  Marking c-client-2007f-r4 ppc for bug 445063
+
+  29 Nov 2012; <ago@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for amd64, wrt bug #445063
+
+  29 Nov 2012; Jeroen Roovers <jer@gentoo.org> c-client-2007f-r4.ebuild:
+  Stable for HPPA (bug #445063).
+
+  17 Oct 2012;  <naota@gentoo.org> c-client-2007f-r4.ebuild:
+  Add ~x86-fbsd. #267299
+
+*c-client-2007f-r4 (15 Oct 2012)
+
+  15 Oct 2012; Eray Aslan <eras@gentoo.org> +c-client-2007f-r4.ebuild,
+  +files/c-client-2007f-topal.patch, metadata.xml:
+  Add topal and chappa USE flags for use with mail-client/alpine - bug #391387.
+  Fix ssl linkage.
+
+  08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/c-client-2007f-ldflags.patch, c-client-2007f-r3.ebuild:
+  Ensure kerberos builds properly with as-needed
+
+  08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> c-client-2007f-r3.ebuild:
+  Whitespace.
+
+*c-client-2007f-r3 (08 Oct 2012)
+
+  08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +c-client-2007f-r3.ebuild:
+  Add in IPv6 and Kerberos support from uw-imap.
+
+  11 Jul 2012; Eray Aslan <eras@gentoo.org> -c-client-2007f.ebuild:
+  Remove old
+
+*c-client-2007f-r2 (11 Jul 2012)
+
+  11 Jul 2012; Eray Aslan <eras@gentoo.org> +c-client-2007f-r2.ebuild:
+  Make build system multilib aware - bug #425766. Thanks to Anthony Basile
+
+  08 Jul 2012; Raúl Porcel <armin76@gentoo.org> c-client-2007f-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #413601
+
+  08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  c-client-2007f-r1.ebuild:
+  x86 stable wrt bug #413601
+
+  29 May 2012; Brent Baude <ranger@gentoo.org> c-client-2007f-r1.ebuild:
+  Marking c-client-2007f-r1 ppc for bug 413601
+
+  29 May 2012; Alexis Ballier <aballier@gentoo.org> c-client-2007f-r1.ebuild:
+  keyword ~amd64-fbsd
+
+  16 May 2012; Jeroen Roovers <jer@gentoo.org> c-client-2007f-r1.ebuild:
+  Stable for HPPA (bug #413601).
+
+  08 May 2012; Brent Baude <ranger@gentoo.org> c-client-2007f-r1.ebuild:
+  Marking c-client-2007f-r1 ppc64 for bug 413601
+
+  29 Apr 2012; Markus Meier <maekke@gentoo.org> c-client-2007f-r1.ebuild:
+  arm stable, bug #413601
+
+  26 Apr 2012; Agostino Sarubbo <ago@gentoo.org> c-client-2007f-r1.ebuild:
+  Stable for amd64, wrt bug #413601
+
+*c-client-2007f-r1 (20 Feb 2012)
+
+  20 Feb 2012; Eray Aslan <eras@gentoo.org> +c-client-2007f-r1.ebuild:
+  EAPI bump. Add static-libs USE flag. Fix header install.
+
+*c-client-2007f (20 Nov 2011)
+
+  20 Nov 2011; Eray Aslan <eras@gentoo.org> +c-client-2007f.ebuild:
+  version bump
+
+  25 Jul 2011; Eray Aslan <eras@gentoo.org> -c-client-2007e.ebuild,
+  -c-client-2007e-r1.ebuild:
+  remove old
+
+  17 Jul 2011; Mark Loeser <halcy0n@gentoo.org> c-client-2007e-r2.ebuild:
+  Stable for ppc64; bug #368585
+
+  22 Jun 2011; Brent Baude <ranger@gentoo.org> c-client-2007e-r2.ebuild:
+  Marking c-client-2007e-r2 ppc for bug 368585
+
+  12 Jun 2011; Raúl Porcel <armin76@gentoo.org> c-client-2007e-r2.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #368585
+
+  11 Jun 2011; Markus Meier <maekke@gentoo.org> c-client-2007e-r2.ebuild:
+  arm stable, bug #368585
+
+  07 Jun 2011; Eray Aslan <eras@gentoo.org> c-client-2007e-r2.ebuild:
+  Add back kolab patch - bug #370489
+
+  07 Jun 2011; Eray Aslan <eras@gentoo.org> files/c-client-2007e-ldflags.patch:
+  Fix as-needed properly - bug #370421
+
+  07 Jun 2011; Eray Aslan <eras@gentoo.org> files/c-client-2007e-ldflags.patch:
+  Fix as-needed flag - bug #370421
+
+  05 Jun 2011; Jeroen Roovers <jer@gentoo.org> c-client-2007e-r2.ebuild:
+  Stable for HPPA (bug #368585).
+
+  31 May 2011; Markus Meier <maekke@gentoo.org> c-client-2007e-r2.ebuild:
+  x86 stable, bug #368585
+
+  31 May 2011; Eray Aslan <eras@gentoo.org> c-client-2007e-r2.ebuild:
+  Improve symlink code - bug #369351. Thanks to Nicola Rauseo.
+
+  27 May 2011; Markos Chandras <hwoarang@gentoo.org> c-client-2007e-r2.ebuild:
+  Stable on amd64 wrt bug #368585
+
+*c-client-2007e-r2 (11 May 2011)
+
+  11 May 2011; Eray Aslan <eras@gentoo.org> +c-client-2007e-r2.ebuild:
+  Symlink shared library - bug #255118. Drop kolab USE flag.
+
+  16 Mar 2011; Eray Aslan <eras@gentoo.org> c-client-2007e.ebuild,
+  c-client-2007e-r1.ebuild:
+  change to new style virtual/imap-c-client bug 358993
+
+  16 Aug 2010; Jeroen Roovers <jer@gentoo.org> c-client-2007e-r1.ebuild:
+  Combine sed scripts for single file, die on failure.
+
+*c-client-2007e-r1 (16 Aug 2010)
+
+  16 Aug 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/c-client-2004a-amd64-so-fix.patch, -c-client-2004g.ebuild,
+  -c-client-2004g-r1.ebuild, -files/c-client-2004g_KOLAB_Annotations.patch,
+  -c-client-2006k.ebuild, +c-client-2007e-r1.ebuild,
+  +files/c-client-2007e-ldflags.patch, metadata.xml:
+  Respect LDFLAGS, CC, AR, RANLIB by Olivier Huber (bug #331773). Get rid of
+  the useless patch version variables since they are used only once and
+  obscure casual grep epatch *.ebuild outcome. Install RFCs only when
+  USE=doc.
+
+  24 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove wrobel from metadata.xml (#111816)
+
+  30 Mar 2009; Raúl Porcel <armin76@gentoo.org> c-client-2007e.ebuild:
+  arm/s390/sh stable wrt #252567
+
+  07 Jan 2009; Raúl Porcel <armin76@gentoo.org> c-client-2007e.ebuild:
+  alpha/ia64 stable wrt #252567
+
+  03 Jan 2009; Markus Meier <maekke@gentoo.org> c-client-2007e.ebuild:
+  x86 stable, bug #252567
+
+  03 Jan 2009; Jeroen Roovers <jer@gentoo.org> c-client-2007e.ebuild:
+  Stable for HPPA (bug #252567).
+
+  30 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> c-client-2007e.ebuild:
+  Stable on sparc, security bug #252567
+
+  29 Dec 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  c-client-2007e.ebuild:
+  amd64 stable wrt security bug #252567
+
+  29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  c-client-2007e.ebuild:
+  ppc stable, bug #252567
+
+  29 Dec 2008; Brent Baude <ranger@gentoo.org> c-client-2007e.ebuild:
+  Marking c-client-2007e ppc64 for bug 252567
+
+*c-client-2007e (28 Dec 2008)
+
+  28 Dec 2008; Gunnar Wrobel <wrobel@gentoo.org> +c-client-2007e.ebuild:
+  Added net-libs/c-client-2007e in response to sec issue #252567.
+
+  02 May 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  c-client-2006k.ebuild:
+  ppc stable, bug #213473
+
+  21 Apr 2008; Jeroen Roovers <jer@gentoo.org> c-client-2006k.ebuild:
+  Stable for HPPA (bug #213473).
+
+  20 Apr 2008; Raúl Porcel <armin76@gentoo.org> c-client-2006k.ebuild:
+  ia64/sparc stable wrt #213473
+
+  19 Apr 2008; Markus Rothe <corsair@gentoo.org> c-client-2006k.ebuild:
+  Stable on ppc64; bug #213473
+
+  18 Apr 2008; Markus Meier <maekke@gentoo.org> c-client-2006k.ebuild:
+  amd64/x86 stable, bug #213473
+
+  18 Apr 2008; Tobias Klausmann <klausman@gentoo.org> c-client-2006k.ebuild:
+  Stable on alpha, bug #213473
+
+  02 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> c-client-2004g.ebuild,
+  c-client-2004g-r1.ebuild, c-client-2006k.ebuild:
+  Group and world writable directories cause GrSec to deny exection on the
+  package for security. That is too much permission anyway, so clean up perms
+  better.
+
+  22 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org> ChangeLog, Manifest:
+  Clean up changelog.
+
+*c-client-2006k (22 Feb 2008)
+*c-client-2004g-r1 (22 Feb 2008)
+
+  22 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org>
+  +files/c-client-2004g_KOLAB_Annotations.patch,
+  +files/c-client-2006k_GENTOO_Makefile.patch,
+  +files/c-client-2006k_GENTOO_amd64-so-fix.patch,
+  +files/c-client-2006k_KOLAB_Annotations.patch, metadata.xml,
+  c-client-2004g.ebuild, +c-client-2004g-r1.ebuild, +c-client-2006k.ebuild:
+  Added c-client-2004g-r1 and c-client-2006k, both with support for the Kolab
+  groupware server.
+
+  21 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> c-client-2004g.ebuild:
+  Clean up all repoman warnings.
+
+  21 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> -c-client-2002d.ebuild,
+  -c-client-2002d-r1.ebuild, -c-client-2002e.ebuild,
+  -c-client-2002e-r1.ebuild, -c-client-2002e-r2.ebuild,
+  -c-client-2004a.ebuild, -c-client-2004a-r1.ebuild, -c-client-2004c.ebuild:
+  Clean up all old versions.
+
+  21 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> c-client-2004g.ebuild:
+  PAM is only needed by the Linux build.
+
+  07 Jul 2007; Jeroen Roovers <jer@gentoo.org> c-client-2004g.ebuild:
+  Stable for HPPA (bug #183898).
+
+  05 Jul 2007; Markus Rothe <corsair@gentoo.org> c-client-2004g.ebuild:
+  Stable on ppc64; bug #183898
+
+  04 Jul 2007; Christoph Mende <angelos@gentoo.org> c-client-2004g.ebuild:
+  Stable on amd64 wrt bug #183898
+
+  02 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> c-client-2004g.ebuild:
+  Stable on sparc wrt #183898
+
+  02 Jul 2007; Raúl Porcel <armin76@gentoo.org> c-client-2004g.ebuild:
+  alpha/ia64/x86 stable wrt #183898
+
+  02 Jul 2007; Lars Weiler <pylon@gentoo.org> c-client-2004g.ebuild:
+  Stable on ppc; bug #183898.
+
+  18 May 2007; Roy Marples <uberlord@gentoo.org> c-client-2004g.ebuild:
+  Keyworded ~x86-fbsd, #138170 thanks to Nicholas Steicke.
+
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  Transition to Manifest2.
+
+*c-client-2004g (06 Oct 2005)
+
+  06 Oct 2005; Robin H. Johnson <robbat2@gentoo.org> +c-client-2004g.ebuild:
+  Bug #107562, version bump.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Stable on alpha.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> c-client-2004a-r1.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Stable on ppc.
+
+  06 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Marked stable on amd64.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> c-client-2004a-r1.ebuild:
+  stable on ia64
+
+  31 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Stable on sparc
+
+*c-client-2004c (30 Mar 2005)
+
+  30 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +c-client-2004c.ebuild:
+  Version bump.
+
+  30 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Move 2004a-r1 to stable x86.
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> c-client-2004a-r1.ebuild:
+  Tiny cleanup in symlink creation of the .so.
+
+  20 Feb 2005; Hardave Riar <hardave@gentoo.org> c-client-2004a.ebuild:
+  Stable on mips
+
+*c-client-2004a-r1 (01 Feb 2005)
+
+  01 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/c-client-2004a-amd64-so-fix.patch, +c-client-2004a-r1.ebuild:
+  Patched Makefile to build a shared library for amd64, allowing PHP 5 with imap
+  to compile. Also fixed the symlinking of c-client.a for multilib archs.
+
+  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> :
+  Addeing to ~mips for testing
+
+*c-client-2004a (02 Oct 2004)
+
+  02 Oct 2004; <iggy@gentoo.org> +c-client-2004a.ebuild:
+  version bump, added pam use flag
+
+  18 Aug 2004; Tom Gall <tgall@gentoo.org> c-client-2002e-r2.ebuild:
+  stable on ppc64
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> c-client-2002e-r2.ebuild:
+  adding s390 keywords
+
+*c-client-2002e-r2 (05 Feb 2004)
+
+  05 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e-r2.ebuild:
+  fix bug #40146, move -fPIC to all arches as it's needed for lots of fixes.
+
+  01 Jan 2004; Jon Portnoy <avenj@gentoo.org> c-client-2002e-r1.ebuild :
+  AMD64 keywords.
+
+  10 Jan 2004; <agriffis@gentoo.org> c-client-2002e-r1.ebuild:
+  stable on ia64
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild,
+  c-client-2002d.ebuild, c-client-2002e-r1.ebuild, c-client-2002e.ebuild:
+  fix bug #35437
+
+*c-client-2002e-r1 (08 Dec 2003)
+
+  08 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e-r1.ebuild:
+  fix bug #35378 and move new ebuild to stable right away to fix some other
+  glitches
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+*c-client-2002e (25 Oct 2003)
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e.ebuild:
+  version bump
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild:
+  bump -r1 to stable
+
+*c-client-2002d-r1 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild:
+  add more -fPIC support
+
+  02 Aug 2003; Tavis Ormandy <taviso@gentoo.org> c-client-2002d.ebuild:
+  stable on alpha
+
+  12 Jul 2003; Jason Wever <weeve@gentoo.org> c-client-2002d.ebuild:
+  Changed ~sparc keyword to sparc to fix dependency borkage.
+
+  28 Jun 2003; Tavis Ormandy <taviso@gentoo.org> c-client-2002d.ebuild:
+  alpha needs -fPIC
+
+*c-client-2002d (07 Jun 2003)
+
+  20 Jun 2003; Guy Martin <gmsoft@gentoo.org> c-client-2002d.ebuild :
+  Added hppa to KEYWORDS to fix dependencies problem with mod_php.
+
+  07 Jun 2003; Robin Johnson <robbat2@gentoo.org> Manifest,
+  files/digest-c-client-2002d, files/2002d-Makefile.patch, ChangeLog,
+  c-client-2002d.ebuild:
+  Initial import. Ebuild based on submission in bug #20372 by Celestial Wizard
+  <gentoo@dev.celestialwizard.org>
+
+ 

net-libs/c-client/Manifest

@@ -0,0 +1,11 @@
+AUX c-client-2006k_GENTOO_Makefile.patch 2441 SHA256 6f7bf2d23f346f0f8eed4c4ae61e5b5c95d1a12e15e7fb4192a5a723754255f8 SHA512 35b9dd0737986e466dfbfc5388827b09934b32a9a7922bba3d7b4a4bd40dcaf2985a7f2d5bd3e884ad8d33c61eaabdc7f797d6af450b3f85cd0dacec764233e0 WHIRLPOOL 56c5ca98b651de9711f261f5cb1346a517c14bedca4c44d9bc0da4201b75264a8dd1568952f693c93a0fb80d905b52f4d121fefaac1d51b08d9096514fbaaaa4
+AUX c-client-2006k_GENTOO_amd64-so-fix.patch 665 SHA256 77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184 SHA512 213f06e133704ed2bb9fc6900edb7a4505bf6965409ecf76502bf9cafdf7c981bca552479f8ffaa1a355d2f1c1c08dbe0453fa5bce06590f6627d0e622c70879 WHIRLPOOL e111b86dbc52ec97851d229366cec17b7999c3924bd33da52f2290d0ab0afabdfe75db8eb4e0e359c96ad1d7265c28eee92d1a1337ba25ddaa3cb003ef106d1e
+AUX c-client-2006k_KOLAB_Annotations.patch 14551 SHA256 cd8833d4eabd8fbad6a1588e3ee5375fced007964f1c6bcd016b34bee5d8eaf2 SHA512 871093236b3ae300968e1e200a2389566af72ed1f62ad57c1dc617dd59e8378f29175fe07e5cfc575e022f3c27769b06850cbf21567f7cc359ca204c4d87a3af WHIRLPOOL ec2e5e84bb2bc4bb17bd63d93a1d4f25be165e00e783d01e88ce695d0987dcc023dacbddedc030d02a0de3d2e7677760f80a60a85a223b687b78150870df942d
+AUX c-client-2007e-heimdal.patch 1083 SHA256 4cf433c9d157dbbf52408dddf1d87ec5733a70dff157ac04b0b895a9e8e604bc SHA512 1db3635f35ebfc9486c227dde590e70ab6a812a9cba8e9c7880a1b245b656f87d3a3b8b5bd7664ca37fff9118134a143b14fba135fe204f7776aa5e62848527a WHIRLPOOL 065af01f79c71a0b6ba73be529ec201442c92e1d80701296ef00775f25d52a0d26ab3858ef97c890fb479c81f19d5b44c105be1fc8137a703af34a82df9ffa3e
+AUX c-client-2007f-ldflags.patch 1648 SHA256 41f42d69bcd550d8aa62a756bc90d579612a6230be1794dcf9580e49287a485b SHA512 b635479ade20a0225b5847664579b97961de6981bc747357f9282f89dacd1860030904a43625f5e939f5afb3df38738fd6744fc659261a97e7f8eed9e6cde00c WHIRLPOOL 91367d9fe5c661d6c98e75376d7101ee31ec13155cba62da10b0b787e969fab87d650c661809a40da67f21757d4988f99a129dc159aec7e00036b01b48d376b1
+AUX c-client-2007f-topal.patch 1070 SHA256 2927b586a5faef4b6b77451c7a72c351d3304b15493e337b4a47d625d0d45884 SHA512 a32b4e381c0b66fe5621d625b4fa3ba51dba8d8d4504cf137762e917cc637badc094ffa3d5238530c020cb24a228010d9714768c915691564c037638c5cc345f WHIRLPOOL 411780a2b4560f68421b92ee147332be1a2ead13580169c0235ad48e308cc816c9adf9b82e5e074cba1452be6f4d85d59cafdcd06754889bfb8edbea96352240
+DIST c-client-2007f-chappa-115-all.patch.gz 30571 SHA256 ce7512e1b0d904d6429bb999bc0b159becc253088bbd89ef2185e6c948723cff SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65 WHIRLPOOL 9fef9066c43df4c15f4f75bbad3634481e4cfce69c054682fe40193c30db6f9ceaed40138d00133c1bf1623dd45d251031562b2f16f1699ebcf0fbc8ce6c4653
+DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
+EBUILD c-client-2007f-r4.ebuild 4226 SHA256 3dd0a7110edfa7f3df8d87a3c6d7ebf3d7a1101df6c2fe597ca2fe98e49e752a SHA512 2ff90094700b9b8042b5a71e9c2dbe17339e78cadb39617c8eccf2818db5e729a2d1a4d8726ebb63081717b951568f0f29125d1d7b7e847b19823a6bba76983d WHIRLPOOL 0a6120888229c80614ccaa0f0d8a6b485aac6f727aedef52c3d47d7b446c9eb78f7456ac5a6104c680bd0b34437d712f8cb90a7a8fe89c15ec55364e7f87875e
+MISC ChangeLog 14233 SHA256 d0a8cf94b35e132099fc75b3bfc9b31b75f6ae6ccae3c9aede297ba0c64ceb03 SHA512 6d2421703cf5cd8dec434f27eb133038e5f0eef85c0a80ccdb74d749a07ed67325d7526e825afa295e2bde473519eec175851acc38fe55c8c61cb83766e53c81 WHIRLPOOL b478a38cde07cb494b31fa3efa57e960bdb704f4be524ca2aa4222c36f83af42ff97c3b3e863f2f4e7a7228b3009e0711eb9878f62b709afe6906ba2b7c4d6ff
+MISC metadata.xml 493 SHA256 2edbcc472b96ecaf42e59644792ab029f8285e1be6aaf8d5136cd7a021210e61 SHA512 9a0b21eaa73777d2c6576c4ee274d9792886d9564a2043dd519cf6f5b0ae1436beea319cce4589dc3fbb7ee7753c7dec11feb5cee4145836f99a18ca075daa00 WHIRLPOOL 279f5059ed842c5e4c0f12f1d3e6390eb63f717fb5200bae6076b886da5f7642178394a34b137123ec13f2a998aa5a5b50094e1e7bb437dbeb377a117fb4ddab

net-libs/c-client/c-client-2007f-r4.ebuild

@@ -0,0 +1,136 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r4.ebuild,v 1.12 2012/12/30 16:37:05 armin76 Exp $
+
+EAPI=4
+
+inherit flag-o-matic eutils libtool toolchain-funcs multilib
+
+MY_PN=imap
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+CHAPPA_PL=115
+DESCRIPTION="UW IMAP c-client library"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
+	chappa? ( mirror://gentoo/${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	!net-mail/uw-imap
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
+
+src_prepare() {
+	# Tarball packed with bad file perms
+	chmod -R u+rwX,go-w .
+
+	# lots of things need -fPIC, including various platforms, and this library
+	# generally should be built with it anyway.
+	append-flags -fPIC
+
+	# Modifications so we can build it optimally and correctly
+	sed \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+	# Make the build system more multilib aware
+	sed \
+		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+	# Targets should use the Gentoo (ie linux) fs
+	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
+		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
+
+	# Apply a patch to only build the stuff we need for c-client
+	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
+
+	# Apply patch to add the compilation of a .so for PHP
+	# This was previously conditional, but is more widely useful.
+	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
+
+	# heimdal
+	if has_version app-crypt/heimdal ; then
+		epatch "${FILESDIR}"/${PN}-2007e-heimdal.patch
+	fi
+
+	# Remove the pesky checks about SSL stuff
+	sed -e '/read.*exit/d' -i Makefile || die
+
+	# Respect LDFLAGS
+	epatch "${FILESDIR}"/${PN}-2007f-ldflags.patch
+	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		-i src/osdep/unix/Makefile || die "Respecting build flags"
+
+	use topal && epatch "${FILESDIR}/${P}-topal.patch"
+	use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+
+	elibtoolize
+}
+
+src_compile() {
+	local mymake ipver ssltype target passwdtype
+	ipver='IP=4'
+	use ipv6 && ipver="IP=6" && touch ip6
+	use ssl && ssltype="unix" || ssltype="none"
+	if use kernel_linux ; then
+		use pam && target=lnp passwdtype=pam || target=lnx passwdtype=std
+	elif use kernel_FreeBSD ; then
+		target=bsf passwdtype=pam
+	fi
+	use kerberos \
+		&& mymake="EXTRAAUTHENTICATORS=gss" \
+		&& EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
+	# no parallel builds supported!
+	emake -j1 SSLTYPE=${ssltype} $target \
+		PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \
+		EXTRACFLAGS="${CFLAGS}" \
+		EXTRALDFLAGS="${LDFLAGS}" \
+		EXTRALIBS="${EXTRALIBS}" \
+		GSSDIR=/usr
+}
+
+src_install() {
+	if use static-libs; then
+		# Library binary
+		dolib.a c-client/c-client.a
+		dosym c-client.a /usr/$(get_libdir)/libc-client.a
+	fi
+
+	# Now the shared library
+	dolib.so c-client/libc-client.so.1.0.0
+
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+	# Headers
+	insinto /usr/include/imap
+	doins src/osdep/unix/*.h
+	doins src/c-client/*.h
+	doins c-client/linkage.h
+	doins c-client/linkage.c
+	doins c-client/osdep.h
+	if use ssl; then
+		echo "  ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c || die
+	fi
+	# Docs
+	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
+	if use doc; then
+		docinto rfc
+		dodoc docs/rfc/*.txt
+		docinto draft
+		dodoc docs/draft/*
+	fi
+}

net-libs/c-client/files/c-client-2006k_GENTOO_Makefile.patch

@@ -0,0 +1,70 @@
+Fix the Makefile for building on Gentoo.
+
+diff -r b15554ece4d6 Makefile
+--- a/Makefile	Thu Feb 21 17:49:39 2008 +0100
++++ b/Makefile	Thu Feb 21 18:51:31 2008 +0100
+@@ -295,7 +295,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
+ 
+ # Make the IMAP Toolkit
+ 
+-all:	c-client SPECIALS rebuild bundled
++all:	c-client SPECIALS rebuild
+ 
+ c-client:
+ 	@echo Not processed yet.  In a first-time build, you must specify
+@@ -665,16 +665,9 @@ an ua:
+ 	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
+ 	$(TOOLS)/$@ "$(LN)" src/charset c-client
+ 	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
+-	$(TOOLS)/$@ "$(LN)" src/mtest mtest
+-	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
+-	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+-	$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
+-	$(TOOLS)/$@ "$(LN)" src/mlock mlock
+-	$(TOOLS)/$@ "$(LN)" src/dmail dmail
+-	$(TOOLS)/$@ "$(LN)" src/tmail tmail
+ 	$(LN) $(TOOLS)/$@ .
+ 
+-build:	OSTYPE rebuild rebuildclean bundled
++build:	OSTYPE rebuild rebuildclean
+ 
+ OSTYPE:
+ 	@$(MAKE) ip$(IP)
+@@ -690,8 +683,6 @@ OSTYPE:
+ 	echo $(BUILDTYPE) > OSTYPE
+ 	$(TOUCH) rebuild
+ 
+-rebuild:
+-	@$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
+ 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ 	@$(TOUCH) SPECIALS
+ 	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+@@ -700,28 +691,6 @@ rebuildclean:
+ rebuildclean:
+ 	$(SH) -c '$(RM) rebuild || true'
+ 
+-bundled:
+-	@echo Building bundled tools...
+-	$(CD) mtest;$(MAKE)
+-	$(CD) ipopd;$(MAKE)
+-	$(CD) imapd;$(MAKE)
+-	$(CD) mailutil;$(MAKE)
+-	@$(SH) -c '(test -f /usr/include/sysexits.h ) || make sysexitwarn'
+-	$(CD) mlock;$(MAKE) || true
+-	$(CD) dmail;$(MAKE) || true
+-	$(CD) tmail;$(MAKE) || true
+-
+-
+-sysexitwarn:
+-	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-	@echo + Hmm...it does not look like /usr/include/sysexits.h exists.
+-	@echo + Either your system is too ancient to have the sysexits.h
+-	@echo + include, or your C compiler gets it from some other location
+-	@echo + than /usr/include.  If your system is too old to have the
+-	@echo + sysexits.h include, you will not be able to build the
+-	@echo + following programs.
+-	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-
+ clean:
+ 	@echo Removing old processed sources and binaries...
+ 	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'

net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch

@@ -0,0 +1,13 @@
+diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
+--- a/src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
++++ b/src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
+@@ -962,6 +962,9 @@ onceenv:
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)

net-libs/c-client/files/c-client-2006k_KOLAB_Annotations.patch

@@ -0,0 +1,448 @@
+Provides get/set ANNOTATIONS support to the c-client library. [Version: 2006k]
+
+diff -r 217555555c77 src/c-client/imap4r1.c
+--- a/src/c-client/imap4r1.c	Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/imap4r1.c	Thu Feb 21 17:38:15 2008 +0100
+@@ -135,7 +135,8 @@ typedef struct imap_argument {
+ #define MULTIAPPEND 13
+ #define SNLIST 14
+ #define MULTIAPPENDREDO 15
+-
++#define QLIST 16
++#define QSTRING 17
+ 
+ /* Append data */
+ 
+@@ -205,12 +206,15 @@ void imap_gc_body (BODY *body);
+ void imap_gc_body (BODY *body);
+ void imap_capability (MAILSTREAM *stream);
+ long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
++long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
+ 
+ IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]);
+ IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s);
+ long imap_soutr (MAILSTREAM *stream,char *string);
+ IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s,
+ 				    SIZEDTEXT *as,long wildok,char *limit);
++IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
++				    SIZEDTEXT *as,char *limit);
+ IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s,
+ 				    STRING *st);
+ IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base,
+@@ -2753,6 +2757,84 @@ long imap_getacl (MAILSTREAM *stream,cha
+     args[0] = &ambx; args[1] = NIL;
+   return imap_acl_work (stream,"GETACL",args);
+ }
++
++/* IMAP set annotation
++ * Accepts: mail stream
++ *          annotation struct
++ * Returns: T on success, NIL on failure
++ */
++
++long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation)
++{
++  IMAPARG *args[4],ambx,apth,aval;
++  long ret;
++  
++  ambx.type = ASTRING;
++  ambx.text = (void *) annotation->mbox;
++  args[0] = &ambx;
++  
++  apth.type = QSTRING;
++  apth.text = (void *) annotation->entry;
++  args[1] = &apth;
++
++  STRINGLIST *st,*l;
++  ANNOTATION_VALUES *v;
++  
++  l = st = mail_newstringlist();
++  v = annotation->values;
++  while(v){
++    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->attr)));
++    l->next = mail_newstringlist();
++    l = l->next;
++    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->value)));
++    if(v->next){
++      l->next = mail_newstringlist();
++      l = l->next;
++    }
++    v = v->next;
++  }
++  
++  aval.type = QLIST;
++  aval.text = (void *)st;
++  args[2] = &aval;
++  args[3] = NIL;
++  
++  ret = imap_annotation_work(stream, "SETANNOTATION",args);
++  mail_free_stringlist(&st);
++  return ret;
++}
++  
++  
++  
++/* IMAP get annotation
++ * Accepts: mail stream
++ *          mailbox name
++ *          annotation entry list
++ *          annotation attribute list
++ * Returns: T on success with data returned via callback, NIL on failure
++ */
++
++long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries, STRINGLIST *attributes)
++{
++  IMAPARG *args[4],ambx,apth,aattr;
++  long ret;
++  ambx.type = ASTRING;
++  ambx.text = (void*) mailbox;
++  args[0] = &ambx; 
++
++ 
++  apth.type = QLIST;
++  apth.text = (void*) entries;
++  args[1] = &apth;
++
++  aattr.type = QLIST;
++  aattr.text = (void*) attributes;
++  args[2] = &aattr;
++
++  args[3] = NIL;
++  ret = imap_annotation_work(stream, "GETANNOTATION",args);
++  return ret;
++}
+ 
+ /* IMAP list rights
+  * Accepts: mail stream
+@@ -2805,6 +2887,16 @@ long imap_acl_work (MAILSTREAM *stream,c
+   else mm_log ("ACL not available on this IMAP server",ERROR);
+   return ret;
+ }
++ long imap_annotation_work(MAILSTREAM *stream, char *command,IMAPARG *args[])
++{
++  long ret = NIL;
++  IMAPPARSEDREPLY *reply;
++  if (imap_OK (stream,reply = imap_send (stream,command,args)))
++    ret = LONGT;
++  else mm_log (reply->text,ERROR);
++  return ret;
++}
++
+ 
+ /* IMAP set quota
+  * Accepts: mail stream
+@@ -2937,6 +3029,11 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
+       if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND))
+ 	return reply;
+       break;
++    case QSTRING:		/* atom or string, must be literal? */
++      st.size = strlen ((char *) (st.data = (unsigned char *) arg->text));
++      if (reply = imap_send_qstring (stream,tag,&s,&st,CMDBASE+MAXCOMMAND))
++	return reply;
++      break;
+     case LITERAL:		/* literal, as a stringstruct */
+       if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply;
+       break;
+@@ -2947,6 +3044,18 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
+       do {			/* for each list item */
+ 	*s++ = c;		/* write prefix character */
+ 	if (reply = imap_send_astring (stream,tag,&s,&list->text,NIL,
++				       CMDBASE+MAXCOMMAND)) return reply;
++	c = ' ';		/* prefix character for subsequent strings */
++      }
++      while (list = list->next);
++      *s++ = ')';		/* close list */
++      break;
++    case QLIST:			/* list of strings */
++      list = (STRINGLIST *) arg->text;
++      c = '(';			/* open paren */
++      do {			/* for each list item */
++	*s++ = c;		/* write prefix character */
++	if (reply = imap_send_qstring (stream,tag,&s,&list->text,
+ 				       CMDBASE+MAXCOMMAND)) return reply;
+ 	c = ' ';		/* prefix character for subsequent strings */
+       }
+@@ -3119,6 +3228,32 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
+   reply = imap_sout (stream,tag,CMDBASE,&s);
+   mail_unlock (stream);		/* unlock stream */
+   return reply;
++}
++
++/* IMAP send quoted-string
++ * Accepts: MAIL stream
++ *	    reply tag
++ *	    pointer to current position pointer of output bigbuf
++ *	    atom-string to output
++ *	    maximum to write as atom or qstring
++ * Returns: error reply or NIL if success
++ */
++
++IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
++				    SIZEDTEXT *as,char *limit)
++{
++  unsigned long j;
++  char c;
++  STRING st;
++				/* in case needed */
++  INIT (&st,mail_string,(void *) as->data,as->size);
++				/* always write literal if no space */
++  if ((*s + as->size) > limit) return imap_send_literal (stream,tag,s,&st);
++
++  *(*s)++ = '"';	/* write open quote */
++  for (j = 0; j < as->size; j++) *(*s)++ = as->data[j];
++  *(*s)++ = '"';	/* write close quote */
++  return NIL;
+ }
+ 
+ /* IMAP send atom-string
+@@ -4049,6 +4184,50 @@ void imap_parse_unsolicited (MAILSTREAM 
+     }
+   }
+ 
++  else if (!strcmp (reply->key,"ANNOTATION") && (s = reply->text)){
++    char * mbox;    
++    /* response looks like ANNOTATION "mailbox" "entry" ("attr" "value" ["attr" "value"]) ["entry" ("attr "value" ["attr" "value"] )]*/
++    getannotation_t an = (getannotation_t) mail_parameters (NIL,GET_ANNOTATION,NIL);
++    
++    mbox = imap_parse_astring (stream, &s, reply,NIL);
++    
++    while(*s){
++      ANNOTATION * al = mail_newannotation();    
++      al->mbox = cpystr(mbox);
++      t = imap_parse_astring (stream, &s, reply,NIL);
++      al->entry = t;
++      STRINGLIST *strlist;
++      if (s){while (*s == ' ')s++;}
++      
++      strlist = imap_parse_stringlist(stream, &s,reply);
++
++      ANNOTATION_VALUES *vlIter, *vlBegin;
++      vlIter = vlBegin = NIL;
++      if (strlist) {
++        while(strlist){	
++          if(vlIter){
++            vlIter->next = mail_newannotationvalue();
++            vlIter = vlIter->next;
++          }else{
++            vlIter = mail_newannotationvalue();
++            vlBegin = vlIter;
++          }
++          if ( strlist->text.size )
++            vlIter->attr = cpystr (strlist->text.data);        
++          strlist = strlist->next;        
++          if(!strlist) continue;
++          if ( strlist->text.size )
++            vlIter->value = cpystr (strlist->text.data);
++          strlist = strlist->next;
++        }
++      }
++      al->values = vlBegin;
++      if (an) 
++        (*an) (stream,al);
++      mail_free_annotation(&al);
++    }
++    fs_give ((void **)&mbox);
++  }
+   else if (!strcmp (reply->key,"ACL") && (s = reply->text) &&
+ 	   (t = imap_parse_astring (stream,&s,reply,NIL))) {
+     getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL);
+diff -r 217555555c77 src/c-client/imap4r1.h
+--- a/src/c-client/imap4r1.h	Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/imap4r1.h	Thu Feb 21 17:38:15 2008 +0100
+@@ -279,3 +279,5 @@ long imap_setquota (MAILSTREAM *stream,c
+ long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits);
+ long imap_getquota (MAILSTREAM *stream,char *qroot);
+ long imap_getquotaroot (MAILSTREAM *stream,char *mailbox);
++long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes);
++long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation); 
+diff -r 217555555c77 src/c-client/mail.c
+--- a/src/c-client/mail.c	Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/mail.c	Thu Feb 21 17:38:15 2008 +0100
+@@ -69,6 +69,7 @@ static newsrcquery_t mailnewsrcquery = N
+ static newsrcquery_t mailnewsrcquery = NIL;
+ 				/* ACL results callback */
+ static getacl_t mailaclresults = NIL;
++static getannotation_t mailannotationresults = NIL;
+ 				/* list rights results callback */
+ static listrights_t maillistrightsresults = NIL;
+ 				/* my rights results callback */
+@@ -598,6 +599,11 @@ void *mail_parameters (MAILSTREAM *strea
+     ret = (void *) (debugsensitive ? VOIDT : NIL);
+     break;
+ 
++  case SET_ANNOTATION:
++    mailannotationresults = (getannotation_t) value;
++  case GET_ANNOTATION:
++    ret = (void *) mailannotationresults;
++    break;
+   case SET_ACL:
+     mailaclresults = (getacl_t) value;
+   case GET_ACL:
+@@ -5701,7 +5707,15 @@ ACLLIST *mail_newacllist (void)
+   return (ACLLIST *) memset (fs_get (sizeof (ACLLIST)),0,sizeof (ACLLIST));
+ }
+ 
+-
++ANNOTATION *mail_newannotation (void)
++{
++  return (ANNOTATION *) memset (fs_get (sizeof (ANNOTATION)),0,sizeof(ANNOTATION));
++}
++
++ANNOTATION_VALUES *mail_newannotationvalue (void)
++{
++  return (ANNOTATION_VALUES *) memset (fs_get (sizeof (ANNOTATION_VALUES)),0,sizeof(ANNOTATION_VALUES));
++}
+ /* Mail instantiate new quotalist
+  * Returns: new quotalist
+  */
+@@ -6024,6 +6038,25 @@ void mail_free_acllist (ACLLIST **al)
+   }
+ }
+ 
++static void mail_free_annotation_values(ANNOTATION_VALUES **val)
++{
++  if (*val) {
++    if ((*val)->attr) fs_give ((void**) &(*val)->attr);
++    if ((*val)->value) fs_give ((void**) &(*val)->value);
++    mail_free_annotation_values (&(*val)->next);
++    fs_give ((void **) val);
++  }
++}				
++void mail_free_annotation(ANNOTATION **al)
++{
++  if (*al) {
++    if((*al)->mbox) fs_give ((void**) &(*al)->mbox);
++    if((*al)->entry) fs_give ((void**) &(*al)->entry);
++    if((*al)->values)
++      mail_free_annotation_values(&(*al)->values);
++    fs_give ((void **) al);
++  }
++}
+ 
+ /* Mail garbage collect quotalist
+  * Accepts: pointer to quotalist pointer
+diff -r 217555555c77 src/c-client/mail.h
+--- a/src/c-client/mail.h	Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/mail.h	Thu Feb 21 17:38:15 2008 +0100
+@@ -351,6 +351,8 @@
+ #define SET_SCANCONTENTS (long) 573
+ #define GET_MHALLOWINBOX (long) 574
+ #define SET_MHALLOWINBOX (long) 575
++#define GET_ANNOTATION (long) 576
++#define SET_ANNOTATION (long) 577
+ 
+ /* Driver flags */
+ 
+@@ -1043,6 +1045,24 @@ ACLLIST {
+   char *identifier;		/* authentication identifier */
+   char *rights;			/* access rights */
+   ACLLIST *next;
++};
++
++/* ANNOTATION Response */
++
++#define ANNOTATION_VALUES struct annotation_value_list
++
++ANNOTATION_VALUES {
++	char *attr;
++	char *value;
++	ANNOTATION_VALUES *next;
++};
++
++#define ANNOTATION struct annotation
++
++ANNOTATION {
++	char *mbox;
++	char *entry;
++	ANNOTATION_VALUES * values;
+ };
+ 
+ /* Quota resource list */
+@@ -1353,6 +1373,7 @@ typedef void (*logouthook_t) (void *data
+ typedef void (*logouthook_t) (void *data);
+ typedef char *(*sslclientcert_t) (void);
+ typedef char *(*sslclientkey_t) (void);
++typedef void (*getannotation_t) (MAILSTREAM *stream,ANNOTATION* annot);
+ 
+ /* Globals */
+ 
+@@ -1771,7 +1792,10 @@ SORTPGM *mail_newsortpgm (void);
+ SORTPGM *mail_newsortpgm (void);
+ THREADNODE *mail_newthreadnode (SORTCACHE *sc);
+ ACLLIST *mail_newacllist (void);
++ANNOTATION* mail_newannotation(void);
++ANNOTATION_VALUES* mail_newannotationvalue(void);
+ QUOTALIST *mail_newquotalist (void);
++void mail_free_annotation(ANNOTATION **a);
+ void mail_free_body (BODY **body);
+ void mail_free_body_data (BODY *body);
+ void mail_free_body_parameter (PARAMETER **parameter);
+diff -r 217555555c77 src/mtest/mtest.c
+--- a/src/mtest/mtest.c	Thu Feb 21 17:37:37 2008 +0100
++++ b/src/mtest/mtest.c	Thu Feb 21 17:38:15 2008 +0100
+@@ -145,6 +145,8 @@ int main ()
+ #endif
+   return NIL;
+ }
++
++void mm_annotation (MAILSTREAM *stream, ANNOTATION *a);
+ 
+ /* MM command loop
+  * Accepts: MAIL stream
+@@ -195,6 +197,28 @@ void mm (MAILSTREAM *stream,long debug)
+ 	mail_setflag (stream,arg,"\\DELETED");
+       else puts ("?Bad message number");
+       break;
++    case 'A':
++      {
++        char parms[MAILTMPLEN];
++        prompt("Annotation: ",parms);
++        if (parms) {
++          mail_parameters(stream,SET_ANNOTATION,mm_annotation);
++          STRINGLIST *entries = mail_newstringlist();
++          STRINGLIST *cur = entries;
++          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr (parms)));
++          cur->next = NIL;
++          
++          STRINGLIST *attributes = mail_newstringlist();
++          cur = attributes;
++          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr ("*")));
++          cur->next = NIL;
++          
++          imap_getannotation(stream,"INBOX",entries,attributes);
++          mail_free_stringlist(&entries);
++          mail_free_stringlist(&attributes);
++        }
++      }
++      break;  
+     case 'E':			/* Expunge command */
+       mail_expunge (stream);
+       last = 0;
+@@ -347,7 +371,7 @@ void mm (MAILSTREAM *stream,long debug)
+     case '?':			/* ? command */
+       puts ("Body, Check, Delete, Expunge, Find, GC, Headers, Literal,");
+       puts (" MailboxStatus, New Mailbox, Overview, Ping, Quit, Send, Type,");
+-      puts ("Undelete, Xit, +, -, or <RETURN> for next message");
++      puts ("Undelete, Xit,Annotation, +, -, or <RETURN> for next message");
+       break;
+     default:			/* bogus command */
+       printf ("?Unrecognized command: %s\n",cmd);
+@@ -600,6 +624,18 @@ void prompt (char *msg,char *txt)
+ 
+ /* Interfaces to C-client */
+ 
++void mm_annotation (MAILSTREAM *stream, ANNOTATION *a)
++{
++  if(a){
++    fprintf(stderr,"mailbox: %s\nentry: %s\n",a->mbox,a->entry);
++    ANNOTATION_VALUES * v = a->values;
++    while(v){
++      fprintf(stderr,"attr: %s, value: %s\n",v->attr,v->value);
++      v = v->next;
++    }
++  }
++}
++
+ 
+ void mm_searched (MAILSTREAM *stream,unsigned long number)
+ {

net-libs/c-client/files/c-client-2007e-heimdal.patch

@@ -0,0 +1,26 @@
+diff -uNr imap-2007e.orig/src/osdep/unix/kerb_mit.c imap-2007e/src/osdep/unix/kerb_mit.c
+--- imap-2007e.orig/src/osdep/unix/kerb_mit.c	2013-04-19 07:57:41.779870534 +0200
++++ imap-2007e/src/osdep/unix/kerb_mit.c	2013-04-19 07:59:14.202715090 +0200
+@@ -27,8 +27,8 @@
+  */
+ 
+ #define PROTOTYPE(x) x
+-#include <gssapi/gssapi_generic.h>
+-#include <gssapi/gssapi_krb5.h>
++#include <gssapi/gssapi.h>
++#include <krb5.h>
+ 
+ 
+ long kerberos_server_valid (void);
+diff -uNr imap-2007e.orig/src/osdep/unix/Makefile.gss imap-2007e/src/osdep/unix/Makefile.gss
+--- imap-2007e.orig/src/osdep/unix/Makefile.gss	2013-04-19 07:57:41.777870559 +0200
++++ imap-2007e/src/osdep/unix/Makefile.gss	2013-04-19 07:58:42.335113489 +0200
+@@ -29,7 +29,7 @@
+ GSSDIR=/usr/local
+ GSSINCLUDE=$(GSSDIR)/include
+ GSSLIB=$(GSSDIR)/lib
+-GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1
++GSSCFLAGS= -I$(GSSINCLUDE) -DKRB5_DEPRECATED=1
+ GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
+ GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
+ 

net-libs/c-client/files/c-client-2007f-ldflags.patch

@@ -0,0 +1,33 @@
+--- src/osdep/unix/Makefile~	2011-06-07 16:04:29.000000000 +0300
++++ src/osdep/unix/Makefile	2011-06-07 15:55:31.000000000 +0300
+@@ -954,23 +954,24 @@
+ 
+ # Once-only environment setup
+ 
+-once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once:	ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+ 
+ onceenv:
+ 	@echo Once-only environment setup...
+ 	echo $(CC) > CCTYPE
+-	echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
+-	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
++	echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
+ 	 -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ 	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
+ 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+-	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++	echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS
++	echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+-	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
+-	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
+ 	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy

net-libs/c-client/files/c-client-2007f-topal.patch

@@ -0,0 +1,27 @@
+diff -cr alpine-2.00.orig/imap/src/c-client/mail.h alpine-2.00.new/imap/src/c-client/mail.h
+*** src/c-client/mail.h	2008-08-08 18:34:22.000000000 +0100
+--- src/c-client/mail.h	2009-05-01 13:40:37.000000000 +0100
+***************
+*** 775,780 ****
+--- 775,781 ----
+      unsigned long bytes;	/* size of text in octets */
+    } size;
+    char *md5;			/* MD5 checksum */
++   unsigned short topal_hack;    /* set to 1 if topal has wrecked the sending */
+    void *sparep;			/* spare pointer reserved for main program */
+  };
+  
+diff -cr alpine-2.00.orig/imap/src/c-client/mail.c alpine-2.00.new/imap/src/c-client/mail.c
+*** src/c-client/mail.c	2008-06-04 19:39:54.000000000 +0100
+--- src/c-client/mail.c	2009-04-30 22:34:13.000000000 +0100
+***************
+*** 2712,2717 ****
+--- 2712,2719 ----
+    BODY *b = NIL;
+    PART *pt;
+    unsigned long i;
++   /* Topal hack 2 */
++   mail_fetchstructure (stream,msgno,&b);
+  				/* make sure have a body */
+    if (section && *section && mail_fetchstructure (stream,msgno,&b) && b)
+      while (*section) {		/* find desired section */

net-libs/c-client/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>net-mail</herd>
+	<use>
+		<flag name="doc">Install RFCs related to IMAP</flag>
+		<flag name='topal'>Enable support for <pkg>net-mail/topal</pkg>
+		for use with <pkg>mail-client/alpine</pkg></flag>
+		<flag name='chappa'>Enable Eduardo Chappa's patches for use with
+		<pkg>mail-client/alpine</pkg> (mainly adds support for maildir)</flag>
+	</use>
+</pkgmetadata>

virtual/krb5/ChangeLog

@@ -0,0 +1,9 @@
+# ChangeLog for virtual/krb5
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/krb5/ChangeLog,v 1.1 2011/03/13 03:38:23 eras Exp $
+
+*krb5-0 (13 Mar 2011)
+
+  13 Mar 2011; Eray Aslan <eras@gentoo.org> +krb5-0.ebuild, +metadata.xml:
+  Initial commit
+

virtual/krb5/Manifest

@@ -0,0 +1,3 @@
+EBUILD krb5-0.ebuild 506 SHA256 e33cf2c67b24d6966a0f2da2fa93c25c42b2a05e0d6fe22d398d84b1b60e81d1 SHA512 ef41e8d48a76b71ea296e1c39bf0e5803eeb2531415700645f80a145f891c5576313ef9a21a5d2aac9b9b0220fa61be843cdbb8f634eefac4ca5b56736351206 WHIRLPOOL c538574d2dc5a66318afd1ec4cf20b80bd38b9b01d66ea61142836f8c0ea9735481a6655cbfef0b917db867081d9ec0d1b5b89240a3d4edf7100367dc56ca867
+MISC ChangeLog 311 SHA256 5ef5605f58d521d9e69d244e7af9e6adaf1947b3ff5548ca5d311826ab1b7238 SHA512 09e65197fe0d13d524d48e70776442a2bdd655f32af9e6891f0b5f831bfc2101e4d0fa5b085798f35c33069c774633e926f1aa6be9d91d6bf36b49f6ab96b428 WHIRLPOOL e260a9cfee7aeac4296714a9813a020fba3001b950fd7fa94d4d1cdd99356beb3edb952cef2726002429be638990f697a70bd519247635451b0e80532cd762a9
+MISC metadata.xml 162 SHA256 1fe742cb3e026ef71551bf567491db50008748c528c2adc2a7db3e278bfba1d9 SHA512 b333ea0c5689e101f94a81a21582243c2a77d546693f86975a6b5943300617d333093bf306d0169ca91bb25ef61f77870f91de0ee1070c8c744e3a57fa0e376c WHIRLPOOL 317f87315f56484a46bd8ddcf26bc2977026a75dd93899cac18a64a912fbd86642c413a0fd9301b686ec5aa2ca4d86f6215b6e7362aa0b6d88eedd4b66420f57

virtual/krb5/krb5-0.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/krb5/krb5-0.ebuild,v 1.1 2011/03/13 03:38:23 eras Exp $
+
+EAPI=3
+
+DESCRIPTION="Virtual for Kerberos V implementation"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( app-crypt/heimdal app-crypt/mit-krb5 )"

virtual/krb5/metadata.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kerberos</herd>
+</pkgmetadata>
+