Add support for --config action.

Package-Manager: portage-2.2_rc68/cvs/Linux x86_64

3 files changed, 34 insertions, 14 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 3d8cfdbbb214..ee3d9d4cc82a 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.98 2010/08/27 09:44:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.99 2010/08/27 10:00:43 scarabeus Exp $
+
+  27 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild:
+  Add support for --config action.
 
   27 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild:
   Move dbus deps to proper section, add missing dep.
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 5ec3014a3776..799e0617d223 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -10,6 +10,6 @@ DIST quassel-0.6.1.tar.bz2 2531035 RMD160 39e08319488062e02545055c91554ee1ea0259
 EBUILD quassel-0.5.1.ebuild 3218 RMD160 39c25156b7ed5c938be60b9b189d7c52a18af088 SHA1 5b9b23f3c6a99ce9494ba4c6d0ceef131c0d7d2a SHA256 d7e361d29f8ab6caf2303600e1832caab14165eda7201557ec3cc0a2e3055cdf
 EBUILD quassel-0.5.2.ebuild 3282 RMD160 2c191d65f757c83445da768cd83966c912682bc6 SHA1 00129b070abdd35dfafc8e12bcd286897b29697f SHA256 e7c9433470ad9a1a0e2b2d74f2e90dc15008fc86a484cf066ceb38f185832fba
 EBUILD quassel-0.6.1.ebuild 2901 RMD160 bffc3302e8829a4e4d3ffbe3d449f95b06cbd6d7 SHA1 7c5f1c1bb8c0bf5d1d9b2da962f1319e3ff44ec7 SHA256 ce206222ccec46dfdd8602d87a1cdfc71db626d2546863f9b2de95590013ebcd
-EBUILD quassel-9999.ebuild 4193 RMD160 249c17b2cd5993dbc6a2ad56fdb7124fffd9776d SHA1 3336644f77063b281a7c3ac2007ff8b86c1abdb2 SHA256 954d3a2bc401e0362e9f676e529d1a5fd653699d6aa1babcc87615ec01d7bafd
-MISC ChangeLog 16959 RMD160 fddb99aee0b44552236465eba1e3af61378bc3de SHA1 13e9632b9759955d3022e647e80bc548b0d15355 SHA256 19dd6a170c36470fb146b67c2b68e6e25ebc9fe912f5c145b84f7ba30d28a06b
+EBUILD quassel-9999.ebuild 4622 RMD160 82f5467b414326969b79b1d835ada541e4ff6c2b SHA1 78008ed47eb61ba9b58fab916a57d45d6fd71baf SHA256 52f542d3c53aea60a0b8678f31c400e3d2202c09a06a69b149e719172a0f7c3b
+MISC ChangeLog 17071 RMD160 baaabc1a402783792e9a3490c4715999edefb955 SHA1 f75a52a5957a3a1ec685b34a8a985d371871ad1d SHA256 27e37427e4d67e5f040fec2db5d5adc48e518af4a11729501c7e2f4ee278ebb8
 MISC metadata.xml 1807 RMD160 4f33edc434ec5a41fc4beffc37648ceda4117d91 SHA1 3a1d4fee34a947daf4ed51d405ea616d61ff671c SHA256 973cc0263875a0ba9bdde43b5e3d2daa51ff81ce716e5f4a1087aa33064b8f07
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 81054d4d128a..a14aed66f619 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.45 2010/08/27 09:44:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.46 2010/08/27 10:00:43 scarabeus Exp $
 
 EAPI="2"
 
@@ -124,26 +124,43 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use server && use ssl; then
-		# inform about genreating ssl certificate
-		elog "If you want to use ssl connection to your core, please generate ssl key, with following command:"
-		elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${QUASSEL_DIR}/quasselCert.pem -out ${QUASSEL_DIR}/quasselCert.pem"
-		echo
-		elog "Also remember that with the above command the key is valid only for 1 year."
-	fi
-
 	if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && use ssl ; then
-		echo
 		elog "Information on how to enable SSL support for client/core connections"
 		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
 	fi
 
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
 	# temporary info mesage
 	if use server; then
+		echo
 		ewarn "Please note that all configuration moved from"
 		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
 		ewarn "to: ${QUASSEL_DIR}."
 		echo
-		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."
+		ewarn "For migration, stop the core, move quasselcore files (pretty	much"
+		ewarn "everything apart from quasselclient.conf and settings.qss) into"
+		ewarn "new location and then start server again."
+	fi
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
 	fi
 }