From: Remi Cardona Date: Sun, 25 Jan 2015 12:52:58 +0000 (+0000) Subject: net-misc/networkmanager: fix build with /bin/sh != bash X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa7cd352dd42da349cdfb9facb4961bfd932cd1f;p=gentoo.git net-misc/networkmanager: fix build with /bin/sh != bash Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x901AB08A --- diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 7eb5a5b213b2..608c79e47191 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.223 2015/01/23 09:33:13 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.224 2015/01/25 12:52:57 remi Exp $ + + 25 Jan 2015; Rémi Cardona networkmanager-1.0.0.ebuild, + +files/networkmanager-1.0.0-remove-bashisms.patch: + Fix build with /bin/sh != bash, see bug #536540. 23 Jan 2015; Pacho Ramos networkmanager-1.0.0.ebuild: gdbus-codegen is using at build time (#537398 by Reuben Martin) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 211df28985e6..93b7aafb087c 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -10,19 +10,20 @@ AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164 AUX networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch 2015 SHA256 b883506591031ebda11beed149975137950449c0c17a4c3f06745c89d782256c SHA512 3435d9ab85df69e6cd8284a34bf689331d338d13a5d64d52abc36f4ffb5c3ba31aa4336560a7e0e082c58dd916ba4364dfb75246f1bd8c22c81aa195f4ff18a7 WHIRLPOOL eb9fbd2ff5471539dcfbb0cee8213ae479c191695f798a7475484c7061d636f5cb6e6be3eebbb74e0781481477002846d37957768e5b089c2b0bbc143f9d4991 AUX networkmanager-1.0.0-find-helpers.patch 666 SHA256 46013a02f3608b4bf48975b1be16e71d489c8947c4faf4b3944b29b4f5f1c6c3 SHA512 8754eef0efbe387d14f8e3f167ab726d9cb5da726dd4ee110e6601642cd11cb1238ce8b2168ad4a165ca749094093c523e14dc9405d5e68813c991df2ac473b2 WHIRLPOOL 133e7c01238e788378e97ec73d366b0c707c72213a642370af5256b0a8cdfd5774204fd6b1c501d52b12a5c21900baf90454a2912015c2cc8d9a5b390e9252f4 AUX networkmanager-1.0.0-lto-switch.patch 1162 SHA256 c76a4e16828f967cfed35fa6a49bb3522a03b25b1ab13e8a2182a8f6c1678a36 SHA512 9e5c39ceb7f1e56bb5559ad92e6ad2385408f5aa59f24256ae5723a0cc47d47df5fd56ba412b790f86f603611114fb954f6d41974fa454380a6789795b222282 WHIRLPOOL 5f1eb3d8f3b7cd97a49ae6f80753de24fb00b357a829801394776651fb8602a50daac18eee524dc4d362c42f55601cabe6a04ca322a17dcad842c16d9476491f +AUX networkmanager-1.0.0-remove-bashisms.patch 1758 SHA256 2d9870eae54b8032153cd7ea9c75a3134426d32ed4e5dcba7f0ae3776a4d7e1b SHA512 6b42fc0d4ccb6c15844e0395d57131c9dad3a137129bd55eceddb5484e3ca7ec2e68fbddf76627737a8b1630bd7c701b559db148834c857644f37b2e9ffb5369 WHIRLPOOL 9e87e387ce85e2301716baf307376ba3f878081b0c56d781f2a8dc8ffa54b813c941c72aa8df5b303d21ca57f4dda47601e926c27e2f6f99d6c49a90174d2dc6 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9ebb755c23c9aca279f321eb924247c282bdd50c2c8337fe40 SHA512 0cc4ec34e5933229a9b25e25b26d7619ac1a61275cd4c33a658c98578e6a27d4d2b1337c1e839467c625739a6ae2175ab6d883c4bfbe35642dbbafb7b11a421d WHIRLPOOL 1d0fb976ffc26aba74fc8b8bee081efc236ea647da0970a5564730522f2f837bfa5cd0853268d5098126810a4429b2ff7840f9cf66e6faa3bd5829b175679681 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c DIST NetworkManager-1.0.0.tar.xz 3210884 SHA256 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 SHA512 7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e WHIRLPOOL df928cb0a9be0782b1f853d808273f798ca62be5f0fd650caf033fb16b98ef696c7f90eaed90488ef7f6a9e607cf74cd865848523fbbf08cd26487e98b4a455a EBUILD networkmanager-0.9.10.1_pre20141101.ebuild 10706 SHA256 a3d0c1f069b710d5ae40d9c0d8376b19e1a5f52f5e3bd50644fd5b26a0f67ca0 SHA512 06c378ab4ef3b65e2b9b2ace581b644d8af79dc9154fa014f66619e1d47ae17281fb759d2e45b0e762ad544827f61f9b634c1f93e54f510395529f16897dbca9 WHIRLPOOL 17953ca142fe8a4e6753ed13a7ae64070abf39b59e9bb798376e0e47e82ada4666d0075d043888e98c65327340e0e73edc37752b381ec7f3ea4e79c060ae2638 EBUILD networkmanager-0.9.8.10-r1.ebuild 8440 SHA256 580948a52d8f47ab225af2e221b04d25ac1a4cc14f9c352dad3ef066e996635c SHA512 182fa0697cbfd27b4d502e318b77b2271c9e746e13bd6ad6c88f83ecba2ccc7cd9b1b182e14eb7974460e61ee82b1280a00aba70b7e9baf36f27e515b4a70ee7 WHIRLPOOL a9bdeae4e4eb7fc08ac26f6e6318e79921f18f5679b75d5670aca3085b9aaa46363c49e06df0e319d129ae58cc9990b903603ee64ef05c34a7e9f4fb9bc0ee5a -EBUILD networkmanager-1.0.0.ebuild 10547 SHA256 7693841dfb6bcf6737bc1c573a9995986966122521b7b375ea44be9ae819e59d SHA512 47181ec3609d02e76dbae9ca4f78d83a585c99ccee732238131af28f1ddc88365627d44a1739be216808abb682e72b760be4a826147d97f4af7e05bbad0cb0fa WHIRLPOOL 7540c6f43bb05bbed71643156f1df55148105acbbf3c2b9bc4f8910948deef80474c8a2f5aa81328ef4ce6605eed5b73cab02c1f33963ace53ad630d4acc76e8 -MISC ChangeLog 53989 SHA256 58f2c9f7f1c1101a5b1768e17262920c8c576fd3f072c60d4af1a3d5b1eefc77 SHA512 24b5ce1e563366b67f7a1770638f18f3ee564c6a3a5abd8639d0732880ecee2b69cee88a8836fbffad6f0e7fcbf72a448ef9605bdba637f2043cdb08d4433220 WHIRLPOOL ea98c0aa45daa414844bfaeed6ea899b23169a4230755f7ff6fcef0bb846c9e4df87f0c6696466ed06f9f8e4633b91fc503dbd0c88ced8ce3a527ff234e8a59a +EBUILD networkmanager-1.0.0.ebuild 10654 SHA256 26a8dda02c74e5b044e7bf39a8a7979d6ec2c4d8335d111d2dac057881acbef8 SHA512 f180adfc278abe5c739becf3e654dd1849de95e5947dc590c32ee9f10d1f6dc3acc09ed070a433d2417acac8b5641b18140bf5d9bd150dfb76fe5863cf0f1b4e WHIRLPOOL 1d0181f1b9a90592b6776bd5de7c04ee0fdff880fd7538f977a234d60defa18e25bb584d2e7801864d2c80921139f0cf4ecf660e313762385af47e45e4554c93 +MISC ChangeLog 54169 SHA256 75ee910294d50d5d57b37d5e716ed9657ba6a1daebc8defea348601e69f324c2 SHA512 196a0dcd984541833198b8a2ac3cc73047ab252f6a5001fa6105c54f274339d94fe524453a78bf367882ca6f6307d8eeba24d5743c44b9fcd8a1dd814de431b9 WHIRLPOOL 8ab219b1b798665299fa4a23c15d5e9db4d8339425b2d30ed2b7154c353faeb91d41e035599374779efab057d4685ab65831c03e17ba5c86a784beb5da9710c9 MISC metadata.xml 1385 SHA256 d04ab1cb16ef0a6a26f7c33bd86d675d523a66a5b0bca93d8400e6856ca34f41 SHA512 2c7f04f034612dee8b6b52c9048bc5344d733f4666889472af5efaaf603127b570d564936b8c5c95bb54ba868d594fc5eb0a11b8b223cac47dc64c1ffd999a0c WHIRLPOOL 3713878a1db910af3904203485c31b5364d1ff4c9c67ab38a0b246c378811a2e33112215134731e760f3fc8155c692a25f5277239f6d2ea6d8f4aa32c4f9a61a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTCFVoACgkQCaWpQKGI+9RzIQCeJ3cYwWV4sb1xfL6G97uu5r14 -PxcAn1lOiSXjmASWStiU0gcKCe5iEcZv -=0djs +iEYEAREIAAYFAlTE5yoACgkQfUU/I5AasIocYACg9Z57xF15PJo62q+ETjBy2fNX +EKYAn3t/xKyGec7chDyfPmKBlIaxIf4T +=lXQT -----END PGP SIGNATURE----- diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch new file mode 100644 index 000000000000..366627f7eb18 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch @@ -0,0 +1,44 @@ +From 4c3c9a38272112fe7a6a248ba521d55ac1b66892 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Cardona?= +Date: Sun, 25 Jan 2015 13:02:19 +0100 +Subject: [PATCH] build: use POSIX-compliant 'printf' instead of 'echo' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes the following error when running ./configure with dash: + + checking for QT... yes + checking for moc-qt4... no + checking for moc... moc + configure: error: --with-udev-dir must be an absolute path or 'yes' or + 'no'. Instead it is '/lib/udev' + +As per the Autoconf Manual's section on "Limitations of Shell Builtins": + + The simple echo is probably the most surprising source of portability + troubles. It is not possible to use ‘echo’ portably unless both + options and escape sequences are omitted. + +https://www.gnu.org/software/automake/faq/autoconf.html#echo +https://bugs.gentoo.org/536540 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b407686..5c87c7e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -302,7 +302,7 @@ AM_CONDITIONAL(WITH_QT, test "${enable_qt}" = "yes") + + AC_ARG_WITH(udev-dir, AS_HELP_STRING([--with-udev-dir=DIR], [Absolute path of the udev base directory. Set to 'no' not to install the udev rules]), [], [with_udev_dir="yes"]) + if (test "$with_udev_dir" != 'no'); then +- if (test "$with_udev_dir" != 'yes' && echo -n "$with_udev_dir" | grep -v -q '^/'); then ++ if (test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'); then + AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir']) + fi + if (test "$with_udev_dir" = 'yes'); then +-- +2.2.1 + diff --git a/net-misc/networkmanager/networkmanager-1.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild index a5da35ab2078..1394a6493a2d 100644 --- a/net-misc/networkmanager/networkmanager-1.0.0.ebuild +++ b/net-misc/networkmanager/networkmanager-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.0.ebuild,v 1.2 2015/01/23 09:33:13 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.0.ebuild,v 1.3 2015/01/25 12:52:57 remi Exp $ EAPI="5" GCONF_DEBUG="no" @@ -126,6 +126,9 @@ src_prepare() { # Fix lto configure switch, upstream bug #742575 (from 1.0 branch) epatch "${FILESDIR}"/${PN}-1.0.0-lto-switch.patch + # Fix build with /bin/sh != bash, see bug #536540 + epatch "${FILESDIR}/${PN}-1.0.0-remove-bashisms.patch" + # Force use of /run, avoid eautoreconf, upstream bug #737139 sed -e 's:$localstatedir/run/:/run/:' -i configure || die