From: Jon Portnoy Date: Fri, 16 Jun 2006 17:52:04 +0000 (+0000) Subject: Version bump, bug 136227 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c05ec14b8307ef3e948bc13ed12087d018f5d4ba;p=gentoo.git Version bump, bug 136227 Package-Manager: portage-2.1 --- diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog index b94049edb00d..4138d2674b14 100644 --- a/net-dns/dnsmasq/ChangeLog +++ b/net-dns/dnsmasq/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/dnsmasq # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.96 2006/06/12 19:49:47 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.97 2006/06/16 17:52:03 avenj Exp $ + + 16 Jun 2006; Jon Portnoy dnsmasq-2.32.ebuild : + Version bump plus a patch from tove@gentoo.org to respect + LDFLAGS, bug #136227. 12 Jun 2006; Simon Stelling dnsmasq-2.31.ebuild: stable on amd64 diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 81e47fae6dde..be5f44e62a14 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -10,9 +10,14 @@ AUX dnsmasq221-netlink.diff 337 RMD160 f3758092f73ccc8c465c39da9801c90a0e85a45a 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 DIST dnsmasq-2.22.tar.gz 146239 RMD160 40cd3fd193aabf119319d4e0c363597f1be67300 SHA1 83858155bbb58cf6b4b92a99b3f8f8cb0e091148 SHA256 cc2c86cbd0ec020a4486ac9d195e6a848a0d11a280c3194e095719f60c9751a9 DIST dnsmasq-2.30.tar.gz 202596 RMD160 664bd6d12d3eb6d297886025cecb57ace918a3fd SHA1 b08e226b63536c48cbf16059b16620d3e5e8f33a SHA256 523002e3614e3acf4a66783e18daa9d2393b69f46976c38d46763b29c6ef9450 DIST dnsmasq-2.31.tar.gz 204338 RMD160 7f45c52a76a1edabb868c42069bc4e7710d414e5 SHA1 0dbd561f7e82f3a8a9892347c75d747e816b3b14 SHA256 bb2ec35de2392307587a213bca93fdade6b5d65168b529fc5a95b2edd134edee +DIST dnsmasq-2.32.tar.gz 220656 RMD160 add05f013f952841c8bce1c7d92fc6d36a542b73 SHA1 f07c090922777f061fbe52aea464b1e43b3988d3 SHA256 ee6b71c2fb7237d3aec8a363266a9b62adaf880b52f1960298f915c863a39bdb EBUILD dnsmasq-2.22.ebuild 966 RMD160 b16714149f6c19934dda3c17799e1a2d8fa4954b SHA1 cfb20a119c08ae556e2165734817cc1620e00119 SHA256 1cae3529defbc82a2137b2700c77dd2b220b81336bda05d6032c9906c85655a4 MD5 0a447ac8c0c6f3a6d325a7bc615a9804 dnsmasq-2.22.ebuild 966 RMD160 b16714149f6c19934dda3c17799e1a2d8fa4954b dnsmasq-2.22.ebuild 966 @@ -25,10 +30,14 @@ EBUILD dnsmasq-2.31.ebuild 968 RMD160 27283893284d556e1f74553ff41e2eececb05e7c S MD5 f40e32c9daa7fe41894deafe17a8f940 dnsmasq-2.31.ebuild 968 RMD160 27283893284d556e1f74553ff41e2eececb05e7c dnsmasq-2.31.ebuild 968 SHA256 29f975a68f270ed47c1081ee7516630ceca2330ef1bb6d56c99629e898025cc8 dnsmasq-2.31.ebuild 968 -MISC ChangeLog 11548 RMD160 fb40e47edd816de2fb496bccc0122d747c37483a SHA1 50b0e6763931c5b02359091e0b2b29b646de351d SHA256 40881f294ee419757b4c7933f1079f677ac88587af7d3f3900577d342865b67f -MD5 64e2ca2967cb9e0013cb7a9ece61ca0a ChangeLog 11548 -RMD160 fb40e47edd816de2fb496bccc0122d747c37483a ChangeLog 11548 -SHA256 40881f294ee419757b4c7933f1079f677ac88587af7d3f3900577d342865b67f ChangeLog 11548 +EBUILD dnsmasq-2.32.ebuild 1057 RMD160 539cf491c316881ac7dcef65812b574f570a4bde SHA1 eac73ad97855bd41286d2104c5862e384f7aefe1 SHA256 761eb96831a6607ab467ad69c657beb9f422a8e40929bb2e07cb6dfa2cdc94ab +MD5 626fc40777fd6c429f94fda20eddca91 dnsmasq-2.32.ebuild 1057 +RMD160 539cf491c316881ac7dcef65812b574f570a4bde dnsmasq-2.32.ebuild 1057 +SHA256 761eb96831a6607ab467ad69c657beb9f422a8e40929bb2e07cb6dfa2cdc94ab dnsmasq-2.32.ebuild 1057 +MISC ChangeLog 11701 RMD160 ed5f87e5062e761d443b6405eba21f3a806ad52e SHA1 b686ed5c27cee2549c842ff41de26ed7087deebb SHA256 af19a15143a6bd474c0a346b922e298e80bbd64503a7bf5f8518f29b6ea6503d +MD5 487723db51813211dd1c1ee4f64dc231 ChangeLog 11701 +RMD160 ed5f87e5062e761d443b6405eba21f3a806ad52e ChangeLog 11701 +SHA256 af19a15143a6bd474c0a346b922e298e80bbd64503a7bf5f8518f29b6ea6503d ChangeLog 11701 MISC metadata.xml 245 RMD160 81d0c116517a0ed796a727cc156601c038f8462c SHA1 740f14d7efbc4fb579755a1b740af85f20d71d2b SHA256 4c25e96fc0d5c20b7bc313c4a67637523833173070f8badca27273ab6a1b6a02 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245 RMD160 81d0c116517a0ed796a727cc156601c038f8462c metadata.xml 245 @@ -42,3 +51,6 @@ SHA256 82bf540344282ac65510c8cd372b983a0784e799babd0e5a91e136693715dead files/di MD5 c8208969c5beb7a58bae2666ab0e5133 files/digest-dnsmasq-2.31 238 RMD160 e612b5108e9775d63ec132b107609b8c122ec371 files/digest-dnsmasq-2.31 238 SHA256 5d32e1997e58a7d0bd61e63759b9f771a483d4f16bf89205a0f9be6be0e7ab17 files/digest-dnsmasq-2.31 238 +MD5 e8cfcc22ffb49252f17d4bb23ecceb5c files/digest-dnsmasq-2.32 238 +RMD160 e6ebc4491d6066d5ef010bbb10b403b9123c7096 files/digest-dnsmasq-2.32 238 +SHA256 d6c43c12ccd5357f31644704dd7916a8fb8dda84750ea416aed7fea2b64525af files/digest-dnsmasq-2.32 238 diff --git a/net-dns/dnsmasq/dnsmasq-2.32.ebuild b/net-dns/dnsmasq/dnsmasq-2.32.ebuild new file mode 100644 index 000000000000..a7c6d3aa1c3e --- /dev/null +++ b/net-dns/dnsmasq/dnsmasq-2.32.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.32.ebuild,v 1.1 2006/06/16 17:52:03 avenj Exp $ + +inherit eutils toolchain-funcs + +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 ~s390 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.51" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/dnsmasq232-ldflags.diff +} + +src_compile() { + 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 +} diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.32 b/net-dns/dnsmasq/files/digest-dnsmasq-2.32 new file mode 100644 index 000000000000..baad38b454b7 --- /dev/null +++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.32 @@ -0,0 +1,3 @@ +MD5 d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz 220656 +RMD160 add05f013f952841c8bce1c7d92fc6d36a542b73 dnsmasq-2.32.tar.gz 220656 +SHA256 ee6b71c2fb7237d3aec8a363266a9b62adaf880b52f1960298f915c863a39bdb dnsmasq-2.32.tar.gz 220656 diff --git a/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff b/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff new file mode 100644 index 000000000000..1eb7deb859ae --- /dev/null +++ b/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff @@ -0,0 +1,11 @@ +--- 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)