diff options
Diffstat (limited to 'mail/prayer')
| -rw-r--r-- | mail/prayer/Makefile | 114 | ||||
| -rw-r--r-- | mail/prayer/distinfo | 2 | ||||
| -rw-r--r-- | mail/prayer/files/patch-files-Makefile | 30 | ||||
| -rw-r--r-- | mail/prayer/files/patch-lib-mydb.c | 16 | ||||
| -rw-r--r-- | mail/prayer/files/patch-lib_ssl.c | 120 | ||||
| -rw-r--r-- | mail/prayer/files/patch-man-Makefile | 22 | ||||
| -rw-r--r-- | mail/prayer/files/patch-servers-Makefile | 11 | ||||
| -rw-r--r-- | mail/prayer/files/patch-shared_config.c | 14 | ||||
| -rw-r--r-- | mail/prayer/files/patch-templates-remove-url-prefix | 184 | ||||
| -rw-r--r-- | mail/prayer/files/patch-utils-Makefile | 11 | ||||
| -rw-r--r-- | mail/prayer/files/patch-utils__prayer-cyclog.SRC | 20 | ||||
| -rw-r--r-- | mail/prayer/files/prayer.in | 52 | ||||
| -rw-r--r-- | mail/prayer/pkg-descr | 10 | ||||
| -rw-r--r-- | mail/prayer/pkg-plist | 112 |
14 files changed, 0 insertions, 718 deletions
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile deleted file mode 100644 index 0afb7ae6c7df..000000000000 --- a/mail/prayer/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -# $FreeBSD$ - -PORTNAME= prayer -PORTVERSION= 1.3.5 -PORTREVISION= 4 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/ - -MAINTAINER= koue@chaosophia.net -COMMENT= Prayer Webmail System - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-05-05 - -LICENSE= GPLv2 - -LIB_DEPENDS= libc-client4.so:mail/cclient - -USES= iconv shebangfix gmake perl5 uidfix -USE_PERL5= build - -SHEBANG_FILES= utils/ucsnews.pl \ - templates/old/make_olist.pl \ - templates/src/*.pl - -PORTDOCS= ACCOUNTD CMD_LINE DESIGN DONE DONE-OLD FEATURES ICONLIST \ - INSTALL LOGS NOTICE README ROADMAP SECURITY TODO - -USE_RC_SUBR= prayer - -OPTIONS_DEFINE= SESSIONCACHE TIDY SSL LDAP DOCS -OPTIONS_DEFAULT= SESSIONCACHE TIDY SSL LDAP - -SESSIONCACHE_DESC= Activate Session Cache - -USERS= _prayer -GROUPS= prayer - -SESSIONCACHE_USES= bdb:5+ -LDAP_USE= OPENLDAP=yes -SSL_USES= ssl -TIDY_LIB_DEPENDS= libtidy.so:www/tidy-lib - -GID!= id -g -DESTDIRNAME= BROOT -MAKE_ARGS+= RW_USER="${UID}" RW_GROUP="${GID}" RO_GROUP="${GID}" RO_USER="${UID}" \ - CCLIENT_INCLUDE="-I${LOCALBASE}/include/c-client" \ - CCLIENT_LIBS="-L${LOCALBASE}/lib -lc-client4" \ - CC="${CC}" \ - CPPFLAGS="${CFLAGS} -I${ICONV_PREFIX}/include" \ - LDFLAGS="-L${ICONV_PREFIX}/lib" \ - PREFIX="${PREFIX}/prayer" \ - BIN_DIR="${PREFIX}/sbin" \ - PRAYER_CONFIG_FILE="${ETCDIR}/prayer.cf" \ - ACCOUNTD_CONFIG_FILE="${ETCDIR}/accountd.cf" - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MLDAP_ENABLE} -MAKE_ARGS+= LDAP_ENABLE=true \ - LDAP_INCLUDE="-I${LOCALBASE}/include" \ - LDAP_LIBS="-L${LOCALBASE}/lib -lldap" -.else -MAKE_ARGS+= LDAP_ENABLE=false -.endif - -.if ${PORT_OPTIONS:MTIDY} -MAKE_ARGS+= TIDY_ENABLE=true \ - TIDY_INCLUDE=-I${LOCALBASE}/include/tidy \ - TIDY_LIBS="-L${LOCALBASE}/lib -ltidy" -.else -MAKE_ARGS+= TIDY_ENABLE=false -.endif - -.if ${PORT_OPTIONS:MSSL} -MAKE_ARGS+= CCLIENT_SSL_ENABLE=true \ - SSL_ENABLE=true \ - INCLUDES=-I${OPENSSLINC} \ - LDFLAGS="${LDFLAGS} -L${OPENSSLLIB}" -.else -MAKE_ARGS+= CCLIENT_SSL_ENABLE=false \ - SSL_ENABLE=false -.endif - -.if ${PORT_OPTIONS:MSESSIONCACHE} -MAKE_ARGS+= SESSION_CACHE_ENABLE=true \ - DB_INCLUDE=-I${BDB_INCLUDE_DIR} \ - DB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" -.else -MAKE_ARGS+= SESSION_CACHE_ENABLE=false -.endif - -pre-patch: - @${CP} ${WRKSRC}/defaults/Config ${WRKSRC}/Config - -post-patch: -# correct chroot - @${REINPLACE_CMD} "s#\"/chroot/prayer\"#config->var_prefix#" ${WRKSRC}/servers/prayer_chroot.c -# change the user in the default config and cylog util - @${REINPLACE_CMD} "s#prayer_user = \"prayer\"#prayer_user = \"_prayer\"#" ${WRKSRC}/files/etc/prayer.cf.SRC - @${REINPLACE_CMD} "s#\"prayer\" \"prayer\"#\"_prayer\" \"prayer\"#" ${WRKSRC}/utils/prayer-cyclog.SRC - @${REINPLACE_CMD} "s,-lutil,-lutil ${ICONV_LIB}," ${WRKSRC}/Config - -pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/prayer \ - ${STAGEDIR}${PREFIX}/prayer - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}/var/spool/prayer - -.include <bsd.port.mk> diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo deleted file mode 100644 index da23195a1cfa..000000000000 --- a/mail/prayer/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (prayer-1.3.5.tar.gz) = aa79da17dceeb7eb24a1744e25286b3518eef882d8682f9959050d2bfb92ae8c -SIZE (prayer-1.3.5.tar.gz) = 751658 diff --git a/mail/prayer/files/patch-files-Makefile b/mail/prayer/files/patch-files-Makefile deleted file mode 100644 index 83f6f2ab28d5..000000000000 --- a/mail/prayer/files/patch-files-Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- files/Makefile.orig Sun May 11 16:59:12 2003 -+++ files/Makefile Tue Jan 6 10:33:33 2004 -@@ -57,12 +57,12 @@ - fi - - install-config: etc/prayer.cf -- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -- etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE} -+ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}-dist - - install-aconfig: -- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -- etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE} -+ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}-dist - - install-motd: - $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -@@ -82,8 +82,8 @@ - BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \ - ./install.sh - if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi -- if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi -- if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi -+ if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE)-dist ]; then $(MAKE) install-config; fi -+ if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE)-dist ]; then $(MAKE) install-aconfig; fi - if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi - if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi - diff --git a/mail/prayer/files/patch-lib-mydb.c b/mail/prayer/files/patch-lib-mydb.c deleted file mode 100644 index 9cd1d0017133..000000000000 --- a/mail/prayer/files/patch-lib-mydb.c +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/mydb.c.orig Thu Feb 17 23:09:40 2005 -+++ lib/mydb.c Thu Feb 17 23:06:11 2005 -@@ -49,12 +49,12 @@ - #include <string.h> - #include <stdio.h> - #include <netdb.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <errno.h> - #include <syslog.h> --#include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> diff --git a/mail/prayer/files/patch-lib_ssl.c b/mail/prayer/files/patch-lib_ssl.c deleted file mode 100644 index e1930758aa7e..000000000000 --- a/mail/prayer/files/patch-lib_ssl.c +++ /dev/null @@ -1,120 +0,0 @@ ---- lib/ssl.c.orig 2012-06-30 14:30:08 UTC -+++ lib/ssl.c -@@ -14,6 +14,7 @@ - /* Headers files for OpenSSL */ - - #include <openssl/lhash.h> -+#include <openssl/opensslv.h> - #include <openssl/ssl.h> - #include <openssl/err.h> - #include <openssl/rand.h> -@@ -78,17 +79,6 @@ static void os_initialize_prng(struct ssl_config *ssl_ - int totbytes = 0; - int bytes; - -- if (ssl_config->egd_socket) { -- if ((bytes = RAND_egd(ssl_config->egd_socket)) == -1) { -- log_fatal("EGD Socket %s failed", ssl_config->egd_socket); -- } else { -- totbytes += bytes; -- log_debug("Snagged %d random bytes from EGD Socket %s", -- bytes, ssl_config->egd_socket); -- goto SEEDED; /* ditto */ -- } -- } -- - /* Try the good-old default /dev/urandom, if available */ - totbytes += add_rand_file("/dev/urandom"); - if (prng_seeded(totbytes)) { -@@ -212,6 +202,8 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses - unsigned char *data = NULL, *asn; - time_t expire; - int ret = -1; -+ unsigned int session_id_length; -+ unsigned char *session_id = SSL_SESSION_get_id(sess, &session_id_length); - - if (!sess_dbopen) - return 0; -@@ -241,8 +233,7 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses - if (data && len) { - /* store the session in our database */ - do { -- ret = DB->store(sessdb, (void *) sess->session_id, -- sess->session_id_length, -+ ret = DB->store(sessdb, (void *) session_id, session_id_length, - (void *) data, len + sizeof(time_t), NULL); - } - while (ret == MYDB_AGAIN); -@@ -255,8 +246,8 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses - if (ssl_verbose_logging) { - int i; - char idstr[SSL_MAX_SSL_SESSION_ID_LENGTH * 2 + 1]; -- for (i = 0; i < sess->session_id_length; i++) -- sprintf(idstr + i * 2, "%02X", sess->session_id[i]); -+ for (i = 0; i < session_id_length; i++) -+ sprintf(idstr + i * 2, "%02X", session_id[i]); - - log_debug("new SSL session: id=%s, expire=%s, status=%s", - idstr, ctime(&expire), ret ? "failed" : "ok"); -@@ -298,7 +289,10 @@ static void remove_session(unsigned char *id, int idle - */ - static void remove_session_cb(SSL_CTX * ctx, SSL_SESSION * sess) - { -- remove_session(sess->session_id, sess->session_id_length); -+ unsigned int session_id_length; -+ unsigned char *session_id = SSL_SESSION_get_id(sess, &session_id_length); -+ -+ remove_session(session_id, session_id_length); - } - - /* -@@ -387,16 +381,17 @@ void ssl_context_init(struct ssl_config *ssl_config) - SSL_load_error_strings(); - - /* Set up client context: only used by accountd */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - client_ctx = SSL_CTX_new(SSLv3_client_method()); -+#else -+ client_ctx = SSL_CTX_new(TLS_client_method()); -+#endif - SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_BOTH); - SSL_CTX_set_info_callback(client_ctx, info_callback); - #ifdef SSL_MODE_AUTO_RETRY - SSL_CTX_set_mode(client_ctx, SSL_MODE_AUTO_RETRY); - #endif - -- if (SSL_CTX_need_tmp_RSA(client_ctx)) -- SSL_CTX_set_tmp_rsa_callback(client_ctx, rsa_callback); -- - /* Don't bother with session cache for client side: not enough - * connections to worry about caching */ - SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_OFF); -@@ -503,10 +498,6 @@ void ssl_context_init(struct ssl_config *ssl_config) - log_fatal("SSL_CTX_set_options(SSL_OP_CIPHER_SERVER_PREFERENCE)" - "failed"); - -- /* Set up RSA temporary key callback routine */ -- if (SSL_CTX_need_tmp_RSA(server_ctx)) -- SSL_CTX_set_tmp_rsa_callback(server_ctx, rsa_callback); -- - /* Initialise RSA temporary key (will take a couple of secs to complete) */ - ssl_init_rsakey(ssl_config); - } -@@ -615,7 +606,7 @@ void *ssl_start_server(int fd, unsigned long timeout) - else - log_debug("SSL: No client certificate"); - -- switch (ssl->session->ssl_version) { -+ switch (SSL_version(ssl)) { - case SSL2_VERSION: - ver = "SSLv2"; - break; -@@ -668,7 +659,7 @@ void *ssl_start_client(int fd, unsigned long timeout) - - /* Verify certificate here? Need local context to play with? */ - -- switch (((SSL *) ssl)->session->ssl_version) { -+ switch (SSL_version(ssl)) { - case SSL2_VERSION: - ver = "SSLv2"; - break; diff --git a/mail/prayer/files/patch-man-Makefile b/mail/prayer/files/patch-man-Makefile deleted file mode 100644 index ab8e8e273a74..000000000000 --- a/mail/prayer/files/patch-man-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- man/Makefile.orig 2009-03-16 13:46:41.000000000 +0800 -+++ man/Makefile 2009-03-16 13:46:56.000000000 +0800 -@@ -20,12 +20,12 @@ - PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \ - BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \ - -- mkdir -p $(BROOT)$(PREFIX)/man -- mkdir -p $(BROOT)$(PREFIX)/man/man5 -- mkdir -p $(BROOT)$(PREFIX)/man/man8 -+ mkdir -p $(BROOT)$(MANPREFIX)/man -+ mkdir -p $(BROOT)$(MANPREFIX)/man/man5 -+ mkdir -p $(BROOT)$(MANPREFIX)/man/man8 - -- $(INSTALL) prayer.cf.5 $(BROOT)$(PREFIX)/man/man5 -- $(INSTALL) prayer.8 $(BROOT)$(PREFIX)/man/man8 -- $(INSTALL) prayer-session.8 $(BROOT)$(PREFIX)/man/man8 -- $(INSTALL) prayer-ssl-prune.8 $(BROOT)$(PREFIX)/man/man8 -+ $(INSTALL) prayer.cf.5 $(BROOT)$(MANPREFIX)/man/man5 -+ $(INSTALL) prayer.8 $(BROOT)$(MANPREFIX)/man/man8 -+ $(INSTALL) prayer-session.8 $(BROOT)$(MANPREFIX)/man/man8 -+ $(INSTALL) prayer-ssl-prune.8 $(BROOT)$(MANPREFIX)/man/man8 - diff --git a/mail/prayer/files/patch-servers-Makefile b/mail/prayer/files/patch-servers-Makefile deleted file mode 100644 index 2d3383e821dc..000000000000 --- a/mail/prayer/files/patch-servers-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- servers/Makefile.orig 2009-03-16 22:51:20.000000000 +0800 -+++ servers/Makefile 2009-03-16 22:51:25.000000000 +0800 -@@ -98,8 +98,6 @@ - -rm -f $(BIN) core *.o *.flc *~ \#*\# - - install: all -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -- $(BROOT)$(BIN_DIR) - $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ - prayer $(BROOT)$(BIN_DIR) - $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ diff --git a/mail/prayer/files/patch-shared_config.c b/mail/prayer/files/patch-shared_config.c deleted file mode 100644 index 68fb78d8f2ba..000000000000 --- a/mail/prayer/files/patch-shared_config.c +++ /dev/null @@ -1,14 +0,0 @@ ---- shared/config.c.orig 2012-06-30 14:30:08 UTC -+++ shared/config.c -@@ -455,9 +455,9 @@ static struct { - "draft_att_total_max", config_number, OFFSET(draft_att_total_max)} - , { - "dualuse", config_bool, OFFSET(dualuse)} -- , { -+ , /*{ - "egd_socket", config_path, OFFSET(egd_socket)} -- , { -+ , */{ - "expunge_on_exit", config_bool, OFFSET(expunge_on_exit)} - , { - "fatal_dump_core", config_bool, OFFSET(fatal_dump_core)} diff --git a/mail/prayer/files/patch-templates-remove-url-prefix b/mail/prayer/files/patch-templates-remove-url-prefix deleted file mode 100644 index 85f6f2a20c18..000000000000 --- a/mail/prayer/files/patch-templates-remove-url-prefix +++ /dev/null @@ -1,184 +0,0 @@ -diff -Naur templates.orig/cam/frontend_compose_timeout.t templates/cam/frontend_compose_timeout.t ---- templates.orig/cam/frontend_compose_timeout.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/cam/frontend_compose_timeout.t 2009-03-13 12:18:28.859721000 +0100 -@@ -46,7 +46,7 @@ - </div> - </form> - --<p><a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p><a href="/login/<% $user |u %>">\ - Click here to login again</a></p> - % CALL container_end - % CALL footer -diff -Naur templates.orig/cam/frontend_login_error.t templates/cam/frontend_login_error.t ---- templates.orig/cam/frontend_login_error.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/cam/frontend_login_error.t 2009-03-13 12:18:54.133542000 +0100 -@@ -12,10 +12,10 @@ - % ENDIF - - % IFDEF $user --<p>Please <a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p>Please <a href="/login/<% $user |u %>">\ - try again</a></p> - % ELSE --<p>Please <a href="<% $url_prefix |n %>/">try again</a></p> -+<p>Please <a href="/">try again</a></p> - % ENDIF - - % CALL container_end -diff -Naur templates.orig/cam/frontend_security.t templates/cam/frontend_security.t ---- templates.orig/cam/frontend_security.t 2008-10-02 09:01:56.000000000 +0200 -+++ templates/cam/frontend_security.t 2009-03-13 12:19:23.592170000 +0100 -@@ -5,7 +5,7 @@ - <h2>Security Alert</h2> - - <p>Login request did not come from -- <a href = "<% $url_prefix |n %>"><% $url_prefix |h %></a></p> -+ <a href = "/"><% $url_prefix |h %></a></p> - - % CALL container_end - % CALL footer -diff -Naur templates.orig/cam/frontend_session.t templates/cam/frontend_session.t ---- templates.orig/cam/frontend_session.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/cam/frontend_session.t 2009-03-13 12:19:42.839703000 +0100 -@@ -4,7 +4,7 @@ - % CALL container_start - <h3>Couldn't connect to Webmail session server</h3> - --<p><a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p><a href="/login/<% $user |u %>">\ - Try again</a> later</p> - % CALL container_end - % CALL footer -diff -Naur templates.orig/cam/frontend_timeout.t templates/cam/frontend_timeout.t ---- templates.orig/cam/frontend_timeout.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/cam/frontend_timeout.t 2009-03-13 12:19:55.817016000 +0100 -@@ -4,7 +4,7 @@ - % CALL container_start - <h3>Couldn't connect to session. Maybe it timed out?</h3> - --<p><a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p><a href="/login/<% $user |u %>">\ - Click here to login again</a></p> - % CALL container_end - % CALL footer -diff -Naur templates.orig/cam/login.t templates/cam/login.t ---- templates.orig/cam/login.t 2008-10-07 10:36:43.000000000 +0200 -+++ templates/cam/login.t 2009-03-13 12:20:17.892743000 +0100 -@@ -82,7 +82,7 @@ - </table> - % ENDIF - <form method="post" accept-charset="UTF-8" enctype="multipart/form-data" -- action="<% ${url_prefix} |n %>" class="lookup" id="credentials"> -+ action="/" class="lookup" id="credentials"> - <fieldset> - <div> - <table id="login"><tr> -diff -Naur templates.orig/cam/login_hermes.t templates/cam/login_hermes.t ---- templates.orig/cam/login_hermes.t 2008-10-27 12:43:06.000000000 +0100 -+++ templates/cam/login_hermes.t 2009-03-13 12:20:36.756388000 +0100 -@@ -106,7 +106,7 @@ - </table> - % ENDIF - <form method="post" accept-charset="UTF-8" enctype="multipart/form-data" -- action="<% ${url_prefix} |n %>" class="lookup" id="credentials"> -+ action="/" class="lookup" id="credentials"> - <fieldset> - <div> - % IFDEF $raven_enable -diff -Naur templates.orig/cam/raven_blocked.t templates/cam/raven_blocked.t ---- templates.orig/cam/raven_blocked.t 2008-09-16 12:52:45.000000000 +0200 -+++ templates/cam/raven_blocked.t 2009-03-13 12:21:04.147607000 +0100 -@@ -7,7 +7,7 @@ - <p>Raven logins have been disabled for this account. You will need to log - in using the normal <% $g_service_name |h %> username and password</p> - --<p><a href="<% $url_prefix |n %>/login/<% $username |u %>">Click here</a> -+<p><a href="/login/<% $username |u %>">Click here</a> - to return to the login screen</p> - % CALL container_end - % CALL footer -diff -Naur templates.orig/old/frontend_compose_timeout.t templates/old/frontend_compose_timeout.t ---- templates.orig/old/frontend_compose_timeout.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/old/frontend_compose_timeout.t 2009-03-13 12:25:09.617868000 +0100 -@@ -45,7 +45,7 @@ - </div> - </form> - --<p><a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p><a href="/login/<% $user |u %>">\ - Click here</a> to login again</p> - - % CALL footer -diff -Naur templates.orig/old/frontend_login_error.t templates/old/frontend_login_error.t ---- templates.orig/old/frontend_login_error.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/old/frontend_login_error.t 2009-03-13 12:27:01.925958000 +0100 -@@ -11,9 +11,9 @@ - % ENDIF - - % IFDEF $user --<p>Please <a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p>Please <a href="/login/<% $user |u %>">\ - try again</a></p> - % ELSE --<p>Please <a href="<% $url_prefix |n %>/">try again</a></p> -+<p>Please <a href="/">try again</a></p> - % ENDIF - % CALL footer -diff -Naur templates.orig/old/frontend_security.t templates/old/frontend_security.t ---- templates.orig/old/frontend_security.t 2008-10-02 09:01:57.000000000 +0200 -+++ templates/old/frontend_security.t 2009-03-13 12:27:52.204673000 +0100 -@@ -4,6 +4,6 @@ - <h2>Security Alert</h2> - - <p>Login request did not come from -- <a href = "<% $url_prefix |n %>"><% $url_prefix |h %></a></p> -+ <a href = "/"><% $url_prefix |h %></a></p> - - % CALL footer -diff -Naur templates.orig/old/frontend_session.t templates/old/frontend_session.t ---- templates.orig/old/frontend_session.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/old/frontend_session.t 2009-03-13 12:28:05.778814000 +0100 -@@ -3,6 +3,6 @@ - % CALL header - <h3>Couldn't connect to Webmail session server</h3> - --<p><a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p><a href="/login/<% $user |u %>">\ - Try again</a> later</p> - % CALL footer -diff -Naur templates.orig/old/frontend_timeout.t templates/old/frontend_timeout.t ---- templates.orig/old/frontend_timeout.t 2008-10-14 10:07:08.000000000 +0200 -+++ templates/old/frontend_timeout.t 2009-03-13 12:28:24.240569000 +0100 -@@ -3,6 +3,6 @@ - % CALL header - <h3>Couldn't connect to session. Maybe it timed out?</h3> - --<p><a href="<% $url_prefix |n %>/login/<% $user |u %>">\ -+<p><a href="/login/<% $user |u %>">\ - Click here</a> to login again</p> - % CALL footer -diff -Naur templates.orig/old/login.t templates/old/login.t ---- templates.orig/old/login.t 2008-10-02 09:01:57.000000000 +0200 -+++ templates/old/login.t 2009-03-13 12:28:39.815144000 +0100 -@@ -37,7 +37,7 @@ - % ENDIF - % - <form method="post" accept-charset="UTF-8" enctype="multipart/form-data" -- action="<% ${url_prefix} |n %>" id="credentials"> -+ action="/" id="credentials"> - <table cellpadding="5"> - <tr> - <td>Username</td> -diff -Naur templates.orig/old/raven_blocked.t templates/old/raven_blocked.t ---- templates.orig/old/raven_blocked.t 2008-09-16 12:52:48.000000000 +0200 -+++ templates/old/raven_blocked.t 2009-03-13 12:28:57.300178000 +0100 -@@ -6,7 +6,7 @@ - <p>Raven logins have been disabled for this account. You will need to log - in using the normal <% $g_service_name |h %> username and password</p> - --<p><a href="<% $url_prefix |n %>/login/<% $username |u %>">Click here</a> -+<p><a href="/login/<% $username |u %>">Click here</a> - to return to the login screen</p> - - % CALL footer diff --git a/mail/prayer/files/patch-utils-Makefile b/mail/prayer/files/patch-utils-Makefile deleted file mode 100644 index 5eac9e0dda58..000000000000 --- a/mail/prayer/files/patch-utils-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile.orig 2009-03-16 23:12:54.000000000 +0800 -+++ utils/Makefile 2009-03-16 23:13:16.000000000 +0800 -@@ -72,8 +72,6 @@ - -rm -f $(BIN) core *.o *.flc *~ \#*\# - - install: all -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -- $(BROOT)$(BIN_DIR) - $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ - prayer-ssl-prune $(BROOT)$(BIN_DIR) - $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ diff --git a/mail/prayer/files/patch-utils__prayer-cyclog.SRC b/mail/prayer/files/patch-utils__prayer-cyclog.SRC deleted file mode 100644 index 9591941713d7..000000000000 --- a/mail/prayer/files/patch-utils__prayer-cyclog.SRC +++ /dev/null @@ -1,20 +0,0 @@ ---- utils/prayer-cyclog.SRC 2003/04/15 13:00:03 1.1 -+++ utils/prayer-cyclog.SRC 2003/07/30 18:43:46 -@@ -4,9 +4,16 @@ - suffix=gz - # Following is correct for Linux. --compress="/bin/gzip" --chown="/bin/chown" --chgrp="/bin/chgrp" -+#compress="/bin/gzip" -+#chown="/bin/chown" -+#chgrp="/bin/chgrp" -+#mv="/bin/mv" -+#rm="/bin/rm" -+ -+# Following is correct for FreeBSD -+compress="/usr/bin/gzip" -+chown="/usr/sbin/chown" -+chgrp="/usr/bin/chgrp" - mv="/bin/mv" - rm="/bin/rm" diff --git a/mail/prayer/files/prayer.in b/mail/prayer/files/prayer.in deleted file mode 100644 index c6daa2f6ab14..000000000000 --- a/mail/prayer/files/prayer.in +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# PROVIDE: prayer -# REQUIRE: LOGIN -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# prayer_enable (bool): Set to NO by default. -# prayer_chrooted (bool): Set to NO by default. -# Force prayer to be executed in chrooted -# prayer_prefork (bool): Set to NO by default. -# Allow prayer to prefork itself at startup -# - -. /etc/rc.subr - -name="prayer" -rcvar=prayer_enable - -command=%%PREFIX%%/sbin/${name} -pidfile="/var/spool/prayer/pid/${name}.pid" - -start_precmd="prayer_prestart" -stop_postcmd="prayer_poststop" - -load_rc_config $name - -: ${prayer_enable="NO"} -: ${prayer_chrooted="NO"} -: ${prayer_prefork="NO"} - -prayer_prestart() -{ - if checkyesno prayer_enable; then - if checkyesno prayer_chrooted; then - echo "Chroot no fully functionnal for now so not activated" - # command=/usr/local/sbin/${name}-chroot - fi - if ! checkyesno prayer_prefork; then - command_args="--disable-prefork" - fi - fi - return 0 -} - -prayer_poststop() -{ - kill -15 `head -1 /var/spool/prayer/pid/${name}-session.pid` -} - -run_rc_command "$1" diff --git a/mail/prayer/pkg-descr b/mail/prayer/pkg-descr deleted file mode 100644 index c951f0d4dcef..000000000000 --- a/mail/prayer/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Prayer is yet another Webmail interface for IMAP servers on Unix systems. - -It exists because we weren't terribly happy about the characteristics of -existing Webmail interfaces: in particular scalability problems with common -open source Webmail packages and the lack of flexibility that commercial -packages would give us. This doesn't mean that Prayer is trying to compete -with existing Webmail packages. It just means that Prayer is better suited -to our particular environment. - -WWW: http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/ diff --git a/mail/prayer/pkg-plist b/mail/prayer/pkg-plist deleted file mode 100644 index 4a431ee17eec..000000000000 --- a/mail/prayer/pkg-plist +++ /dev/null @@ -1,112 +0,0 @@ -etc/prayer/prayer.cf-dist -etc/prayer/accountd.cf-dist -man/man5/prayer.cf.5.gz -man/man8/prayer-session.8.gz -man/man8/prayer-ssl-prune.8.gz -man/man8/prayer.8.gz -prayer/icons/bg-home-menu-top.gif -prayer/icons/bg-nav-primary.gif -prayer/icons/bg-tab-left-active.gif -prayer/icons/bg-tab-left-over.gif -prayer/icons/bg-tab-left.gif -prayer/icons/bg-tab-right-active.gif -prayer/icons/bg-tab-right-over.gif -prayer/icons/bg-tab-right.gif -prayer/icons/button-search.gif -prayer/icons/button2-bm.png -prayer/icons/divider-site-tools-small.gif -prayer/icons/icon-alert-normal.gif -prayer/icons/icon-alert-warning.gif -prayer/icons/icon-arrow-home-menu-orange.gif -prayer/icons/icon-arrow-home-menu.gif -prayer/icons/icon-arrow-nav-breadcrumb.gif -prayer/icons/icon-arrow-nav-primary-down.gif -prayer/icons/icon-arrow-nav-primary-up.gif -prayer/icons/icon-arrow-nav-primary.gif -prayer/icons/icon-home.gif -prayer/icons/icon-quick-links.gif -prayer/icons/icon-section.gif -prayer/icons/identifier.gif -prayer/icons/identifier800.gif -prayer/icons/ifmlogo-small.gif -prayer/icons/ifmlogo.gif -prayer/icons/msg-seen.png -prayer/icons/next-white.gif -prayer/icons/next.gif -prayer/icons/prev-white.gif -prayer/icons/previous.gif -prayer/icons/raven.gif -prayer/icons/rssfeed.gif -prayer/icons/sort-d.gif -prayer/icons/sort-u.gif -prayer/icons/srssfeed.gif -prayer/icons/ucs-id-small.jpg -prayer/icons/ucs-s.gif -prayer/icons/ucs.gif -prayer/icons/addressbook-inactive.gif -prayer/icons/addressbook.gif -prayer/icons/back.gif -prayer/icons/blank.gif -prayer/icons/compose-inactive.gif -prayer/icons/compose.gif -prayer/icons/cross.gif -prayer/icons/dir.gif -prayer/icons/display-inactive.gif -prayer/icons/display.gif -prayer/icons/down.gif -prayer/icons/folders-inactive.gif -prayer/icons/folders.gif -prayer/icons/help-inactive.gif -prayer/icons/help.gif -prayer/icons/left-inactive.gif -prayer/icons/left.gif -prayer/icons/leftleft-inactive.gif -prayer/icons/leftleft.gif -prayer/icons/logout.gif -prayer/icons/mailbox-inactive.gif -prayer/icons/mailbox.gif -prayer/icons/manage-inactive.gif -prayer/icons/manage.gif -prayer/icons/msg-answered.gif -prayer/icons/msg-deleted.gif -prayer/icons/msg-seen.gif -prayer/icons/msg-unseen.gif -prayer/icons/off.gif -prayer/icons/on.gif -prayer/icons/paperclip-small.gif -prayer/icons/right-inactive.gif -prayer/icons/right.gif -prayer/icons/rightright-inactive.gif -prayer/icons/rightright.gif -prayer/icons/tick.gif -prayer/icons/univheader.gif -prayer/static/blue.css -prayer/static/camstyle.css -prayer/static/common.css -prayer/static/content.css -prayer/static/forms.css -prayer/static/gray.css -prayer/static/green.css -prayer/static/help.css -prayer/static/high.css -prayer/static/ie6.css -prayer/static/ie7.css -prayer/static/layout.css -prayer/static/links.css -prayer/static/minmax.js -prayer/static/print.css -prayer/static/reset.css -prayer/static/rssfeed.css -prayer/static/typography.css -prayer/static/yellow.css -prayer/etc/motd.html -sbin/prayer -sbin/prayer-db-prune -sbin/prayer-session -sbin/prayer-ssl-prune -sbin/prayer-sem-prune -sbin/prayer-cyclog -sbin/prayer-chroot -@dir prayer/certs -@dir etc/prayer -@dir(_prayer,prayer,) /var/spool/prayer |