Add patch to fix compilation on bsd, clean out some stale files and previous version.

Package-Manager: portage-2.1.2-r9

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index ec7031a2a7e122749919cdb5d695fa6d2666bcb1..ea3e999fddc073b6bbaa4d7a27885d554b0b52fa 100644 (file)
--- 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.110 2007/02/05 17:25:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.111 2007/02/08 15:28:18 chutzpah Exp $
+
+  08 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+  -files/dnsmasq232-ldflags.diff, +files/dnsmasq-2.37-bsd.patch,
+  -files/dnsmasq221-netlink.diff, -dnsmasq-2.36.ebuild, dnsmasq-2.37.ebuild:
+  Add patch to fix compilation on bsd, clean out some stale files and previous
+  version.
 
 *dnsmasq-2.37 (05 Feb 2007)
 

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index a74ac312c95f562c1049697036559578f924d4b8..409a94e70c87d386a011d9657fcdb2298b7004de 100644 (file)
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,6 +1,7 @@
------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
@@ -13,21 +14,12 @@ AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461
 MD5 5990c2d2cb92209feacf8f3a5a7d0831 files/dnsmasq.confd 140
 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 files/dnsmasq.confd 140
 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746 files/dnsmasq.confd 140
-AUX dnsmasq221-netlink.diff 337 RMD160 f3758092f73ccc8c465c39da9801c90a0e85a45a SHA1 8340a6462bde9a9c5a8fabcb20e727ae25331c8d SHA256 0bf8a78e498fa56408033b2727e686f9c04c6be6f3b390fb6273d94361397466
-MD5 d1c7a35f0fe7e1e17d98990eec175b06 files/dnsmasq221-netlink.diff 337
-RMD160 f3758092f73ccc8c465c39da9801c90a0e85a45a files/dnsmasq221-netlink.diff 337
-SHA256 0bf8a78e498fa56408033b2727e686f9c04c6be6f3b390fb6273d94361397466 files/dnsmasq221-netlink.diff 337
-AUX dnsmasq232-ldflags.diff 613 RMD160 55b0075809e759b5a7b232beb8403192ab9cdc01 SHA1 ab616c6128d90429be174c1d424db57a5667b5e6 SHA256 8c87add5dc171ac274e29fcfb076c346d23d475b4581c6079ab55295fab067ec
-MD5 2d42231253354e143b4aba0b1490c998 files/dnsmasq232-ldflags.diff 613
-RMD160 55b0075809e759b5a7b232beb8403192ab9cdc01 files/dnsmasq232-ldflags.diff 613
-SHA256 8c87add5dc171ac274e29fcfb076c346d23d475b4581c6079ab55295fab067ec files/dnsmasq232-ldflags.diff 613
 AUX resolvconf.dnsmasq 2693 RMD160 ae2243cf5b68aa4fcb2f482115c6d4e49889de6a SHA1 a7082a24bde8ae2bdd4919e2079134b45c761160 SHA256 ff3518048270e1635126d630a27ec88873cc559327341d1f0b786f5c127f1575
 MD5 5454b4f7e8df3dafa5fecb6d016b0fb2 files/resolvconf.dnsmasq 2693
 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.36.tar.gz 268105 RMD160 14d1616cb0d57addf4afa3a9725a97cf5f479884 SHA1 eb8569ea35221f07b64060544e69dfaa9d4703c2 SHA256 0acc17cf059bb9b0ecde9a57ca5f09aadfebf99fe6b4ebcddf5800875aee3242
 DIST dnsmasq-2.37.tar.gz 271316 RMD160 0561e4876c397ac80587a5f20a821ff0776c23cb SHA1 1543baf390c14e09c54ef33cd66264fd7661d31d SHA256 6ddf6be81d5974a2cbe4c9c3b130e5b746c6415165b1d82ad390150ecd614385
 EBUILD dnsmasq-2.31.ebuild 967 RMD160 1518ebea042712941b9d9b154e3fc52ca3731629 SHA1 19a85f22eb7faf2becf7f23e788e3509901c5340 SHA256 51f059ab78b780e34d538f911aff2283e53781780799a52fd8100da382309b0f
 MD5 2757ef66c4498cc17694439855a6f5bb dnsmasq-2.31.ebuild 967
@@ -37,18 +29,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.36.ebuild 1530 RMD160 b1db98e893e589b025137967aa2815e5d21e035c SHA1 9e40a547961b2766d60ef739d4daec5cae27d605 SHA256 a2f0ff92c843c8b51d380412d040efcba050fe4662362762314b343c5925cb99
-MD5 451a4e79eed35d915d53d7843da0482c dnsmasq-2.36.ebuild 1530
-RMD160 b1db98e893e589b025137967aa2815e5d21e035c dnsmasq-2.36.ebuild 1530
-SHA256 a2f0ff92c843c8b51d380412d040efcba050fe4662362762314b343c5925cb99 dnsmasq-2.36.ebuild 1530
-EBUILD dnsmasq-2.37.ebuild 1530 RMD160 fd84ee52bf872975d8df6b9735ccbfd1e682dc88 SHA1 b90d29169b8c821e09ca148e56c44f0b101d53c6 SHA256 2ad34482508147676b3bdebdba614a303d163dad23f17f53fc99cb756e02f937
-MD5 0aaf629b396da0c69a97bb8155896cd5 dnsmasq-2.37.ebuild 1530
-RMD160 fd84ee52bf872975d8df6b9735ccbfd1e682dc88 dnsmasq-2.37.ebuild 1530
-SHA256 2ad34482508147676b3bdebdba614a303d163dad23f17f53fc99cb756e02f937 dnsmasq-2.37.ebuild 1530
-MISC ChangeLog 13400 RMD160 8c5f24959de453cf0cf2bb8656d9ec9fb1a783e1 SHA1 bbaba6f1811b4e0c2fa5c776f9190308f50d8fa9 SHA256 ea6a5d67dcd7a9073874029f645339b2c99027e2dacf214dfc2bf4465d8b81b1
-MD5 1ab119608ba60e06406583353c4cd907 ChangeLog 13400
-RMD160 8c5f24959de453cf0cf2bb8656d9ec9fb1a783e1 ChangeLog 13400
-SHA256 ea6a5d67dcd7a9073874029f645339b2c99027e2dacf214dfc2bf4465d8b81b1 ChangeLog 13400
+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
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
 MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251
 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251
@@ -59,16 +47,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 a1946d200e2840ae9b50e2d7fdbbd5d8 files/digest-dnsmasq-2.36 238
-RMD160 643fcf0014a59fb1ceed56131c440230ff5d3399 files/digest-dnsmasq-2.36 238
-SHA256 ba08fbc405229631822f7e957812c5e814875a86e260e1fcd1c2ddba8be4ea80 files/digest-dnsmasq-2.36 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)
-
-iD8DBQFFx2iDWt/XSf2CZdkRAnZ0AJoDTCLX46dEu2LZo2Y7CRNNVvj2+ACfTr6e
-wR3DVvbIeRkL/sf2E1rFouY=
-=UcGY
------END PGP SIGNATURE-----

diff --git a/net-dns/dnsmasq/dnsmasq-2.36.ebuild b/net-dns/dnsmasq/dnsmasq-2.36.ebuild
deleted file mode 100644 (file)
index 0561404..0000000
--- a/net-dns/dnsmasq/dnsmasq-2.36.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.36.ebuild,v 1.2 2007/01/26 03:56:26 chutzpah Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P="${P/_/}"
-MY_PV="${PV/_rc*/}"
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus isc resolvconf tftp"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       >=sys-apps/portage-2.0.51
-       dbus? ( sys-apps/dbus )
-       resolvconf? ( net-dns/resolvconf-gentoo )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       # dnsmasq on FreeBSD wants the config file in a silly location, this fixes
-       epatch "${FILESDIR}/${PN}-fbsd-config.patch"
-}
-
-src_compile() {
-       use tftp || append-flags -DNO_TFTP
-       use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
-       use isc && sed -i '$ a #define HAVE_ISC_READER' src/config.h
-       emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-       make \
-               PREFIX=/usr \
-               MANDIR=/usr/share/man \
-               DESTDIR="${D}" \
-               install || die
-       dodoc CHANGELOG FAQ
-       dohtml *.html
-
-       newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-       newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-       insinto /etc
-       newins dnsmasq.conf.example dnsmasq.conf
-
-       if use resolvconf ; then
-               exeinto /etc/resolvconf/update.d
-               newexe ${FILESDIR}/resolvconf.dnsmasq dnsmasq
-       fi
-}

diff --git a/net-dns/dnsmasq/dnsmasq-2.37.ebuild b/net-dns/dnsmasq/dnsmasq-2.37.ebuild
index 74b700b11cbf7382303daaba7122562d5bb1984d..e0d5b441cf67a74ce8949250f8effa59f3a863d1 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.37.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.37.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.1 2007/02/05 17:25:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.37.ebuild,v 1.2 2007/02/08 15:28:18 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -29,6 +29,9 @@ 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.36 b/net-dns/dnsmasq/files/digest-dnsmasq-2.36
deleted file mode 100644 (file)
index f046a4c..0000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.36
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 392bf22dbff84eae010e149f15cd4136 dnsmasq-2.36.tar.gz 268105
-RMD160 14d1616cb0d57addf4afa3a9725a97cf5f479884 dnsmasq-2.36.tar.gz 268105
-SHA256 0acc17cf059bb9b0ecde9a57ca5f09aadfebf99fe6b4ebcddf5800875aee3242 dnsmasq-2.36.tar.gz 268105

diff --git a/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch b/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch
new file mode 100644 (file)
index 0000000..dd7e42c
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch
@@ -0,0 +1,29 @@
+--- 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;

diff --git a/net-dns/dnsmasq/files/dnsmasq221-netlink.diff b/net-dns/dnsmasq/files/dnsmasq221-netlink.diff
deleted file mode 100644 (file)
index 2211147..0000000
--- a/net-dns/dnsmasq/files/dnsmasq221-netlink.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urN dnsmasq-2.21.orig/src/netlink.c dnsmasq-2.21/src/netlink.c
---- dnsmasq-2.21.orig/src/netlink.c  2005-03-13 10:37:44.000000000 +0100
-+++ dnsmasq-2.21/src/netlink.c  2005-03-24 12:31:52.000000000 +0100
-@@ -16,6 +16,7 @@
-
- #ifdef HAVE_RTNETLINK
-
-+#include <linux/types.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>

diff --git a/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff b/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff
deleted file mode 100644 (file)
index 1eb7deb..0000000
--- a/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- bld/Makefile       2006-06-08 21:22:22.000000000 +0200
-+++ bld/Makefile       2006-06-08 21:22:56.000000000 +0200
-@@ -9,7 +9,7 @@
-       $(CC) $(CFLAGS) $(COPTS) $(I18N) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --cflags dbus-1` $(RPM_OPT_FLAGS) -Wall -W -c $<
- 
- dnsmasq : $(OBJS)
--      $(CC) -o $@  $(OBJS) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1` $(LIBS) 
-+      $(CC) $(LDFLAGS) -o $@  $(OBJS) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1` $(LIBS) 
- 
- dnsmasq.pot : $(OBJS:.o=.c) dnsmasq.h config.h
-       xgettext -d dnsmasq --foreign-user --keyword=_ -o dnsmasq.pot -i $(OBJS:.o=.c)