From a32e7defba0d2f8309c5896f04737ccb7d74177e Mon Sep 17 00:00:00 2001 From: "Stefan Garthe (the_mgt)" Date: Mon, 2 Aug 2010 17:46:54 +0000 Subject: mail-mta/citadel: Yet another version bump, upstream maintanance and bug fix release svn path=/sunrise/; revision=11069 --- mail-mta/citadel/ChangeLog | 4 + mail-mta/citadel/Manifest | 6 +- mail-mta/citadel/citadel-7.82.ebuild | 203 ----------------------------------- mail-mta/citadel/citadel-7.83.ebuild | 203 +++++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 206 deletions(-) delete mode 100644 mail-mta/citadel/citadel-7.82.ebuild create mode 100644 mail-mta/citadel/citadel-7.83.ebuild diff --git a/mail-mta/citadel/ChangeLog b/mail-mta/citadel/ChangeLog index a915c6183..69739c60e 100644 --- a/mail-mta/citadel/ChangeLog +++ b/mail-mta/citadel/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Aug 2010; the_mgt (the_mgt) -citadel-7.82.ebuild, + +citadel-7.83.ebuild: + Yet another version bump, upstream maintanance and bug fix release + 22 Jul 2010; the_mgt (the_mgt) -citadel-7.72.ebuild, +citadel-7.82.ebuild: Version bump to 7.82 diff --git a/mail-mta/citadel/Manifest b/mail-mta/citadel/Manifest index 844b27e87..d4e00c6ee 100644 --- a/mail-mta/citadel/Manifest +++ b/mail-mta/citadel/Manifest @@ -1,7 +1,7 @@ AUX citadel.confd 957 RMD160 50f8ade88eb6b0c88aa94b42e13f81b725099027 SHA1 091d9223315c5d390ecd18bba44198ed6dfe2c22 SHA256 ef9309d200cb0617b91ee0983db41b53e424a9b4095e0f5ec76112866865871f AUX citadel.init 767 RMD160 afd16e3aec56496d4fa3ee59966428e742d31dd1 SHA1 719871e18211554f1088ef3ad2ca438c9c67c20d SHA256 16fc77dc01825c920d38864b880f0a00bc22aee5ebc552518c0bf94cb8b4b7c7 AUX mailer.conf 236 RMD160 a01981ea92dfafa4039c7f09f41a9b5722bf56d6 SHA1 5e8e0cd326bda077831a309ff3825897b3156279 SHA256 f0df591d761bb078447d666fdf18c42e511fb5765a4ddc2fca2bc96f7df50be8 -DIST citadel-7.82.tar.gz 842440 RMD160 0cf86eaedbe0ccb1b69f00d7c88cb0b0ea6745ae SHA1 0ff3dfc7af9c61aee6900e78fa472d8514b158ca SHA256 14d0c3c85701ae2a7fee5cf85e4c697a5b5a82a35cdec3066f612fb9ea57fbab -EBUILD citadel-7.82.ebuild 6702 RMD160 b5d8801b3fb6bd91d0a3cc027757e80f6e412168 SHA1 dc560f6c3d4e39e927fd8dc7cd7aa9be42d8600d SHA256 8bec7a762f04b4a4807d53e0105b865f3cc0fac91cfe714b98256981e33e2d10 -MISC ChangeLog 869 RMD160 ae16445b33a91651991d31f1000730e29592179c SHA1 ee975884cc5a3011cd8c5daaa61b7d611803cb43 SHA256 1defea154aa10d980cdb97f40ae41713b46dc1290356c1f223d06afd6f975c0b +DIST citadel-7.83.tar.gz 842485 RMD160 093cd880b4da088ef860013f64822a4a181c5c52 SHA1 531dad821d7520d4c08b11069bd18d575708b74c SHA256 55d6d76f1642953adb0a7c67ae31920e41d35a89fe627b06d495a332c13b45a8 +EBUILD citadel-7.83.ebuild 6702 RMD160 b5d8801b3fb6bd91d0a3cc027757e80f6e412168 SHA1 dc560f6c3d4e39e927fd8dc7cd7aa9be42d8600d SHA256 8bec7a762f04b4a4807d53e0105b865f3cc0fac91cfe714b98256981e33e2d10 +MISC ChangeLog 1035 RMD160 1538264f6bf898b25f07d15cfdac848ad98a1654 SHA1 d34f74642ecb1a319ab04dda7c36ea3740ef8ad0 SHA256 ceb658718038df9c7f443075fb2867d994a5203daa0ad19132a0d9232da602ac MISC metadata.xml 1129 RMD160 930f30bb3ea1a44bba945b1b47f267e59dfbc59e SHA1 ec741f1c7da2b0ce7364925932cdeed1dbdbc55f SHA256 fb9524b90c4c10dfee051e4134364435781ff124a6170050fabf58d49178db75 diff --git a/mail-mta/citadel/citadel-7.82.ebuild b/mail-mta/citadel/citadel-7.82.ebuild deleted file mode 100644 index 2dc11b755..000000000 --- a/mail-mta/citadel/citadel-7.82.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit eutils multilib - -DESCRIPTION="Groupware/Email/Jabberserver. Collaboration, Calender, BBS/Forum, Chat with easy install and usage" -HOMEPAGE="http://www.citadel.org/" -SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ldap mailwrapper pam pic ssl threads" - -DEPEND="=dev-libs/libcitadel-7.81 - >=sys-libs/db-4.1.25_p1 - virtual/libiconv - ldap? ( >=net-nds/openldap-2.0.27 ) - pam? ( sys-libs/pam ) - ssl? ( >=dev-libs/openssl-0.9.6 )" -RDEPEND="${DEPEND} - net-mail/mailbase - !mailwrapper? ( !virtual/mta !net-mail/mailwrapper ) - mailwrapper? ( >=net-mail/mailwrapper-0.2 )" - -PROVIDE="virtual/mta - virtual/mda - virtual/imapd" - -MESSAGEBASE="/var/lib/citadel" - -pkg_setup() { - #Homedir needs to be the same as --with-datadir - einfo "Adding Citadel User/Group" - enewgroup citadel - enewuser citadel -1 -1 ${MESSAGEBASE} citadel,mail -} - -src_configure() { - econf \ - --with-rundir=/var/run/citadel \ - --with-datadir=/var/lib/citadel \ - --with-spooldir=/var/spool/citadel \ - --with-autosysconfdir=/var/lib/citadel/data \ - --with-staticdatadir=/etc/citadel \ - --with-sysconfdir=/etc/citadel \ - --with-ssldir=/etc/ssl/citadel \ - --with-helpdir=/usr/share/citadel-server \ - --with-docdir=/usr/share/doc/${PF} \ - --with-utility-bindir=/usr/$(get_libdir)/citadel \ - --without-libdspam \ - $(use_enable pic pie) \ - $(use_with pam) \ - $(use_with ssl openssl) \ - $(use_with ldap) \ - --with-db -} - -src_install() { - if use pam ; then - dodir /etc/pam.d || die "Creating /etc/pam.d failed in sandbox" - fi - - emake DESTDIR="${D}" install-new || die "make install failed" - - # Protect ${MESSAGEBASE} - echo CONFIG_PROTECT="${MESSAGEBASE}" > "${T}"/10citadel - doenvd "${T}"/10citadel || die "Config-protecting failed" - - # Keep emerge from removing empty directories when updating - keepdir "${MESSAGEBASE}"/data - keepdir /var/spool/citadel/network/{systems,spoolout,spoolin} - keepdir /var/run/citadel/network/{systems,spoolout,spoolin} - keepdir /etc/citadel/messages - - #Fix some permissions and sendmail stuff - fowners citadel:citadel /etc/citadel /var/lib/citadel || die "Changing owner failed" - fowners root:citadel /usr/sbin/citmail || die "Changing owner failed" - rm "${D}"/usr/sbin/sendmail || die "Removinf sendmail bin failed" - - if use mailwrapper ; then - insinto /etc/mail - doins "${FILESDIR}"/mailer.conf || die "Installing mailer.conf failed" - else - dosym /usr/sbin/citmail /usr/sbin/sendmail || die "Linking sendmail to citmail failed" - dosym /usr/sbin/citmail /usr/$(get_libdir)/sendmail || die "Compatibility sendmail link failed" - fi - - if use ldap ; then - insinto /etc/openldap/schema - doins openldap/citadel.schema || die "Inserting LDAP schema failed" - doins openldap/rfc2739.schema || die "Inserting LDAP schema failed" - fi - - newinitd "${FILESDIR}"/citadel.init citadel || die "Inserting initscript failed" - newconfd "${FILESDIR}"/citadel.confd citadel || die "Inserting conf for initscript failed" -} - -pkg_postinst() { - #remove a file Citadel complains about in the logs while running - rm /var/lib/citadel/data/.keep_mail-mta_citadel-0 || die "Removing keepdir dummie failed" - - einfo "The administration tools have been placed in /usr/$(get_libdir)/citadel" - einfo - einfo "There are two possible options to get Citadel running, if this is" - einfo "a new install:" - einfo - einfo "1. The no-nonse fullspeed approach with most stuff done for you:" - einfo "# emerge --config =${CATEGORY}/${PF}" - einfo - einfo "2. Manually configuring it with its setup routine:" - einfo "You should make yourself familiar with Citadels setup:" - einfo "http://www.citadel.org/doku.php/documentation:cmdman:setup" - einfo "You probalby do not want to let setup chose the mode of starting" - einfo - einfo "The second approach is only recommended to experienced users!!!" - einfo - einfo "The service will automatically start after you configured it." - einfo "Initscript is /etc/init.d/citadel. Also look into /etc/conf.d" - einfo - einfo "The following clients are available:" - einfo "a) the citadel console client was installed with this ebuild" - einfo "b) www-servers/webcit provides a web-based gui" -} - -pkg_config() { - #we have to stop the server if it is accidently running - [ -f /var/run/citadel/citadel.socket ] && \ - die "Citadel seems to be running, please stop it while configuring!" - - #Citadel's setup uses a few enviromental variables to control it. - # Mandatory for non-interactive setup! - export CITADEL_INSTALLER="yes" - - # Citadel location. - export CITADEL="/var/run/citadel/" - - if use ldap ; then - export SLAPD_Binary="/usr/$(get_libdir)/openldap/slapd" - export LDAP_CONFIG="/etc/openldap/sldap.conf" - fi - - # Don't create any inittab/initscript/xinet stuff entry. - # We'll provide our own init script - export CREATE_INITTAB_ENTRY="no" - export CREATE_XINETD_ENTRY="no" - export NO_INIT_SCRIPTS="yes" - export ACT_AS_MTA="no" #just prohibits setup to mess with init scripts - - einfo "On which ip should the server listen?" - einfo "Press enter to default to 0.0.0.0 and listen on all interfaces." - read -rp " >" ipadress ; echo - if [ -z "$ipadress" ] ; then - export IP_ADDR="0.0.0.0" - else - export IP_ADDR="$ipadress" - fi - - # The main admin name for citadel can be chosen at random - einfo "Insert a name for your citadel admin account:" - read -rp " >" sysadminname ; echo - export SYSADMIN_NAME="$sysadminname" - - local pwd1="misch" - local pwd2="masch" - - until [[ "x$pwd1" = "x$pwd2" ]] ; do - einfo "Insert a password for the citadel admin user" - einfo "Avoid [\"'\\_%] characters in the password" - read -rsp " >" pwd1 ; echo - - einfo "Retype the password" - read -rsp " >" pwd2 ; echo - - if [[ "x$pwd1" != "x$pwd2" ]] ; then - ewarn "Passwords are not the same" - fi - done - export SYSADMIN_PW="$pwd2" - - #Now we will create the config using defaults and enviromental variables. - /usr/$(get_libdir)/citadel/setup -q - unset SYSADMIN_PW - - #Verify the /etc/services entry was made - if [ -f /etc/services ] && ! grep -q '^citadel' /etc/services ; then - echo "citadel 504/tcp # citadel" >> /etc/services - fi - - einfo "Be sure to read the documentation in /usr/share/doc/${PF}" - einfo - einfo "The server should now be up and running, enjoy!" - einfo "Citadel will listen on its default port 504" - if use mailwrapper; then - einfo - einfo "Citadel listens on port 25 by default, even with mailwrapper useflag!" - einfo "Right now this can only be disabled in WebCit or with the cli client." - einfo "There is no elegant way to disable that atm, will be fixed upstream." - einfo "Sorry for this inconvenience!" - fi -} diff --git a/mail-mta/citadel/citadel-7.83.ebuild b/mail-mta/citadel/citadel-7.83.ebuild new file mode 100644 index 000000000..2dc11b755 --- /dev/null +++ b/mail-mta/citadel/citadel-7.83.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +inherit eutils multilib + +DESCRIPTION="Groupware/Email/Jabberserver. Collaboration, Calender, BBS/Forum, Chat with easy install and usage" +HOMEPAGE="http://www.citadel.org/" +SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ldap mailwrapper pam pic ssl threads" + +DEPEND="=dev-libs/libcitadel-7.81 + >=sys-libs/db-4.1.25_p1 + virtual/libiconv + ldap? ( >=net-nds/openldap-2.0.27 ) + pam? ( sys-libs/pam ) + ssl? ( >=dev-libs/openssl-0.9.6 )" +RDEPEND="${DEPEND} + net-mail/mailbase + !mailwrapper? ( !virtual/mta !net-mail/mailwrapper ) + mailwrapper? ( >=net-mail/mailwrapper-0.2 )" + +PROVIDE="virtual/mta + virtual/mda + virtual/imapd" + +MESSAGEBASE="/var/lib/citadel" + +pkg_setup() { + #Homedir needs to be the same as --with-datadir + einfo "Adding Citadel User/Group" + enewgroup citadel + enewuser citadel -1 -1 ${MESSAGEBASE} citadel,mail +} + +src_configure() { + econf \ + --with-rundir=/var/run/citadel \ + --with-datadir=/var/lib/citadel \ + --with-spooldir=/var/spool/citadel \ + --with-autosysconfdir=/var/lib/citadel/data \ + --with-staticdatadir=/etc/citadel \ + --with-sysconfdir=/etc/citadel \ + --with-ssldir=/etc/ssl/citadel \ + --with-helpdir=/usr/share/citadel-server \ + --with-docdir=/usr/share/doc/${PF} \ + --with-utility-bindir=/usr/$(get_libdir)/citadel \ + --without-libdspam \ + $(use_enable pic pie) \ + $(use_with pam) \ + $(use_with ssl openssl) \ + $(use_with ldap) \ + --with-db +} + +src_install() { + if use pam ; then + dodir /etc/pam.d || die "Creating /etc/pam.d failed in sandbox" + fi + + emake DESTDIR="${D}" install-new || die "make install failed" + + # Protect ${MESSAGEBASE} + echo CONFIG_PROTECT="${MESSAGEBASE}" > "${T}"/10citadel + doenvd "${T}"/10citadel || die "Config-protecting failed" + + # Keep emerge from removing empty directories when updating + keepdir "${MESSAGEBASE}"/data + keepdir /var/spool/citadel/network/{systems,spoolout,spoolin} + keepdir /var/run/citadel/network/{systems,spoolout,spoolin} + keepdir /etc/citadel/messages + + #Fix some permissions and sendmail stuff + fowners citadel:citadel /etc/citadel /var/lib/citadel || die "Changing owner failed" + fowners root:citadel /usr/sbin/citmail || die "Changing owner failed" + rm "${D}"/usr/sbin/sendmail || die "Removinf sendmail bin failed" + + if use mailwrapper ; then + insinto /etc/mail + doins "${FILESDIR}"/mailer.conf || die "Installing mailer.conf failed" + else + dosym /usr/sbin/citmail /usr/sbin/sendmail || die "Linking sendmail to citmail failed" + dosym /usr/sbin/citmail /usr/$(get_libdir)/sendmail || die "Compatibility sendmail link failed" + fi + + if use ldap ; then + insinto /etc/openldap/schema + doins openldap/citadel.schema || die "Inserting LDAP schema failed" + doins openldap/rfc2739.schema || die "Inserting LDAP schema failed" + fi + + newinitd "${FILESDIR}"/citadel.init citadel || die "Inserting initscript failed" + newconfd "${FILESDIR}"/citadel.confd citadel || die "Inserting conf for initscript failed" +} + +pkg_postinst() { + #remove a file Citadel complains about in the logs while running + rm /var/lib/citadel/data/.keep_mail-mta_citadel-0 || die "Removing keepdir dummie failed" + + einfo "The administration tools have been placed in /usr/$(get_libdir)/citadel" + einfo + einfo "There are two possible options to get Citadel running, if this is" + einfo "a new install:" + einfo + einfo "1. The no-nonse fullspeed approach with most stuff done for you:" + einfo "# emerge --config =${CATEGORY}/${PF}" + einfo + einfo "2. Manually configuring it with its setup routine:" + einfo "You should make yourself familiar with Citadels setup:" + einfo "http://www.citadel.org/doku.php/documentation:cmdman:setup" + einfo "You probalby do not want to let setup chose the mode of starting" + einfo + einfo "The second approach is only recommended to experienced users!!!" + einfo + einfo "The service will automatically start after you configured it." + einfo "Initscript is /etc/init.d/citadel. Also look into /etc/conf.d" + einfo + einfo "The following clients are available:" + einfo "a) the citadel console client was installed with this ebuild" + einfo "b) www-servers/webcit provides a web-based gui" +} + +pkg_config() { + #we have to stop the server if it is accidently running + [ -f /var/run/citadel/citadel.socket ] && \ + die "Citadel seems to be running, please stop it while configuring!" + + #Citadel's setup uses a few enviromental variables to control it. + # Mandatory for non-interactive setup! + export CITADEL_INSTALLER="yes" + + # Citadel location. + export CITADEL="/var/run/citadel/" + + if use ldap ; then + export SLAPD_Binary="/usr/$(get_libdir)/openldap/slapd" + export LDAP_CONFIG="/etc/openldap/sldap.conf" + fi + + # Don't create any inittab/initscript/xinet stuff entry. + # We'll provide our own init script + export CREATE_INITTAB_ENTRY="no" + export CREATE_XINETD_ENTRY="no" + export NO_INIT_SCRIPTS="yes" + export ACT_AS_MTA="no" #just prohibits setup to mess with init scripts + + einfo "On which ip should the server listen?" + einfo "Press enter to default to 0.0.0.0 and listen on all interfaces." + read -rp " >" ipadress ; echo + if [ -z "$ipadress" ] ; then + export IP_ADDR="0.0.0.0" + else + export IP_ADDR="$ipadress" + fi + + # The main admin name for citadel can be chosen at random + einfo "Insert a name for your citadel admin account:" + read -rp " >" sysadminname ; echo + export SYSADMIN_NAME="$sysadminname" + + local pwd1="misch" + local pwd2="masch" + + until [[ "x$pwd1" = "x$pwd2" ]] ; do + einfo "Insert a password for the citadel admin user" + einfo "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + ewarn "Passwords are not the same" + fi + done + export SYSADMIN_PW="$pwd2" + + #Now we will create the config using defaults and enviromental variables. + /usr/$(get_libdir)/citadel/setup -q + unset SYSADMIN_PW + + #Verify the /etc/services entry was made + if [ -f /etc/services ] && ! grep -q '^citadel' /etc/services ; then + echo "citadel 504/tcp # citadel" >> /etc/services + fi + + einfo "Be sure to read the documentation in /usr/share/doc/${PF}" + einfo + einfo "The server should now be up and running, enjoy!" + einfo "Citadel will listen on its default port 504" + if use mailwrapper; then + einfo + einfo "Citadel listens on port 25 by default, even with mailwrapper useflag!" + einfo "Right now this can only be disabled in WebCit or with the cli client." + einfo "There is no elegant way to disable that atm, will be fixed upstream." + einfo "Sorry for this inconvenience!" + fi +} -- cgit v1.2.3-65-gdbad