WebSVN - prayer - Path Comparison - /tags Rev 108 and /tags Rev 85

Ignore whitespace Rev 108 → Rev 85

/tags/1.3.2-dfsg1-2/debian/rules
File deleted

Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.3.2-dfsg1-2/debian/prayer.lintian-overrides
===================================================================
--- 1.3.2-dfsg1-2/debian/prayer.lintian-overrides (revision 108)
+++ 1.3.2-dfsg1-2/debian/prayer.lintian-overrides (nonexistent)
@@ -1 +0,0 @@
-prayer: possible-gpl-code-linked-with-openssl
Index: 1.3.2-dfsg1-2/debian/prayer-accountd.init
===================================================================
--- 1.3.2-dfsg1-2/debian/prayer-accountd.init (revision 108)
+++ 1.3.2-dfsg1-2/debian/prayer-accountd.init (nonexistent)
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: prayer-accountd
-# Required-Start:
-# Required-Stop:
-# Should-Start: $local_fs
-# Should-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Prayer account helper daemon
-# Description: Lets users change passwords, manage filters and other things not supported by IMAP itself
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/prayer-accountd
-PIDFILE=/var/run/prayer-accountd.pid
-DESC="Prayer account helper server"
-
-test -x $DAEMON \|\| exit 0
-
-egrep -iq "^[[:space:]]accountd_port[[:space:]]=[[:space:]][[:digit:]]+[[:space:]]$" /etc/prayer/accountd.cf \|\| exit 0
-
-. /lib/lsb/init-functions
-
-# Include prayer defaults if available
-if [ -f /etc/default/prayer-accountd ] ; then
- . /etc/default/prayer-accountd
-fi
-
-set +e
-
-start() {
- log_daemon_msg "Starting $DESC" "accountd"
- start-stop-daemon --start --background --make-pidfile --pidfile $PIDFILE \
- --exec $DAEMON -- $DAEMON_OPTS
- log_end_msg $?
-}
-
-stop() {
- log_daemon_msg "Stopping $DESC"
- if [ -f "$PIDFILE" ]; then
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
- log_progress_msg "accountd"
- fi
- rm -f "$PIDFILE"
- log_end_msg 0
-}
-
-case "$1" in
- start)
- start
- ;;
-
- stop)
- stop
- ;;
-
- restart\|force-reload)
- stop
- sleep 1
- start
- ;;
- *)
- N=/etc/init.d/prayer-accountd
- # echo "Usage: $N {start\|stop\|restart\|reload\|force-reload}" >&2
- log_failure_msg "Usage: $N {start\|stop\|restart\|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Index: 1.3.2-dfsg1-2/debian/Config
===================================================================
--- 1.3.2-dfsg1-2/debian/Config (revision 108)
+++ 1.3.2-dfsg1-2/debian/Config (nonexistent)
@@ -1,149 +0,0 @@
-# $Cambridge: hermes/src/prayer/defaults/Config,v 1.12 2008/05/21 13:25:13 dpc22 Exp $
-#
-# Prayer - a Webmail Interface
-#
-# Copyright (c) University of Cambridge 2000 - 2002
-# See the file NOTICE for conditions of use and distribution.
-#
-# Conventional Configure file.
-
-SSL_ENABLE = true # SSL requires OpenSSL
-SESSION_CACHE_ENABLE = true # SSL session cache Requires Berkeley DB 3 or 4
-GZIP_ENABLE = true # Enable on the fly compression of pages
-LDAP_ENABLE = true # Add LDAP interface
-FENCE_ENABLE = false # Use Electric Fence to catch malloc problems
-MUTEX_SEMAPHORE = true # Use SYSV mutexes rather than file locking
-
-# Following depend on the way that you have configured c-client
-CCLIENT_SSL_ENABLE = false # C-client was built with SSL support
-CCLIENT_PAM_ENABLE = false # C-client was built with PAM support
-CCLIENT_KERB_ENABLE = false # C-client was built with Kerberos support
-
-# Probably don't need the following
-ACCOUNTD_ENABLE = true # Only of use in Cambridge at the moment.
-ACCOUNTD_SSL_ENABLE = true # Enable SSL support in account management daemon
-ACCOUNTD_PAM_ENABLE = true # Enable PAM support in account management daemon
-ACCOUNTD_USE_BSD_PTY = false # Use Berkeley PTYs rather than Sys V PTYs
-
-############################################################################
-# Location of compiler
-CC = gcc
-# Location of make program (GNU make required)
-MAKE = make
-# Location of install program (GNU install or compatible required)
-INSTALL = install
-
-# Base Compiler options for GCC (use CFLAGS, CPPFLAGS and LDFLAGS if passed in)
-BASECFLAGS := $(CFLAGS)
-BASECFLAGS ?= -Wall -g -O2
-BASECFLAGS += $(CPPFLAGS)
-
-BASELDFLAGS := $(LDFLAGS)
-BASELDFLAGS ?= -g
-
-# Minimal libraries needed by Linux
-BASE_LIBS = -lcrypt -lutil
-# FreeBSD needs some extra libraries:
-# BASE_LIBS = -lcrypt -liconv -lutil
-# Solaris needs even more libararies:
-# BASE_LIBS = -lcrypt -lxnet -lnsl -lsocket
-
-# Base Compiler options for Sun SUNWspro compiler
-#CC = /opt/SUNWspro/bin/cc
-#BASECFLAGS = -fast
-#BASELDFLAGS = -s
-
-############################################################################
-# Location of various include files and libraries.
-############################################################################
-
-# Location of c-client library.
-CCLIENT_DIR=/usr/include/c-client
-CCLIENT_INCLUDE=-I$(CCLIENT_DIR)
-CCLIENT_LIBS=-lc-client
-
-# Electric fence (required if FENCE_ENABLE set)
-FENCE_INCLUDE=
-FENCE_LIBS=-lmcheck
-
-# Zlib (required if GZIP_ENABLE set)
-Z_INCLUDE =
-Z_LIBS = -lz
-
-# LDAP (required if LDAP_ENABLE set)
-LDAP_INCLUDE =
-LDAP_LIBS = -lldap
-
-# Pam (required if CCLIENT_PAM_ENABLE set)
-PAM_INCLUDE =
-PAM_LIBS = -lpam
-
-# Kerberos (required if CCLIENT_KERB_ENABLE set)
-KERB_INCLUDE =
-KERB_LIBS = -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-
-# SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
-#
-# Following suitable for Linux and FreeBSD which have SSL preinstalled
-# (Header files from OpenSSL 0.9.7 want to include various Kerboros stuff)
-#
-SSL_INCLUDE=
-SSL_LIBS=-lssl -lcrypto
-OPENSSL=openssl
-
-# Following definitions suitable for our Sun systems.
-#SSL_BASE=/opt/local/ssl/current
-#SSL_INCLUDE=-I ${SSL_BASE}/include
-#SSL_LIBS=-L ${SSL_BASE}/lib -lssl -lcrypto
-#OPENSSL=${SSL_BASE}/bin/openssl
-
-# DB definitions (required if SESSION_CACHE_ENABLE set)
-#
-# Following suitable for Redhat Linux which has DB 3 preinstalled
-DB_INCLUDE=
-DB_LIBS=-ldb
-
-# Following suitable for FreeBSD with DB 4 package installed
-#DB_INCLUDE=-I/usr/local/include/db4
-#DB_LIBS=-L/usr/local/lib -ldb4
-
-############################################################################
-
-# Install location of prayer configuration and support files. The initial
-# config file runs prayer processes as user "prayer" and group "prayer".
-# If you are using SSL, the certificate file must be readable by RW_USER or
-# RW_GROUP. It is important that nothing else can read the certificate file.
-
-# Build root (used by Redhat RPM system)
-BROOT=$(CURDIR)/../debian/tmp
-
-# Directory, User and group for read-write files: log files, sockets etc
-VAR_PREFIX = /var/run/prayer
-RW_USER = root
-RW_GROUP = root
-
-# Root Directory, User and group for read-only configuration files.
-# Default configuration and permissions does not allow prayer user to
-# update prayer configuration file.
-
-PREFIX = /usr/share/prayer
-LIB_PREFIX = /usr/lib/prayer
-SHLIBEXT = .so
-
-RO_USER = root
-RO_GROUP = root
-
-# Access permissions for general objects (wrt above users and groups)
-PUBLIC_EXEC = 0755
-PUBLIC_DIR = 0755
-PUBLIC_FILE = 0644
-
-# Access permissions for private objects (wrt above users and groups)
-PRIVATE_EXEC = 0750
-PRIVATE_DIR = 0750
-PRIVATE_FILE = 0640
-
-# Location of configuration files and binaries
-PRAYER_CONFIG_FILE = /etc/prayer/prayer.cf
-BIN_DIR = /usr/sbin
-ACCOUNTD_CONFIG_FILE = /etc/prayer/accountd.cf
Index: 1.3.2-dfsg1-2/debian/prayer-accountd.install
===================================================================
--- 1.3.2-dfsg1-2/debian/prayer-accountd.install (revision 108)
+++ 1.3.2-dfsg1-2/debian/prayer-accountd.install (nonexistent)
@@ -1,2 +0,0 @@
-usr/sbin/prayer-accountd
-etc/prayer/accountd.cf
Index: 1.3.2-dfsg1-2/debian/copyright
===================================================================
--- 1.3.2-dfsg1-2/debian/copyright (revision 108)
+++ 1.3.2-dfsg1-2/debian/copyright (nonexistent)
@@ -1,93 +0,0 @@
-This package was debianized by Magnus Holmgren <magnus@kibibyte.se> on
-Tue, 24 Oct 2006 21:08:34 +0200.
-
-It was downloaded from ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer
-
-However, due to dubious copyright/licensing status of the coat of
-arms/logo of the University of Cambridge, the upstream (.orig) tarball
-has been modified by removing the following files from the files/icons
-directory:
-
- identifier.gif
- identifier800.gif
- ucs-id-small.jpg
- univheader.gif
-
-Upstream author/maintainer: David Carter <dpc22@cam.ac.uk> et al.
-
-The Debian packaging is © 2006-2008 Magnus Holmgren <holmgren@debian.org>
-and is licensed under the GPL.
-
-The original licence is as follows (from the file NOTICE in the upstream
-distribution); the GPL should be in /usr/share/common-licenses/GPL on a debian
-system.
-
-
-The Prayer Webmail Interface
-----------------------------
-
-Copyright (c) 2002 University of Cambridge
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-In addition, for the avoidance of any doubt, permission is granted to
-link this program with OpenSSL or any other library package.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-USA
-
-INCORPORATED CODE
------------------
-
-Code implementing the SSL session cache has been adapted from code used by
-the Cyrus IMAP server, which is distributed under the following copyright:
-
-/* Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any other legal
- * details, please contact
- * Office of Technology Transfer
- * Carnegie Mellon University
- * 5000 Forbes Avenue
- * Pittsburgh, PA 15213-3890
- * (412) 268-4387, fax: (412) 268-7395
- * tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
Index: 1.3.2-dfsg1-2/debian
===================================================================
--- 1.3.2-dfsg1-2/debian (revision 108)
+++ 1.3.2-dfsg1-2/debian (nonexistent)

/1.3.2-dfsg1-2/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property
Index: 1.3.2-dfsg1-2
===================================================================
--- 1.3.2-dfsg1-2 (revision 108)
+++ 1.3.2-dfsg1-2 (nonexistent)

/1.3.2-dfsg1-2
Property changes:
Deleted: svn:mergeinfo
## -0,3 +0,0 ##
Reverse-merged /tags/1.2.2.1-1:r47-51
Reverse-merged /branches/lenny:r52-71
Reverse-merged /tags/1.2.2.1-7:r53-72

Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 108 → Rev 85