diff options
author | adam <adam@pkgsrc.org> | 2003-07-28 15:51:23 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2003-07-28 15:51:23 +0000 |
commit | de30e822c353daa01367be7ba22b327d9945282e (patch) | |
tree | a253628e5399ef77e2eac912c3205bb316060f45 /mail/prayer/patches | |
parent | fb38ffb291764504fea6920445c8836221206b4a (diff) | |
download | pkgsrc-de30e822c353daa01367be7ba22b327d9945282e.tar.gz |
Changes 1.0.6 - 1.0.8
* Remove "Feel free to send more messages" text from vacation messages.
* Disable gzip for Opera attachment download.
* Fixed config->prayer_user expansion.
* fatal() shouldn't dump core if root.
* Fixed abook_list boundary condition when current entry is last on page.
* Added message download link for Message/RFC822 sections.
* Fix session_server() ping interval logic.
* Other bug-fixes
Diffstat (limited to 'mail/prayer/patches')
-rw-r--r-- | mail/prayer/patches/patch-aa | 37 | ||||
-rw-r--r-- | mail/prayer/patches/patch-ab | 52 | ||||
-rw-r--r-- | mail/prayer/patches/patch-ac | 12 | ||||
-rw-r--r-- | mail/prayer/patches/patch-ad | 8 | ||||
-rw-r--r-- | mail/prayer/patches/patch-ae | 21 | ||||
-rw-r--r-- | mail/prayer/patches/patch-af | 36 |
6 files changed, 74 insertions, 92 deletions
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa index d1893965869..648fb9e9dec 100644 --- a/mail/prayer/patches/patch-aa +++ b/mail/prayer/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2003/07/02 12:08:22 jmmv Exp $ +$NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $ ---- Config.orig 2002-11-07 09:50:44.000000000 +0100 -+++ Config -@@ -17,9 +17,9 @@ ACCOUNTD_SSL_ENABLE = false # Enable S +--- Config.orig 2003-05-29 11:49:38.000000000 +0200 ++++ Config 2003-07-28 16:50:50.000000000 +0200 +@@ -14,9 +14,9 @@ DIRECT_ENABLE = false # Experimental. Leave this switched off... # Following depend on the way that you have configured c-client @@ -12,9 +12,20 @@ $NetBSD: patch-aa,v 1.3 2003/07/02 12:08:22 jmmv Exp $ -CCLIENT_KERB_ENABLE = false # C-client was built with Kerberos support +CCLIENT_KERB_ENABLE = true # C-client was built with Kerberos support - ############################################################################ - # Location of compiler -@@ -53,9 +53,9 @@ BASE_LIBS = -lcrypt + # Probably don't need the following + ACCOUNTD_ENABLE = false # Only of use in Cambridge at the moment. +@@ -35,8 +35,8 @@ + # Base Compiler options for GCC. + #BASECFLAGS = -Wall -g + #BASELDFLAGS = -g +-BASECFLAGS = -Wall -g -O2 +-BASELDFLAGS = -g -O2 ++BASECFLAGS = -Wall ++BASELDFLAGS = + BASE_LIBS = -lcrypt + + # Base Compiler options for Sun SUNWspro compiler +@@ -56,9 +56,9 @@ # which points to ../../imap/c-client. This just reduces the amount of # noise output on each line when building the package. # @@ -27,16 +38,18 @@ $NetBSD: patch-aa,v 1.3 2003/07/02 12:08:22 jmmv Exp $ CCLIENT_SSL_ENABLE = true # -@@ -99,7 +99,7 @@ PAM_LIBS = -lpam +@@ -101,8 +101,8 @@ + PAM_LIBS = -lpam # Kerberos (required if CCLIENT_KERB_ENABLE set) - KERB_INCLUDE = +-KERB_INCLUDE = -I/usr/kerberos/include -KERB_LIBS = -L/usr/kerberos/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ++KERB_INCLUDE = -I/usr/include +KERB_LIBS = -L/usr/lib -lgssapi -lcom_err -lkrb5 -lasn1 -lroken -ldes # SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set) # -@@ -121,8 +121,8 @@ DB_INCLUDE= +@@ -126,8 +126,8 @@ DB_LIBS=-ldb # Following suitable for FreeBSD with DB 4 package installed @@ -47,7 +60,7 @@ $NetBSD: patch-aa,v 1.3 2003/07/02 12:08:22 jmmv Exp $ ############################################################################ -@@ -143,7 +143,7 @@ RW_GROUP = prayer +@@ -148,7 +148,7 @@ # Default configuration and permissions does not allow prayer user to # update prayer configuration file. @@ -56,7 +69,7 @@ $NetBSD: patch-aa,v 1.3 2003/07/02 12:08:22 jmmv Exp $ RO_USER = root RO_GROUP = prayer -@@ -158,6 +158,6 @@ PRIVATE_DIR = 0750 +@@ -163,6 +163,6 @@ PRIVATE_FILE = 0640 # Location of configuration files and binaries diff --git a/mail/prayer/patches/patch-ab b/mail/prayer/patches/patch-ab index 47da484909c..b5297dc2456 100644 --- a/mail/prayer/patches/patch-ab +++ b/mail/prayer/patches/patch-ab @@ -1,31 +1,25 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $ +$NetBSD: patch-ab,v 1.2 2003/07/28 15:51:25 adam Exp $ ---- Makefile.orig Wed Oct 30 13:56:30 2002 -+++ Makefile -@@ -12,7 +12,7 @@ endif - all: - (cd files; $(MAKE) all) - (cd prayer; $(MAKE) all) -- (cd accountd; $(MAKE) all) -+# (cd accountd; $(MAKE) all) +--- files/install.sh.orig 2003-05-19 14:34:10.000000000 +0200 ++++ files/install.sh 2003-07-28 17:18:33.000000000 +0200 +@@ -75,13 +75,16 @@ + ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${BIN_DIR} + fi - cert: - (cd files; $(MAKE) cert) -@@ -23,7 +23,7 @@ install-cert: - install: - (cd files; $(MAKE) install) - (cd prayer; $(MAKE) install) -- (cd accountd; $(MAKE) install) -+# (cd accountd; $(MAKE) install) - ifeq ($(strip $(RPM_BUILD)), true) - (cd files; $(MAKE) redhat-install-init.d) - endif -@@ -44,7 +44,7 @@ clean: - rm -rf docs/*~ docs/\#*\# - (cd prayer; $(MAKE) clean) - (cd files; $(MAKE) clean) -- (cd accountd; $(MAKE) clean) -+# (cd accountd; $(MAKE) clean) - - distclean: clean - (cd files; $(MAKE) distclean) ++if [ ! -d "${PREFIX}/share/prayer" ]; then ++ mkdir "${PREFIX}/share/prayer" ++fi + for i in help icons + do +- if [ -d "${PREFIX}/${i}" ]; then ++ if [ -d "${PREFIX}/share/prayer/${i}" ]; then + echo Removing old ${i} +- rm -rf ${PREFIX}/${i} ++ rm -rf ${PREFIX}/share/prayer/${i} + fi + echo Copying ${i} +- (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -) +- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i}) ++ (tar cf - ${i}) | (cd ${PREFIX}/share/prayer ; tar xf -) ++ (cd ${PREFIX}/share/prayer; chown -R ${RO_USER}:${RO_GROUP} ${i}) + done diff --git a/mail/prayer/patches/patch-ac b/mail/prayer/patches/patch-ac index 3194b4531fd..f4c2b195e89 100644 --- a/mail/prayer/patches/patch-ac +++ b/mail/prayer/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2003/03/02 12:10:47 jmmv Exp $ +$NetBSD: patch-ac,v 1.3 2003/07/28 15:51:25 adam Exp $ ---- files/Makefile.orig 2002-10-30 15:08:03.000000000 +0100 -+++ files/Makefile -@@ -12,10 +12,10 @@ endif +--- files/Makefile.orig 2003-05-11 16:59:12.000000000 +0200 ++++ files/Makefile 2003-07-28 16:42:53.000000000 +0200 +@@ -14,10 +14,10 @@ all: ./etc/prayer.cf ./init.d/prayer ./etc/prayer.cf: ./etc/prayer.cf.SRC @@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.2 2003/03/02 12:10:47 jmmv Exp $ ifeq ($(strip $(SSL_ENABLE)), true) -@@ -50,24 +50,24 @@ distclean: +@@ -53,24 +53,24 @@ install-cert: if [ -f certs/prayer.pem ]; then \ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \ @@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.2 2003/03/02 12:10:47 jmmv Exp $ install: PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \ -@@ -78,11 +78,7 @@ install: +@@ -81,11 +81,7 @@ PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \ BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \ ./install.sh diff --git a/mail/prayer/patches/patch-ad b/mail/prayer/patches/patch-ad index 46a7238828e..05b5baa587b 100644 --- a/mail/prayer/patches/patch-ad +++ b/mail/prayer/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $ +$NetBSD: patch-ad,v 1.2 2003/07/28 15:51:25 adam Exp $ ---- prayer/Makefile.orig Wed Oct 30 11:43:18 2002 -+++ prayer/Makefile -@@ -88,8 +88,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t +--- prayer/Makefile.orig 2003-05-21 16:41:16.000000000 +0200 ++++ prayer/Makefile 2003-07-28 16:43:11.000000000 +0200 +@@ -89,8 +89,8 @@ SESSION_LIBS += $(KERB_LIBS) endif diff --git a/mail/prayer/patches/patch-ae b/mail/prayer/patches/patch-ae index 0cc1ded3031..39f39b3b3f0 100644 --- a/mail/prayer/patches/patch-ae +++ b/mail/prayer/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2003/03/02 12:10:47 jmmv Exp $ +$NetBSD: patch-ae,v 1.2 2003/07/28 15:51:25 adam Exp $ ---- files/etc/prayer.cf.SRC.orig 2002-11-06 11:13:44.000000000 +0100 -+++ files/etc/prayer.cf.SRC -@@ -363,16 +363,16 @@ ispell_path = /usr/bin/ispell +--- files/etc/prayer.cf.SRC.orig 2003-05-11 16:59:12.000000000 +0200 ++++ files/etc/prayer.cf.SRC 2003-07-28 17:33:34.000000000 +0200 +@@ -368,25 +368,25 @@ # <login_suffix_path> # Login page prefix @@ -17,9 +17,20 @@ $NetBSD: patch-ae,v 1.1 2003/03/02 12:10:47 jmmv Exp $ -#login_suffix_path = "$prefix/etc/login_suffix.html" +#login_suffix_path = "__PKG_SYSCONFDIR__/login_suffix.html" + # Session banner (local HTML inserted into each page of login session) + #session_banner_path = "$prefix/etc/session_banner.html" + # Welcome text displayed when user first logs in -welcome_path = "$prefix/etc/welcome.html" +welcome_path = "__PKG_SYSCONFDIR__/welcome.html" # Location of help files - help_dir = "$prefix/help" +-help_dir = "$prefix/help" ++help_dir = "__PREFIX__/share/prayer/help" + + # Location of icon files +-icon_dir = "$prefix/icons" ++icon_dir = "__PREFIX__/share/prayer/icons" + + # Location of binary files + bin_dir = "__BIN_DIR__" diff --git a/mail/prayer/patches/patch-af b/mail/prayer/patches/patch-af deleted file mode 100644 index 33302c1195d..00000000000 --- a/mail/prayer/patches/patch-af +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/06/16 16:57:02 jmc Exp $ - ---- prayer/mydb_db3.c.orig Mon Jun 16 11:16:13 2003 -+++ prayer/mydb_db3.c Mon Jun 16 11:24:26 2003 -@@ -239,13 +239,18 @@ - - assert(dbinit); - -+/* DB4.1 doesn't use DB_INCOMPLETE anymore */ -+#if !((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - do { -+#endif - #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0)) - r = txn_checkpoint(dbenv, 0, 0, 0); - #else - r = txn_checkpoint(dbenv, 0, 0); - #endif -+#if !((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - } while (r == DB_INCOMPLETE); -+#endif - if (r) { - syslog(LOG_ERR, "DBERROR: couldn't checkpoint: %s", - db_strerror(r)); -@@ -354,7 +359,12 @@ - } - /* xxx set comparator! */ - -+ /* 4.1 supports transactions and changed the open() syntax */ -+#if ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) -+ r = db->open(db, NULL, fname, NULL, DB_BTREE, DB_CREATE, 0664); -+#else - r = db->open(db, fname, NULL, DB_BTREE, DB_CREATE, 0664); -+#endif - if (r != 0) { - syslog(LOG_ERR, "DBERROR: opening %s: %s", fname, db_strerror(r)); - return MYDB_IOERROR; |