mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Add new 2.4 branch of Cyrus IMAPd after repocopy.
PR: ports/151472 Repocopied by: portmgr (marcus)
This commit is contained in:
parent
e5da75e577
commit
f670b6f88f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=263193
11 changed files with 66 additions and 156 deletions
|
@ -81,6 +81,7 @@
|
||||||
SUBDIR += cyrus-imapd2
|
SUBDIR += cyrus-imapd2
|
||||||
SUBDIR += cyrus-imapd22
|
SUBDIR += cyrus-imapd22
|
||||||
SUBDIR += cyrus-imapd23
|
SUBDIR += cyrus-imapd23
|
||||||
|
SUBDIR += cyrus-imapd24
|
||||||
SUBDIR += cyrus2courier
|
SUBDIR += cyrus2courier
|
||||||
SUBDIR += dbmail
|
SUBDIR += dbmail
|
||||||
SUBDIR += dbmail20
|
SUBDIR += dbmail20
|
||||||
|
|
|
@ -6,22 +6,19 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= cyrus-imapd
|
PORTNAME= cyrus-imapd
|
||||||
PORTVERSION= 2.3.16
|
PORTVERSION= 2.4.0
|
||||||
PORTREVISION= 2
|
#PORTREVISION= 0
|
||||||
CATEGORIES= mail ipv6
|
CATEGORIES= mail ipv6
|
||||||
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
|
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/
|
||||||
http://ftp.andrew.cmu.edu/pub/cyrus/ \
|
|
||||||
http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
|
|
||||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
|
|
||||||
|
|
||||||
MAINTAINER= ume@FreeBSD.org
|
MAINTAINER= ume@FreeBSD.org
|
||||||
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
|
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
|
||||||
|
|
||||||
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
|
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
|
||||||
|
|
||||||
CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].*
|
CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].*
|
||||||
|
|
||||||
LATEST_LINK= ${PORTNAME}23
|
LATEST_LINK= ${PORTNAME}24
|
||||||
|
|
||||||
USE_RC_SUBR= imapd.sh
|
USE_RC_SUBR= imapd.sh
|
||||||
USE_OPENSSL= yes
|
USE_OPENSSL= yes
|
||||||
|
@ -38,45 +35,24 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
|
||||||
--with-perl=${PERL5}
|
--with-perl=${PERL5}
|
||||||
MAKE_JOBS_UNSAFE= yes
|
MAKE_JOBS_UNSAFE= yes
|
||||||
|
|
||||||
OPTIONS= AUTOCREATE "Use autocreate INBOX patch (UoA)" off \
|
LICENSE= BSD
|
||||||
AUTOSIEVE "Use autosievefolder patch (UoA)" off \
|
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
|
||||||
BDB "Use Berkeley DB" on \
|
|
||||||
|
OPTIONS= BDB "Use Berkeley DB" on \
|
||||||
DRAC "Enable DRAC support" off \
|
DRAC "Enable DRAC support" off \
|
||||||
IDLED "Enable IMAP idled support" off \
|
IDLED "Enable IMAP idled support" off \
|
||||||
LDAP_PTLOADER "Enable LDAP ptloader" off \
|
LDAP "Use LDAP (experimental)" off \
|
||||||
LISTEXT "Enable IMAP List extensions" off \
|
|
||||||
MURDER "Enable IMAP Murder support" off \
|
MURDER "Enable IMAP Murder support" off \
|
||||||
MYSQL "Use MySQL (experimental)" off \
|
MYSQL "Use MySQL" off \
|
||||||
NETSCAPEHACK "Enable X-NETSCAPE extensions" off \
|
NETSCAPEHACK "Enable X-NETSCAPE extensions" off \
|
||||||
NNTP "Enable NNTP support" off \
|
NNTP "Enable NNTP support" off \
|
||||||
PGSQL "Use PostgreSQL (experimental)" off \
|
PGSQL "Use PostgreSQL" off \
|
||||||
REPLICATION "Enable replication" off \
|
REPLICATION "Enable replication (experimental)" off \
|
||||||
SQLITE "Use SQLite (experimental)" off \
|
SNMP "Enable SNMP support" off \
|
||||||
SNMP_5 "Enable SNMP support" off
|
SQLITE "Use SQLite" off
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
||||||
# Autocreate Inbox and Autosieve patches from UoA
|
|
||||||
# WWW: http://email.uoa.gr/projects/cyrus/
|
|
||||||
|
|
||||||
.if defined(WITH_AUTOCREATE) || defined(WITH_AUTOSIEVE)
|
|
||||||
PATCH_DIST_STRIP= -p1
|
|
||||||
PATCH_SITES+= http://email.uoa.gr/download/cyrus/${PORTNAME}-${PORTVERSION}/
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(WITH_AUTOCREATE)
|
|
||||||
AUTOCREATE_VERSION= 0.10-0
|
|
||||||
PATCHFILES+= ${PORTNAME}-${PORTVERSION}-autocreate-${AUTOCREATE_VERSION}.diff
|
|
||||||
PLIST_SUB+= AUTOCREATE=""
|
|
||||||
.else
|
|
||||||
PLIST_SUB+= AUTOCREATE="@comment "
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(WITH_AUTOSIEVE)
|
|
||||||
AUTOSIEVE_VERSION= 0.6.0
|
|
||||||
PATCHFILES+= ${PORTNAME}-${PORTVERSION}-autosieve-${AUTOSIEVE_VERSION}.diff
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(WITHOUT_BDB)
|
.if defined(WITHOUT_BDB)
|
||||||
BDB_LIB_NAME= no
|
BDB_LIB_NAME= no
|
||||||
.else
|
.else
|
||||||
|
@ -133,18 +109,12 @@ PLIST_SUB+= REPLICATION=""
|
||||||
PLIST_SUB+= REPLICATION="@comment "
|
PLIST_SUB+= REPLICATION="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITH_LISTEXT)
|
|
||||||
CONFIGURE_ARGS+=--enable-listext
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(WITH_NETSCAPEHACK)
|
.if defined(WITH_NETSCAPEHACK)
|
||||||
CONFIGURE_ARGS+=--enable-netscapehack
|
CONFIGURE_ARGS+=--enable-netscapehack
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITH_DRAC)
|
.if defined(WITH_DRAC)
|
||||||
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
|
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in
|
||||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in \
|
|
||||||
${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4
|
|
||||||
.if ${OSVERSION} >= 800037
|
.if ${OSVERSION} >= 800037
|
||||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4
|
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4
|
||||||
.endif
|
.endif
|
||||||
|
@ -153,19 +123,19 @@ CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
|
||||||
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
|
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITH_SNMP_5)
|
.if defined(WITH_SNMP)
|
||||||
LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
|
LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
|
||||||
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
|
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
|
||||||
.else
|
.else
|
||||||
CONFIGURE_ARGS+=--with-snmp=no
|
CONFIGURE_ARGS+=--with-snmp=no
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITH_LDAP_PTLOADER)
|
.if defined(WITH_LDAP)
|
||||||
USE_OPENLDAP= yes
|
USE_OPENLDAP= yes
|
||||||
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
|
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
|
||||||
PLIST_SUB+= LDAP_PTLOADER=""
|
PLIST_SUB+= LDAP=""
|
||||||
.else
|
.else
|
||||||
PLIST_SUB+= LDAP_PTLOADER="@comment "
|
PLIST_SUB+= LDAP="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if !exists(/usr/lib/libkrb5.a)
|
.if !exists(/usr/lib/libkrb5.a)
|
||||||
|
@ -188,11 +158,10 @@ CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
|
||||||
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
|
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
|
||||||
cyr_dbtool.8 cyr_df.8 cyr_expire.8 cyr_synclog.8 \
|
cyr_dbtool.8 cyr_df.8 cyr_expire.8 cyr_synclog.8 \
|
||||||
ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 \
|
ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 \
|
||||||
idled.8 imapd.8 ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 \
|
idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 mbexamine.8 \
|
||||||
master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
|
mbpath.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
|
||||||
reconstruct.8 rmnews.8 smmapd.8 squatter.8 sync_client.8 \
|
smmapd.8 squatter.8 sync_client.8 sync_reset.8 sync_server.8 \
|
||||||
sync_reset.8 sync_server.8 syncnews.8 timsieved.8 \
|
syncnews.8 timsieved.8 tls_prune.8 unexpunge.8
|
||||||
tls_prune.8 unexpunge.8
|
|
||||||
|
|
||||||
DOCS= altnamespace anoncvs bugs changes faq feedback index \
|
DOCS= altnamespace anoncvs bugs changes faq feedback index \
|
||||||
install install-admin-mb install-auth install-compile \
|
install install-admin-mb install-auth install-compile \
|
||||||
|
@ -209,7 +178,14 @@ CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
|
||||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||||
|
|
||||||
|
.if defined(WITH_DRAC)
|
||||||
|
pre-patch:
|
||||||
|
${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \
|
||||||
|
< ${WRKSRC}/contrib/drac_auth.patch
|
||||||
|
.endif
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
|
||||||
@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
|
@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
|
||||||
-e "s|%%PREFIX%%|${PREFIX}|g" \
|
-e "s|%%PREFIX%%|${PREFIX}|g" \
|
||||||
-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
|
-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
|
||||||
|
|
|
@ -1,9 +1,3 @@
|
||||||
MD5 (cyrus-imapd-2.3.16.tar.gz) = 6a37feb1985974eee8a4a4b2932dd54c
|
MD5 (cyrus-imapd-2.4.0.tar.gz) = a05553483a7d2dba8ea2159e7cd294c9
|
||||||
SHA256 (cyrus-imapd-2.3.16.tar.gz) = e020ac79403a683bddc136c25887fe501edcc8d73b308982f4b68ec828ab63d2
|
SHA256 (cyrus-imapd-2.4.0.tar.gz) = 2928a174e4e602f6145b7f711d15a07e65ec8fa50e6b4fe1d43620e557afa6f8
|
||||||
SIZE (cyrus-imapd-2.3.16.tar.gz) = 2359349
|
SIZE (cyrus-imapd-2.4.0.tar.gz) = 2377376
|
||||||
MD5 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 98b88f89e72bbabfd3da35fc94809247
|
|
||||||
SHA256 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = a373c9d4e3b35c8ecbd4ad7806cf50196525c3c1a32c35bc18d7b6c449bd57e3
|
|
||||||
SIZE (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 86056
|
|
||||||
MD5 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = bb5171a5824f600b8a41cb00ab36cf02
|
|
||||||
SHA256 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = b50acaf0595e320ac89fdd15b375b7e051009ebbe839c461bbb2b2a7006c23c5
|
|
||||||
SIZE (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = 7920
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
Index: cmulocal/ucdsnmp.m4
|
|
||||||
diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4
|
|
||||||
--- cmulocal/ucdsnmp.m4.orig Tue May 25 10:27:58 2004
|
|
||||||
+++ cmulocal/ucdsnmp.m4 Sat Dec 10 16:34:09 2005
|
|
||||||
@@ -31,9 +31,12 @@
|
|
||||||
|
|
||||||
if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
|
|
||||||
CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
|
|
||||||
- LIB_UCDSNMP=$SNMP_LIBS
|
|
||||||
+ LIB_UCDSNMP="$SNMP_LIBS -lwrap"
|
|
||||||
+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
|
|
||||||
+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
|
|
||||||
AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
|
|
||||||
AC_SUBST(LIB_UCDSNMP)
|
|
||||||
+ AC_SUBST(LDFLAGS_UCDSNMP)
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
@@ -59,7 +62,7 @@
|
|
||||||
LIB_UCDSNMP=""
|
|
||||||
if test "$with_snmp" != no; then
|
|
||||||
AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
|
|
||||||
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
|
|
||||||
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
|
|
||||||
AC_CHECK_LIB(rpm, rpmdbOpen,
|
|
||||||
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
|
|
||||||
fi
|
|
|
@ -262,7 +262,7 @@ sievedir: /var/imap/sieve
|
||||||
# and sieve.
|
# and sieve.
|
||||||
# Allowed values: berkeley, berkeley-nosync, skiplist
|
# Allowed values: berkeley, berkeley-nosync, skiplist
|
||||||
#
|
#
|
||||||
#duplicate_db: berkeley-nosync
|
#duplicate_db: skiplist
|
||||||
|
|
||||||
# The cyrusdb backend to use for the mailbox list.
|
# The cyrusdb backend to use for the mailbox list.
|
||||||
# Allowed values: flat, berkeley, skiplist
|
# Allowed values: flat, berkeley, skiplist
|
||||||
|
@ -272,7 +272,7 @@ sievedir: /var/imap/sieve
|
||||||
# The cyrusdb backend to use for the pts cache.
|
# The cyrusdb backend to use for the pts cache.
|
||||||
# Allowed values: berkeley, skiplist
|
# Allowed values: berkeley, skiplist
|
||||||
#
|
#
|
||||||
#ptscache_db: berkeley
|
#ptscache_db: skiplist
|
||||||
|
|
||||||
# The cyrusdb backend to use for the seen state.
|
# The cyrusdb backend to use for the seen state.
|
||||||
# Allowed values: flat, berkeley, skiplist
|
# Allowed values: flat, berkeley, skiplist
|
||||||
|
@ -283,7 +283,7 @@ sievedir: /var/imap/sieve
|
||||||
# Allowed values: berkeley, berkeley-nosync, berkeley-hash,
|
# Allowed values: berkeley, berkeley-nosync, berkeley-hash,
|
||||||
# berkeley-hash-nosync, skiplist
|
# berkeley-hash-nosync, skiplist
|
||||||
#
|
#
|
||||||
#statuscache_db: berkeley-nosync
|
#statuscache_db: skiplist
|
||||||
|
|
||||||
# The cyrusdb backend to use for the subscriptions list.
|
# The cyrusdb backend to use for the subscriptions list.
|
||||||
# Allowed values: flat, berkeley, skiplist
|
# Allowed values: flat, berkeley, skiplist
|
||||||
|
@ -293,7 +293,7 @@ sievedir: /var/imap/sieve
|
||||||
# The cyrusdb backend to use for the TLS cache.
|
# The cyrusdb backend to use for the TLS cache.
|
||||||
# Allowed values: berkeley, berkeley-nosync, skiplist
|
# Allowed values: berkeley, berkeley-nosync, skiplist
|
||||||
#
|
#
|
||||||
#tlscache_db: berkeley-nosync
|
#tlscache_db: skiplist
|
||||||
|
|
||||||
# Maximum SSF (security strength factor) that the server will allow a
|
# Maximum SSF (security strength factor) that the server will allow a
|
||||||
# client to negotiate.
|
# client to negotiate.
|
||||||
|
|
|
@ -1,41 +1,13 @@
|
||||||
Index: configure
|
Index: configure
|
||||||
diff -u configure.orig configure
|
diff -u configure.orig configure
|
||||||
--- configure.orig 2009-12-21 23:20:56.817376076 +0900
|
--- configure.orig 2010-10-12 10:22:49.725848550 +0900
|
||||||
+++ configure 2009-12-21 23:21:49.196653299 +0900
|
+++ configure 2010-10-12 11:00:05.295936060 +0900
|
||||||
@@ -642,6 +642,7 @@
|
@@ -19686,7 +19686,7 @@
|
||||||
IMAP_COM_ERR_LIBS
|
|
||||||
LIB_RT
|
|
||||||
LIB_UCDSNMP
|
|
||||||
+LDFLAGS_UCDSNMP
|
|
||||||
SNMP_CONFIG
|
|
||||||
LIB_WRAP
|
|
||||||
SNMP_SUBDIRS
|
|
||||||
@@ -20173,7 +20174,7 @@
|
|
||||||
PERL_SUBDIRS="imap"
|
PERL_SUBDIRS="imap"
|
||||||
PERL="${with_perl}"
|
PERL="${with_perl}"
|
||||||
case "${target_os}" in
|
case "${target_os}" in
|
||||||
- linux*|netbsd*)
|
- linux*|netbsd*)
|
||||||
+ linux*|netbsd*|freebsd*)
|
+ linux*|netbsd*|freebsd*)
|
||||||
{ $as_echo "$as_me:$LINENO: checking for perl cccdlflags needed on \"${target_os}\"" >&5
|
echo "$as_me:$LINENO: checking for perl cccdlflags needed on \"${target_os}\"" >&5
|
||||||
$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
|
echo $ECHO_N "checking for perl cccdlflags needed on \"${target_os}\"... $ECHO_C" >&6
|
||||||
eval `${PERL} -V:cccdlflags`
|
eval `${PERL} -V:cccdlflags`
|
||||||
@@ -20749,7 +20750,9 @@
|
|
||||||
|
|
||||||
if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
|
|
||||||
CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
|
|
||||||
- LIB_UCDSNMP=$SNMP_LIBS
|
|
||||||
+ LIB_UCDSNMP="$SNMP_LIBS -lwrap"
|
|
||||||
+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
|
|
||||||
+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
|
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
|
||||||
#define HAVE_NETSNMP 1
|
|
||||||
@@ -21135,7 +21138,7 @@
|
|
||||||
#define HAVE_UCDSNMP 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
|
|
||||||
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
|
|
||||||
{ $as_echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
|
|
||||||
$as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
|
|
||||||
if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
|
|
||||||
|
|
14
mail/cyrus-imapd24/files/patch-imap::nntpd.c
Normal file
14
mail/cyrus-imapd24/files/patch-imap::nntpd.c
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
Index: imap/nntpd.c
|
||||||
|
diff -u -p imap/nntpd.c.orig imap/nntpd.c
|
||||||
|
--- imap/nntpd.c.orig 2010-10-12 06:35:47.000000000 +0900
|
||||||
|
+++ imap/nntpd.c 2010-10-12 12:18:23.780338789 +0900
|
||||||
|
@@ -55,6 +55,9 @@
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
+#ifdef HAVE_STDINT_H
|
||||||
|
+#include <stdint.h>
|
||||||
|
+#endif
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
|
@ -1,12 +0,0 @@
|
||||||
Index: lib/imapurl.c
|
|
||||||
diff -u -p lib/imapurl.c.orig lib/imapurl.c
|
|
||||||
--- lib/imapurl.c.orig 2009-03-31 13:11:22.000000000 +0900
|
|
||||||
+++ lib/imapurl.c 2009-09-10 00:28:05.287769072 +0900
|
|
||||||
@@ -50,6 +50,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <time.h>
|
|
||||||
+#include <sys/types.h>
|
|
||||||
|
|
||||||
#include "imapurl.h"
|
|
||||||
#include "xmalloc.h"
|
|
|
@ -2,15 +2,6 @@ Index: master/Makefile.in
|
||||||
diff -u master/Makefile.in.orig master/Makefile.in
|
diff -u master/Makefile.in.orig master/Makefile.in
|
||||||
--- master/Makefile.in.orig Sat May 29 03:03:05 2004
|
--- master/Makefile.in.orig Sat May 29 03:03:05 2004
|
||||||
+++ master/Makefile.in Wed Jul 21 04:13:16 2004
|
+++ master/Makefile.in Wed Jul 21 04:13:16 2004
|
||||||
@@ -58,7 +58,7 @@
|
|
||||||
DEPLIBS = @DEPLIBS@
|
|
||||||
|
|
||||||
CFLAGS = @CFLAGS@
|
|
||||||
-LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
|
|
||||||
+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@
|
|
||||||
LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
|
|
||||||
|
|
||||||
SHELL = /bin/sh
|
|
||||||
@@ -76,10 +76,10 @@
|
@@ -76,10 +76,10 @@
|
||||||
all: $(PROGS) $(LOBJS)
|
all: $(PROGS) $(LOBJS)
|
||||||
|
|
||||||
|
|
|
@ -18,4 +18,4 @@ read/write connections to the same mailbox are permitted. The server
|
||||||
supports access control lists on mailboxes and storage quotas on mailbox
|
supports access control lists on mailboxes and storage quotas on mailbox
|
||||||
hierarchies.
|
hierarchies.
|
||||||
|
|
||||||
WWW: http://cyrusimap.web.cmu.edu/
|
WWW: http://www.cyrusimap.org/
|
||||||
|
|
|
@ -11,7 +11,6 @@ bin/smtptest
|
||||||
bin/synctest
|
bin/synctest
|
||||||
cyrus/bin/arbitron
|
cyrus/bin/arbitron
|
||||||
cyrus/bin/chk_cyrus
|
cyrus/bin/chk_cyrus
|
||||||
%%AUTOCREATE%%cyrus/bin/compile_sieve
|
|
||||||
cyrus/bin/ctl_cyrusdb
|
cyrus/bin/ctl_cyrusdb
|
||||||
cyrus/bin/ctl_deliver
|
cyrus/bin/ctl_deliver
|
||||||
cyrus/bin/ctl_mboxlist
|
cyrus/bin/ctl_mboxlist
|
||||||
|
@ -19,7 +18,9 @@ cyrus/bin/cvt_cyrusdb
|
||||||
cyrus/bin/cyr_dbtool
|
cyrus/bin/cyr_dbtool
|
||||||
cyrus/bin/cyr_df
|
cyrus/bin/cyr_df
|
||||||
cyrus/bin/cyr_expire
|
cyrus/bin/cyr_expire
|
||||||
|
cyrus/bin/cyr_sequence
|
||||||
cyrus/bin/cyr_synclog
|
cyrus/bin/cyr_synclog
|
||||||
|
cyrus/bin/cyr_userseen
|
||||||
cyrus/bin/cyrdump
|
cyrus/bin/cyrdump
|
||||||
cyrus/bin/deliver
|
cyrus/bin/deliver
|
||||||
%%NNTP%%cyrus/bin/fetchnews
|
%%NNTP%%cyrus/bin/fetchnews
|
||||||
|
@ -29,8 +30,6 @@ cyrus/bin/imapd
|
||||||
cyrus/bin/ipurge
|
cyrus/bin/ipurge
|
||||||
cyrus/bin/lmtpd
|
cyrus/bin/lmtpd
|
||||||
cyrus/bin/lmtpproxyd
|
cyrus/bin/lmtpproxyd
|
||||||
%%REPLICATION%%cyrus/bin/make_md5
|
|
||||||
%%REPLICATION%%cyrus/bin/make_sha1
|
|
||||||
cyrus/bin/masssievec
|
cyrus/bin/masssievec
|
||||||
cyrus/bin/master
|
cyrus/bin/master
|
||||||
cyrus/bin/mbexamine
|
cyrus/bin/mbexamine
|
||||||
|
@ -42,9 +41,9 @@ cyrus/bin/notifyd
|
||||||
cyrus/bin/pop3d
|
cyrus/bin/pop3d
|
||||||
cyrus/bin/pop3proxyd
|
cyrus/bin/pop3proxyd
|
||||||
cyrus/bin/proxyd
|
cyrus/bin/proxyd
|
||||||
%%LDAP_PTLOADER%%cyrus/bin/ptdump
|
%%LDAP%%cyrus/bin/ptdump
|
||||||
%%LDAP_PTLOADER%%cyrus/bin/ptexpire
|
%%LDAP%%cyrus/bin/ptexpire
|
||||||
%%LDAP_PTLOADER%%cyrus/bin/ptloader
|
%%LDAP%%cyrus/bin/ptloader
|
||||||
cyrus/bin/quota
|
cyrus/bin/quota
|
||||||
cyrus/bin/reconstruct
|
cyrus/bin/reconstruct
|
||||||
cyrus/bin/sievec
|
cyrus/bin/sievec
|
||||||
|
@ -63,6 +62,7 @@ include/cyrus/auth.h
|
||||||
include/cyrus/bsearch.h
|
include/cyrus/bsearch.h
|
||||||
include/cyrus/byteorder64.h
|
include/cyrus/byteorder64.h
|
||||||
include/cyrus/charset.h
|
include/cyrus/charset.h
|
||||||
|
include/cyrus/crc32.h
|
||||||
include/cyrus/cyrusdb.h
|
include/cyrus/cyrusdb.h
|
||||||
include/cyrus/glob.h
|
include/cyrus/glob.h
|
||||||
include/cyrus/gmtoff.h
|
include/cyrus/gmtoff.h
|
||||||
|
@ -86,6 +86,7 @@ include/cyrus/parseaddr.h
|
||||||
include/cyrus/prot.h
|
include/cyrus/prot.h
|
||||||
include/cyrus/retry.h
|
include/cyrus/retry.h
|
||||||
include/cyrus/rfc822date.h
|
include/cyrus/rfc822date.h
|
||||||
|
include/cyrus/signals.h
|
||||||
include/cyrus/strhash.h
|
include/cyrus/strhash.h
|
||||||
include/cyrus/stristr.h
|
include/cyrus/stristr.h
|
||||||
include/cyrus/sysexits.h
|
include/cyrus/sysexits.h
|
||||||
|
|
Loading…
Add table
Reference in a new issue