From 560b21435203845175cf5b283538c4084f1fdd9c Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sun, 18 Mar 2007 06:07:51 +0000 Subject: Replacing einfo with elog (Portage version: 2.1.2.2) --- mail-mta/qmail-ldap/ChangeLog | 7 +++- mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild | 48 +++++++++++++-------------- mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild | 48 +++++++++++++-------------- mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild | 42 +++++++++++------------ mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild | 42 +++++++++++------------ 5 files changed, 94 insertions(+), 93 deletions(-) diff --git a/mail-mta/qmail-ldap/ChangeLog b/mail-mta/qmail-ldap/ChangeLog index 4a855da643f8..bb1035729dc3 100644 --- a/mail-mta/qmail-ldap/ChangeLog +++ b/mail-mta/qmail-ldap/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/qmail-ldap # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.13 2007/02/22 01:06:26 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.14 2007/03/18 06:07:51 genone Exp $ + + 18 Mar 2007; Marius Mauch qmail-ldap-1.03-r1.ebuild, + qmail-ldap-1.03-r2.ebuild, qmail-ldap-1.03-r3.ebuild, + qmail-ldap-1.03-r4.ebuild: + Replacing einfo with elog 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild index ea0f95ecd334..6ef9ea18d013 100644 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.10 2006/02/17 16:34:46 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.11 2007/03/18 06:07:51 genone Exp $ IUSE="ssl" @@ -296,35 +296,35 @@ pkg_postinst() { groupadd ldapauth &>/dev/null fi - echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m" - echo -e "\e[32;01m emerge --config =${PF} \033[0m" - echo -e "\e[32;01m This will setup qmail to run out-of-the-box on your system. \033[0m" - echo -e "" - echo -e "\e[32;01m To start qmail at boot you have to enable the /etc/init.d/svscan rc file \033[0m" - echo -e "\e[32;01m and create the following links : \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-send /service/qmail-send \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d \033[0m" - echo -e "" - echo -e "\e[32;01m NOTE: Please check your /var/qmail/control/ldap* files to match your local \033[0m" - echo -e "\e[32;01m ldap settings and add the qmail.schema to your slapd.conf. For sample ldifs,\033[0m" - echo -e "\e[32;01m please check /usr/share/doc/${PF}/samples.ldif.gz \033[0m" + elog "Please do not forget to run, the following syntax:" + elog "emerge --config =${PF}" + elog "This will setup qmail to run out-of-the-box on your system." + elog + elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following links :" + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" + elog + elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local" + elog "ldap settings and add the qmail.schema to your slapd.conf. For sample ldifs,\033[0m" + elog "please check /usr/share/doc/${PF}/samples.ldif.gz" if use ssl; then - echo "Creating a self-signed ssl-cert:" + einfo "Creating a self-signed ssl-cert:" /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem chmod 640 /var/qmail/control/servercert.pem chown qmaild:qmail /var/qmail/control/servercert.pem ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem - echo -e "\e[32;01m If You want to have a signed cert, do the following: \033[0m" - echo -e "\e[32;01m openssl req -new -nodes -out req.pem \ \033[0m" - echo -e "\e[32;01m -keyout /var/qmail/control/servercert.pem \033[0m" - echo -e "\e[32;01m chmod 640 /var/qmail/control/servercert.pem \033[0m" - echo -e "\e[32;01m chown qmaild:qmail /var/qmail/control/servercert.pem \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem \033[0m" - echo -e "\e[32;01m Send req.pem to your CA to obtain signed_req.pem, and do: \033[0m" - echo -e "\e[32;01m cat signed_req.pem >> /var/qmail/control/servercert.pem \033[0m" + elog "If You want to have a signed cert, do the following:" + elog "openssl req -new -nodes -out req.pem \\" + elog "-keyout /var/qmail/control/servercert.pem" + elog "chmod 640 /var/qmail/control/servercert.pem" + elog "chown qmaild:qmail /var/qmail/control/servercert.pem" + elog "ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem" + elog "Send req.pem to your CA to obtain signed_req.pem, and do:" + elog "cat signed_req.pem >> /var/qmail/control/servercert.pem" fi } diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild index e5a1cdf1768f..5329da427453 100644 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild,v 1.8 2005/10/24 11:45:35 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild,v 1.9 2007/03/18 06:07:51 genone Exp $ IUSE="ssl" @@ -300,36 +300,36 @@ pkg_postinst() { groupadd ldapauth &>/dev/null fi - echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m" - echo -e "\e[32;01m emerge --config =${PF} \033[0m" - echo -e "\e[32;01m This will setup qmail to run out-of-the-box on your system. \033[0m" - echo -e "" - echo -e "\e[32;01m To start qmail at boot you have to enable the /etc/init.d/svscan rc file \033[0m" - echo -e "\e[32;01m and create the following links : \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-send /service/qmail-send \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d \033[0m" - echo -e "" - echo -e "\e[32;01m NOTE: Please check your /var/qmail/control/ldap* files to match your local \033[0m" - echo -e "\e[32;01m ldap settings and add the qmail.schema along with \"allow bind_v2\" to your \033[0m" - echo -e "\e[32;01m slapd.conf. For sample ldifs, please check \033[0m" - echo -e "\e[32;01m /usr/share/doc/${PF}/samples.ldif.gz \033[0m" + elog "Please do not forget to run, the following syntax :\033[0m" + elog "emerge --config =${PF}" + elog "This will setup qmail to run out-of-the-box on your system." + elog + elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following links :" + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" + elog + elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local" + elog "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your" + elog "slapd.conf. For sample ldifs, please check" + elog "/usr/share/doc/${PF}/samples.ldif.gz" if use ssl; then - echo "Creating a self-signed ssl-cert:" + einfo "Creating a self-signed ssl-cert:" /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem chmod 640 /var/qmail/control/servercert.pem chown qmaild:qmail /var/qmail/control/servercert.pem ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem - echo -e "\e[32;01m If You want to have a signed cert, do the following: \033[0m" - echo -e "\e[32;01m openssl req -new -nodes -out req.pem \ \033[0m" - echo -e "\e[32;01m -keyout /var/qmail/control/servercert.pem \033[0m" - echo -e "\e[32;01m chmod 640 /var/qmail/control/servercert.pem \033[0m" - echo -e "\e[32;01m chown qmaild:qmail /var/qmail/control/servercert.pem \033[0m" - echo -e "\e[32;01m ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem \033[0m" - echo -e "\e[32;01m Send req.pem to your CA to obtain signed_req.pem, and do: \033[0m" - echo -e "\e[32;01m cat signed_req.pem >> /var/qmail/control/servercert.pem \033[0m" + elog "If You want to have a signed cert, do the following:" + elog "openssl req -new -nodes -out req.pem \\" + elog "-keyout /var/qmail/control/servercert.pem" + elog "chmod 640 /var/qmail/control/servercert.pem" + elog "chown qmaild:qmail /var/qmail/control/servercert.pem" + elog "ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem" + elog "Send req.pem to your CA to obtain signed_req.pem, and do:" + elog "cat signed_req.pem >> /var/qmail/control/servercert.pem" fi } diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild index e33c37945334..40beabf7f7fe 100644 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild,v 1.8 2005/10/24 11:45:35 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild,v 1.9 2007/03/18 06:07:51 genone Exp $ IUSE="ssl" @@ -258,10 +258,10 @@ rootmailfixup() { # so you can check mail as root easily local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then - einfo "Previously the qmail ebuilds created /root/.maildir/ but not" - einfo "mail was every delivered there. If the directory does not" - einfo "contain any mail, please delete it and run:" - einfo "${TMPCMD}" + elog "Previously the qmail ebuilds created /root/.maildir/ but not" + elog "mail was every delivered there. If the directory does not" + elog "contain any mail, please delete it and run:" + elog "${TMPCMD}" else ${TMPCMD} fi @@ -296,22 +296,20 @@ pkg_postinst() { groupadd ldapauth &>/dev/null fi - einfo "Please do not forget to run, the following syntax :" - einfo "emerge --config =${PF} " - einfo "This will setup qmail to run out-of-the-box on your system including SSL. " - echo - einfo "To start qmail at boot you have to enable the /etc/init.d/svscan rc file " - einfo "and create the following links : " - einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send " - einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd " - einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d " - echo - einfo "NOTE: Please check your /var/qmail/control/ldap* files to match your local " - einfo "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your " - einfo "slapd.conf. For sample ldifs, please check " - einfo "/usr/share/doc/${PF}/samples.ldif.gz " - - + elog "Please do not forget to run, the following syntax :" + elog "emerge --config =${PF} " + elog "This will setup qmail to run out-of-the-box on your system including SSL. " + elog + elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file " + elog "and create the following links : " + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send " + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd " + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d " + elog + elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local " + elog "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your " + elog "slapd.conf. For sample ldifs, please check " + elog "/usr/share/doc/${PF}/samples.ldif.gz " } pkg_config() { diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild index bc67ce026e0d..ff2567bc86d5 100644 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild,v 1.8 2005/10/24 11:45:35 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild,v 1.9 2007/03/18 06:07:51 genone Exp $ IUSE="ssl" @@ -275,10 +275,10 @@ rootmailfixup() { # so you can check mail as root easily local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then - einfo "Previously the qmail ebuilds created /root/.maildir/ but not" - einfo "mail was every delivered there. If the directory does not" - einfo "contain any mail, please delete it and run:" - einfo "${TMPCMD}" + elog "Previously the qmail ebuilds created /root/.maildir/ but not" + elog "mail was every delivered there. If the directory does not" + elog "contain any mail, please delete it and run:" + elog "${TMPCMD}" else ${TMPCMD} fi @@ -314,22 +314,20 @@ pkg_postinst() { fi - einfo "Please do not forget to run, the following syntax :" - einfo "emerge --config =${PF} " - einfo "This will setup qmail to run out-of-the-box on your system including SSL. " - echo - einfo "To start qmail at boot you have to enable the /etc/init.d/svscan rc file " - einfo "and create the following links : " - einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send " - einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd " - einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d " - echo - einfo "NOTE: Please check your /var/qmail/control/ldap* files to match your local " - einfo "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your " - einfo "slapd.conf. For sample ldifs, please check " - einfo "/usr/share/doc/${PF}/samples.ldif.gz " - - + elog "Please do not forget to run, the following syntax :" + elog "emerge --config =${PF} " + elog "This will setup qmail to run out-of-the-box on your system including SSL. " + elog + elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file " + elog "and create the following links : " + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send " + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd " + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d " + elog + elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local " + elog "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your " + elog "slapd.conf. For sample ldifs, please check " + elog "/usr/share/doc/${PF}/samples.ldif.gz " } pkg_config() { -- cgit v1.2.3-65-gdbad