Fix building with glibc-2.16.0 - bug #437660

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 124 insertions, 16 deletions

diff --git a/app-crypt/shishi/ChangeLog b/app-crypt/shishi/ChangeLog
index ff03c811cf76..26c5ddeda073 100644
--- a/app-crypt/shishi/ChangeLog
+++ b/app-crypt/shishi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/shishi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/ChangeLog,v 1.4 2012/07/11 09:11:47 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/ChangeLog,v 1.5 2012/10/09 08:50:50 eras Exp $
+
+*shishi-1.0.1-r1 (09 Oct 2012)
+
+  09 Oct 2012; Eray Aslan <eraya@gentoo.org> +files/shishi_gets.patch,
+  +shishi-1.0.1-r1.ebuild:
+  Fix building with glibc-2.16.0 - bug #437660
 
   11 Jul 2012; Eray Aslan <eras@gentoo.org> shishi-1.0.1.ebuild,
   +files/shishi_automake-1.12.patch:
@@ -19,4 +25,3 @@
   +files/shishi_resolv.patch, +files/shishid.confd, +files/shishid.init,
   +metadata.xml:
   Initial import - bug #255461. Based on ebuild by AD Rutledge
-
diff --git a/app-crypt/shishi/Manifest b/app-crypt/shishi/Manifest
index aac0b580c97c..0b5c447edd41 100644
--- a/app-crypt/shishi/Manifest
+++ b/app-crypt/shishi/Manifest
@@ -2,27 +2,29 @@
 Hash: SHA256
 
 AUX shishi_automake-1.12.patch 1305 SHA256 d25d1ab8406ba56cb8a96eee056f121fcba16e966928de6d2e19b14d0ab24119 SHA512 27a642c1b69e05b438bb92934f8960c0307b4176837dacab7002f1c3dd488812943b1881888c26e4dfcfbbf56af944ef57c492b685a551db0e37a8796e9b3e6f WHIRLPOOL e26fa385496f9b2233311e2f261c7c82aeb47229dbd21b6bd7eb94bb346b6c27a26646a5f415976ab21edc4b0d4387f61fc99a83441d0c4087c826302b7805a6
+AUX shishi_gets.patch 681 SHA256 0d90f752c0bee8112d61b5d44ce2e9c336712315f9645371ef08a23ebeae12bc SHA512 8b41766391b4292399305824b8a1bd4b486d84b1b3e4e595543fa8c2881fe27d973930ac8d96246806372eabfc16be78fd0ead431014290956829c46840a7de8 WHIRLPOOL d1417a9a250b64fd9b0717bbf1e30a73fb4b68a4f276df986fa411f4bfcaebc90308966853cf862ffc884ddca09f138c5667924124278e9b56bc2b610fb681c2
 AUX shishi_resolv.patch 897 SHA256 231af9a2eddf7358551bfc48063824121e99a37c46332c70ddfd45fc0f0d887f SHA512 639c021ad98af49e04b3dcb2fcada3bdb27cbcdaec39afd84e8dc0d3e5ae4bedaaf1c4df4cba9d6fbfbef2d450235e27941239521e7c26c04c5423485d8f03ef WHIRLPOOL 7a997431f34ef1eeecad03bfa3bc92649cacd758e462631dd20d1e1cd165bae1c16adf60d09de71c728a588a4b496174966416f616b8e9bb89b945ff225459fa
 AUX shishid.confd 133 SHA256 7280cdf9d4cdcb1be8298727c29630a04e62fb4b1c1f1c0d1528e1389b81408d SHA512 83b4586a28790e5a25e4d0d5b7df079402e596cb60b12d1c560088822cba623a380f6785135b1b43b7ccaf9f33b52fae7dd2220ad29553e922d52478c2fba228 WHIRLPOOL 7a2bf16ad9a61e8938ce51e1ede4ad3b4a24e5fd4e8516e40d10188f4fb9fbf52ebb9fe9cf6a0bb4538e993e5b16c5a3258e04a30ba2762e13896208c32b5457
 AUX shishid.init 672 SHA256 c934b3a4e521e0e6609a320875da2b960250eb28ed01f690becdfdee4db5fe39 SHA512 0475c33aa350453c5ef19e21f7d6fe205222b36da6aadd57bb8cde1491a60e94cb839c2b4c650f40689b0240e4cd3ed56f70cf646b8a2acf4ab55ab4f28e9a23 WHIRLPOOL 7a14a32d82d8c9bc8cd9d27962ac7b7d9e56bd038980e8ad9fd1d2fbc9043f732815869711a1e75660214677584c1d16371c93a92c834f1535a00a552ccddb88
 DIST shishi-1.0.1.tar.gz 4999488 SHA256 9d7e4738df21116422585b347ad1c985d2bafd32c8665b4c5563617573e2868d SHA512 cb24baae75072e7ee20946d1d15a16c8a77e44f110f88e5f17e64d5e0110c0a00f18e8651b6f162a6e13c1a39b248ca03849c3d8ae4f8d7512dbc77f54f8d98c WHIRLPOOL 45b92a57b8b3a06a7a84160bacdc370883d8a9417f4f9b6feef36e5d6654d8db79695623265cfae6982a60679a3041741a3cbd4dafa4c75b91aebc7c08dd5e1c
+EBUILD shishi-1.0.1-r1.ebuild 2196 SHA256 0b007ee6bf2edf0f53c541fae961cbef893b1660d7f70f5810fe580982b943db SHA512 2fc1808033939828a8695b9d98855ccc398fda9e60d0323497549eec14facebf66ebbb3a16841a820fce6db556f2c23c2879a46902390fedeada16bfd1ce1147 WHIRLPOOL 6daf277a492c7d577c7f5b1816a6e59dea0f512f163c873310d6874bbeb026a62556823421a601e39e044aece136b2540e719cd37a23eb9774c0763ce797bb82
 EBUILD shishi-1.0.1.ebuild 2120 SHA256 188b431302a19ec68a08f7e3c2f78790de33815a7581df267c22818ed8d48f6b SHA512 21889afaee45db1ce05c1ea6e00a291e43af67fa14d6ff6c60848cd23f47d7e7f35f81b4b3cf12ce5162d63591f51c13d40afc25a443438944dec2293b4c5dbd WHIRLPOOL a1c28f86ef06256248365e975a3f4ae151771b7f2ed4559fdba8adcd843092d11cf0fef6b473778fdf7187b2695b1e3d8b7e43e05f1eeb288f8fc8b279793ff1
-MISC ChangeLog 837 SHA256 1050c6135778e8bca9f9dddbcc8a328b6b27c6dd3d46e325ca534feb985e6322 SHA512 80f02cb6f112d59500a0d9ab5a2802cffd3bbbb7a0f527c428e329e64e4eb3af1bfd4fcfedc57802e57630a2404f6a012c9876c47dcfee38ea33f3cd926cdcd5 WHIRLPOOL 6cc21d3eed609eacc01bbcda4af8cc3aedebf6fb6df7686ab8551e21d7b615bb803561c465ef582504ed0871acdfa8aa803caca1eb0c56ee8fe16a7bea99c44c
+MISC ChangeLog 1014 SHA256 e010029e8885b6bc61d47b020c4a85b25e7d340841ac085eb7417c7e82359ba8 SHA512 31973609bb571e33f1d9d75d429c110f44e5155e53b1f8269b415544ddc06b2bf2453f082637d8663eea5780db48530fbcbea319a595f3fca3c9c607ffcf6fcb WHIRLPOOL 503f1eeaea2d5eb0510bc9688cbcf6b121fab2e4765e0f066cf8618b25018274d4dfa8919704f56a4b1603cd821e7ac8f7149d6a5816bf6b298ec14b03c16d76
 MISC metadata.xml 703 SHA256 94e7555ed79d1dcd1263c42f96b3396d96bee92486044c50d6104c646366c1f0 SHA512 1ef213d1c2b353c68f82a36da2ae08ab7159d6a83dff80ecfe1f3a4670a97c891fe2d066626d6e897a2a8bd8ab0404f9643c24e875ccd449b2cf282aadda6fc7 WHIRLPOOL 430b52ba7a92a073c92c048938e4b747ae6cc13d4a099869caf06595549fe5614b007d00407e041e28a6f2b4f59cf2a1ad1fb02ac7b2b437b743253434c3d2eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP/UNiAAoJEHfx8XVYajsfF/0P/0zWdfvWLRrde/UzMBKXeaQG
-Ta8ccvTFg5l87H9xTrDdgDASmaS2W2fEIWi32y+gz5Sf1GYRYA8kDOUzlnye6UqH
-hfgY5jsP12qR4TY6oSnT5LPTjkUtclywdN6ZUPsCVJ2U0iS0wzxtqrFysUOpBq8O
-n153zoFla8Lr2FKjVxIp++dc8OWtuWlb6BvaWuFIigLKOLi+9RRDK6OgmeUJg661
-Hksw3sfZu5Tyr0w2b1xR2UZSLDYiiKviGBtVWUUCCF+4RfB29sx50NZZqSwYABrZ
-LnMdDwEAEn+bppeLJ9w8wos/OX1J5CFH54P3IxTG7d3kT9Io7jU4ZdlCIrxbDdTZ
-dhnnL3pSUK+fo2c/ijm7DMJS0Csm4p2BomCgeD6QabXSUEziHnCPn5F/0Gj3z/g/
-GEiKlTohB2fb7wm/vm7ptPhIpyC7RukZlgD8cLk4Dr0YLsD1L0IZLtFqCtadcY5c
-VDzPrls1RbYJw1vtjbTHHjZ/O2h5ZBS5RLwLmxjxnH4Ptk78wBfXJICqoFDzkyy3
-EWBTzmmQgP7OWLBzWnH82FGce29UU6rFixL6SvY6qe5ZQCgdW+tbPfhl4ojbagmX
-56X9AvhRQtCv8YeEZeDHojFZwR40GPpLS9loQJ9SSh3SGDbJMd7XQEDP/T0kO/p/
-SKMVGla9SmWvor17k46v
-=s6vS
+iQIcBAEBCAAGBQJQc+V0AAoJEHfx8XVYajsfI20P/0BI86IFVw6UUUiouRzeskOw
+aivOAFei9rhburnLEWXBOO3RNAAb3Xc6qDcAZwTsGXOqY6o80dByo5QnF1qVtOrG
+OCmTh+Jo3rqNWGSgwAmmqg8NtyEmFI6KP2oPhzePoPj/5eeJ5aEz7YzkdzwkSa16
+CS4N61q/0FiGKiYwsWNqFyGzdoItg90a8YkHojvpcqxTeapemWvVp6tC76JV8HM8
+AJgBwmWOzoFehdZF0qDigLNG5N0CTK7rkrOdIjvCAxQaevLazRrK6dS21O7CZ5Bv
+Jgft3AEFUip2iFG75fmIm337qlaFdnRflm7U0Gx5C94GoTvlhZ3zqagKG158zgIN
+v00oc8e/5GeGWCwDqSxCBNUWSi9Tk6HGIikox/++ua2ArNwiRNxlIo2qExUEbC5d
+PvnZH610kt1MdsXfKaJeDJAFB/PAZBPqXrDmsWwjW46XhSH+48Z4fyForp0m9PYE
+YOl4pU/Xpg9WxlO16q7txJuHdYfSdWJpSvuJ/F/70eLidiJP0b5kISkPQIg8RtUi
+HPLlMqnISBtQXBSs2Jmrx0RW0t2zG2Rpek2vJBJCxRgOdBVp2dO7eXG6QrM9T7Eb
+xK7P20I6vxuLGP9qbfnwxHHiEf5NTZaremdxMArHNklUhVnQaN1TpDVq5i+dRx5T
+Yy8BAxyzsynEkL2x250h
+=Ar/B
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/shishi/files/shishi_gets.patch b/app-crypt/shishi/files/shishi_gets.patch
new file mode 100644
index 000000000000..12137204f455
--- /dev/null
+++ b/app-crypt/shishi/files/shishi_gets.patch
@@ -0,0 +1,20 @@
+diff --git a/gl/stdio.in.h b/gl/stdio.in.h
+index 06d9780..fa04a10 100644
+--- a/gl/stdio.in.h
++++ b/gl/stdio.in.h
+@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # endif
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides C11
++   removed it.  */
++#ifdef gets
++#undef gets
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/app-crypt/shishi/shishi-1.0.1-r1.ebuild b/app-crypt/shishi/shishi-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..37b29bc505dd
--- /dev/null
+++ b/app-crypt/shishi/shishi-1.0.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/shishi-1.0.1-r1.ebuild,v 1.1 2012/10/09 08:50:50 eras Exp $
+
+EAPI=4
+inherit multilib autotools eutils
+
+DESCRIPTION="A free implementation of the Kerberos 5 network security system"
+HOMEPAGE="https://www.gnu.org/software/shishi/"
+SRC_URI="mirror://gnu/shishi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnutls idn ipv6 nls pam +des +3des +aes +md +null +arcfour static-libs"
+
+DEPEND="gnutls? ( net-libs/gnutls )
+		idn? ( net-dns/libidn )
+		dev-libs/libtasn1
+		dev-libs/libgcrypt
+		dev-libs/libgpg-error
+		virtual/libiconv
+		virtual/libintl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix finding libresolv.so
+	epatch "${FILESDIR}/${PN}_resolv.patch"
+	# fix building with automake-1.12 bug #424095
+	epatch "${FILESDIR}/${PN}_automake-1.12.patch"
+	# fix building with glibc-2.16.0
+	epatch "${FILESDIR}/${PN}_gets.patch"
+
+	# don't create a new database
+	sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable pam) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_with idn libidn-prefix) \
+		$(use_enable gnutls starttls) \
+		$(use_enable des) \
+		$(use_enable 3des) \
+		$(use_enable aes) \
+		$(use_enable md) \
+		$(use_enable null) \
+		$(use_enable arcfour) \
+		$(use_enable static-libs static) \
+		--with-system-asn1 \
+		--with-libgcrypt \
+		--with-html-dir=/usr/share/doc/${P} \
+		--with-db-dir=/var/shishi \
+		--with-pam-dir=/$(get_libdir)/security \
+		--disable-rpath \
+		--with-packager="Gentoo" \
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	keepdir /var/shishi
+	fperms 0700 /var/shishi
+	echo "db file /var/shishi" >> "${D}/etc/shishi/shisa.conf" || die
+
+	newinitd "${FILESDIR}/shishid.init" shishid
+	newconfd "${FILESDIR}/shishid.confd" shishid
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
+	doman doc/man/* doc/*.1
+	dohtml doc/reference/html/*
+	doinfo doc/*.info*
+
+	rm -f "${D}/$(get_libdir)/security/pam_shishi.la"
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}