Attachment #106608 for bug #147230

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

Lines 37-53 Link Here

(-)spamass-milter/Makefile (-6 / +13 lines)
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39		39
		40	ORIG_ARGS= fd:mMp:P:r:u:D:i:b:B:e:x
		41	NEW_ARGS:= ${ORIG_ARGS}
		42
40	.if defined(WITH_ADDAUTH_PATCH)	43	.if defined(WITH_ADDAUTH_PATCH)
41	EXTRA_PATCHES= ${FILESDIR}/extra-patch-addauth	44	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-addauth
		45	NEW_ARGS:= ${NEW_ARGS}a
42	.endif	46	.endif
43		47
44	.if defined(WITH_REJECTTEXT_PATCH)	48	.if defined(WITH_REJECTTEXT_PATCH)
45	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rejecttext1	49	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rejecttext1
46	.if defined(WITH_ADDAUTH_PATCH)	50	NEW_ARGS:= ${NEW_ARGS}R:
47	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rejecttext2a
48	.else
49	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rejecttext2
50	.endif	51	.endif
		52
		53	# extra-patch-options is modified in pre-patch
		54	.if ${ORIG_ARGS} != ${NEW_ARGS}
		55	EXTRA_PATCHES+= ${WRKDIR}/extra-patch-options
51	.endif	56	.endif
52		57
53	.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)	58	.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
Lines 67-73 Link Here
67	.else	72	.else
68	IGNORE= base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes	73	IGNORE= base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
69	.endif	74	.endif
70	.endif
71	.else	75	.else
72	BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail	76	BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
73	MILTERBASE?= ${LOCALBASE}	77	MILTERBASE?= ${LOCALBASE}
Lines 92-97 Link Here
92	MAN1= spamass-milter.1	96	MAN1= spamass-milter.1
93		97
94	pre-patch:	98	pre-patch:
		99	.if ${ORIG_ARGS} != ${NEW_ARGS}
		100	@${SED} -e 's\|%NEW_ARGS%\|${NEW_ARGS}\|' ${FILESDIR}/extra-patch-options > ${WRKDIR}/extra-patch-options
		101	.endif
95		102
96	.if !defined(WITH_SENDMAIL_PORT)	103	.if !defined(WITH_SENDMAIL_PORT)
97	@${ECHO_CMD} ""	104	@${ECHO_CMD} ""




 
 #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
 static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -181,7 +182,7 @@
 main(int argc, char* argv[])
 {
    int c, err = 0;
-   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x";
+   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xa";
    char *sock = NULL;
    bool dofork = false;
    char *pidfilename = NULL;
@@ -196,6 +197,9 @@
 	/* Process command line options */
 	while ((c = getopt(argc, argv, args)) != -1) {

Line 0 Link Here

(-)spamass-milter/files/extra-patch-options (+11 lines)
	1	--- spamass-milter.cpp.ORIG 2006-06-17 11:06:30.000000000 +0200
	2	+++ spamass-milter.cpp 2006-06-17 11:10:11.000000000 +0200
	3	@@ -181,7 +182,7 @@
	4	main(int argc, char* argv[])
	5	{
	6	int c, err = 0;
	7	- const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x";
	8	+ const char *args = "%NEW_ARGS%";
	9	char *sock = NULL;
	10	bool dofork = false;
	11	char *pidfilename = NULL;

Return to bug 147230

Lines 22-36 Link Here

(-)spamass-milter/files/extra-patch-addauth (-9 lines)
22		22
23	#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */	23	#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
24	static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;	24	static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
25	@@ -181,7 +182,7 @@
26	main(int argc, char* argv[])
27	{
28	int c, err = 0;
29	- const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x";
30	+ const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xa";
31	char *sock = NULL;
32	bool dofork = false;
33	char *pidfilename = NULL;
34	@@ -196,6 +197,9 @@	25	@@ -196,6 +197,9 @@
35	/* Process command line options */	26	/* Process command line options */
36	while ((c = getopt(argc, argv, args)) != -1) {	27	while ((c = getopt(argc, argv, args)) != -1) {