| 1 |
swegener 07/09/09 20:37:33 |
| 2 |
|
| 3 |
Modified: ChangeLog avahi-0.6.20-r2.ebuild |
| 4 |
avahi-0.6.19-r2.ebuild avahi-0.6.21.ebuild |
| 5 |
Log: |
| 6 |
Start avahi-daemon before netmount, bug #188719. Print a message that the dbus configuration needs to be reloaded before starting avahi-daemon for the first time, bug #191307. |
| 7 |
(Portage version: 2.1.3.9) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.126 net-dns/avahi/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.126&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.126&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.125&r2=1.126 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v |
| 19 |
retrieving revision 1.125 |
| 20 |
retrieving revision 1.126 |
| 21 |
diff -u -r1.125 -r1.126 |
| 22 |
--- ChangeLog 9 Sep 2007 13:46:55 -0000 1.125 |
| 23 |
+++ ChangeLog 9 Sep 2007 20:37:32 -0000 1.126 |
| 24 |
@@ -1,6 +1,14 @@ |
| 25 |
# ChangeLog for net-dns/avahi |
| 26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.125 2007/09/09 13:46:55 swegener Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.126 2007/09/09 20:37:32 swegener Exp $ |
| 29 |
+ |
| 30 |
+ 09 Sep 2007; Sven Wegener <swegener@g.o> |
| 31 |
+ +files/avahi-0.6.21-service_name_chosen.patch, |
| 32 |
+ +files/avahi-start-after-netmount.patch, avahi-0.6.19-r2.ebuild, |
| 33 |
+ avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild: |
| 34 |
+ Start avahi-daemon before netmount, bug #188719. Print a message that the |
| 35 |
+ dbus configuration needs to be reloaded before starting avahi-daemon for the |
| 36 |
+ first time, bug #191307. |
| 37 |
|
| 38 |
09 Sep 2007; Sven Wegener <swegener@g.o> |
| 39 |
-files/avahi-0.6.16-svn-1353.patch, -files/avahi-0.6.16-svn-1361.patch, |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.2 net-dns/avahi/avahi-0.6.20-r2.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild?rev=1.2&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild?rev=1.2&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild?r1=1.1&r2=1.2 |
| 48 |
|
| 49 |
Index: avahi-0.6.20-r2.ebuild |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v |
| 52 |
retrieving revision 1.1 |
| 53 |
retrieving revision 1.2 |
| 54 |
diff -u -r1.1 -r1.2 |
| 55 |
--- avahi-0.6.20-r2.ebuild 8 Aug 2007 20:28:52 -0000 1.1 |
| 56 |
+++ avahi-0.6.20-r2.ebuild 9 Sep 2007 20:37:32 -0000 1.2 |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
# Copyright 2000-2007 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.1 2007/08/08 20:28:52 swegener Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.2 2007/09/09 20:37:32 swegener Exp $ |
| 62 |
|
| 63 |
WANT_AUTOMAKE="1.9" |
| 64 |
|
| 65 |
@@ -103,6 +103,7 @@ |
| 66 |
epatch "${FILESDIR}"/${P}-make-known-answers-not-conflict.patch |
| 67 |
epatch "${FILESDIR}"/${P}-cleanup-dns-compression-table.patch |
| 68 |
epatch "${FILESDIR}"/${P}-autoipd.patch |
| 69 |
+ epatch "${FILESDIR}"/avahi-start-after-netmount.patch |
| 70 |
|
| 71 |
use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.3 net-dns/avahi/avahi-0.6.19-r2.ebuild |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild?rev=1.3&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild?rev=1.3&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild?r1=1.2&r2=1.3 |
| 81 |
|
| 82 |
Index: avahi-0.6.19-r2.ebuild |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v |
| 85 |
retrieving revision 1.2 |
| 86 |
retrieving revision 1.3 |
| 87 |
diff -u -r1.2 -r1.3 |
| 88 |
--- avahi-0.6.19-r2.ebuild 25 Aug 2007 14:32:12 -0000 1.2 |
| 89 |
+++ avahi-0.6.19-r2.ebuild 9 Sep 2007 20:37:32 -0000 1.3 |
| 90 |
@@ -1,6 +1,6 @@ |
| 91 |
# Copyright 1999-2007 Gentoo Foundation |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.2 2007/08/25 14:32:12 vapier Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.3 2007/09/09 20:37:32 swegener Exp $ |
| 95 |
|
| 96 |
WANT_AUTOMAKE="1.9" |
| 97 |
|
| 98 |
@@ -103,6 +103,7 @@ |
| 99 |
epatch "${FILESDIR}"/${P}-ui-sharp-gtk.patch |
| 100 |
epatch "${FILESDIR}"/${P}-assert-security.patch |
| 101 |
epatch "${FILESDIR}"/${PN}-0.6.20-autoipd.patch |
| 102 |
+ epatch "${FILESDIR}"/avahi-start-after-netmount.patch |
| 103 |
|
| 104 |
eautomake |
| 105 |
} |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.5 net-dns/avahi/avahi-0.6.21.ebuild |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild?rev=1.5&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild?rev=1.5&content-type=text/plain |
| 113 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild?r1=1.4&r2=1.5 |
| 114 |
|
| 115 |
Index: avahi-0.6.21.ebuild |
| 116 |
=================================================================== |
| 117 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v |
| 118 |
retrieving revision 1.4 |
| 119 |
retrieving revision 1.5 |
| 120 |
diff -u -r1.4 -r1.5 |
| 121 |
--- avahi-0.6.21.ebuild 22 Aug 2007 03:00:48 -0000 1.4 |
| 122 |
+++ avahi-0.6.21.ebuild 9 Sep 2007 20:37:32 -0000 1.5 |
| 123 |
@@ -1,6 +1,6 @@ |
| 124 |
# Copyright 2000-2007 Gentoo Foundation |
| 125 |
# Distributed under the terms of the GNU General Public License v2 |
| 126 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.4 2007/08/22 03:00:48 redhatter Exp $ |
| 127 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.5 2007/09/09 20:37:32 swegener Exp $ |
| 128 |
|
| 129 |
inherit eutils mono python qt3 qt4 |
| 130 |
|
| 131 |
@@ -99,6 +99,8 @@ |
| 132 |
epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch |
| 133 |
epatch "${FILESDIR}"/${P}-dbus-compat.patch |
| 134 |
epatch "${FILESDIR}"/${P}-browse-help.patch |
| 135 |
+ epatch "${FILESDIR}"/${P}-service_name_chosen.patch |
| 136 |
+ epatch "${FILESDIR}"/avahi-start-after-netmount.patch |
| 137 |
|
| 138 |
use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf |
| 139 |
} |
| 140 |
@@ -146,7 +148,7 @@ |
| 141 |
} |
| 142 |
|
| 143 |
src_install() { |
| 144 |
- make install py_compile=true DESTDIR="${D}" || die "make install failed" |
| 145 |
+ emake install py_compile=true DESTDIR="${D}" || die "make install failed" |
| 146 |
use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks |
| 147 |
|
| 148 |
use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc |
| 149 |
@@ -162,11 +164,11 @@ |
| 150 |
} |
| 151 |
|
| 152 |
pkg_postrm() { |
| 153 |
- use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi |
| 154 |
+ use python && python_mod_cleanup |
| 155 |
} |
| 156 |
|
| 157 |
pkg_postinst() { |
| 158 |
- use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi |
| 159 |
+ use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi |
| 160 |
|
| 161 |
if use autoipd |
| 162 |
then |
| 163 |
@@ -175,4 +177,12 @@ |
| 164 |
elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" |
| 165 |
elog |
| 166 |
fi |
| 167 |
+ |
| 168 |
+ if use dbus |
| 169 |
+ then |
| 170 |
+ elog |
| 171 |
+ elog "If this is your first install of avahi please reload your dbus config" |
| 172 |
+ elog "with /etc/init.d/dbus reload before starting avahi-daemon!" |
| 173 |
+ elog |
| 174 |
+ fi |
| 175 |
} |
| 176 |
|
| 177 |
|
| 178 |
|
| 179 |
-- |
| 180 |
gentoo-commits@g.o mailing list |
Archives