Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/knock: metadata.xml ChangeLog knock-0.5-r1.ebuild
Date: Tue, 31 Aug 2010 11:02:30
Message-Id: 20100831110225.190AB20051@flycatcher.gentoo.org
1 xmw 10/08/31 11:02:25
2
3 Modified: metadata.xml ChangeLog knock-0.5-r1.ebuild
4 Log:
5 Made knockd daemon optional with IUSE server, fixes bug 311257.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.6 net-misc/knock/metadata.xml
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/metadata.xml?rev=1.6&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/metadata.xml?rev=1.6&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/metadata.xml?r1=1.5&r2=1.6
14
15 Index: metadata.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-misc/knock/metadata.xml,v
18 retrieving revision 1.5
19 retrieving revision 1.6
20 diff -u -r1.5 -r1.6
21 --- metadata.xml 31 Aug 2010 09:33:43 -0000 1.5
22 +++ metadata.xml 31 Aug 2010 11:02:24 -0000 1.6
23 @@ -6,4 +6,7 @@
24 <email>xmw@g.o</email>
25 <name>Michael Weber</name>
26 </maintainer>
27 + <use>
28 + <flag name='server'>Installs the knockd server daemon.</flag>
29 + </use>
30 </pkgmetadata>
31
32
33
34 1.39 net-misc/knock/ChangeLog
35
36 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/ChangeLog?rev=1.39&view=markup
37 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/ChangeLog?rev=1.39&content-type=text/plain
38 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/ChangeLog?r1=1.38&r2=1.39
39
40 Index: ChangeLog
41 ===================================================================
42 RCS file: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v
43 retrieving revision 1.38
44 retrieving revision 1.39
45 diff -u -r1.38 -r1.39
46 --- ChangeLog 31 Aug 2010 09:33:43 -0000 1.38
47 +++ ChangeLog 31 Aug 2010 11:02:24 -0000 1.39
48 @@ -1,6 +1,10 @@
49 # ChangeLog for net-misc/knock
50 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
51 -# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.38 2010/08/31 09:33:43 xmw Exp $
52 +# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.39 2010/08/31 11:02:24 xmw Exp $
53 +
54 + 31 Aug 2010; Michael Weber <xmw@g.o> knock-0.5-r1.ebuild,
55 + metadata.xml:
56 + Made knockd daemon optional with IUSE server, fixes bug 311257.
57
58 *knock-0.5-r1 (31 Aug 2010)
59
60
61
62
63 1.2 net-misc/knock/knock-0.5-r1.ebuild
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/knock-0.5-r1.ebuild?rev=1.2&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/knock-0.5-r1.ebuild?rev=1.2&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/knock/knock-0.5-r1.ebuild?r1=1.1&r2=1.2
68
69 Index: knock-0.5-r1.ebuild
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.5-r1.ebuild,v
72 retrieving revision 1.1
73 retrieving revision 1.2
74 diff -u -r1.1 -r1.2
75 --- knock-0.5-r1.ebuild 31 Aug 2010 09:33:43 -0000 1.1
76 +++ knock-0.5-r1.ebuild 31 Aug 2010 11:02:24 -0000 1.2
77 @@ -1,6 +1,6 @@
78 # Copyright 1999-2010 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 -# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.5-r1.ebuild,v 1.1 2010/08/31 09:33:43 xmw Exp $
81 +# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.5-r1.ebuild,v 1.2 2010/08/31 11:02:24 xmw Exp $
82
83 EAPI=2
84
85 @@ -13,28 +13,34 @@
86 LICENSE="GPL-2"
87 SLOT="0"
88 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
89 -IUSE=""
90 +IUSE="+server"
91
92 -DEPEND="net-libs/libpcap"
93 -RDEPEND="net-firewall/iptables
94 - ${DEPEND}"
95 +DEPEND="server? ( net-libs/libpcap )"
96 +RDEPEND="${DEPEND}"
97
98 src_prepare() {
99 epatch "${FILESDIR}"/${P}-gcc-4.3.patch
100
101 sed -i -e "s:/usr/sbin/iptables:/sbin/iptables:g" knockd.conf || die
102 +
103 + if ! use server ; then
104 + sed -i -e '/^all:/s:knockd::' \
105 + -e '/$(INSTALL).*knockd/d' Makefile.in || die
106 + fi
107 }
108
109 src_install() {
110 make DESTDIR="${D}" install || die
111 dodoc ChangeLog README TODO || die
112
113 - newinitd "${FILESDIR}"/knockd.initd knock || die
114 - newconfd "${FILESDIR}"/knockd.confd knock || die
115 + if use server ; then
116 + newinitd "${FILESDIR}"/knockd.initd knock || die
117 + newconfd "${FILESDIR}"/knockd.confd knock || die
118 + fi
119 }
120
121 pkg_postinst() {
122 - if ! has_version net-firewall/iptables ; then
123 + if use server && ! has_version net-firewall/iptables ; then
124 einfo
125 elog "You're really encouraged to install net-firewall/iptables to"
126 elog "actually modify your firewall and use the example configuration."