kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Use PERL_LEVEL to distinguish installed perl version.

Browse source 
- Add WITH_SKIPLIST_MBOX to enable skiplist mboxlist.
- Add WITH_MURDER to enable murder.
This commit is contained in:
Hajimu UMEMOTO 2003-01-01 19:34:41 +00:00
parent c9e7df7fbc
commit 53b32fda0a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=72087
16 changed files with 232 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mail/cyrus-imapd2/Makefile
View file

@ -21,7 +21,6 @@ LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
USE_PERL5= yes
GNU_CONFIGURE= YES
@ -32,6 +31,19 @@ CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
--with-auth=unix \
--with-com_err
.if defined(WITH_SKIPLIST_MBOX)
CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
.endif
.if defined(WITH_MURDER)
CONFIGURE_ARGS+=--enable-murder
CFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
PLIST_SUB+= MURDER=""
.else
PLIST_SUB+= MURDER="@comment "
.endif
.if defined(WITH_SNMP)
# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
@ -59,7 +71,10 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
@ -68,7 +83,7 @@ post-patch:
> ${WRKSRC}/tools/mkimap.new
@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500600
@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new

19
mail/cyrus-imapd2/files/patch-bc
View file

@ -1,7 +1,7 @@
Index: imap/Makefile.in
diff -u imap/Makefile.in.orig imap/Makefile.in
--- imap/Makefile.in.orig Fri Apr 19 02:35:26 2002
+++ imap/Makefile.in Thu May 2 04:02:37 2002
--- imap/Makefile.in.orig Fri Jul 26 06:07:05 2002
+++ imap/Makefile.in Fri Sep 13 18:49:25 2002
@@ -61,7 +61,7 @@
CYRUS_USER=@cyrus_user@
CYRUS_GROUP=@cyrus_group@
@ -11,3 +11,18 @@ diff -u imap/Makefile.in.orig imap/Makefile.in
CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
IMAP_LIBS = @IMAP_LIBS@
SIEVE_LIBS = @SIEVE_LIBS@
@@ -244,12 +244,12 @@
mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o mupdate \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \

19
mail/cyrus-imapd2/files/patch-master::service-thread.c Normal file
View file

@ -0,0 +1,19 @@
Index: master/service-thread.c
diff -u master/service-thread.c.orig master/service-thread.c
--- master/service-thread.c.orig Fri Sep 13 18:43:06 2002
+++ master/service-thread.c Fri Sep 13 19:15:50 2002
@@ -100,8 +100,13 @@
socklen_t len = sizeof(sin);
/* is this a connection from the local host? */
+ memset(&sin, 0, len);
if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
+ switch (((struct sockaddr *)&sin)->sa_family) {
+ case AF_INET:
+ case AF_INET6:
+ break;
+ default:
return 1;
}
}

4
mail/cyrus-imapd2/pkg-plist
View file

@ -29,6 +29,10 @@ cyrus/bin/reconstruct
cyrus/bin/squatter
cyrus/bin/timsieved
cyrus/bin/tls_prune
%%MURDER%%cyrus/bin/lmtpproxyd
%%MURDER%%cyrus/bin/mupdate
%%MURDER%%cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
etc/cyrus.conf.dist
@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf

21
mail/cyrus-imapd22/Makefile
View file

@ -21,7 +21,6 @@ LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
USE_PERL5= yes
GNU_CONFIGURE= YES
@ -32,6 +31,19 @@ CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
--with-auth=unix \
--with-com_err
.if defined(WITH_SKIPLIST_MBOX)
CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
.endif
.if defined(WITH_MURDER)
CONFIGURE_ARGS+=--enable-murder
CFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
PLIST_SUB+= MURDER=""
.else
PLIST_SUB+= MURDER="@comment "
.endif
.if defined(WITH_SNMP)
# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
@ -59,7 +71,10 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
@ -68,7 +83,7 @@ post-patch:
> ${WRKSRC}/tools/mkimap.new
@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500600
@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new

19
mail/cyrus-imapd22/files/patch-bc
View file

@ -1,7 +1,7 @@
Index: imap/Makefile.in
diff -u imap/Makefile.in.orig imap/Makefile.in
--- imap/Makefile.in.orig Fri Apr 19 02:35:26 2002
+++ imap/Makefile.in Thu May 2 04:02:37 2002
--- imap/Makefile.in.orig Fri Jul 26 06:07:05 2002
+++ imap/Makefile.in Fri Sep 13 18:49:25 2002
@@ -61,7 +61,7 @@
CYRUS_USER=@cyrus_user@
CYRUS_GROUP=@cyrus_group@
@ -11,3 +11,18 @@ diff -u imap/Makefile.in.orig imap/Makefile.in
CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
IMAP_LIBS = @IMAP_LIBS@
SIEVE_LIBS = @SIEVE_LIBS@
@@ -244,12 +244,12 @@
mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o mupdate \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \

19
mail/cyrus-imapd22/files/patch-master::service-thread.c Normal file
View file

@ -0,0 +1,19 @@
Index: master/service-thread.c
diff -u master/service-thread.c.orig master/service-thread.c
--- master/service-thread.c.orig Fri Sep 13 18:43:06 2002
+++ master/service-thread.c Fri Sep 13 19:15:50 2002
@@ -100,8 +100,13 @@
socklen_t len = sizeof(sin);
/* is this a connection from the local host? */
+ memset(&sin, 0, len);
if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
+ switch (((struct sockaddr *)&sin)->sa_family) {
+ case AF_INET:
+ case AF_INET6:
+ break;
+ default:
return 1;
}
}

4
mail/cyrus-imapd22/pkg-plist
View file

@ -29,6 +29,10 @@ cyrus/bin/reconstruct
cyrus/bin/squatter
cyrus/bin/timsieved
cyrus/bin/tls_prune
%%MURDER%%cyrus/bin/lmtpproxyd
%%MURDER%%cyrus/bin/mupdate
%%MURDER%%cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
etc/cyrus.conf.dist
@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf

21
mail/cyrus-imapd23/Makefile
View file

@ -21,7 +21,6 @@ LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
USE_PERL5= yes
GNU_CONFIGURE= YES
@ -32,6 +31,19 @@ CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
--with-auth=unix \
--with-com_err
.if defined(WITH_SKIPLIST_MBOX)
CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
.endif
.if defined(WITH_MURDER)
CONFIGURE_ARGS+=--enable-murder
CFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
PLIST_SUB+= MURDER=""
.else
PLIST_SUB+= MURDER="@comment "
.endif
.if defined(WITH_SNMP)
# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
@ -59,7 +71,10 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
@ -68,7 +83,7 @@ post-patch:
> ${WRKSRC}/tools/mkimap.new
@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500600
@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new

19
mail/cyrus-imapd23/files/patch-bc
View file

@ -1,7 +1,7 @@
Index: imap/Makefile.in
diff -u imap/Makefile.in.orig imap/Makefile.in
--- imap/Makefile.in.orig Fri Apr 19 02:35:26 2002
+++ imap/Makefile.in Thu May 2 04:02:37 2002
--- imap/Makefile.in.orig Fri Jul 26 06:07:05 2002
+++ imap/Makefile.in Fri Sep 13 18:49:25 2002
@@ -61,7 +61,7 @@
CYRUS_USER=@cyrus_user@
CYRUS_GROUP=@cyrus_group@
@ -11,3 +11,18 @@ diff -u imap/Makefile.in.orig imap/Makefile.in
CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
IMAP_LIBS = @IMAP_LIBS@
SIEVE_LIBS = @SIEVE_LIBS@
@@ -244,12 +244,12 @@
mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o mupdate \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \

19
mail/cyrus-imapd23/files/patch-master::service-thread.c Normal file
View file

@ -0,0 +1,19 @@
Index: master/service-thread.c
diff -u master/service-thread.c.orig master/service-thread.c
--- master/service-thread.c.orig Fri Sep 13 18:43:06 2002
+++ master/service-thread.c Fri Sep 13 19:15:50 2002
@@ -100,8 +100,13 @@
socklen_t len = sizeof(sin);
/* is this a connection from the local host? */
+ memset(&sin, 0, len);
if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
+ switch (((struct sockaddr *)&sin)->sa_family) {
+ case AF_INET:
+ case AF_INET6:
+ break;
+ default:
return 1;
}
}

4
mail/cyrus-imapd23/pkg-plist
View file

@ -29,6 +29,10 @@ cyrus/bin/reconstruct
cyrus/bin/squatter
cyrus/bin/timsieved
cyrus/bin/tls_prune
%%MURDER%%cyrus/bin/lmtpproxyd
%%MURDER%%cyrus/bin/mupdate
%%MURDER%%cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
etc/cyrus.conf.dist
@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf

21
mail/cyrus-imapd24/Makefile
View file

@ -21,7 +21,6 @@ LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
USE_PERL5= yes
GNU_CONFIGURE= YES
@ -32,6 +31,19 @@ CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
--with-auth=unix \
--with-com_err
.if defined(WITH_SKIPLIST_MBOX)
CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
.endif
.if defined(WITH_MURDER)
CONFIGURE_ARGS+=--enable-murder
CFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
PLIST_SUB+= MURDER=""
.else
PLIST_SUB+= MURDER="@comment "
.endif
.if defined(WITH_SNMP)
# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
@ -59,7 +71,10 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
.if ${PERL_LEVEL} < 500600
RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
.endif
@ -68,7 +83,7 @@ post-patch:
> ${WRKSRC}/tools/mkimap.new
@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${OSVERSION} < 500000
.if ${PERL_LEVEL} < 500600
@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new

19
mail/cyrus-imapd24/files/patch-bc
View file

@ -1,7 +1,7 @@
Index: imap/Makefile.in
diff -u imap/Makefile.in.orig imap/Makefile.in
--- imap/Makefile.in.orig Fri Apr 19 02:35:26 2002
+++ imap/Makefile.in Thu May 2 04:02:37 2002
--- imap/Makefile.in.orig Fri Jul 26 06:07:05 2002
+++ imap/Makefile.in Fri Sep 13 18:49:25 2002
@@ -61,7 +61,7 @@
CYRUS_USER=@cyrus_user@
CYRUS_GROUP=@cyrus_group@
@ -11,3 +11,18 @@ diff -u imap/Makefile.in.orig imap/Makefile.in
CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
IMAP_LIBS = @IMAP_LIBS@
SIEVE_LIBS = @SIEVE_LIBS@
@@ -244,12 +244,12 @@
mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o mupdate \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
$(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \

19
mail/cyrus-imapd24/files/patch-master::service-thread.c Normal file
View file

@ -0,0 +1,19 @@
Index: master/service-thread.c
diff -u master/service-thread.c.orig master/service-thread.c
--- master/service-thread.c.orig Fri Sep 13 18:43:06 2002
+++ master/service-thread.c Fri Sep 13 19:15:50 2002
@@ -100,8 +100,13 @@
socklen_t len = sizeof(sin);
/* is this a connection from the local host? */
+ memset(&sin, 0, len);
if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
+ switch (((struct sockaddr *)&sin)->sa_family) {
+ case AF_INET:
+ case AF_INET6:
+ break;
+ default:
return 1;
}
}

4
mail/cyrus-imapd24/pkg-plist
View file

@ -29,6 +29,10 @@ cyrus/bin/reconstruct
cyrus/bin/squatter
cyrus/bin/timsieved
cyrus/bin/tls_prune
%%MURDER%%cyrus/bin/lmtpproxyd
%%MURDER%%cyrus/bin/mupdate
%%MURDER%%cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
etc/cyrus.conf.dist
@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf