Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-dns/avahi
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-09-07 23:03:46 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-09-07 23:03:46 +0000
commit0638f10b5822717afc99a56bac267aacc12fc4bb (patch)
tree7c602ea8a5b4fe939c70be1097d25b5ebf71bb4a /net-dns/avahi
parentUndo the last change; as correctly pointed out by Arfrever it makes no sense. (diff)
downloadhistorical-0638f10b5822717afc99a56bac267aacc12fc4bb.tar.gz
historical-0638f10b5822717afc99a56bac267aacc12fc4bb.tar.bz2
historical-0638f10b5822717afc99a56bac267aacc12fc4bb.zip
Patch Makefile.am, not Makefile.in, bug #501664
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA
Diffstat (limited to 'net-dns/avahi')
-rw-r--r--net-dns/avahi/ChangeLog6
-rw-r--r--net-dns/avahi/Manifest30
-rw-r--r--net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch26
3 files changed, 32 insertions, 30 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c72b3d19c3d2..1b563ac1b5be 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dns/avahi
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.271 2014/08/30 18:45:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.272 2014/09/07 23:03:35 blueness Exp $
+
+ 07 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+ files/avahi-0.6.31-fix-locale-build.patch:
+ Patch Makefile.am, not Makefile.in, bug #501664
30 Aug 2014; Anthony G. Basile <blueness@gentoo.org> avahi-0.6.31-r5.ebuild:
Stable on arm, bug #520338
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 0c14003091be..fe296e73f6c9 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -8,7 +8,7 @@ AUX avahi-0.6.30-optional-gtk-utils.patch 2422 SHA256 1233ba93af567117091094921e
AUX avahi-0.6.30-parallel.patch 1348 SHA256 76dc507af0a6035881a0d5aaadfeea7a8aa1b598253e6671d3a5346f452b52d9 SHA512 826acb44f7164f7250604e9f97d6cc4e474d47d7712f29095fafba6de149bb636c4ef543b8c9b29b45922ee1f087495f8135d2c36740e16dd2eee53e509a6959 WHIRLPOOL cfcea707bb1cffa322815f68686a64f20929c884ec020617490642ab449fe56cb5eb99d7742284060f84490eb081b63f3fb8a20bc38630a2adbce80c74ee2f7a
AUX avahi-0.6.31-build-client-without-daemon.patch 738 SHA256 d3d1d451886f7bcd7c20cb2c29ec9b5f59ead4ee9567f40d9820ec2275a01a85 SHA512 0d7ab88560eed40bb04360442b4daba6aa58d9f7f7d60b64c0e47b86ff0e6f2fcc8ccc7fbeab9ed87f77eedfde3814d37f82da9ae010223ef0e81e5b64d34b04 WHIRLPOOL caee48616992cfaf71bd5b7b7b90bd0a179a17ab7b2eb60a04026bc099ad2a611f107cf21a634b2cdaf0f15bcbb44523a7eef84cd692e653f537a1bc1501aacc
AUX avahi-0.6.31-fix-install-avahi-discover.patch 715 SHA256 79da591066f1ddb454f4d7b7ed7163a0d13c332462ac0c2db3e8a6cd130f8441 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79 WHIRLPOOL 3b5aa85769688a070707e2a03cccbb4861465bad7b03f5d6e34819dbe2dda5934b332934102616d0a0910cddf80150497f15df19d53726850e1a64d0c48e34d9
-AUX avahi-0.6.31-fix-locale-build.patch 1154 SHA256 50fec589be9c40d1cd26d4b5d6a68fcc9f849a691265533236ad7b238fa21abe SHA512 b969378e596470f2465d63ebb3c66bb13bb3e7d9df8523abc76339b62a00967c58921f87b2b95a3c28f884ab4dc79ea5d2675cb052b99cd9a426c410b75734d8 WHIRLPOOL a98aac36801ffaa816aaee010ff8bb10f37e5202901b81bf6daef0e7f411a135d836a2254b65a4229f1cff8466d4c1f613af925311f02be0fa03aec15ba31b8d
+AUX avahi-0.6.31-fix-locale-build.patch 866 SHA256 a55f964f9f834e2d864e05bdda00b514650ecca05d8d35dc570c50c51fa616ed SHA512 c970cd5d199024699e3345d59fb03d0966b62c859e9dd2107a1adef4cb7433a2ebcf2cd6331f4726d84a3ec973b45d7e93824fb80a8c8dcf3fcf6a610a67b337 WHIRLPOOL e1878ae2254b1efcf72e4deff94788a389c5e301e70e699007089f06b60163ce8f34790a5b774b42e255e800a2474f8b3a28e1cd0232f9feb16233cdcd7fff64
AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9fbfeab5f213a94121c8bff6ae8fff99a9aae7eeaa34442 SHA512 659d36b06bf721664105bf51a1610186700004dea2af5dc43e29a8d688e903fb0c69416b1b98957de902901fc5ed04fdd252d30e23f680608608e6f633b94b17 WHIRLPOOL e258af6f138ab7b838a8886d74b73f8d44aefea981bd3e876cca41a144081ad4d199f9ba4031fda71c5d78578869fadd1b226a11b101df406fa2d85911d06e81
AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19
AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 SHA256 24954a76f0dfdffc9a079072f8f4d50e292f8ae2a2b8e5a49f488519057c51b0 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7 WHIRLPOOL f0859f44face57b0eefb6858203bbfa73d6c4be2aa684911d3a152eeca93f972eb81650c4c307b96cd5764c1b12ade6624574331c944db259159bc9321092edb
@@ -18,22 +18,22 @@ DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092
EBUILD avahi-0.6.30-r3.ebuild 5804 SHA256 e4fd4ef76c2e6ba2803086500ce095cfd1760f14b8865760b69c8c654ae44fcf SHA512 1fa33ff17ece7b2b79c2615bfbfd2b3a22f4a29d415ce92ce1c41d330df31f6d68f40919264f425a79dce36271ecae3d1461a2a9674193e36e5939ecde952c78 WHIRLPOOL 035a893e3be89534140b1fc797c982e66ae9371b6d1215ca66050e817f633a499c9b924d7749e2d5ce7f760f6c3f0985e47efd4c7bc14031dd60bb89412ebd9c
EBUILD avahi-0.6.31-r2.ebuild 5173 SHA256 008708915ea5073e8bb58301efc2c3df85cc7327860320d130f3849ca88baecb SHA512 01b5ae7a03e3d0d8e4079515d3adc1b05d032bd7ed6db3b20423ddca7cf54326e1441086515f7cbb7e94d300ce34d5e23d1ba0ecfe5c49eee1af84a82f6f7d42 WHIRLPOOL 2aa4d3410fce721882f28042f334d55ac8950406be5094305955237169b9f61ff8737bda4255cc8c8b70ac1aa6d4d4dcf7e719ab19a65621341b2df6b77d7497
EBUILD avahi-0.6.31-r5.ebuild 6339 SHA256 8f5dee9892e5f4062e06730cb0dec0539d1507531f0e5dc20c1edc9d3dd3e790 SHA512 e747759d81363f201ce09b35b2b9243d348f1d7c7b67807f870d50f981b764f0866cbe506463a08501b99b08bc6fa0ee594dabbafdfcc8c7e20952307e1fbcdc WHIRLPOOL 284f2db22c61b68f469fad6a719dd48c2074183d4c1053727577a3aa101a24b53bfeea39eec0c11f9aef2496a4d8da41ec9a812f0fb792f5bbc32f3016fc72bf
-MISC ChangeLog 40532 SHA256 f8a5f578cb2ea692edf1ca53ce9af1da74deb6837e4c4f21fa8ac3910bfc8193 SHA512 c9ef42dcf3b6830eaaf3a489bb2c569f71ad14e05fcd055b6a8a57c87e212416fd4d2886491803529d53c45c59e4205c82c0b7476e98f99365270403fffa780b WHIRLPOOL f4c24cb73fb704b746f72cd71d567e4416cd7477cc7d965fe0c370c1572abde6e70a9e8e9bee131eb81f075dec086be7ab1fbcad79aedb87c5afe95482689c24
+MISC ChangeLog 40683 SHA256 303dc354c0a7d76afdb6a29a1cbbd3d196c9dbb246f82be8351c62e756f55bf1 SHA512 4928e88ed310e334c1fefa2647def093d23d42b09b9d594fa66701caedb9580ae641dffcefa72f10c297ec469980d787b89210816c3cae9e2ad3781b13a64abc WHIRLPOOL aae93302d5d92ec01fed9ce7e75cd9e2da80484f65b6b9321271db515e7da68ada64c6e70efb53f2311c7cc5c90993a27259ca66e10962e07eca13caf349638d
MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUAhxcAAoJEJOE+m71LUu67qUP+wUkOUXW3G28fJEaBIT9UHG6
-SMDqvpQbvX5IsCAV9ce0ZjbBBGvjAjf2SUZiu9R2eKJA45fw1C4if9sTli4z9voh
-IMk285VX9eskxbRzGOgjBT7EZbxyugxDk/5yqhqqMbmCIOotezB/jypkuzC9HLGo
-Knxryszu0ToABRWbSeA+VwoWY4japRtqQBK4gTkZf6NfpAss1kj1mcgT3Yx10oWK
-VIZ1vcCDYHzEZwGrcLCzOCyALKGOTnVkIDWqSPXXqCJ0H4naRR64mUizIyfMJhXN
-JuNgzlr/4i+4WKrcwXydpFZNU92hzLoGiBRWzbAxmsHHVLDL1jVIz0J2JbGcDUOu
-GrwqLlAO9SUCC0BrCJvis0iq1G2AhpGpi6cF8UYxuyJzX5rWINJw35OemLzyYIKH
-7GfifttOVdNFDpWqX+rlCzoL5kcFnTn8XLOJfY+J3j/fnIhj/mJTmrM6MECcNDQE
-ivfF6pfpHbeVhnJPXRnS8EX13w3vdbFXf7fd9XT5MAH/WqKJPd+SxRXpCtbgXIxr
-GrXWyvIXVE/8JkYfV3sicheOp1l06VaGXfcoERNMmouPIfhVmDLrSIg800hvI0yI
-HUga1DsAZOPwKVuPX4603HChV+CZFgFey/Rivrxb7ChmkHot/7N4UVhbLUSwhixN
-grRebuH/QG9+3PI8nNw6
-=sMKj
+iQIcBAEBCAAGBQJUDOTgAAoJEJOE+m71LUu6zygP/06PI93eapDYvg6pYXyvqjAy
+ScZT84KRV9JllBfm79ssDXEj1AVV5X2iDOnCFWiwFX84stpigoQZq/KChM1MgF2Q
+A4ZrbwcPuArW3DaQBQWVy/88HMnEppcviREvaHVGGl5gpR7+BO7SAwGrpzCePdXK
+WvSgyfR10hj8QEzjX47NRSvFC3Y1GDhmbxbp7sfSlpTM7TxtiRU0hTujYtjq3Sl/
+L6nyat46PQ2Nl1BwVSFiB16DFq0qks5JRxYKC4xQYjGeo8D78YEBLl9iynwV0cQD
+Z0vbHOA8HVciMPzzK/WaBIBuuRb/KWs28zBgd6w/lw3QKgobZH08H4d9TsCqYPXm
+lhgc5IZ2EICKAEEaPflxQb5xmcaGeCGnCeE1ry/fMXamyGj3oEu7yZnfF0ylTHcL
+p+NpyaqIQqQc6HHzZem0k7Ic3KqHuQl7XJJ0k3PD3aUUOyWP7EiF/FkYfXrPQZHQ
+yMiL3kFgU9R2Svd6rmCQHIWTNKkp/rFidSOaMOtYaH6ksfKixBXFD7dJJ3DbUFyL
+ZpBvKHq49dsIcxsyMmtXU+fKdsCr7FcXp4fZSkcW1KRQRbaYKfixCS2YjnV2HeqL
+ML5mFMoGMZIfqVROAG4xnAq3dUkmEsZNe0tRr81D3P9f/+9D6Wkiu7zxX+mZfpPt
+1J+Gw4CVoKyT/8v9rKrN
+=7zsS
-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
index f3ae58807405..b0e47e907462 100644
--- a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
+++ b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
@@ -1,22 +1,20 @@
avahi-gobject fails to build under et_EE and possibly other locales.
The regex for a sed in avahi-gobject/Makefile fails under various locales.
-Forcing LANG=C fixes the issue.
-
-Patch-by: Rafał Mużyło <galtgendo@o2.pl>
+Forcing LC_ALL=C fixes the issue.
X-Gentoo-Bug: 501664
X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664
-diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.in avahi-0.6.31/avahi-gobject/Makefile.in
---- avahi-0.6.31.orig/avahi-gobject/Makefile.in 2014-08-20 13:10:02.914432590 -0400
-+++ avahi-0.6.31/avahi-gobject/Makefile.in 2014-08-20 13:12:09.024436983 -0400
-@@ -992,7 +992,7 @@
+diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.am avahi-0.6.31/avahi-gobject/Makefile.am
+--- avahi-0.6.31.orig/avahi-gobject/Makefile.am 2010-08-25 20:51:39.007153001 -0400
++++ avahi-0.6.31/avahi-gobject/Makefile.am 2014-09-07 19:00:05.485657990 -0400
+@@ -76,7 +76,7 @@
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@signals-marshal.list: $(CORE_SOURCES) Makefile.am
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(AM_V_GEN)( cd $(srcdir) && \
--@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
-+@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ LANG=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(CORE_SOURCES) ) \
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ if cmp -s $@.tmp $@; then \
+ signals-marshal.list: $(CORE_SOURCES) Makefile.am
+ $(AM_V_GEN)( cd $(srcdir) && \
+- sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
++ LC_ALL=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+ $(CORE_SOURCES) ) \
+ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
+ if cmp -s $@.tmp $@; then \