Bug #337504: compile-fix for gnutls linked with gcrypt. Relies on WANT_AUTOMAKE=none eautoreconf support added to autotools.eclass as openldap configure.in uses AM_INIT_AUTOMAKE but there are no Makefile.am (all Makefile.in are hand-written).

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

9 files changed, 95 insertions, 20 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index bd774578f87a..8dd4c24162ec 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.389 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.390 2012/02/12 00:54:14 robbat2 Exp $
+
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.4.28-gnutls-gcrypt.patch, openldap-2.4.21.ebuild,
+  openldap-2.4.23.ebuild, openldap-2.4.24.ebuild, openldap-2.4.25-r1.ebuild,
+  openldap-2.4.25.ebuild, openldap-2.4.28.ebuild:
+  Bug #337504: compile-fix for gnutls linked with gcrypt. Relies on
+  WANT_AUTOMAKE=none eautoreconf support added to autotools.eclass as openldap
+  configure.in uses AM_INIT_AUTOMAKE but there are no Makefile.am (all
+  Makefile.in are hand-written).
 
   10 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r1.ebuild,
   openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild, openldap-2.4.23.ebuild,
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index ece1b55b5d5b..b04ce777a37a 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -13,6 +13,7 @@ AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 RMD160 7e17304b2b85e2
 AUX openldap-2.4.17-gcc44.patch 509 RMD160 07c1b8400e1b24cb8f20f2647b1354d2b28f653d SHA1 5df5a165acec74667f5989f291aedd958be56358 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda
 AUX openldap-2.4.19-contrib-smbk5pwd.patch 1555 RMD160 ce8f5caafa4b3d89dc11537f0045335b25c59404 SHA1 372906228b2ab6be13a689f895e173abb4862f2e SHA256 8e08af4235529cbc0c4541a28d5cf7e8cf3f41f7504af41527e993e1399fee92
 AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 RMD160 3708b0709210b15cc93557fbb816c9ca064f2ec1 SHA1 883730e1f10849f817d9a7198514159ca305b73d SHA256 62937bd82d218cddc8637d194c6aedc316cd1eb6179c00ba70cef0381b4e841b
+AUX openldap-2.4.28-gnutls-gcrypt.patch 340 RMD160 69c2c7527aa3723fa24c6ed1895b4f83ea105902 SHA1 af09a9e41adcc2d307c1758fc76b4cb543dac455 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0
 AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d
 AUX slapd-initd 609 RMD160 3e1daa2bbbbec78aad265a1c4190098730a4234d SHA1 56d5f1d1f59e37bbcef2399847328c7963694f0a SHA256 840f984031b1fc84d4c6ba59c5ba0de5794be596215f0089c7739dba88d610d5
 AUX slapd-initd2 622 RMD160 750d7c59d1b7e47b0b21b96d301244c3ec3e28bf SHA1 a438adef50bfb925cc7550156b6dbefd68dcb856 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa
@@ -26,11 +27,11 @@ DIST openldap-2.4.25.tgz 5250595 RMD160 31217119f9a82712240bee10c2a350c8f35e0b8e
 DIST openldap-2.4.28.tgz 5436340 RMD160 b542e19fcae08182cb18969f2d3fe8d87df8a7f2 SHA1 d888beae1723002a5a2ff5509d3040df40885774 SHA256 332ab5b13dbc0f85b1112d7a6f3485069108bfbd4d2603c8b548adbfa9bbc371
 EBUILD openldap-2.3.43-r1.ebuild 18090 RMD160 3415f23627af828e3910c4a6a695eba9410d7930 SHA1 7eb4842bf389d5d6743ef855a257752877e0dece SHA256 33c761272d6d1d57a9f665e06326bc2cd7d51a38e98bb9b3fb9f3376d60e7fd9
 EBUILD openldap-2.4.19-r1.ebuild 19717 RMD160 1e39e23a5dff5301997cfac6200779aeed4b8643 SHA1 a0a98e47bdc186f499103d384b98803b84525f97 SHA256 d5ee7046de27272f6c11a417f17823d4b4dc1c5e12e5f79e1f64d06a8033c414
-EBUILD openldap-2.4.21.ebuild 19919 RMD160 5daf6d2d45b624d6af25019905df2f1811125b5b SHA1 3dc2525a34d4517cdb358a0cfcd1f1164b3c3e12 SHA256 1edea12ea8d1932c38fb2b3525a376289e3e4e94d14625bffb8d613e01154b89
-EBUILD openldap-2.4.23.ebuild 19908 RMD160 ecab5c642a120d5d3c879fc78acd988edf87e3be SHA1 0b0915e01e835df6b1bfd727265ea00a1cbb0ea8 SHA256 203e4ec39a3bba01c843eb25568fcc2ae4cbb8d719d27e971d5c9668d133e841
-EBUILD openldap-2.4.24.ebuild 19908 RMD160 f6466aae3ee2a0bcbce07cb0051f5cb7b984dfa3 SHA1 50973d8f4c468980cad94f0909be361797e97c8f SHA256 95d26ff175f9655a5821ca1cf179faee5feb9353c489ebd4cc866efc40df6b26
-EBUILD openldap-2.4.25-r1.ebuild 20614 RMD160 32b7e43ae4180e9f006581d8b95494cc6b26c3af SHA1 68747f7573da44e32514129cb5db859ff4a858e5 SHA256 41b1d839848df1b6d1ac0fd9be5b65d11f023eabb4073ec9f74ef9499b7ddbb3
-EBUILD openldap-2.4.25.ebuild 19919 RMD160 27076fbca76dbdccf1257f0a0cd2205d30918204 SHA1 c0b2cf5c7e5f487dd1db9f49441ee5e561915052 SHA256 dc00f7c5bc716efcac74969c7c0302cfb3c46c56c858b70b441e7ff635651c65
-EBUILD openldap-2.4.28.ebuild 20611 RMD160 816083e1bce8bb7a0d15c1d378dc06533583c0f9 SHA1 0b13895f45c3713e3ac8fe9735f1657a77f5127b SHA256 696e0854fbd7802cc06f7d75c49d95245db58a89b6e6bd66cde8ca737fed823a
-MISC ChangeLog 66955 RMD160 c47c7b0cf62eae3c3de35a0d3a5f6d45662f8e75 SHA1 f10328c0583c422fadde5bbc49e4f1d43f1ba071 SHA256 54b950789396bc723c24d9c8d8da2d8bb5bac5f8cb47cbae8eb7247e60af800d
+EBUILD openldap-2.4.21.ebuild 20184 RMD160 508643b50977c0d29b2a019582246f572cf1eb68 SHA1 9a4f6d767892641726b40b9c8a08bda991bc5db6 SHA256 b58113d2f6d193acaa1e65f7551fba92c228ad78fa42230316588ab9eb24ef80
+EBUILD openldap-2.4.23.ebuild 20174 RMD160 52f1ac72f742764a35ae9d085204ad0851ce9263 SHA1 45b47293cc775c65cc9e7cfacf17094b108eaacb SHA256 2df6bbd02003b8a30275bf50bc6aa896177b64fa31e5c72c383970cf84d67bdc
+EBUILD openldap-2.4.24.ebuild 20173 RMD160 49fe1c0a3d415691858f50728a5dd218c2de4cff SHA1 68653ce967c24e821e2a8893c7151397b1b014f2 SHA256 36174edb27b4eda5d93731626e10fe4870c86c4e3d44d55a11c408c370da2d8b
+EBUILD openldap-2.4.25-r1.ebuild 20879 RMD160 85f10aed763b082a0f94f28967c7fa5dde548b9a SHA1 9936f70278756bb82279dd0d3313a545a215394a SHA256 54a76ebd749c5a24a435d2b6d69f45efa20377ab5cb02212f8ad523e5a327063
+EBUILD openldap-2.4.25.ebuild 20184 RMD160 1f8c50d7af86a7b4fa443db1f9137125cffc6e00 SHA1 81ceaee7464a4b0032025a633dd81c7b3f8021ce SHA256 b75c30e30cc5d30011c731d5212a627cafc7f5f2b485fbdc651611fc2109223f
+EBUILD openldap-2.4.28.ebuild 20876 RMD160 b63e24a39c5a2b926fa1bd9c5e6ca27935e733ef SHA1 67c596c1738dcb177896510f0b75c2365258f1ad SHA256 4d6c64089973745eff3176677d603ef419d82e567136d75977b3ed315a5830cf
+MISC ChangeLog 67457 RMD160 b0213312773ef9b7185ca0d804924fa6be1c537d SHA1 23e0bb262acb01a3d215637350b1708ffa9e87ed SHA256 80bebc61e1590739cc44de08b7f6e718a887b5480e16bcc5936725d2d7942bcf
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
diff --git a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
new file mode 100644
index 000000000000..aeecb0f40132
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
@@ -0,0 +1,11 @@
+--- openldap-2.4.28/configure.in.orig	2012-02-11 22:40:36.004360795 +0000
++++ openldap-2.4.28/configure.in	2012-02-11 22:40:13.410986851 +0000
+@@ -1214,7 +1214,7 @@
+ 				ol_with_tls=gnutls
+ 				ol_link_tls=yes
+ 
+-				TLS_LIBS="-lgnutls"
++				TLS_LIBS="-lgnutls -lgcrypt"
+ 
+ 				AC_DEFINE(HAVE_GNUTLS, 1, 
+ 					[define if you have GNUtls])
diff --git a/net-nds/openldap/openldap-2.4.21.ebuild b/net-nds/openldap/openldap-2.4.21.ebuild
index 3d968581601e..a2e45619fd82 100644
--- a/net-nds/openldap/openldap-2.4.21.ebuild
+++ b/net-nds/openldap/openldap-2.4.21.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.3 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index a9ba41842cbd..5feb490b00b3 100644
--- a/net-nds/openldap/openldap-2.4.23.ebuild
+++ b/net-nds/openldap/openldap-2.4.23.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.9 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.10 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index b888f8d061f6..cbe38500758c 100644
--- a/net-nds/openldap/openldap-2.4.24.ebuild
+++ b/net-nds/openldap/openldap-2.4.24.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.8 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.9 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.25-r1.ebuild b/net-nds/openldap/openldap-2.4.25-r1.ebuild
index 3fda021034e5..407efcdd6688 100644
--- a/net-nds/openldap/openldap-2.4.25-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.25-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.3 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="3"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.25.ebuild b/net-nds/openldap/openldap-2.4.25.ebuild
index 39a91d81452e..044fae90a335 100644
--- a/net-nds/openldap/openldap-2.4.25.ebuild
+++ b/net-nds/openldap/openldap-2.4.25.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.3 2012/02/10 18:10:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {
diff --git a/net-nds/openldap/openldap-2.4.28.ebuild b/net-nds/openldap/openldap-2.4.28.ebuild
index cf6a24e64955..34d953e7ca5a 100644
--- a/net-nds/openldap/openldap-2.4.28.ebuild
+++ b/net-nds/openldap/openldap-2.4.28.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.1 2012/02/02 20:10:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.2 2012/02/12 00:54:14 robbat2 Exp $
 
 EAPI="3"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+WANT_AUTOMAKE=none
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
@@ -237,6 +238,9 @@ src_prepare() {
 	# bug #233633
 	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
 
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \
@@ -247,6 +251,11 @@ src_prepare() {
 	sed -i \
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	#sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
+	eautoreconf
+	#sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
 }
 
 build_contrib_module() {