Do not statically link libkmod #493630 by Nikoli.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 167 insertions, 5 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index e00e9769cb4f..180414d4c077 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.118 2013/12/08 18:22:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.119 2013/12/09 01:55:28 vapier Exp $
+
+*kmod-15-r1 (09 Dec 2013)
+
+  09 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/kmod-15-dynamic-kmod.patch, +kmod-15-r1.ebuild:
+  Do not statically link libkmod #493630 by Nikoli.
 
   08 Dec 2013; Markus Meier <maekke@gentoo.org> kmod-15.ebuild:
   arm stable, bug #487338
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 747655308138..1a49f0564763 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,18 +2,30 @@
 Hash: SHA256
 
 AUX kmod-13-errno_syscall.patch 795 SHA256 bc766470c0a0e53471395a8e6499f5bef7a4af5dfd52688cac17d30efb4b2605 SHA512 4bb3fcd824120d19bef2efaf19fcaab3a49089e0d7790899b322db480fe32533786d6b6a0ecd085ed00203bb87af4255c462a22997404a6b4fa431e2c4aeed58 WHIRLPOOL 5410867ec236e24d6075aeeadda8a81a43c9c3a4d02a3b330a0724bdecb3f837141eb6590331c43c5faf9e5cdb903aeaf35efe80f08c342bb14b12bcbbdfcffe
+AUX kmod-15-dynamic-kmod.patch 493 SHA256 36aa0232ec80a8f211c29d349ab5ef8c3f6dea1cb490e5d5c272125d30e3f04d SHA512 f26a75da8b0cfe861c60e6bdb66eec61be74038e1fa4ae45c4f8d19ea2b08e2b96683bc33e5b91945522c8dfc3af61bac094b31a1dda44965e378acf4ec4eb83 WHIRLPOOL 33e5bcb0658215005feb952dd0f42fb60242d1541d4e9ac5a76a34fba16b3638d48eeec17c1d9a98caff4d0f80e8fa9e37a2b0a2bbcfabbf9c25571460d8536d
 AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7fa8b7188b364689b0e SHA512 cddd4e95ffd112adedfb01c90ea3cea268236983f2dd88f0a83855d62dfa8a63e1f1457a9517ebbc45970455b8f8c0dc7f4d56c138bcc3d453c7ba61d189ff85 WHIRLPOOL 920e19b8d99ff77a337b0edf2fda3461249bdd253d1c6d14c1e872d931ef643679185e8bac6b7d58490dae640f78cc1a8492f627893bfee46b48fa2c4efc947b
 DIST kmod-13.tar.xz 1435864 SHA256 6c36d3abba2f98c84973ae275951c866f8bf304e7356c2fe60633800239d7956 SHA512 6182a043c32944c2dc336101e4d8a9be9ccd0106677f9f7a2e76b83a09ec2fc1333aed9b82773abe09f8adb1771e796690f1610c64b337e21bdabffe76fed434 WHIRLPOOL 95196f4c65fec778727a9b8d0209dcb08e64280b4b5d6e88b5343acb3a360b62c13a0dcf510d3c2080fad4ef1562c5e9fa11f84979d0acee03dab3fac8b3eaac
 DIST kmod-15.tar.xz 1453996 SHA256 e8ef0ea7e1929b46aa681fe6ce58c5e62d0026289026ebfc63abae3b8fd5ca9e SHA512 67a03cabe9d81c14eb0bef20f3c8ff4614418cb2b2c3e1428d8a57399372ecdce6e403399a578d2f62a1ae4b61c83713edd1ad1e31533ea35503c5b11b92c223 WHIRLPOOL 53249d4b29c3added90c7a9e9c2349c3964809f5a8f274b15f06008151d90f4da8c77c02a0062bf6f2ed19d176d7f16b99c82d149a906c7983aeb9f27d391744
 EBUILD kmod-13-r1.ebuild 2214 SHA256 1c49c3d05418621483f8392448f8f5c2353c6bcee5f96a018f033142557b2db2 SHA512 3f61eb1cb9673da22eb4b0edf195d1cf3c18b4dfcac13f714947ba573821f4c38e4c5fc0854fa255055618b6cb8d750bfb6977347207f5d7bb1dd9906ff09537 WHIRLPOOL ce977f64d4eaa6e4d1440c43734d6c29117c74142c1b19b0163248dd3a26dc39130525ec90014653c173d1ae35a902f507e74223b9df2801ac699d75d8ca16ab
+EBUILD kmod-15-r1.ebuild 3629 SHA256 2d33e6bd0348648eb49e0810a416178c5d9f1e4b5ceadbc143747a4b68f1907f SHA512 5f4f53d8d485e9a41be4d4484aaed45e430d89c32d598e8b25429a7dd28ce724bd6ef30febb25ec6be2ca864c1a2362c863894d875feafea9f6d0d346951ab4e WHIRLPOOL 4c0b76ee402cbb1c0a87f1b8645f68ec79abcd95277c5b8185f3bd4daf43c450831375c0c8257e23ff4fb1f9b0caa9fbf14e8774a01d72d75299564b96075076
 EBUILD kmod-15.ebuild 3567 SHA256 12967465d02e8fc37bc0eda161dd1cb66b09e1602309951b7a212823a72b466d SHA512 baef04a8d64ba133e8590742352f8cea75331c3178347b65708e9a84d0fdee522990c0764ac439266ec17eeaa905f94175b5171fed2de5694292590f470aec71 WHIRLPOOL e0a3e09e04a59485d1f959cce750bcbb0595ad3340cfd681cddca369adc877fd2e72e83de9ab2b570d1375ca3ed93f6d26df8aa814d8aaa43fcae4f84858ee9a
 EBUILD kmod-9999.ebuild 3578 SHA256 87af4c2ffc6a408bb3b3d4a8ccc1dfb6e30ec5b6818130ade4c8bbe2045f218c SHA512 aa558f2c4918ea1fc5b23d7d039107f45be74014dd34fdea95dba14dd7e9b65039368a428cb331921046cd8e919eff64eb84bcb8a023e2be1daedf07aa3de21b WHIRLPOOL 2de4f9dbe4371172745c9752a4d72be385530c449c425c71d376ca6dfedad6d66acdb67810c6696522eb9280e1fe228cf9e589922b37d761ea821b51a036935e
-MISC ChangeLog 17162 SHA256 b59947d4c58ba6768d54ca7fa3e58fcb24464ec28ac69401deeaeab8189e5baf SHA512 4c303be304c56329bd4ebaabc64778b03c948abc683f1fc576ff2b3492833039b95f4fd446d010cdc6dd58b5c00f537e0c4bd359483f95a8392349b2dbb07dd6 WHIRLPOOL b06029aed806520d6a1fb43c5548a84799ecdaad6a8d43444b5334b40c1ac56c00db4da8b08d3c17ec7e3fae9924df6cff40561589b66c27a5725add524e1075
+MISC ChangeLog 17349 SHA256 6d686fd915b1e8efb335e122d63d1cb1bd3a66079a4f63ae1e4b661a90f21b9c SHA512 8bb7d54297a31a581d143bc45a7d3b6e5326713a9812aaca8835d4480c66735a5fec5fd67a4a5242097f8ced8f0d784dc2a5a48ead638c5e0e92c216a44cc31c WHIRLPOOL b801aaef3a5f1c1477109137587e41e07e995fbf3eb0f56cb537e1de83376d1be19635381c09b49e5d7fac2d784bf670c06f773c59e1ef7df7d2aacfed9e36a7
 MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkupEACgkQkKaRLQcq0GK4ngCfckXHsok4NsLf4TRKhJv3xj9v
-xj0AnjuJEo+fcZ/HMwMQiuVVOAgGgECI
-=U/yP
+iQIcBAEBCAAGBQJSpSMXAAoJELEHsLL7fEFWfloP/0o157J0GWJJNhSGXG2SVVSb
+7Bs7W5tOlbDAxfYLHv3BOPF+28fCE/sfE5TnAaI6AK16uhGKBYkyP3O01YjM741L
+BG4awD3VHtT3W8xzzM7s+Ecusk711BlzCzb3dsdnUKl9VytUB7uPOEu/mLJ1f1+1
+CxZCfaGyXiv7nTG/moWgIX5abhRXHx67kux9xdnYh5e/MMpdfeT0x0n1sH4LAOym
+9C5lD2xr1eHgi9KUcfHPHzEUWIXYPQEpi7aU5K6d25O7kyCLFsqCqp+/slg3yYJ5
+0lRVWjWOy/6QkXQFKMVj54dQKuIYZTlUImi6SXsN8zcvBG7G25dpX74mhIs1H/ZK
+SGwM7/WvuN2gbk3d1V0GRfW7JJ0grb11cpeFd1HqaIWYFaBX9YSl7+wKst4+s97G
+zIWzOepNkxL3jOozCq67/APfrd7OlvuO81CXW/GpYhbxBhTfC1l/7sDV3+mD5kAk
+/rXBXY7akRy2sKjYnyOAFrOebDAF8EX4uNZWwxjWXMxY59oEv76IswA8rsirV3hw
+1SWCrfFTvgy+i3zd5I/h1VGoBehbZVHmhZX0RjqiZwZ9ANwQW2G5E9G07HFLIqQ3
+DsyyrOv49DijpqJYFlMy70sFkQolQfkouuUEYws+VxbGZ9voxiIo25KpU46HWZJs
+ZnOSviJkCBzgHox/gbk/
+=xq18
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/files/kmod-15-dynamic-kmod.patch b/sys-apps/kmod/files/kmod-15-dynamic-kmod.patch
new file mode 100644
index 000000000000..c93bea6d6a85
--- /dev/null
+++ b/sys-apps/kmod/files/kmod-15-dynamic-kmod.patch
@@ -0,0 +1,16 @@
+do not statically link kmod against its own libraries
+
+https://bugs.gentoo.org/493630
+http://thread.gmane.org/gmane.linux.kernel.modules/1206
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -817,7 +817,7 @@
+ @BUILD_TOOLS_TRUE@		     tools/static-nodes.c
+ 
+ @BUILD_TOOLS_TRUE@tools_kmod_LDADD = libkmod/libkmod-util.la \
+-@BUILD_TOOLS_TRUE@		   libkmod/libkmod-internal.la
++@BUILD_TOOLS_TRUE@		   libkmod/libkmod.la
+ 
+ 
+ # ------------------------------------------------------------------------------
diff --git a/sys-apps/kmod/kmod-15-r1.ebuild b/sys-apps/kmod/kmod-15-r1.ebuild
new file mode 100644
index 000000000000..86f8a7937f4a
--- /dev/null
+++ b/sys-apps/kmod/kmod-15-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15-r1.ebuild,v 1.1 2013/12/09 01:55:28 vapier Exp $
+
+EAPI=5
+inherit autotools eutils libtool multilib toolchain-funcs versionator
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc lzma +openrc static-libs +tools zlib"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	openrc? ( !<sys-apps/openrc-0.12 )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	zlib? ( virtual/pkgconfig )"
+
+pkg_setup() {
+	[[ $(tc-getCPP) == *cpp ]] && ! version_is_at_least 4.6 $(gcc-version) && \
+		die "You need at least GNU GCC 4.6.x to build this package." #481020
+}
+
+src_prepare() {
+	if [ ! -e configure ]; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--with-rootlibdir=/$(get_libdir) \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	if use tools; then
+		local bincmd sbincmd
+		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym /bin/kmod /sbin/${sbincmd}
+		done
+
+		# These are also usable as normal user
+		for bincmd in lsmod modinfo; do
+			dosym kmod /bin/${bincmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
+
+	use openrc && doinitd "${FILESDIR}"/kmod-static-nodes
+}
+
+pkg_postinst() {
+	if use openrc; then
+		if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
+			ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+			rm -f "${ROOT}"etc/runlevels/boot/static-nodes
+		fi
+
+		# Add kmod to the runlevel automatically if this is the first install of this package.
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			if [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then
+				ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-static-nodes
+			fi
+		fi
+
+		if [[ -e ${ROOT}etc/runlevels/sysinit ]]; then
+			if [[ ! -e ${ROOT}etc/runlevels/sysinit/kmod-static-nodes ]]; then
+				ewarn
+				ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+				ewarn "kernel modules to have required static nodes!"
+				ewarn "Run this command:"
+				ewarn "\trc-update add kmod-static-nodes sysinit"
+			fi
+		fi
+	fi
+}