Attachment #83673 for bug #119496

View | Details | Raw Unified | Return to bug 119496
Collapse All | Expand All

Lines 6-12 Link Here

(-)prayer/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= prayer	8	PORTNAME= prayer
9	PORTVERSION= 1.0.16	9	PORTVERSION= 1.0.18
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= mail www	11	CATEGORIES= mail www
12	MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/	12	MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/

Lines 1-3 Link Here

(-)prayer/distinfo (-3 / +3 lines)
1	MD5 (prayer-1.0.16.tar.gz) = bede9f6cb3502d6180581bc4ff1f1961	1	MD5 (prayer-1.0.18.tar.gz) = 405177f14ced9ef11969f4db2dd96c13
2	SHA256 (prayer-1.0.16.tar.gz) = 227fc7130b1ca2cc07cfe32aabc1b47ea5edfe9c8960dd46502f748a92cfd69b	2	SHA256 (prayer-1.0.18.tar.gz) = 0c0f6a8d388ab95669566cc1bbe271992917f01d55e1caf695103e1f098d5f4a
3	SIZE (prayer-1.0.16.tar.gz) = 575980	3	SIZE (prayer-1.0.18.tar.gz) = 566168




--- Config.orig	2006-04-05 13:35:35.000000000 +0100
+++ Config	2008-01-09 16:25:14.000000000 +0000
@@ -28,7 +28,7 @@
 
 ############################################################################

 #
-CCLIENT_DIR=./c-client
-CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
-CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
+#CCLIENT_DIR=./c-client
+#CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
+#CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
 CCLIENT_SSL_ENABLE  = true
 
 #

 #
 #CCLIENT_INCLUDE = -I/usr/local/include/c-client
+CCLIENT_INCLUDE = -I${LOCALBASE}/include/c-client
 #CCLIENT_LIBS    = -L/usr/local/lib -lc-client4
+CCLIENT_LIBS     = -L${LOCALBASE}/lib -lc-client4
 #
 # Complication:
 #   The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.

 
 ############################################################################
@@ -99,7 +102,7 @@
 Z_LIBS    = -lz
 
 # LDAP (required if LDAP_ENABLE set)
-LDAP_INCLUDE =
+LDAP_INCLUDE = -I${LOCALBASE}/include
 LDAP_LIBS    = -lldap
 
 # Pam (required if CCLIENT_PAM_ENABLE set)
@@ -128,12 +131,12 @@




--- prayer/prayer_chroot.c.orig	2006-04-11 15:29:26.000000000 +0100
+++ prayer/prayer_chroot.c	2008-01-09 16:26:45.000000000 +0000
@@ -10,8 +10,6 @@
 #include "prayer.h"
 #include "prayer_server.h"
 
-#include <sys/prctl.h>
-
 BOOL prayer_main_use_existing(struct prayer *prayer, char *ports)
 {
     char *use_ssl, *fd, *next;
@@ -305,7 +303,6 @@
         if (getuid() == 0)
             log_fatal("Failed to lose root priveledges");       /* Stop impossible loop */
 
-        prctl(PR_SET_DUMPABLE, 1);
     }
 
     if (getuid() == 0)

Return to bug 119496

Lines 1-5 Link Here

(-)prayer/files/patch-Config (-8 / +8 lines)
1	--- Config.orig Tue Feb 7 12:38:13 2006	1	--- Config.orig 2006-04-05 13:35:35.000000000 +0100
2	+++ Config Tue Feb 7 12:38:46 2006	2	+++ Config 2008-01-09 16:25:14.000000000 +0000
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,7 @@
4		4
5	############################################################################	5	############################################################################
Lines 25-34 Link Here
25	#	25	#
26	-CCLIENT_DIR=./c-client	26	-CCLIENT_DIR=./c-client
27	-CCLIENT_INCLUDE=-I $(CCLIENT_DIR)	27	-CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
28	-CCLIENT_LIB=./$(CCLIENT_DIR)/c-client.a	28	-CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
29	+#CCLIENT_DIR=./c-client	29	+#CCLIENT_DIR=./c-client
30	+#CCLIENT_INCLUDE=-I $(CCLIENT_DIR)	30	+#CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
31	+#CCLIENT_LIB=./$(CCLIENT_DIR)/c-client.a	31	+#CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
32	CCLIENT_SSL_ENABLE = true	32	CCLIENT_SSL_ENABLE = true
33		33
34	#	34	#
Lines 37-44 Link Here
37	#	37	#
38	#CCLIENT_INCLUDE = -I/usr/local/include/c-client	38	#CCLIENT_INCLUDE = -I/usr/local/include/c-client
39	+CCLIENT_INCLUDE = -I${LOCALBASE}/include/c-client	39	+CCLIENT_INCLUDE = -I${LOCALBASE}/include/c-client
40	#CCLIENT_LIB = -L/usr/local/lib -lc-client4	40	#CCLIENT_LIBS = -L/usr/local/lib -lc-client4
41	+CCLIENT_LIB = -L${LOCALBASE}/lib -lc-client4	41	+CCLIENT_LIBS = -L${LOCALBASE}/lib -lc-client4
42	#	42	#
43	# Complication:	43	# Complication:
44	# The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.	44	# The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
Lines 49-60 Link Here
49		49
50	############################################################################	50	############################################################################
51	@@ -99,7 +102,7 @@	51	@@ -99,7 +102,7 @@
52	Z_LIB = -lz	52	Z_LIBS = -lz
53		53
54	# LDAP (required if LDAP_ENABLE set)	54	# LDAP (required if LDAP_ENABLE set)
55	-LDAP_INCLUDE =	55	-LDAP_INCLUDE =
56	+LDAP_INCLUDE = -I${LOCALBASE}/include	56	+LDAP_INCLUDE = -I${LOCALBASE}/include
57	LDAP_LIB = -lldap	57	LDAP_LIBS = -lldap
58		58
59	# Pam (required if CCLIENT_PAM_ENABLE set)	59	# Pam (required if CCLIENT_PAM_ENABLE set)
60	@@ -128,12 +131,12 @@	60	@@ -128,12 +131,12 @@

Line 0 Link Here

(-)prayer/files/patch-prayer_chroot.c (+19 lines)
	1	--- prayer/prayer_chroot.c.orig 2006-04-11 15:29:26.000000000 +0100
	2	+++ prayer/prayer_chroot.c 2008-01-09 16:26:45.000000000 +0000
	3	@@ -10,8 +10,6 @@
	4	#include "prayer.h"
	5	#include "prayer_server.h"
	6
	7	-#include <sys/prctl.h>
	8	-
	9	BOOL prayer_main_use_existing(struct prayer prayer, char ports)
	10	{
	11	char use_ssl, fd, *next;
	12	@@ -305,7 +303,6 @@
	13	if (getuid() == 0)
	14	log_fatal("Failed to lose root priveledges"); /* Stop impossible loop */
	15
	16	- prctl(PR_SET_DUMPABLE, 1);
	17	}
	18
	19	if (getuid() == 0)