Subversion Repositories prayer-err

Compare Revisions

Ignore whitespace Rev 22 → Rev 23

/trunk/debian/patches/makefile_install_config.patch
13,40 → 13,23
aliases_name = "vacation.aliases"
--- a/files/Makefile
+++ b/files/Makefile
@@ -53,41 +53,44 @@ distclean:
install-cert:
if [ -f certs/prayer.pem ]; then \
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
- -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
+ -m $(PRIVATE_FILE) certs/prayer.pem ${DESTDIR}${PREFIX}/certs; \
fi
@@ -65,26 +65,29 @@ install-aconfig:
install-config: etc/prayer.cf
$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
+ etc/prayer.cf ${DESTDIR}${PRAYER_CONFIG_FILE}
install-aconfig:
$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
+ etc/prayer-accountd.cf ${DESTDIR}${ACCOUNTD_CONFIG_FILE}
install-motd:
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- etc/motd.html ${BROOT}${PREFIX}/etc
+ etc/motd.html ${DESTDIR}/etc/prayer
+ etc/motd.html ${BROOT}/etc/prayer
install-welcome:
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- etc/welcome.html ${BROOT}${PREFIX}/etc
+ etc/welcome.html ${DESTDIR}/etc/prayer
+ etc/welcome.html ${BROOT}/etc/prayer
install:
- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}${PREFIX}
+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}/etc/prayer
+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}${PREFIX}
+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}/etc/prayer
+
+ PREFIX=$(DESTDIR)$(PREFIX) VAR_PREFIX=$(DESTDIR)$(VAR_PREFIX) \
PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \
RW_USER=$(RW_USER) RW_GROUP=$(RW_GROUP) \
PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
53,24 → 36,19
PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
- BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
+ BIN_DIR=$(DESTDIR)$(BIN_DIR) INSTALL=$(INSTALL) \
+ BIN_DIR=$(BROOT)$(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)$(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)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
- if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
+# if [ ! -f $(DESTDIR)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
+ if [ ! -f $(DESTDIR)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
+ if [ ! -f $(DESTDIR)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
+ if [ ! -f $(DESTDIR)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
+ if [ ! -f $(DESTDIR)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi
+ if [ ! -f $(BROOT)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
+ if [ ! -f $(BROOT)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi
redhat-install-init.d:
install -D -o root -g root -m 755 \
- ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
+ ./init.d/prayer $(DESTDIR)/etc/rc.d/init.d/prayer
#chkconfig prayer --level 2345 on
--- a/files/install.sh
+++ b/files/install.sh
@@ -4,77 +4,6 @@
148,7 → 126,7
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
-fi
-
for i in help icons
for i in icons
do
if [ -d "${PREFIX}/${i}" ]; then
--- a/files/etc/prayer.cf.SRC
162,7 → 140,7
# Run prayer as background process.
# TRUE => will return as soon as valid configuration is found.
@@ -428,14 +428,14 @@ bin_dir = "__BIN_DIR__"
@@ -428,10 +428,10 @@ bin_dir = "__BIN_DIR__"
# Various directories used by the running system
# Logs stored in $log_dir
175,17 → 153,16
# $socket_dir is location for unix domain sockets which connect frontend
# to backend in proxy mode of operation.
-socket_dir = "$var_prefix/sockets"
+socket_dir = "/var/run/prayer"
@@ -439,7 +439,7 @@ socket_dir = "$var_prefix/socke
# Split socket directory into 64 subdirs keyed on first letter of sessionID
# Code provides compatibility in both directions: can switch back and forward
@@ -446,14 +446,14 @@ socket_split_dir = TRUE
init_socket_name = init
-socket_split_dir = TRUE
+socket_split_dir = FALSE
# $ssl_session_dir is location for SSL session cache
-ssl_session_dir = "$var_prefix/ssl_scache"
+ssl_session_dir = "/var/run/prayer/ssl_scache"
# Name of Unix domain socket (in $socket_dir) used for initial handshake
# between prayer and prayer-session processes when a user logs in
@@ -450,10 +450,10 @@ ssl_session_dir = "$var_prefix/ssl_s
# Location for temporary files e.g; attachments and folders in transist
# during upload and download operation. Core files also end up here
194,11 → 171,11
# Location for PID files for prayer and prayer-session master processes.
-pid_dir = "$var_prefix/pid"
+pid_dir = "/var/run/prayer"
+pid_dir = "$var_prefix"
# Interface to Hermes finger database
#lookup_rpasswd = "/data/finger/rpasswd.cdb"
@@ -614,7 +614,7 @@ sent_mail_folder = "sent-mail"
@@ -621,7 +621,7 @@ sent_mail_folder = "sent-mail"
# default_domain = "<valid mail domain>"
# Language for ispell.
207,47 → 184,3
# Size of small and large compose windows
small_cols = 80
--- a/prayer/Makefile
+++ b/prayer/Makefile
@@ -102,8 +102,9 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
SESSION_LIBS += $(KERB_LIBS)
endif
-CFLAGS = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS =
+override CFLAGS += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
+LDFLAGS = $(BASELDFLAGS) -Wl,--as-needed
SHARED_OBJS = \
pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
@@ -175,21 +176,21 @@ clean:
install: all
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
- $(BROOT)$(BIN_DIR)
+ $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer $(BROOT)$(BIN_DIR)
+ prayer $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer-chroot $(BROOT)$(BIN_DIR)
+ prayer-chroot $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer-session $(BROOT)$(BIN_DIR)
+ prayer-session $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer-ssl-prune $(BROOT)$(BIN_DIR)
+ prayer-ssl-prune $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer-sem-prune $(BROOT)$(BIN_DIR)
+ prayer-sem-prune $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer-db-prune $(BROOT)$(BIN_DIR)
+ prayer-db-prune $(DESTDIR)$(BIN_DIR)
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
- prayer-cyclog $(BROOT)$(BIN_DIR)
+ prayer-cyclog $(DESTDIR)$(BIN_DIR)
prayer: $(PRAYER_OBJS) prayer_main.o
$(CC) $(LDFLAGS) -o prayer $(PRAYER_OBJS) prayer_main.o $(PRAYER_LIBS)
/trunk/debian/changelog
6,6 → 6,13
* Changed defaults (manual intervention may be needed):
- Let prayer-accountd.pid reside in /var/run; letting the two packages
share /var/run/prayer caused too much trouble.
- prayer.cf (makefile_install_config.patch and debian/Config):
var_prefix set to /var/run/prayer and referred to in other
settings. socket_split_dir disabled by default and default sockets
directory changed to /var/run/prayer/sockets.
* Package build details:
- Reduce makefile_install_config.patch by not changing BROOT into DESTDIR.
- Override CDBS overriding CFLAGS.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 29 May 2008 20:09:18 +0200
 
/trunk/debian/rules
2,8 → 2,6
# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
# This file is public domain.
 
DEB_AUTO_CLEANUP_RCS := yes
 
# Add here any variable or target overrides you need
 
makebuilddir/prayer::
13,12 → 11,7
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
#DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp
DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE)
DEB_MAKE_INSTALL_TARGET = install BROOT=$(CURDIR)/debian/tmp
DEB_INSTALL_CHANGELOGS_ALL = docs/DONE
DEB_INSTALL_DOCS_ALL = -XCVS
DEB_DH_INSTALL_ARGS = -XCVS
DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
clean::
rm -f Config
/trunk/debian/Config
1,4 → 1,4
# $Cambridge: hermes/src/prayer/defaults/Config,v 1.5 2006/04/05 12:35:35 fanf2 Exp $
# $Cambridge: hermes/src/prayer/defaults/Config,v 1.12 2008/05/21 13:25:13 dpc22 Exp $
#
# Prayer - a Webmail Interface
#
12,7 → 12,6
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
DIRECT_ENABLE = false # Experimental. Leave this switched off...
MUTEX_SEMAPHORE = true # Use SYSV mutexes rather than file locking
 
# Following depend on the way that you have configured c-client
34,18 → 33,32
# Location of install program (GNU install or compatible required)
INSTALL = install
 
# Base Compiler options for GCC.
#BASECFLAGS = -Wall -g
#BASELDFLAGS = -g
CFLAGS = -Wall -g -O2
LDFLAGS = -g -O2
# Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in)
ifdef CPPFLAGS
BASECFLAGS = $(CPPFLAGS)
else
BASECFLAGS = -Wall -g -O2
endif
ifdef INCLUDES
BASECFLAGS += $(INCLUDES)
endif
ifdef LDFLAGS
BASELDFLAGS = $(LDFLAGS)
else
BASELDFLAGS = -g
endif
 
# Minimal libraries needed by Linux
BASE_LIBS = -lcrypt
# 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
#BASE_LIBS = -lcrypt -lxnet
 
############################################################################
# Location of various include files and libraries.
52,30 → 65,10
############################################################################
 
# Location of c-client library.
#
# Following works if we have a vanilla c-client installation at same level
# as the prayer installation. Relies on a symbolic link ./prayer/c-client
# which points to ../../imap/c-client. This just reduces the amount of
# noise output on each line when building the package.
#
CCLIENT_DIR=/usr/include/c-client
CCLIENT_INCLUDE=-I$(CCLIENT_DIR)
CCLIENT_LIBS=-lc-client
 
#
# Following works with the mail/cclient port from FreeBSD
#
#CCLIENT_INCLUDE = -I/usr/local/include/c-client
#CCLIENT_LIBS = -L/usr/local/lib -lc-client4
#
# Complication:
# The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
#
#CCLIENT_SSL_ENABLE = true
#CCLIENT_KERB_ENABLE = true
 
############################################################################
 
# Electric fence (required if FENCE_ENABLE set)
FENCE_INCLUDE=
FENCE_LIBS=-lmcheck
132,7 → 125,7
BROOT=$(CURDIR)/../debian/tmp
 
# Directory, User and group for read-write files: log files, sockets etc
VAR_PREFIX = /var/lib/prayer
VAR_PREFIX = /var/run/prayer
RW_USER = root
RW_GROUP = root