Subversion Repositories

--- prayer-1.1.0.orig/files/etc/prayer-accountd.cf
+++ prayer-1.1.0/files/etc/prayer-accountd.cf
@@ -8,6 +8,8 @@
 # Default accountd.cf file suitable for RedHat Linux only.
 # See distribution for some sample files for FreeBSD and Solaris
 
+accountd_port = 145
+
 msforward_name      = ".MSforward"
 forward_name        = ".forward"
 aliases_name        = "vacation.aliases"
--- prayer-1.1.0.orig/files/Makefile
+++ prayer-1.1.0/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
 
 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
 
 install-welcome:
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-       etc/welcome.html ${BROOT}${PREFIX}/etc
+       etc/welcome.html ${DESTDIR}/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
+
+       PREFIX=$(DESTDIR)$(PREFIX) VAR_PREFIX=$(DESTDIR)$(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) \
        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) \
        ./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)/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
 
 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
--- prayer-1.1.0.orig/files/install.sh
+++ prayer-1.1.0/files/install.sh
@@ -4,77 +4,6 @@
 
 PATH=/bin:/sbin/:/usr/bin:/usr/sbin
 
-error=0
-
-if [ "x$PREFIX" = "x" ]; then
-    echo 'PREFIX not defined'
-    error=1
-fi
-
-if [ "x$VAR_PREFIX" = "x" ]; then
-    echo 'VAR_PREFIX not defined'
-    error=1
-fi
-
-if [ "x$RO_USER" = "x" ]; then
-    echo 'RO_USER not defined'
-    error=1
-fi
-
-if [ "x$RO_GROUP" = "x" ]; then
-    echo 'RO_GROUP not defined'
-    error=1
-fi
-
-if [ "x$RW_USER" = "x" ]; then
-    echo 'RW_USER not defined'
-    error=1
-fi
-
-if [ "x$RW_GROUP" = "x" ]; then
-    echo 'RW_GROUP not defined'
-    error=1
-fi
-
-if [ "x$PUBLIC_DIR" = "x" ]; then
-    echo 'PUBLIC_DIR not defined'
-    error=1
-fi
-
-if [ "x$PRIVATE_DIR" = "x" ]; then
-    echo 'PRIVATE_DIR not defined'
-    error=1
-fi
-
-if [ "x$BIN_DIR" = "x" ]; then
-    echo 'BIN_DIR not defined'
-    error=1
-fi
-
-if [ $error != 0 ]; then
-    exit 1
-fi
-
-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
-    ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
-fi
-
-if [ ! -d ${PREFIX} ]; then
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
-fi
-
-if [ ! -d ${PREFIX}/etc ]; then
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
-fi
-
-if [ ! -d ${PREFIX}/certs ]; then
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
-fi
-
-if [ ! -d ${BIN_DIR} ]; then
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
-fi
-
 for i in help icons
 do
     if [ -d "${PREFIX}/${i}" ]; then
--- prayer-1.1.0.orig/files/etc/prayer.cf.SRC
+++ prayer-1.1.0/files/etc/prayer.cf.SRC
@@ -20,7 +20,7 @@ var_prefix  = "__VAR_PREFIX__"
 # User ID to run as if we start off as root
 prayer_user           = "prayer"
 # Group ID to run as if we start off as root
-prayer_group          = "prayer"
+prayer_group          = "nogroup"
 
 # Run prayer as background process.
 #   TRUE => will return as soon as valid configuration is found.
@@ -428,14 +428,14 @@ bin_dir             = "__BIN_DIR__"
 
 # Various directories used by the running system
 # Logs stored in $log_dir
-log_dir             = "$var_prefix/logs"
+log_dir             = "/var/log/prayer"
 
 # $lock_dir used for interlocking between prayer processes
-lock_dir            = "$var_prefix/locks"
+lock_dir            = "/var/lock"
 
 # $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"
 
 # 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
 
 # $ssl_session_dir is location for SSL session cache
-ssl_session_dir     = "$var_prefix/ssl_scache"
+ssl_session_dir     = "/var/run/prayer/ssl_scache"
 
 # Location for temporary files e.g; attachments and folders in transist
 # during upload and download operation. Core files also end up here
-tmp_dir             = "$var_prefix/tmp"
+tmp_dir             = "/tmp"
 
 # Location for PID files for prayer and prayer-session master processes.
-pid_dir             = "$var_prefix/pid"
+pid_dir             = "/var/run/prayer"
 
 # Interface to Hermes finger database
 #lookup_rpasswd   = "/data/finger/rpasswd.cdb"
@@ -614,7 +614,7 @@ sent_mail_folder    = "sent-mail"
 # default_domain      = "<valid mail domain>"
 
 # Language for ispell.
-ispell_language     = "british"
+ispell_language     = "american"
 
 # Size of small and large compose windows
 small_cols          = 80
--- prayer-1.1.0.orig/prayer/Makefile
+++ prayer-1.1.0/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  = $(BASECFLAGS)
+override CFLAGS += $(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)