Date: Sat, 23 Sep 2006 18:39:00 -0400 From: Serge Gagnon <serge.gagnon@b2b2c.ca> To: FreeBSD-gnats-submit@FreeBSD.org Cc: brian@shadowcom.net Subject: ports/103536: [UPDATE] net/citadel to 6.81 and un-forbidden Message-ID: <E1GRG9E-000Azu-HG@quenix1.dyndns.org> Resent-Message-ID: <200609232240.k8NMeLOJ073079@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103536 >Category: ports >Synopsis: [UPDATE] net/citadel to 6.81 and un-forbidden >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 23 22:40:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Serge Gagnon >Release: FreeBSD 6.1-STABLE i386 >Organization: me >Environment: System: FreeBSD quenix1.dyndns.org 6.1-STABLE FreeBSD 6.1-STABLE #0: Fri May 19 13:21:57 EDT 2006 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/QUENIX1 i386 >Description: This is the work we do, me and Brian Ledbetter, to update this ports. Brian is not at home since much time (last time I speak to him was in may 2006) and it seems that he didn't get the time or the opportunity to get online. So, I submit this port for him. I have included his email in CC, but I don't know if he will/can respond. - Update citadel to 6.81 - Instuction on how to update the port (commiter): o rm -rf $FILESDIR/* o rm pkg-message o cd net/citadel && patch <path_to/patch-citadel.diff This version of citadel is running on my server since may 2006 without any problem. I have also made a port of webcit (a web interface to access citadel and also provide http://yourserver/groupdav/ access) that will follow in a couple of hours. I didn't make any contribution since a lot of time, I wish that it is correct. Thanks >How-To-Repeat: >Fix: --- patch-citadel.diff begins here --- Index: Makefile =================================================================== RCS file: /Ports/citadel/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 23 Sep 2006 22:06:12 -0000 1.1.1.1 +++ Makefile 23 Sep 2006 22:16:00 -0000 1.2 @@ -2,55 +2,124 @@ # Date created: Tue Jun 12 15:42:14 EDT 2001 # Whom: brian@shadowcom.net # -# $FreeBSD: ports/net/citadel/Makefile,v 1.9 2006/09/02 18:06:13 kris Exp $ +# $FreeBSD: ports/net/citadel/Makefile,v 1.8 2006/04/02 23:27:18 kris Exp $ # PORTNAME= citadel -PORTVERSION= 5.80 -PORTREVISION= 3 +PORTVERSION= 6.81 CATEGORIES= net -MASTER_SITES= http://uncensored.citadel.org/pub/citadel/ \ - ftp://ftp.tux.org/pub/net/citadel/ \ - http://www.shadowcom.net/Software/Citadel-UX/ -DISTNAME= ${PORTNAME}-ux-${PORTVERSION} - -MAINTAINER= brian@shadowcom.net -COMMENT= Citadel/UX Communications Server - -LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm - -FORBIDDEN= http://www.FreeBSD.org/ports/portaudit/4c005a5e-2541-4d95-80a0-00c76919aa66.html -DEPRECATED= ${FORBIDDEN} -EXPIRATION_DATE=2006-12-01 +MASTER_SITES= http://easyinstall.citadel.org/ + +MAINTAINER?= brian@shadowcom.net +COMMENT?= Citadel/UX Communications Server: Open Groupware for UNIX + +LIB_DEPENDS= db-4.4:${PORTSDIR}/databases/db44 \ + ical:${PORTSDIR}/devel/libical WRKSRC= ${WRKDIR}/citadel -GNU_CONFIGURE= yes -USE_GMAKE= yes -CONFIGURE_ARGS= --with-gdbm=${LOCALBASE} -IS_INTERACTIVE= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes +CONFIGURE_ARGS= --with-db=${LOCALBASE} \ + --prefix=${PREFIX} \ + --exec-prefix=${PREFIX} \ + --includedir=${LOCALBASE}/include \ + --with-datadir=${DATADIR} \ + --with-sysconfdir=${PREFIX}/etc/citadel \ + --with-docdir=${DOCSDIR} \ + --with-spooldir=${PREFIX}/var/spool/${PORTNAME} \ + --with-rundir=${PREFIX}/var/spool/${PORTNAME} \ + --bindir=${PREFIX}/bin \ + --sbindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/libexec \ + --disable-pam \ + --disable-chkpwd +MAKE_ARGS= CFLAGS="${CFLAGS} -DHAVE_DB4_DB_H" +SBIN_FILES= aidepost base64 citmail citserver citsetup msgform \ + sendcommand userlist +BIN_FILES= citadel whobbs stress +SHARE_DIRS= help messages +EMPTY_DIRS= bio bitbucket files images info userpics +DOCS_DIRS= docs techdoc +SUB_FILES= pkg-message + +RCSCRIPT= ${PREFIX}/etc/rc.d/citadel.sh +USE_RC_SUBR= yes + +## Set to "yes" to disable the auto-configuration of the Citadel system +NO_CONFIG?= no + +# Create user accounts for Citadel6 - DEFAULT UID 504, DEFAULT USERNAME citadel +# THE pkg-install SCRIPT WILL REQUIRE MODIFICATION IF DIFFERENT VALUES ARE DESIRED +pre-install: + @ ${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL + +do-install: +# Install system programs + ${INSTALL_PROGRAM} ${WRKSRC}/citmail ${PREFIX}/sbin/sendmail +.for f in ${SBIN_FILES} + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/sbin +.endfor + +# Install user programs +.for f in ${BIN_FILES} + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin +.endfor + +# Install architecture-independent files +.for f in ${SHARE_DIRS} + cd ${WRKSRC} && \ + ${FIND} ${f} -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \ + ${FIND} ${f} -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; +.endfor +.for f in ${EMPTY_DIRS} + ${MKDIR} -p ${DATADIR}/${f} +.endfor + +# Install configuration file + ${MKDIR} -p ${PREFIX}/etc/citadel/netconfigs +.for f in citadel.rc network/mail.aliases public_clients + ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/citadel/ +.endfor + +# Prepare startup script, logs, home path + @echo "rcscript ${FILESDIR}/citadel.sh.tmpl -> ${RCSCRIPT}" + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" "${FILESDIR}/citadel.sh.tmpl" > "${RCSCRIPT}" + +# Set permissions on various items + ${CHOWN} root:wheel ${RCSCRIPT} + ${CHMOD} 554 ${RCSCRIPT} + ${TOUCH} /var/log/citadel.log + ${CHOWN} citadel:wheel /var/log/citadel.log + ${CHMOD} 0640 /var/log/citadel.log + +# Make spool directory +.for f in spoolin spoolout systems + ${MKDIR} -p ${PREFIX}/var/spool/citadel/network/${f} +.endfor + +# Install documentation +.if !defined{NOPORTDOCS} + @echo "docs ${DOCSDIR}" + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.in ${DOCSDIR}/README.FreeBSD + ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/database_cleanup.sh ${DOCSDIR} +. for f in ${DOCS_DIRS} + cd ${WRKSRC} && \ + ${FIND} ${f} -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \ + ${FIND} ${f} -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; +.endfor +.endif post-install: - ${STRIP} ${PREFIX}/bin/aidepost - ${STRIP} ${PREFIX}/bin/base64 - ${STRIP} ${PREFIX}/bin/citadel - ${STRIP} ${PREFIX}/bin/citmail - ${STRIP} ${PREFIX}/bin/citserver - ${STRIP} ${PREFIX}/bin/mailinglist - ${STRIP} ${PREFIX}/bin/msgform - ${STRIP} ${PREFIX}/bin/netmailer - ${STRIP} ${PREFIX}/bin/netpoll - ${STRIP} ${PREFIX}/bin/netproc - ${STRIP} ${PREFIX}/bin/netsetup - ${STRIP} ${PREFIX}/bin/qpdecode - ${STRIP} ${PREFIX}/bin/rcit - ${STRIP} ${PREFIX}/bin/readlog - ${STRIP} ${PREFIX}/bin/sendcommand - ${STRIP} ${PREFIX}/bin/citsetup - ${STRIP} ${PREFIX}/bin/stats - ${STRIP} ${PREFIX}/bin/userlist - ${STRIP} ${PREFIX}/bin/whobbs - ${STRIP} ${PREFIX}/share/citadel/modules/*.so - ${PREFIX}/bin/citsetup - ${CAT} ${PKGMESSAGE} +.if !defined{NO_CONFIG} + @echo "Configuring Citadel/UX system..." + printf "/\nSystem Administrator\ncitadel\n0.0.0.0\n504\n" > ${WRKDIR}/.config_options && \ + /usr/local/sbin/citsetup -q < ${WRKDIR}/.config_options && \ + rm -f ${WRKDIR}/.config_options && \ + echo "Configuration completed successfully" +.endif + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /Ports/citadel/distinfo,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- distinfo 23 Sep 2006 22:06:12 -0000 1.1.1.1 +++ distinfo 23 Sep 2006 22:16:00 -0000 1.2 @@ -1,3 +1,3 @@ -MD5 (citadel-ux-5.80.tar.gz) = b71e7c5295947c9a8cff75dc88b15ee2 -SHA256 (citadel-ux-5.80.tar.gz) = e0f7c7a75a3beb4fc3cb49b7187693f85ccfbfec2663062669b443ad1d43dc9a -SIZE (citadel-ux-5.80.tar.gz) = 444479 +MD5 (citadel-6.81.tar.gz) = 1b572b92245b25c25388b66294c7b848 +SHA256 (citadel-6.81.tar.gz) = cd139d4d49ba59a25b60ae23f2d4080f962792226d74a0521c0cec441c5d7bed +SIZE (citadel-6.81.tar.gz) = 836090 Index: pkg-descr =================================================================== RCS file: /Ports/citadel/pkg-descr,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pkg-descr 23 Sep 2006 22:06:12 -0000 1.1.1.1 +++ pkg-descr 23 Sep 2006 22:16:00 -0000 1.2 @@ -6,9 +6,9 @@ base64 encoding/decoding for MIME parser, public domain by John Walker. 'parsedate' function, public domain by Steven M. Bellovin, et. al. -WWW: http://uncensored.citadel.org/citadel/ +WWW: http://www.citadel.org/ Author: Arthur J. Cancro <ajc@uncensored.citadel.org> -Revision: 5.80 +Revision: 6.81 The Citadel/UX Communications Server provides your enterprise with a powerful alternative to products @@ -22,3 +22,4 @@ -- Maintainer: Brian Ledbetter <brian@shadowcom.net> +Maintainer: Serge Gagnon <serge.gagnon@b2b2c.ca> Index: pkg-install =================================================================== RCS file: /Ports/citadel/pkg-install,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pkg-install 23 Sep 2006 22:06:12 -0000 1.1.1.1 +++ pkg-install 23 Sep 2006 22:16:00 -0000 1.2 @@ -1,16 +1,55 @@ +#! /bin/sh + +# $FreeBSD$ + +PATH=/bin:/usr/sbin +CITUSER=citadel case $2 in - [Pp][Rr][Ee]-[Ii][Nn][Ss][Tt][Aa][Ll][Ll]) - echo "- Installing Citadel/UX Communications Server..." - ;; +PRE-INSTALL) + # uid taken from /etc/services entry for citadel + UID=504 + GID=${UID} + USER=${CITUSER} + GROUP=${USER} - [Pp][Oo][Ss][Tt]-[Ii][Nn][Ss][Tt][Aa][Ll][Ll]) - echo "- Starting the Citadel/UX Setup and Configuration Program..." - ${PKG_PREFIX}/bin/citsetup - echo "- Citadel/UX Communications Server" - echo " Installed PREFIX: ${PKG_PREFIX}" - ;; + echo + echo "I will now attempt to create the user ${CITUSER} (uid/gid ${UID}). If you" + echo "wish to manually create this user, please press CTRL-C and do so now. This" + echo "port expects the user and group to both be named 'citadel' - modification" + echo "to the main Makefile may be required to change this username." + echo + echo "Press CTRL-C within 5 seconds to stop installation." + echo + sleep 5 -esac + if pw group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if pw group add ${GROUP} -g ${GID}; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + + if pw user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + else + if pw user add ${USER} -u ${UID} -g ${GROUP} -h - \ + -d /usr/local/share/citadel -c "Citadel/UX Server" + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi + fi -exit 0 + if ! [ -x /usr/local/share/citadel ] ; then + mkdir -p /usr/local/share/citadel + chown -R ${USER}:${GROUP} /usr/local/share/citadel + fi + ;; +esac Index: pkg-plist =================================================================== RCS file: /Ports/citadel/pkg-plist,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pkg-plist 23 Sep 2006 22:06:12 -0000 1.1.1.1 +++ pkg-plist 23 Sep 2006 22:16:00 -0000 1.2 @@ -1,114 +1,81 @@ -@group 3 -@mode 755 -@name citadel-5.80 -@owner 0 -bin/aidepost -bin/base64 -bin/chkpwd +etc/citadel/citadel.rc +etc/citadel/mail.aliases +etc/citadel/public_clients +%%DATADIR%%/help/aide +%%DATADIR%%/help/floors +%%DATADIR%%/help/hours +%%DATADIR%%/help/intro +%%DATADIR%%/help/mail +%%DATADIR%%/help/network +%%DATADIR%%/help/nice +%%DATADIR%%/help/policy +%%DATADIR%%/help/software +%%DATADIR%%/help/summary +%%DATADIR%%/messages/aideopt +%%DATADIR%%/messages/changepw +%%DATADIR%%/messages/dotopt +%%DATADIR%%/messages/entermsg +%%DATADIR%%/messages/entopt +%%DATADIR%%/messages/goodbye +%%DATADIR%%/messages/hello +%%DATADIR%%/messages/help +%%DATADIR%%/messages/mainmenu +%%DATADIR%%/messages/newuser +%%DATADIR%%/messages/readopt +%%DATADIR%%/messages/register +%%DATADIR%%/messages/roomaccess +%%DATADIR%%/messages/unlisted +%%DOCSDIR%%/README.FreeBSD +%%DOCSDIR%%/README.txt +%%DOCSDIR%%/database_cleanup.sh +%%DOCSDIR%%/docs/citadel.html +%%DOCSDIR%%/docs/journaling.html +%%DOCSDIR%%/docs/macintosh-readme.txt +%%DOCSDIR%%/docs/windows-readme.txt +%%DOCSDIR%%/techdoc/PAM.txt +%%DOCSDIR%%/techdoc/binaries.txt +%%DOCSDIR%%/techdoc/build.txt +%%DOCSDIR%%/techdoc/chat.txt +%%DOCSDIR%%/techdoc/citadelapi.txt +%%DOCSDIR%%/techdoc/delivery-list.txt +%%DOCSDIR%%/techdoc/developers.txt +%%DOCSDIR%%/techdoc/hack.txt +%%DOCSDIR%%/techdoc/netconfigs.txt +%%DOCSDIR%%/techdoc/package-setup.txt +%%DOCSDIR%%/techdoc/protocol.txt +%%DOCSDIR%%/techdoc/roadmap.txt +%%DOCSDIR%%/techdoc/views.txt bin/citadel -bin/citmail -bin/citserver -bin/citsetup -bin/dnetsetup -bin/mailinglist -bin/msgform -bin/netmailer -bin/netpoll -bin/netproc -bin/netsetup -bin/qpdecode -bin/rcit -bin/readlog -bin/sendcommand -bin/stats -bin/userlist -bin/utilsmenu -bin/weekly +bin/stress bin/whobbs -etc/rc.d/citadel.sh.example -share/citadel/citadel.rc -share/citadel/files/README -share/citadel/help/? -share/citadel/help/aide -share/citadel/help/floors -share/citadel/help/hours -share/citadel/help/intro -share/citadel/help/mail -share/citadel/help/network -share/citadel/help/nice -share/citadel/help/policy -share/citadel/help/software -share/citadel/help/summary -share/citadel/messages/aideopt -share/citadel/messages/changepw -share/citadel/messages/dotopt -share/citadel/messages/entermsg -share/citadel/messages/entopt -share/citadel/messages/goodbye -share/citadel/messages/hello -share/citadel/messages/help -share/citadel/messages/mainmenu -share/citadel/messages/newuser -share/citadel/messages/readopt -share/citadel/messages/register -share/citadel/messages/roomaccess -share/citadel/messages/unlisted -share/citadel/modules/serv_bio.so -share/citadel/modules/serv_chat.so -share/citadel/modules/serv_expire.so -share/citadel/modules/serv_ical.so -share/citadel/modules/serv_imap.so -share/citadel/modules/serv_inetcfg.so -share/citadel/modules/serv_moderate.so -share/citadel/modules/serv_network.so -share/citadel/modules/serv_pas2.so -share/citadel/modules/serv_pop3.so -share/citadel/modules/serv_rwho.so -share/citadel/modules/serv_smtp.so -share/citadel/modules/serv_upgrade.so -share/citadel/modules/serv_vandelay.so -share/citadel/modules/serv_vcard.so -share/citadel/public_clients -share/doc/citadel/techdoc/PAM.txt -share/doc/citadel/techdoc/build.txt -share/doc/citadel/techdoc/chat.txt -share/doc/citadel/techdoc/citadelapi.txt -share/doc/citadel/techdoc/delivery-list.txt -share/doc/citadel/techdoc/developers.txt -share/doc/citadel/techdoc/hack.txt -share/doc/citadel/techdoc/moderation.txt -share/doc/citadel/techdoc/netconfigs.txt -share/doc/citadel/techdoc/session.txt -share/doc/citadel/docs/COPYING.txt -share/doc/citadel/docs/chat.txt -share/doc/citadel/docs/copyright.txt -share/doc/citadel/docs/inetmailsetup.txt -share/doc/citadel/docs/inetmailsetupmx.txt -share/doc/citadel/docs/inetsiteconfig.txt -share/doc/citadel/docs/install.txt -share/doc/citadel/docs/mailinglists.txt -share/doc/citadel/docs/netsetup.txt -share/doc/citadel/docs/network.txt -share/doc/citadel/docs/room-sharing-howto.txt -share/doc/citadel/docs/siteconfig.txt -share/doc/citadel/docs/sysop.txt -share/doc/citadel/docs/upgrading.txt -share/doc/citadel/docs/utils.txt -share/doc/citadel/docs/import-export.txt -share/doc/citadel/docs/citadel-with-berkeley-db.txt -@dirrm share/citadel/bio -@dirrm share/citadel/bitbucket -@dirrm share/citadel/files -@dirrm share/citadel/help -@dirrm share/citadel/images -@dirrm share/citadel/info -@dirrm share/citadel/modules -@dirrm share/citadel/netconfigs -@unexec rmdir share/citadel/messages 2>/dev/null || true -@unexec rmdir share/citadel/network/spoolin 2>/dev/null || true -@unexec rmdir share/citadel/network 2>/dev/null || true -@unexec rmdir share/citadel 2>/dev/null || true -@dirrm share/citadel/userpics -@dirrm share/doc/citadel/techdoc -@dirrm share/doc/citadel/docs -@dirrm share/doc/citadel +sbin/aidepost +sbin/base64 +sbin/citmail +sbin/citserver +sbin/msgform +sbin/sendcommand +sbin/sendmail +sbin/citsetup +sbin/userlist +@dirrm %%DOCSDIR%%/techdoc +@dirrm %%DOCSDIR%%/docs +@dirrm %%DOCSDIR%% +@exec mkdir -p %D/%%DATADIR%%/userpics +@dirrm %%DATADIR%%/userpics +@dirrm %%DATADIR%%/messages +@exec mkdir -p %D/%%DATADIR%%/info +@dirrm %%DATADIR%%/info +@exec mkdir -p %D/%%DATADIR%%/images +@dirrm %%DATADIR%%/images +@dirrm %%DATADIR%%/help +@exec mkdir -p %D/%%DATADIR%%/files +@dirrm %%DATADIR%%/files +@exec mkdir -p %D/%%DATADIR%%/bitbucket +@dirrm %%DATADIR%%/bitbucket +@exec mkdir -p %D/%%DATADIR%%/bio +@dirrm %%DATADIR%%/bio +@dirrm %%DATADIR%% +@exec mkdir etc/citadel/netconfigs +@dirrm etc/citadel/netconfigs +@dirrm etc/citadel + --- patch-citadel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GRG9E-000Azu-HG>