Index: head/mail/fetchmail/Makefile =================================================================== --- head/mail/fetchmail/Makefile (revision 484294) +++ head/mail/fetchmail/Makefile (revision 484295) @@ -1,93 +1,93 @@ # Created by: Ville Eerola # $FreeBSD$ PORTNAME= fetchmail PORTVERSION= 6.3.26 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail ipv6 MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \ http://mandree.home.pages.de/${PORTNAME}/ MAINTAINER= chalpin@cs.wisc.edu COMMENT= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USERS= ${PORTNAME} GROUPS= ${USERS} USES= cpe gmake python shebangfix tar:xz ssl SHEBANG_FILES= fetchmailconf.py USE_RC_SUBR= fetchmail SUB_FILES= pkg-message GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ --without-hesiod --enable-fallback=no \ --with-ssl=${OPENSSLBASE} CONFIGURE_ENV= ac_cv_have_decl_SSLv2_client_method=no LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE OPTIONS_SUB= yes GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gssapi X11_DESC= Python/Tkinter dependencies for ``fetchmailconf'' POP2_DESC= POP2 Protocol support[obsolete] NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NTLM_CONFIGURE_ENABLE= NTLM NTLM_PORTDOCS= README.NTLM # POP2 is obsolete POP2_CONFIGURE_ENABLE= POP2 X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} X11_CONFIGURE_OFF= PYTHON=: X11_SUB_FILES_OFF= fetchmailconf PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \ design-notes.html fetchmail-FAQ.html fetchmail-features.html \ esrs-design-notes.html #.include post-patch: .if !exists(/usr/lib/libcom_err.so) @${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure .endif post-build: @${MAKE_CMD} -C ${WRKSRC} check post-install: ${INSTALL} -d ${STAGEDIR}/var/run/fetchmail ${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-X11-off: ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec .include Index: head/mail/fetchmail/files/fetchmail.in =================================================================== --- head/mail/fetchmail/files/fetchmail.in (revision 484294) +++ head/mail/fetchmail/files/fetchmail.in (revision 484295) @@ -1,149 +1,150 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: fetchmail # REQUIRE: LOGIN mail # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to fetchmail in daemon # mode. # # fetchmail_enable="YES" # # There are two variants: # # * Single system-wide fetchmail daemon: # - It is run as user `fetchmail_user' (default: fetchmail) # Note: The directory /var/run/fetchmail must be writable for # 'fetchmail_user'. # - All configuration is contained in one global file # 'fetchmail_config' (default: %%PREFIX%%/etc/fetchmailrc) # that must be owned by 'fetchmail_user' (mode 700) # - The fetchmail daemon awakes to fetch mail every # 'fetchmail_polling_interval' seconds (default: 900). # # * Per-user daemon # - Users for which a fetchmail daemon is to be started must be # listed in 'fetchmail_users', e.g. fetchmail_users="user1 user2" # The 'fetchmail_user' (sic!) variable is ignored in this # configuration variant. # - The config files for the individual users must be located at # ${fetchmail_home_prefix}/${user}/${fetchmail_config_name}. The # default for 'fetchmail_home_prefix' is "/home", and that for # 'fetchmail_config_name' is ".fetchmailrc". # - Note that "${fetchmail_home_prefix}/${user}" must be writable # for ${user} since it is used to store the per-user PID files! # - There are user-specific versions of 'fetchmail_config' and # 'fetchmail_polling_interval' that can be used to override the # defaults, i.e. for the user 'user1' there are variables # 'fetchmail_user1_config' and 'fetchmail_user1_polling_interval' # - All commands (e.g. start, stop, awaken (see below)) can be either # passed to all instances of the daemon (if %%PREFIX%%/etc/rc.d/fetchmail) # is run as root), or just to the instance belonging to the respective # user. # # Extra commands: # # * 'awaken': Sends a signal to the daemon(s) to check for new mail # immediately # # Fetchmail configuration: # # In any case, you will need a working fetchmailrc file. Please consult # the man page fetchmail(1), the documentation in %%PREFIX%%/share/doc/fetchmail/ # and/or the material found at . . /etc/rc.subr name=fetchmail rcvar=fetchmail_enable command=%%PREFIX%%/bin/${name} pidfile=/var/run/fetchmail/${name}.pid extra_commands="awaken" awaken_cmd="fetchmail_awaken" fetchmail_script=%%PREFIX%%/etc/rc.d/$name # read settings, set default values load_rc_config "$name" : ${fetchmail_enable="NO"} : ${fetchmail_user="fetchmail"} : ${fetchmail_config="%%PREFIX%%/etc/fetchmailrc"} : ${fetchmail_polling_interval="900"} : ${fetchmail_logging_facility="--syslog"} : ${fetchmail_home_prefix="/home"} : ${fetchmail_config_name=".fetchmailrc"} # send signal to fetchmail process(es) to check for new mail immediately fetchmail_awaken() { if [ $rc_pid ]; then echo "Forcing fetchmail to check mailbox(es)..." kill -USR1 $rc_pid else echo "$name not running? (check $pidfile)" fi return } if [ -n "$2" ]; then # perform action for an instance of fetchmail daemon user="$2" if [ "x${fetchmail_users}" != "x" -o "x$3" = "xGLOBALCONFIG" ]; then if [ "x${fetchmail_users}" != "x" ]; then # multiuser setup: determine user specific config and pid file eval fetchmail_config="\${fetchmail_${user}_config:-${fetchmail_home_prefix}/${user}}/${fetchmail_config_name}" eval pidfile="${fetchmail_home_prefix}/${user}/.fetchmail.pid" eval fetchmail_user=$user else eval pidfile=/var/run/fetchmail/fetchmail.pid fi required_files=${fetchmail_config} eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}" fetchmail_flags="-f ${fetchmail_config} \ --pidfile ${pidfile} \ -d ${fetchmail_polling_interval} \ ${fetchmail_logging_facility}" else echo "$0: extra argument ignored" fi else uid=`id -u` if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then # root mode: multiple user profiles are handled by recursive # calls of this script for user in ${fetchmail_users}; do echo "===> fetchmail user: ${user}" $fetchmail_script $1 ${user} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${user} (${retcode}) ${failed:-}" else success="${user} ${success:-}" fi done exit 0 else if [ "x${fetchmail_users}" = "x" ]; then # There is only one global configuration file globalconfig=GLOBALCONFIG fi $fetchmail_script $1 `id -u -n` $globalconfig retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${user} (${retcode}) ${failed:-}" + exit 1 else success="${user} ${success:-}" fi exit 0 fi fi # actually execute the fetchmail program export FETCHMAILUSER=$fetchmail_user run_rc_command "$1"