From 1909d0de16458595564457c78547ce00c7a1a021 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Tue, 13 Feb 2007 20:43:50 +0000 Subject: [PATCH] Version bump, remove 2.37 since it has a nasty potential lockup bug. Package-Manager: portage-2.1.2-r9 --- net-dns/dnsmasq/ChangeLog | 8 +++- net-dns/dnsmasq/Manifest | 38 ++++++------------- ...nsmasq-2.37.ebuild => dnsmasq-2.38.ebuild} | 5 +-- net-dns/dnsmasq/files/digest-dnsmasq-2.37 | 3 -- net-dns/dnsmasq/files/digest-dnsmasq-2.38 | 3 ++ net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch | 29 -------------- 6 files changed, 23 insertions(+), 63 deletions(-) rename net-dns/dnsmasq/{dnsmasq-2.37.ebuild => dnsmasq-2.38.ebuild} (88%) delete mode 100644 net-dns/dnsmasq/files/digest-dnsmasq-2.37 create mode 100644 net-dns/dnsmasq/files/digest-dnsmasq-2.38 delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog index ea3e999fddc0..a991839606dc 100644 --- a/net-dns/dnsmasq/ChangeLog +++ b/net-dns/dnsmasq/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dns/dnsmasq # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.111 2007/02/08 15:28:18 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.112 2007/02/13 20:43:50 chutzpah Exp $ + +*dnsmasq-2.38 (13 Feb 2007) + + 13 Feb 2007; Patrick McLean + -files/dnsmasq-2.37-bsd.patch, -dnsmasq-2.37.ebuild, +dnsmasq-2.38.ebuild: + Version bump, remove 2.37 since it has a nasty potential lockup bug. 08 Feb 2007; Patrick McLean -files/dnsmasq232-ldflags.diff, +files/dnsmasq-2.37-bsd.patch, diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 1a3d7694ad80..4afc6d8a73bd 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -1,10 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX dnsmasq-2.37-bsd.patch 700 RMD160 934efadd8577b0a4dd563d47341956caeddf8880 SHA1 302eee779c4ca4f2d4991974762fdc16879cf331 SHA256 d1056ea33acc13e1a91241bd90775077373e3d5f7da1be85b5e6f4299fca74c3 -MD5 0608dc28d0773300dfa9e249001ca31d files/dnsmasq-2.37-bsd.patch 700 -RMD160 934efadd8577b0a4dd563d47341956caeddf8880 files/dnsmasq-2.37-bsd.patch 700 -SHA256 d1056ea33acc13e1a91241bd90775077373e3d5f7da1be85b5e6f4299fca74c3 files/dnsmasq-2.37-bsd.patch 700 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359 MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451 @@ -23,7 +16,7 @@ RMD160 ae2243cf5b68aa4fcb2f482115c6d4e49889de6a files/resolvconf.dnsmasq 2693 SHA256 ff3518048270e1635126d630a27ec88873cc559327341d1f0b786f5c127f1575 files/resolvconf.dnsmasq 2693 DIST dnsmasq-2.31.tar.gz 204338 RMD160 7f45c52a76a1edabb868c42069bc4e7710d414e5 SHA1 0dbd561f7e82f3a8a9892347c75d747e816b3b14 SHA256 bb2ec35de2392307587a213bca93fdade6b5d65168b529fc5a95b2edd134edee DIST dnsmasq-2.34.tar.gz 255744 RMD160 36061107fa62c433df6a02a5fffdb30acc4bf893 SHA1 81c445433d95725c23a27ad06cd6a51665d14138 SHA256 8b9d6a277abecff19ae835c7f2e66e21cc9a4d37ceb35716aa655fd899287bc0 -DIST dnsmasq-2.37.tar.gz 271316 RMD160 0561e4876c397ac80587a5f20a821ff0776c23cb SHA1 1543baf390c14e09c54ef33cd66264fd7661d31d SHA256 6ddf6be81d5974a2cbe4c9c3b130e5b746c6415165b1d82ad390150ecd614385 +DIST dnsmasq-2.38.tar.gz 272953 RMD160 bfa7ca4a5ededa2aedd708991b8177274b1db8b7 SHA1 267ac7b78e9f48b0d8d65f30fc0faa2a6552ae8c SHA256 54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a EBUILD dnsmasq-2.31.ebuild 967 RMD160 1518ebea042712941b9d9b154e3fc52ca3731629 SHA1 19a85f22eb7faf2becf7f23e788e3509901c5340 SHA256 51f059ab78b780e34d538f911aff2283e53781780799a52fd8100da382309b0f MD5 2757ef66c4498cc17694439855a6f5bb dnsmasq-2.31.ebuild 967 RMD160 1518ebea042712941b9d9b154e3fc52ca3731629 dnsmasq-2.31.ebuild 967 @@ -32,14 +25,14 @@ EBUILD dnsmasq-2.34.ebuild 1316 RMD160 7fa09ef99675319ee3d8f743e746bd2d69800f26 MD5 4e8a18e62fba4e045e8c3be3b4f33f69 dnsmasq-2.34.ebuild 1316 RMD160 7fa09ef99675319ee3d8f743e746bd2d69800f26 dnsmasq-2.34.ebuild 1316 SHA256 7a6729383050e6b996276423af443886325606c9e0049ada972c1e92c30918d7 dnsmasq-2.34.ebuild 1316 -EBUILD dnsmasq-2.37.ebuild 1596 RMD160 63dca4f78851c4f4b43c5e2adb648240e5c58947 SHA1 ee6a91e6ca85a639d3d34716600c5e6f5574f93c SHA256 2655cbf3e07128a90b143345d83bd31b62c8b4ea259cef3b961f8ea7a037db8e -MD5 da962659095e0937032f3d4f495da963 dnsmasq-2.37.ebuild 1596 -RMD160 63dca4f78851c4f4b43c5e2adb648240e5c58947 dnsmasq-2.37.ebuild 1596 -SHA256 2655cbf3e07128a90b143345d83bd31b62c8b4ea259cef3b961f8ea7a037db8e dnsmasq-2.37.ebuild 1596 -MISC ChangeLog 13685 RMD160 9930d5d662de69dc7d1a75627f54094708c7c183 SHA1 318cd4340c70509153c283df2621389c0f2a4444 SHA256 d7be835ab58a8c386e9847bc5687d6703fe3508b092af890a4343096b0e1c127 -MD5 9896c4e98e61702c1f359a88d1c236d6 ChangeLog 13685 -RMD160 9930d5d662de69dc7d1a75627f54094708c7c183 ChangeLog 13685 -SHA256 d7be835ab58a8c386e9847bc5687d6703fe3508b092af890a4343096b0e1c127 ChangeLog 13685 +EBUILD dnsmasq-2.38.ebuild 1530 RMD160 3c7a3c5fa835bfb08b714acfe892791fdc38aca3 SHA1 0200ae073236a62a404a351724ab761fa48c934d SHA256 b1e39a8124b5907805259fb44b186f2b5da61201cb86137bbd17ea509bc6e3db +MD5 a0d009326bd6af028be79d7b6331beb0 dnsmasq-2.38.ebuild 1530 +RMD160 3c7a3c5fa835bfb08b714acfe892791fdc38aca3 dnsmasq-2.38.ebuild 1530 +SHA256 b1e39a8124b5907805259fb44b186f2b5da61201cb86137bbd17ea509bc6e3db dnsmasq-2.38.ebuild 1530 +MISC ChangeLog 13915 RMD160 0d230d47a90d621ce1216302f2795f865e161853 SHA1 6d94b2757f236b13b88809b03f1752c79252c810 SHA256 b65ae01eae2e0a98ec4e05146786ee210be3264538a3e92df344870efb3014d0 +MD5 1e66c4f91afe34f122afc6278649d446 ChangeLog 13915 +RMD160 0d230d47a90d621ce1216302f2795f865e161853 ChangeLog 13915 +SHA256 b65ae01eae2e0a98ec4e05146786ee210be3264538a3e92df344870efb3014d0 ChangeLog 13915 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251 @@ -50,13 +43,6 @@ SHA256 5d32e1997e58a7d0bd61e63759b9f771a483d4f16bf89205a0f9be6be0e7ab17 files/di MD5 bad4050c298c5d809ee5f777d8e1062f files/digest-dnsmasq-2.34 238 RMD160 8c4968a7ca3629cb18e1f241c7b3a9458c1546c5 files/digest-dnsmasq-2.34 238 SHA256 b7556692de6def5af09946319cfd19d19de3348a1223875671b0bfeeacfe76ef files/digest-dnsmasq-2.34 238 -MD5 6468b1c429c009ae5bb12d3e7c777ce4 files/digest-dnsmasq-2.37 238 -RMD160 59228649e3326e4cf8d28f69369783404a95a5eb files/digest-dnsmasq-2.37 238 -SHA256 6a1404d284f7bd5194d9ede205e2ffbcead86525451aeaa02a6ad0bbd0108ea5 files/digest-dnsmasq-2.37 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFy0GuWt/XSf2CZdkRAqZ2AJ9bMEYGreA10oqKfvrqWZjG9/4sCwCggdlX -JH9sq1mY+NQfw+RVjxvywfg= -=dx/D ------END PGP SIGNATURE----- +MD5 835414295b0bed7fcba1fc1d43d90007 files/digest-dnsmasq-2.38 238 +RMD160 df759b67748d7149a7aae7f23e3157dc1a4e4e61 files/digest-dnsmasq-2.38 238 +SHA256 a43f4ec7f3aae182582955b664e8bbf1b567ac8a79dd643573fcd50b7df408a2 files/digest-dnsmasq-2.38 238 diff --git a/net-dns/dnsmasq/dnsmasq-2.37.ebuild b/net-dns/dnsmasq/dnsmasq-2.38.ebuild similarity index 88% rename from net-dns/dnsmasq/dnsmasq-2.37.ebuild rename to net-dns/dnsmasq/dnsmasq-2.38.ebuild index e0d5b441cf67..8e421d6ec3c9 100644 --- a/net-dns/dnsmasq/dnsmasq-2.37.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.38.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.37.ebuild,v 1.2 2007/02/08 15:28:18 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.38.ebuild,v 1.1 2007/02/13 20:43:50 chutzpah Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -29,9 +29,6 @@ src_unpack() { # dnsmasq on FreeBSD wants the config file in a silly location, this fixes epatch "${FILESDIR}/${PN}-fbsd-config.patch" - - # fix compiliationn on bsd - epatch "${FILESDIR}/${P}-bsd.patch" } src_compile() { diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.37 b/net-dns/dnsmasq/files/digest-dnsmasq-2.37 deleted file mode 100644 index 4458920232fd..000000000000 --- a/net-dns/dnsmasq/files/digest-dnsmasq-2.37 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz 271316 -RMD160 0561e4876c397ac80587a5f20a821ff0776c23cb dnsmasq-2.37.tar.gz 271316 -SHA256 6ddf6be81d5974a2cbe4c9c3b130e5b746c6415165b1d82ad390150ecd614385 dnsmasq-2.37.tar.gz 271316 diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.38 b/net-dns/dnsmasq/files/digest-dnsmasq-2.38 new file mode 100644 index 000000000000..a7cfe1f59890 --- /dev/null +++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.38 @@ -0,0 +1,3 @@ +MD5 ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz 272953 +RMD160 bfa7ca4a5ededa2aedd708991b8177274b1db8b7 dnsmasq-2.38.tar.gz 272953 +SHA256 54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a dnsmasq-2.38.tar.gz 272953 diff --git a/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch b/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch deleted file mode 100644 index dd7e42c549d5..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/rfc2131.c.orig 2007-02-07 20:52:07.000000000 +0000 -+++ src/rfc2131.c 2007-02-06 22:13:02.000000000 +0000 -@@ -101,16 +101,22 @@ - { - if (hwlen == 0 && clid && clid_len > 3) - { -- if ((clid[0] == ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394) || clid[0] == hwtype) -+ if (clid[0] == hwtype) - { - *len_out = clid_len - 1 ; - return clid + 1; - } -- else -+ -+#if defined(ARPHRD_EUI64) && defined(ARPHRD_IEEE1394) -+ if (clid[0] == ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394) - { -- *len_out = clid_len; -- return clid; -+ *len_out = clid_len - 1 ; -+ return clid + 1; - } -+#endif -+ -+ *len_out = clid_len; -+ return clid; - } - - *len_out = hwlen; -- 2.26.2