From 7c92a05bcb102dc1c867c0d331ab8f00f03818a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 28 Mar 2006 05:40:50 +0000 Subject: [PATCH] Version bump, thanks to Beech Horn in bug #126167 for notifying and forwardporting the makefiles patch; also now uses gcc to link and respect CC, CFLAGS and LDFLAGS, and doesn't strip. Package-Manager: portage-2.1_pre7-r2 --- net-misc/mDNSResponder/ChangeLog | 12 +- net-misc/mDNSResponder/Manifest | 25 ++- .../files/digest-mDNSResponder-107.5 | 3 + .../files/mDNSResponder-107.5-Makefiles.patch | 170 ++++++++++++++++++ .../mDNSResponder/mDNSResponder-107.5.ebuild | 105 +++++++++++ 5 files changed, 310 insertions(+), 5 deletions(-) create mode 100644 net-misc/mDNSResponder/files/digest-mDNSResponder-107.5 create mode 100644 net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch create mode 100644 net-misc/mDNSResponder/mDNSResponder-107.5.ebuild diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog index cf2f22d90709..14c1b4a4d965 100644 --- a/net-misc/mDNSResponder/ChangeLog +++ b/net-misc/mDNSResponder/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/mDNSResponder -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.19 2005/09/25 22:19:55 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.20 2006/03/28 05:40:50 flameeyes Exp $ + +*mDNSResponder-107.5 (28 Mar 2006) + + 28 Mar 2006; Diego Pettenò + +files/mDNSResponder-107.5-Makefiles.patch, +mDNSResponder-107.5.ebuild: + Version bump, thanks to Beech Horn in bug #126167 for notifying and + forwardporting the makefiles patch; also now uses gcc to link and respect + CC, CFLAGS and LDFLAGS, and doesn't strip. 25 Sep 2005; Diego Pettenò mDNSResponder-107.1.ebuild: diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest index b2e3de8ae46c..f5cccf8c842b 100644 --- a/net-misc/mDNSResponder/Manifest +++ b/net-misc/mDNSResponder/Manifest @@ -1,9 +1,15 @@ -MD5 e110f34bac8e308172df60f7aa54244a ChangeLog 2783 -RMD160 f72ceeba72a95579538152c2526ca8200a4ad067 ChangeLog 2783 -SHA256 0313aad6ba3e9e9d485cab25f5c887ced20a5c20923620ea2968d342174ca3d4 ChangeLog 2783 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 09ed20524a3f8d2261e67999cc973b73 ChangeLog 3139 +RMD160 95a1e93db88dc40e6ff0974b66bf16035a6adb6a ChangeLog 3139 +SHA256 2b886ef4ba6d7c634693641fd941ece9709782cbc9397b3d03b76933264736fc ChangeLog 3139 MD5 6bc193747762e84f664f6a3303296b23 files/digest-mDNSResponder-107.1 262 RMD160 54c2bd241c40159e8fe7ceca16011b3377551684 files/digest-mDNSResponder-107.1 262 SHA256 41f4cf29d74c7713a1ce6dc791412c2cfebc5209f9784322a71ad998cc610ddb files/digest-mDNSResponder-107.1 262 +MD5 44a7177053751f549b8ee2422d103fb0 files/digest-mDNSResponder-107.5 262 +RMD160 bfa8d7cbbcbae1df6b1895083bc69a2cc04f6f32 files/digest-mDNSResponder-107.5 262 +SHA256 e8a669ddfb3bd95be4aaaaf176fbcf89b933010cf6ff9e8c11c86250770e1376 files/digest-mDNSResponder-107.5 262 MD5 854ae89c0e0738fa68590659fe262309 files/digest-mDNSResponder-98 69 RMD160 b772a385d55bab2dd53fb8b0f279f03acb1a4832 files/digest-mDNSResponder-98 69 SHA256 90fc1ccffd98e61b27f1c40a2046987b063ae304d50dc9c4e745645a1def33f3 files/digest-mDNSResponder-98 69 @@ -16,6 +22,9 @@ SHA256 47da76c48b3e380209b6ee98683121c783e4399535b1142601fafacfed59a153 files/dn MD5 b7d4403ae11819a11cd52f31af9548ac files/mDNSResponder-107.1-Makefiles.patch 5584 RMD160 7f46ad1ebc92a6f6ef18e769c32907878298b437 files/mDNSResponder-107.1-Makefiles.patch 5584 SHA256 310631377c83246fb8d40207014157a86236a1f4132505593ad141b4078b5909 files/mDNSResponder-107.1-Makefiles.patch 5584 +MD5 7cf1a2c4c1b4ace1057755629a34849d files/mDNSResponder-107.5-Makefiles.patch 6534 +RMD160 00c6434d558a61281aab5d68bce080f9c191fa17 files/mDNSResponder-107.5-Makefiles.patch 6534 +SHA256 219f9abcfe26bd208c9f91456223844c5b87108f0e0e561d89882f2c37c4d48e files/mDNSResponder-107.5-Makefiles.patch 6534 MD5 7087496865b0e264a209619124877965 files/mDNSResponder-98-Makefiles.patch 3631 RMD160 e6cf2d5bdbc84196407cc8e0bdb94ec16b7b41f0 files/mDNSResponder-98-Makefiles.patch 3631 SHA256 8e43b1a664e4cf532afeef54f8a3be8f1b62435bb6391793ace271d06ce2e4ff files/mDNSResponder-98-Makefiles.patch 3631 @@ -34,9 +43,19 @@ SHA256 87df2b720556e5b3cdc5e6aedae45a237e9e58ecde8799429c02527cd0d9c072 files/md MD5 501fc0cb1abb02772c666ca66a265790 mDNSResponder-107.1.ebuild 2538 RMD160 bb8b8fbb2db5d1c9465556bf53da4dcbaf7ff17e mDNSResponder-107.1.ebuild 2538 SHA256 42e2fb87cbef654b79ddc580117ac907369c38ed4fc342fd04627cbad459bfac mDNSResponder-107.1.ebuild 2538 +MD5 4d996cecd82199366ff8d430ff54f624 mDNSResponder-107.5.ebuild 2849 +RMD160 5c3ca6fce8c273e9d9e8642a42088498a35eed57 mDNSResponder-107.5.ebuild 2849 +SHA256 9868e3e0c84ddd44d675d942222d3be075d588a08a287c5b5648ebf4d89ec565 mDNSResponder-107.5.ebuild 2849 MD5 8b3554909fb9a64630ea24a3a85d850d mDNSResponder-98.ebuild 1015 RMD160 329d5ec64aacee5e4a26f1c0d48f270ce09d5188 mDNSResponder-98.ebuild 1015 SHA256 f7de606d22cd08b3f87882f10a971be8d32d1687e4be77ee7b1a36cfcb7a2fcb mDNSResponder-98.ebuild 1015 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.2 (GNU/Linux) + +iD8DBQFEKMxPAiZjviIA2XgRAm8NAKCRa+tOd/S3o+f55uFV98N+Pv131QCg54IQ +P27bo9dAn9SfC5HMOWHHypI= +=EQMv +-----END PGP SIGNATURE----- diff --git a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.5 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.5 new file mode 100644 index 000000000000..852cf1f50eb9 --- /dev/null +++ b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.5 @@ -0,0 +1,3 @@ +MD5 ec345a16649ecb5b6e50096f2b5cbdaf mDNSResponder-107.5.tar.gz 1379397 +RMD160 df10cb280905f957b5bb2419207288bb66c94e97 mDNSResponder-107.5.tar.gz 1379397 +SHA256 8703e4a72108a8ed89194af7658cac348592e84fa67bd2d3794da4d81a610cf5 mDNSResponder-107.5.tar.gz 1379397 diff --git a/net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch b/net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch new file mode 100644 index 000000000000..a84142bc5445 --- /dev/null +++ b/net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch @@ -0,0 +1,170 @@ +Index: mDNSResponder-107.5/Clients/Makefile +=================================================================== +--- mDNSResponder-107.5.orig/Clients/Makefile ++++ mDNSResponder-107.5/Clients/Makefile +@@ -51,12 +51,16 @@ + + ############################################################################# + +-# On OS X the dns_sd library functions are included in libSystem, which is implicitly linked with every executable +-# If /usr/lib/libSystem.dylib exists, then we're on OS X, so we don't need also to link the "dns_sd" shared library +-ifneq "$(wildcard /usr/lib/libSystem.dylib)" "" +-LIBS = +-else +-LIBS = -L../mDNSPosix/build/prod/ -ldns_sd ++ifneq "$(wildcard ../mDNSPosix/build/prod/libdns_sd.*)" "" ++ LIBS ?= -L../mDNSPosix/build/prod/ -ldns_sd ++endif ++ ++ifneq "$(wildcard ../mDNSPosix/build/debug/libdns_sd.*)" "" ++ LIBS ?= -L../mDNSPosix/build/debug/ -ldns_sd ++endif ++ ++ifneq "$(wildcard /usr/lib/libdns_sd.*)" "" ++ LIBS ?= -ldns_sd + endif + + targets: build/dns-sd +@@ -68,4 +72,4 @@ build: + mkdir build + + build/dns-sd: build dns-sd.c +- cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -o $@ ++ $(CC) $(CFLAGS_OPT) $(LDFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -o $@ +Index: mDNSResponder-107.5/mDNSPosix/Makefile +=================================================================== +--- mDNSResponder-107.5.orig/mDNSPosix/Makefile ++++ mDNSResponder-107.5/mDNSPosix/Makefile +@@ -401,13 +401,13 @@ endif + endif + endif + +-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) ++CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) $(OPT_CFLAGS) + + ############################################################################# + + all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) + +-install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) ++install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) + + # 'setup' sets up the build directory structure the way we want + setup: +@@ -443,7 +443,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ + CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o + + $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) +- @$(LD) $(LIBFLAGS) -o $@ $+ ++ @$(LD) $(LIBFLAGS) -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+ + @$(STRIP) $@ + + Clients: setup libdns_sd ../Clients/build/dns-sd +@@ -457,49 +457,45 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE + @echo "Name Service Switch module done" + + $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o +- @$(LD) $(LIBFLAGS) -o $@ $+ ++ @$(LD) $(LIBFLAGS) -Wl,-soname=$(NSSLINKNAME) -o $@ $+ + @$(STRIP) $@ + + ############################################################################# + + # The Install targets place built stuff in their proper places +-InstalledDaemon: $(INSTBASE)/sbin/mdnsd ++InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd + @echo $+ " installed" + +-InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h ++InstalledLib: $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/include/dns_sd.h + @echo $+ " installed" + +-InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) ++InstalledStartup: $(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) + @echo $+ " installed" + +-InstalledManPages: $(MANPATH)/man8/mdnsd.8 ++InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8 + @echo $+ " installed" + +-InstalledClients: $(INSTBASE)/bin/dns-sd ++InstalledClients: $(DESTDIR)$(INSTBASE)/bin/dns-sd + @echo $+ " installed" + +-InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 ++InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8 + @echo $+ " installed" + + # Note: If daemon already installed, we make sure it's stopped before overwriting it +-$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd ++$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd + @if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi + $(CP) $< $@ + +-$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) ++$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) + $(CP) $< $@ +- $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) +-ifdef LDCONFIG +- # -m means 'merge into existing database', -R means 'rescan directories' +- $(LDCONFIG) -mR +-endif ++ $(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) + +-$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h ++$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h + $(CP) $< $@ + + # We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure + # that the daemon is installed *before* we try to execute the command to start it. +-$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(INSTBASE)/sbin/mdnsd ++$(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) + $(CP) $< $@ + chmod ugo+x $@ + $@ start +@@ -516,36 +512,32 @@ else + endif + endif + +-$(MANPATH)/man5/%.5: %.5 ++$(DESTDIR)$(MANPATH)/man5/%.5: %.5 + cp $< $@ + chmod 444 $@ + +-$(MANPATH)/man8/%.8: %.8 ++$(DESTDIR)$(MANPATH)/man8/%.8: %.8 + cp $< $@ + chmod 444 $@ + +-$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 ++$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 + cp $< $@ + chmod 444 $@ + +-$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd ++$(DESTDIR)$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd ++ mkdir $(DESTDIR)$(INSTBASE)/bin + $(CP) $< $@ + +-$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) +- $(LN) $< $@ +- ldconfig ++$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE) ++ $(LN) $(NSSLIBFILE) $@ + +-$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) ++$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) + $(CP) $< $@ + chmod 444 $@ + +-/etc/nss_mdns.conf: nss_mdns.conf ++$(DESTDIR)etc/nss_mdns.conf: nss_mdns.conf + $(CP) $< $@ + chmod 444 $@ +- # Check the nsswitch.conf file. +- # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' +- cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns +- sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf + + ############################################################################# + diff --git a/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild new file mode 100644 index 000000000000..bb442787b73b --- /dev/null +++ b/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild,v 1.1 2006/03/28 05:40:50 flameeyes Exp $ + +inherit eutils multilib base toolchain-funcs flag-o-matic + +DESCRIPTION="The mDNSResponder project is a component of Bonjour, Apple's initiative for zero-configuration networking." +HOMEPAGE="http://developer.apple.com/networking/bonjour/index.html" +SRC_URI="mirror://gentoo/${P}.tar.gz" +LICENSE="APSL-2 BSD" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug java" + +PATCHES="${FILESDIR}/${P}-Makefiles.patch" + +pkg_setup() { + if use elibc_FreeBSD; then + os=freebsd + else + os=linux + fi +} + +mdnsmake() { + local debug, jdk + use java && jdk='JDK=$(java-config -O)' + use debug && debug='DEBUG=1' + einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \ + ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" STRIP="true" "$@" + emake os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \ + ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" STRIP="true" "$@" +} + +src_compile() { + cd ${S}/mDNSPosix + mdnsmake || die "make mDNSPosix failed" + + if use java; then + mdnsmake Java || die "make mDNSPosix java failed" + fi + + cd ${S}/Clients + mdnsmake || die "make Clients failed" +} + +src_install() { + cd "${S}/mDNSPosix" + + dodir /usr/sbin + dodir /usr/lib + dodir /usr/include + dodir /lib + dodir /etc + dodir /usr/share/man/man5 + dodir /usr/share/man/man8 + + local debug + local objdir="prod" + if use debug; then + debug="DEBUG=1" + objdir=debug + fi + + make DESTDIR="${D}" os=${os} ${debug} install || die "install failed" + + dosbin ${S}/mDNSPosix/build/${objdir}/dnsextd + dosbin ${S}/mDNSPosix/build/${objdir}/mDNSResponderPosix + dosbin ${S}/mDNSPosix/build/${objdir}/mDNSNetMonitor + + dobin ${S}/Clients/build/dns-sd + dobin ${S}/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix + dobin ${S}/mDNSPosix/build/${objdir}/mDNSIdentify + + newinitd ${FILESDIR}/mdnsd.init.d mdnsd + newinitd ${FILESDIR}/mDNSResponderPosix.init.d mDNSResponderPosix + newconfd ${FILESDIR}/mDNSResponderPosix.conf.d mDNSResponderPosix + newinitd ${FILESDIR}/dnsextd.init.d dnsextd + newconfd ${FILESDIR}/dnsextd.conf.d dnsextd + + insinto /etc + doins ${FILESDIR}/mDNSResponderPosix.conf + + dodoc ${S}/README.txt + + # Fix multilib-strictness + mv ${D}/lib ${D}/$(get_libdir) + mv ${D}/usr/lib ${D}/usr/$(get_libdir) + + if use java; then + java-pkg_dojar ${S}/mDNSPosix/build/prod/dns_sd.jar + java-pkg_doso ${S}/mDNSPosix/build/prod/libjdns_sd.so + fi + +} + +pkg_postinst() { + echo + einfo "To enable multicast dns lookups for applications" + einfo "that are not multicast dns aware, edit the 'hosts:'" + einfo "line in /etc/nsswitch.conf to include 'mdns', e.g.:" + einfo "hosts: files mdns dns" + echo +} -- 2.26.2