1 |
gurligebis 08/12/14 18:23:14 |
2 |
|
3 |
Modified: ChangeLog metadata.xml psybnc-2.3.2.7-r2.ebuild |
4 |
Added: psybnc-2.3.2.9.ebuild |
5 |
Log: |
6 |
Bumping to 2.3.2.9, fixing both #172650 and #246596 |
7 |
(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc8 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 net-irc/psybnc/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/ChangeLog?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/ChangeLog?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/ChangeLog?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- ChangeLog 6 May 2007 12:41:07 -0000 1.7 |
23 |
+++ ChangeLog 14 Dec 2008 18:23:14 -0000 1.8 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for net-irc/psybnc |
26 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.7 2007/05/06 12:41:07 genone Exp $ |
28 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.8 2008/12/14 18:23:14 gurligebis Exp $ |
30 |
+ |
31 |
+*psybnc-2.3.2.9 (14 Dec 2008) |
32 |
+ |
33 |
+ 14 Dec 2008; Bjarke Istrup Pedersen <gurligebis@g.o> |
34 |
+ +files/psybnc-2.3.2.9-oidentd.patch, +files/oidentd.conf.psybnc, |
35 |
+ +files/psybnc-oidentd.initd, metadata.xml, psybnc-2.3.2.7-r2.ebuild, |
36 |
+ +psybnc-2.3.2.9.ebuild: |
37 |
+ Bumping to 2.3.2.9, fixing both #172650 and #246596 |
38 |
|
39 |
06 May 2007; Marius Mauch <genone@g.o> psybnc-2.3.2.7-r2.ebuild: |
40 |
Replacing einfo with elog |
41 |
|
42 |
|
43 |
|
44 |
1.3 net-irc/psybnc/metadata.xml |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/metadata.xml?rev=1.3&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/metadata.xml?rev=1.3&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/metadata.xml?r1=1.2&r2=1.3 |
49 |
|
50 |
Index: metadata.xml |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/psybnc/metadata.xml,v |
53 |
retrieving revision 1.2 |
54 |
retrieving revision 1.3 |
55 |
diff -u -r1.2 -r1.3 |
56 |
--- metadata.xml 26 Feb 2007 00:03:08 -0000 1.2 |
57 |
+++ metadata.xml 14 Dec 2008 18:23:14 -0000 1.3 |
58 |
@@ -6,5 +6,8 @@ |
59 |
<email>gurligebis@g.o</email> |
60 |
<name>Bjarke Istrup Pedersen</name> |
61 |
</maintainer> |
62 |
+ <use> |
63 |
+ <flag name='oidentd'>Adds support for oidentd</flag> |
64 |
+ </use> |
65 |
<longdescription>psyBNC is a multi-user and multi-server gateway to IRC networks</longdescription> |
66 |
</pkgmetadata> |
67 |
|
68 |
|
69 |
|
70 |
1.4 net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild |
71 |
|
72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild?rev=1.4&view=markup |
73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild?rev=1.4&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild?r1=1.3&r2=1.4 |
75 |
|
76 |
Index: psybnc-2.3.2.7-r2.ebuild |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v |
79 |
retrieving revision 1.3 |
80 |
retrieving revision 1.4 |
81 |
diff -u -r1.3 -r1.4 |
82 |
--- psybnc-2.3.2.7-r2.ebuild 6 May 2007 12:41:07 -0000 1.3 |
83 |
+++ psybnc-2.3.2.7-r2.ebuild 14 Dec 2008 18:23:14 -0000 1.4 |
84 |
@@ -1,6 +1,6 @@ |
85 |
-# Copyright 1999-2007 Gentoo Foundation |
86 |
+# Copyright 1999-2008 Gentoo Foundation |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v 1.3 2007/05/06 12:41:07 genone Exp $ |
89 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v 1.4 2008/12/14 18:23:14 gurligebis Exp $ |
90 |
|
91 |
inherit eutils versionator toolchain-funcs |
92 |
MY_PV="$(replace_version_separator 3 -)" |
93 |
@@ -26,9 +26,9 @@ |
94 |
|
95 |
src_unpack() { |
96 |
unpack ${A} |
97 |
- cd ${S} |
98 |
+ cd "${S}" |
99 |
|
100 |
- epatch ${FILESDIR}/compile.diff |
101 |
+ epatch "${FILESDIR}/compile.diff" |
102 |
|
103 |
# Useless files |
104 |
rm -f */INFO |
105 |
@@ -84,7 +84,7 @@ |
106 |
newinitd "${FILESDIR}"/psybnc.initd psybnc |
107 |
newconfd "${FILESDIR}"/psybnc.confd psybnc |
108 |
|
109 |
- dodoc CHANGES COPYING FAQ README SCRIPTING TODO |
110 |
+ dodoc CHANGES FAQ README SCRIPTING TODO |
111 |
docinto example-script |
112 |
dodoc scripts/example/DEFAULT.SCRIPT |
113 |
} |
114 |
|
115 |
|
116 |
|
117 |
1.1 net-irc/psybnc/psybnc-2.3.2.9.ebuild |
118 |
|
119 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9.ebuild?rev=1.1&view=markup |
120 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9.ebuild?rev=1.1&content-type=text/plain |
121 |
|
122 |
Index: psybnc-2.3.2.9.ebuild |
123 |
=================================================================== |
124 |
# Copyright 1999-2008 Gentoo Foundation |
125 |
# Distributed under the terms of the GNU General Public License v2 |
126 |
# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9.ebuild,v 1.1 2008/12/14 18:23:14 gurligebis Exp $ |
127 |
|
128 |
inherit eutils versionator toolchain-funcs flag-o-matic |
129 |
MY_PV="$(replace_version_separator 3 -)" |
130 |
PSYBNC_HOME="/var/lib/psybnc" |
131 |
|
132 |
DESCRIPTION="psyBNC is a multi-user and multi-server gateway to IRC networks" |
133 |
HOMEPAGE="http://www.psybnc.at/index.html" |
134 |
SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz" |
135 |
|
136 |
LICENSE="GPL-2" |
137 |
SLOT="0" |
138 |
KEYWORDS="~amd64 ~sparc ~x86" |
139 |
IUSE="ipv6 ssl oidentd" |
140 |
|
141 |
DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d ) |
142 |
oidentd? ( >=net-misc/oidentd-2.0 )" |
143 |
RDEPEND="${DEPEND}" |
144 |
S="${WORKDIR}"/"${PN}" |
145 |
|
146 |
pkg_setup() { |
147 |
enewgroup psybnc |
148 |
enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc |
149 |
} |
150 |
|
151 |
src_unpack() { |
152 |
unpack ${A} |
153 |
cd "${S}" |
154 |
|
155 |
epatch "${FILESDIR}/compile.diff" |
156 |
|
157 |
# add oidentd |
158 |
use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch" |
159 |
|
160 |
# Useless files |
161 |
rm -f */INFO |
162 |
|
163 |
# Prevent stripping the binary |
164 |
sed -i -e "/@strip/ d" tools/autoconf.c |
165 |
|
166 |
# Pretend we already have a certificate, we generate it in pkg_config |
167 |
mkdir key |
168 |
touch key/psybnc.cert.pem |
169 |
|
170 |
if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]] |
171 |
then |
172 |
einfo "Using existing salt.h for password encryption" |
173 |
cp "${ROOT}"/usr/share/psybnc/salt.h salt.h |
174 |
fi |
175 |
} |
176 |
|
177 |
src_compile() { |
178 |
use ipv6 || rm -f tools/chkipv6.c |
179 |
use ssl || rm -f tools/chkssl.c |
180 |
|
181 |
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" |
182 |
} |
183 |
|
184 |
src_install() { |
185 |
dobin psybnc |
186 |
|
187 |
insinto /usr/share/psybnc |
188 |
doins -r help lang salt.h |
189 |
fperms 0600 /usr/share/psybnc/salt.h |
190 |
|
191 |
insinto /etc/psybnc |
192 |
doins "${FILESDIR}"/psybnc.conf |
193 |
|
194 |
keepdir "${PSYBNC_HOME}"/{log,motd,scripts} |
195 |
dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang |
196 |
dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help |
197 |
|
198 |
fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf |
199 |
fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts} |
200 |
fperms 0640 /etc/psybnc/psybnc.conf |
201 |
|
202 |
if use ssl |
203 |
then |
204 |
keepdir /etc/psybnc/ssl |
205 |
dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key |
206 |
else |
207 |
# Drop SSL listener from psybnc.conf |
208 |
sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf |
209 |
fi |
210 |
|
211 |
if use oidentd |
212 |
then |
213 |
insinto /etc |
214 |
doins "${FILESDIR}"/oidentd.conf.psybnc |
215 |
fperms 640 /etc/oidentd.conf.psybnc |
216 |
# install init-script with oidentd-support |
217 |
newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc |
218 |
else |
219 |
# install init-script without oidentd-support |
220 |
newinitd "${FILESDIR}"/psybnc.initd psybnc |
221 |
fi |
222 |
|
223 |
newconfd "${FILESDIR}"/psybnc.confd psybnc |
224 |
|
225 |
dodoc CHANGES FAQ README SCRIPTING TODO |
226 |
docinto example-script |
227 |
dodoc scripts/example/DEFAULT.SCRIPT |
228 |
} |
229 |
|
230 |
pkg_config() { |
231 |
if use ssl |
232 |
then |
233 |
if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]] |
234 |
then |
235 |
ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!" |
236 |
ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again." |
237 |
return |
238 |
fi |
239 |
|
240 |
einfo "Generating certificate request..." |
241 |
openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes |
242 |
einfo "Generating self-signed certificate..." |
243 |
openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem |
244 |
einfo "Setting permissions on files..." |
245 |
chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem |
246 |
chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem |
247 |
fi |
248 |
} |
249 |
|
250 |
pkg_postinst() { |
251 |
if use ssl |
252 |
then |
253 |
elog |
254 |
elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates." |
255 |
fi |
256 |
if use oidentd |
257 |
then |
258 |
elog |
259 |
elog "You have enabled oidentd-support. You will need to set" |
260 |
elog "up your /etc/oident.conf file before running psybnc. An example" |
261 |
elog "for psyBNC can be found under /etc/oident.conf.psybnc." |
262 |
fi |
263 |
elog |
264 |
elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo." |
265 |
elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this." |
266 |
elog |
267 |
elog "To be able to reuse an existing psybnc.conf, you need to make sure that the" |
268 |
elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new" |
269 |
elog "version of psyBNC. It is needed for password encryption and decryption." |
270 |
elog |
271 |
} |