| 1 |
scarabeus 10/08/27 10:00:43 |
| 2 |
|
| 3 |
Modified: ChangeLog quassel-9999.ebuild |
| 4 |
Log: |
| 5 |
Add support for --config action. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc68/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.99 net-irc/quassel/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.99&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.99&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.98&r2=1.99 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
| 19 |
retrieving revision 1.98 |
| 20 |
retrieving revision 1.99 |
| 21 |
diff -u -r1.98 -r1.99 |
| 22 |
--- ChangeLog 27 Aug 2010 09:44:57 -0000 1.98 |
| 23 |
+++ ChangeLog 27 Aug 2010 10:00:43 -0000 1.99 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-irc/quassel |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.98 2010/08/27 09:44:57 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.99 2010/08/27 10:00:43 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 27 Aug 2010; Tomáš Chvátal <scarabeus@g.o> quassel-9999.ebuild: |
| 31 |
+ Add support for --config action. |
| 32 |
|
| 33 |
27 Aug 2010; Tomáš Chvátal <scarabeus@g.o> quassel-9999.ebuild: |
| 34 |
Move dbus deps to proper section, add missing dep. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.46 net-irc/quassel/quassel-9999.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.46&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.46&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.45&r2=1.46 |
| 43 |
|
| 44 |
Index: quassel-9999.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v |
| 47 |
retrieving revision 1.45 |
| 48 |
retrieving revision 1.46 |
| 49 |
diff -u -r1.45 -r1.46 |
| 50 |
--- quassel-9999.ebuild 27 Aug 2010 09:44:57 -0000 1.45 |
| 51 |
+++ quassel-9999.ebuild 27 Aug 2010 10:00:43 -0000 1.46 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.45 2010/08/27 09:44:57 scarabeus Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.46 2010/08/27 10:00:43 scarabeus Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
|
| 60 |
@@ -124,26 +124,43 @@ |
| 61 |
} |
| 62 |
|
| 63 |
pkg_postinst() { |
| 64 |
- if use server && use ssl; then |
| 65 |
- # inform about genreating ssl certificate |
| 66 |
- elog "If you want to use ssl connection to your core, please generate ssl key, with following command:" |
| 67 |
- elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${QUASSEL_DIR}/quasselCert.pem -out ${QUASSEL_DIR}/quasselCert.pem" |
| 68 |
- echo |
| 69 |
- elog "Also remember that with the above command the key is valid only for 1 year." |
| 70 |
- fi |
| 71 |
- |
| 72 |
if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && use ssl ; then |
| 73 |
- echo |
| 74 |
elog "Information on how to enable SSL support for client/core connections" |
| 75 |
elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc." |
| 76 |
fi |
| 77 |
|
| 78 |
+ if use server; then |
| 79 |
+ einfo "If you want to generate SSL certificate remember to run:" |
| 80 |
+ einfo " emerge --config =${CATEGORY}/${PF}" |
| 81 |
+ fi |
| 82 |
+ |
| 83 |
# temporary info mesage |
| 84 |
if use server; then |
| 85 |
+ echo |
| 86 |
ewarn "Please note that all configuration moved from" |
| 87 |
ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/" |
| 88 |
ewarn "to: ${QUASSEL_DIR}." |
| 89 |
echo |
| 90 |
- ewarn "For migration, stop the core, move quasselcore files (pretty much everything apart from quasselclient.conf and settings.qss) into new location and then start server again." |
| 91 |
+ ewarn "For migration, stop the core, move quasselcore files (pretty much" |
| 92 |
+ ewarn "everything apart from quasselclient.conf and settings.qss) into" |
| 93 |
+ ewarn "new location and then start server again." |
| 94 |
+ fi |
| 95 |
+} |
| 96 |
+ |
| 97 |
+pkg_config() { |
| 98 |
+ if use server && use ssl; then |
| 99 |
+ # generate the pem file only when it does not already exist |
| 100 |
+ if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then |
| 101 |
+ einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" |
| 102 |
+ openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ |
| 103 |
+ -keyout "${QUASSEL_DIR}/quasselCert.pem" \ |
| 104 |
+ -out "${QUASSEL_DIR}/quasselCert.pem" |
| 105 |
+ # permissions for the key |
| 106 |
+ chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem" |
| 107 |
+ chmod 400 "${QUASSEL_DIR}/quasselCert.pem" |
| 108 |
+ else |
| 109 |
+ einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists." |
| 110 |
+ einfo "Remove it if you want to create new one." |
| 111 |
+ fi |
| 112 |
fi |
| 113 |
} |
Archives