1 |
reavertm 10/07/03 08:26:39 |
2 |
|
3 |
Modified: ChangeLog quassel-9999.ebuild |
4 |
Log: |
5 |
Add missing enewgroup, rework a little (move enewuser to pkg_setup) |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.92 net-irc/quassel/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.92&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.92&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.91&r2=1.92 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
18 |
retrieving revision 1.91 |
19 |
retrieving revision 1.92 |
20 |
diff -u -r1.91 -r1.92 |
21 |
--- ChangeLog 2 Jul 2010 07:21:41 -0000 1.91 |
22 |
+++ ChangeLog 3 Jul 2010 08:26:39 -0000 1.92 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for net-irc/quassel |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.91 2010/07/02 07:21:41 scarabeus Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.92 2010/07/03 08:26:39 reavertm Exp $ |
28 |
+ |
29 |
+ 03 Jul 2010; Maciej Mrozowski <reavertm@g.o> quassel-9999.ebuild: |
30 |
+ Add missing enewgroup, rework a little |
31 |
|
32 |
02 Jul 2010; Tomáš Chvátal <scarabeus@g.o> quassel-9999.ebuild: |
33 |
Introduce QT_MINIMAL and KDE_MINIMAL. |
34 |
|
35 |
|
36 |
|
37 |
1.39 net-irc/quassel/quassel-9999.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.39&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.39&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.38&r2=1.39 |
42 |
|
43 |
Index: quassel-9999.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v |
46 |
retrieving revision 1.38 |
47 |
retrieving revision 1.39 |
48 |
diff -u -r1.38 -r1.39 |
49 |
--- quassel-9999.ebuild 2 Jul 2010 07:21:41 -0000 1.38 |
50 |
+++ quassel-9999.ebuild 3 Jul 2010 08:26:39 -0000 1.39 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2010 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.38 2010/07/02 07:21:41 scarabeus Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.39 2010/07/03 08:26:39 reavertm Exp $ |
56 |
|
57 |
EAPI="2" |
58 |
|
59 |
@@ -70,6 +70,14 @@ |
60 |
ewarn "Enabling monolithic by default." |
61 |
FORCED_MONO="yes" |
62 |
fi |
63 |
+ |
64 |
+ if use server; then |
65 |
+ QUASSEL_DIR=/var/lib/${PN} |
66 |
+ QUASSEL_USER=${PN} |
67 |
+ # create quassel:quassel user |
68 |
+ enewgroup "${QUASSEL_USER}" |
69 |
+ enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}" |
70 |
+ fi |
71 |
} |
72 |
|
73 |
src_configure() { |
74 |
@@ -97,9 +105,8 @@ |
75 |
|
76 |
if use server ; then |
77 |
# prepare folders in /var/ |
78 |
- dodir /var/lib/${PN}/ |
79 |
- keepdir /var/lib/${PN}/ |
80 |
- fowners ${PN}:${PN} /var/lib/${PN}/ |
81 |
+ keepdir "${QUASSEL_DIR}" |
82 |
+ fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}" |
83 |
|
84 |
# init scripts |
85 |
newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed" |
86 |
@@ -111,23 +118,16 @@ |
87 |
fi |
88 |
} |
89 |
|
90 |
-pkg_preinst() { |
91 |
- if use server; then |
92 |
- # create quassel user |
93 |
- enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}" |
94 |
- fi |
95 |
-} |
96 |
- |
97 |
pkg_postinst() { |
98 |
if use server && use ssl; then |
99 |
# inform about genreating ssl certificate |
100 |
elog "If you want to use ssl connection to your core, please generate ssl key, with folowing command:" |
101 |
- elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /var/lib/${PN}/quasselCert.pem -ou" |
102 |
+ elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${QUASSEL_DIR}/quasselCert.pem -ou" |
103 |
echo |
104 |
elog "Also remember that with the above command the key is valid only for 1 year." |
105 |
fi |
106 |
|
107 |
- if ( use monolithic || [[ ${FORCED_MONO} == "yes" ]] ) && use ssl ; then |
108 |
+ if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && use ssl ; then |
109 |
echo |
110 |
elog "Information on how to enable SSL support for client/core connections" |
111 |
elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc." |
112 |
@@ -137,7 +137,7 @@ |
113 |
if use server; then |
114 |
ewarn "Please note that all configuration moved from" |
115 |
ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/" |
116 |
- ewarn "to: /var/lib/${PN}/." |
117 |
+ ewarn "to: ${QUASSEL_DIR}." |
118 |
echo |
119 |
ewarn "For migration. Stop the core, move the files to new location and then start server again." |
120 |
fi |