1 |
flameeyes 10/09/06 03:59:09 |
2 |
|
3 |
Modified: metadata.xml ChangeLog quagga-0.99.17-r1.ebuild |
4 |
Log: |
5 |
Add a readline USE flag to disable vtysh; ignore pam USE flag if vtysh is disabled; disable forced PIE build; inline most of the parameters to econf call; rename PAM file to Quagga (since that's what the code looks for); update metadata for flag documentation and reduce the description. |
6 |
|
7 |
(Portage version: 2.2_rc75/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 net-misc/quagga/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/metadata.xml?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/metadata.xml?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/metadata.xml?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/quagga/metadata.xml,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- metadata.xml 5 Sep 2010 17:09:36 -0000 1.7 |
23 |
+++ metadata.xml 6 Sep 2010 03:59:09 -0000 1.8 |
24 |
@@ -12,15 +12,14 @@ |
25 |
<longdescription> |
26 |
Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP |
27 |
based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, |
28 |
- OSPFv3, BGP-4, and BGP-4+ (*note Supported RFC::). Quagga also supports special BGP Route |
29 |
- Reflector and Route Server behavior. In addition to traditional IPv4 routing protocols, Quagga |
30 |
- also supports IPv6 routing protocols. With SNMP daemon which supports SMUX protocol, Quagga |
31 |
- provides routing protocol MIBs (*note SNMP Support::). Furthermore Quagga supports OSPFAPI |
32 |
- (*note OSPFAPI Support::), a API interface to the OSPF LSDB. It supports inspection as well as |
33 |
- injection of normal and opaque OSPF LSAs. Applications like SRRD - The Service Rounting |
34 |
- Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF routing |
35 |
- domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood service |
36 |
- state information into the routing domain. |
37 |
+ OSPFv3, BGP-4, and BGP-4+. Quagga also supports special BGP Route Reflector and Route Server |
38 |
+ behavior. In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing |
39 |
+ protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol |
40 |
+ MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports |
41 |
+ inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The |
42 |
+ Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF |
43 |
+ routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood |
44 |
+ service state information into the routing domain. |
45 |
</longdescription> |
46 |
<use> |
47 |
<flag name="bgpclassless"> |
48 |
@@ -48,5 +47,13 @@ |
49 |
Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain |
50 |
sockets are chosen otherwise. |
51 |
</flag> |
52 |
+ <flag name="readline"> |
53 |
+ Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal |
54 |
+ Interface Shell (vtysh). |
55 |
+ </flag> |
56 |
+ <flag name="pam"> |
57 |
+ Add support for PAM (via<pkg>sys-libs/pam</pkg>) to teh Quagga Virtual Terminal Interface |
58 |
+ Shell (vtysh); if the readline USE flag is disabled, this flag is ignored. |
59 |
+ </flag> |
60 |
</use> |
61 |
</pkgmetadata> |
62 |
|
63 |
|
64 |
|
65 |
1.88 net-misc/quagga/ChangeLog |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/ChangeLog?rev=1.88&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/ChangeLog?rev=1.88&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/ChangeLog?r1=1.87&r2=1.88 |
70 |
|
71 |
Index: ChangeLog |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v |
74 |
retrieving revision 1.87 |
75 |
retrieving revision 1.88 |
76 |
diff -u -r1.87 -r1.88 |
77 |
--- ChangeLog 6 Sep 2010 03:31:07 -0000 1.87 |
78 |
+++ ChangeLog 6 Sep 2010 03:59:09 -0000 1.88 |
79 |
@@ -2,7 +2,14 @@ |
80 |
# Copyright 1999-2010 Gentoo Foundation |
81 |
# Copyright 2003-2004 DataCore GmbH |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.87 2010/09/06 03:31:07 flameeyes Exp $ |
84 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.88 2010/09/06 03:59:09 flameeyes Exp $ |
85 |
+ |
86 |
+ 06 Sep 2010; Diego E. Pettenò <flameeyes@g.o> |
87 |
+ quagga-0.99.17-r1.ebuild, metadata.xml: |
88 |
+ Add a readline USE flag to disable vtysh; ignore pam USE flag if vtysh is |
89 |
+ disabled; disable forced PIE build; inline most of the parameters to econf |
90 |
+ call; rename PAM file to Quagga (since that's what the code looks for); |
91 |
+ update metadata for flag documentation and reduce the description. |
92 |
|
93 |
*quagga-0.99.17-r1 (06 Sep 2010) |
94 |
|
95 |
|
96 |
|
97 |
|
98 |
1.2 net-misc/quagga/quagga-0.99.17-r1.ebuild |
99 |
|
100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild?rev=1.2&view=markup |
101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild?rev=1.2&content-type=text/plain |
102 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild?r1=1.1&r2=1.2 |
103 |
|
104 |
Index: quagga-0.99.17-r1.ebuild |
105 |
=================================================================== |
106 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v |
107 |
retrieving revision 1.1 |
108 |
retrieving revision 1.2 |
109 |
diff -u -r1.1 -r1.2 |
110 |
--- quagga-0.99.17-r1.ebuild 6 Sep 2010 03:31:07 -0000 1.1 |
111 |
+++ quagga-0.99.17-r1.ebuild 6 Sep 2010 03:59:09 -0000 1.2 |
112 |
@@ -1,6 +1,6 @@ |
113 |
# Copyright 1999-2010 Gentoo Foundation |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v 1.1 2010/09/06 03:31:07 flameeyes Exp $ |
116 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v 1.2 2010/09/06 03:59:09 flameeyes Exp $ |
117 |
|
118 |
EAPI="2" |
119 |
|
120 |
@@ -18,12 +18,15 @@ |
121 |
LICENSE="GPL-2" |
122 |
SLOT="0" |
123 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86" |
124 |
-IUSE="caps doc ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra elibc_glibc" |
125 |
+IUSE="caps doc ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra elibc_glibc +readline" |
126 |
|
127 |
-COMMON_DEPEND="sys-libs/readline |
128 |
+COMMON_DEPEND=" |
129 |
caps? ( sys-libs/libcap ) |
130 |
snmp? ( net-analyzer/net-snmp ) |
131 |
- pam? ( sys-libs/pam ) |
132 |
+ readline? ( |
133 |
+ sys-libs/readline |
134 |
+ pam? ( sys-libs/pam ) |
135 |
+ ) |
136 |
!elibc_glibc? ( dev-libs/libpcre )" |
137 |
DEPEND="${COMMON_DEPEND} |
138 |
>=sys-devel/libtool-2.2.4" |
139 |
@@ -51,18 +54,11 @@ |
140 |
} |
141 |
|
142 |
src_configure() { |
143 |
- local myconf="--disable-static \ |
144 |
- $(use_enable caps capabilities) \ |
145 |
- $(use_enable snmp) \ |
146 |
- $(use_with pam libpam) \ |
147 |
- $(use_enable !elibc_glibc pcreposix) \ |
148 |
- $(use_enable tcp-zebra) |
149 |
- $(use_enable doc)" |
150 |
- use ipv6 \ |
151 |
- && myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \ |
152 |
- || myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d" |
153 |
+ local myconf= |
154 |
+ |
155 |
use ospfapi \ |
156 |
&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient" |
157 |
+ |
158 |
use realms && myconf="${myconf} --enable-realms" |
159 |
use multipath && myconf="${myconf} --enable-multipath=0" |
160 |
|
161 |
@@ -71,10 +67,26 @@ |
162 |
--enable-group=quagga \ |
163 |
--enable-vty-group=quagga \ |
164 |
--with-cflags="${CFLAGS}" \ |
165 |
- --enable-vtysh \ |
166 |
--sysconfdir=/etc/quagga \ |
167 |
--enable-exampledir=/usr/share/doc/${PF}/samples \ |
168 |
--localstatedir=/var/run/quagga \ |
169 |
+ --disable-static \ |
170 |
+ --disable-pie \ |
171 |
+ \ |
172 |
+ $(use_enable caps capabilities) \ |
173 |
+ $(use_enable snmp) \ |
174 |
+ $(use_enable !elibc_glibc pcreposix) \ |
175 |
+ $(use_enable tcp-zebra) \ |
176 |
+ $(use_enable doc) \ |
177 |
+ \ |
178 |
+ $(use_enable readline vtysh) \ |
179 |
+ $(use_with pam libpam) \ |
180 |
+ \ |
181 |
+ $(use_enable ipv6) \ |
182 |
+ $(use_enable ipv6 ripngd) \ |
183 |
+ $(use_enable ipv6 ospf6d) \ |
184 |
+ $(use_enable ipv6 rtadv) \ |
185 |
+ \ |
186 |
${myconf} \ |
187 |
|| die "configure failed" |
188 |
} |
189 |
@@ -96,7 +108,7 @@ |
190 |
ln -s ripd "${D}"/etc/init.d/${service} || die |
191 |
done |
192 |
|
193 |
- newpamd "${FILESDIR}/quagga.pam" quagga |
194 |
+ use readline && newpamd "${FILESDIR}/quagga.pam" Quagga |
195 |
} |
196 |
|
197 |
pkg_postinst() { |