Bitt Faulk wrote:
>
> The master/Makefile links master with libwrap, and it doesn't need
> it. On my OpenBSD system, this actually causes runtime linking
> errors, as libwrap expects deny_severity and allow_severity to be
> supplied to it. The only place those symbols exist is in
> master/service.o, but that's not linked in my master, only by the
> imap/* clients.
Turns out that it's more than just master that gets messed up. It's
about half of the binaries created. So I created a patch against 2.0.11
w/ the rlim-patch that Larry posted earlier today. It looks like my
patch works fine without Larry's, but you should definitely apply his
patch as well.
You'll have to remove configure and run ``sh SMakefile'' after
applying. SMakefile requires aclocal, autoheader, and autoconf, which
come from the autoconf and automake packages.
I haven't tested it extensively, but I don't see how it could really
break anything. Plus, it fixes a few typos and oms in
timsieved/Makefile.in ;-)
-Bitt
diff -crd cyrus-imapd-2.0.11/configure.in ./configure.in
*** cyrus-imapd-2.0.11/configure.in Mon Dec 25 22:29:34 2000
--- ./configure.in Wed Feb 7 18:03:01 2001
***************
*** 717,723 ****
CMU_LIBWRAP
CMU_UCDSNMP
! LIBS="$LIBS ${LIB_WRAP} ${LIB_SOCKET}"
# Figure out what directories we're linking against.
# Lots of fun for the whole family.
--- 718,724 ----
CMU_LIBWRAP
CMU_UCDSNMP
! LIBS="$LIBS ${LIB_SOCKET}"
# Figure out what directories we're linking against.
# Lots of fun for the whole family.
diff -crd cyrus-imapd-2.0.11/imap/Makefile.in ./imap/Makefile.in
*** cyrus-imapd-2.0.11/imap/Makefile.in Sat Dec 30 18:14:47 2000
--- ./imap/Makefile.in Wed Feb 7 18:30:48 2001
***************
*** 69,74 ****
--- 69,75 ----
IMAP_LIBS = @IMAP_LIBS@
SIEVE_LIBS = @SIEVE_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
LIBS = $(IMAP_LIBS) @ZEPHYR_LIBS@ $(IMAP_COM_ERR_LIBS)
DEPLIBS = ../acap/libacap.a ../lib/libcyrus.a @DEPLIBS@
***************
*** 155,167 ****
libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o lmtpd \
$(SERVICE) lmtpd.o lmtpengine.o lmtpstats.o \
! libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
lmtpproxyd: lmtpstats.o lmtpproxyd.o lmtpengine.o \
libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o lmtpproxyd \
$(SERVICE) lmtpproxyd.o lmtpengine.o lmtpstats.o \
! libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
ctl_deliver: ctl_deliver.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o \
--- 156,168 ----
libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o lmtpd \
$(SERVICE) lmtpd.o lmtpengine.o lmtpstats.o \
! libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
lmtpproxyd: lmtpstats.o lmtpproxyd.o lmtpengine.o \
libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o lmtpproxyd \
$(SERVICE) lmtpproxyd.o lmtpengine.o lmtpstats.o \
! libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
ctl_deliver: ctl_deliver.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o \
***************
*** 173,191 ****
imapd: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
! $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS)
imapd.pure: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
! $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS)
imapd.quant: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
! $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS)
proxyd: pushstats.o proxyd.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o proxyd \
! $(SERVICE) pushstats.o proxyd.o tls.o libimap.a $(DEPLIBS) $(LIBS)
target-acap: target-acap.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o target-acap \
--- 174,192 ----
imapd: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
! $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
imapd.pure: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
! $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
imapd.quant: $(IMAPDOBJS) libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
! $(SERVICE) $(IMAPDOBJS) libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
proxyd: pushstats.o proxyd.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o proxyd \
! $(SERVICE) pushstats.o proxyd.o tls.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
target-acap: target-acap.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o target-acap \
***************
*** 197,207 ****
pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \
! libimap.a $(DEPLIBS) $(LIBS)
pop3proxyd: pop3proxyd.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3proxyd pop3proxyd.o tls.o $(SERVICE) \
! libimap.a $(DEPLIBS) $(LIBS)
arbitron: arbitron.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o arbitron arbitron.o libimap.a $(DEPLIBS) $(LIBS)
--- 198,208 ----
pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \
! libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
pop3proxyd: pop3proxyd.o tls.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3proxyd pop3proxyd.o tls.o $(SERVICE) \
! libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
arbitron: arbitron.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o arbitron arbitron.o libimap.a $(DEPLIBS) $(LIBS)
diff -crd cyrus-imapd-2.0.11/timsieved/Makefile.in ./timsieved/Makefile.in
*** cyrus-imapd-2.0.11/timsieved/Makefile.in Fri Jul 21 14:50:03 2000
--- ./timsieved/Makefile.in Wed Feb 7 18:31:27 2001
***************
*** 68,73 ****
--- 68,74 ----
IMAP_LIBS = @IMAP_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
LIBS = $(IMAP_COM_ERR_LIBS)
DEPLIBS=../sieve/libsieve.a ../imap/libimap.a ../lib/libcyrus.a @DEPLIBS@
***************
*** 81,94 ****
OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o
! timsieved: $(OBJS) $(SERVIVE)
$(CC) $(LDFLAGS) -o timsieved \
! $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS)
! timsieved.pure: $(OBJS)
$(PURIFY) $(PUREOPT) \
$(CC) $(LDFLAGS) -o timsieved.pure \
! $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS)
clean:
rm -f *.o *.a Makefile.bak makedepend.log
--- 82,95 ----
OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o
! timsieved: $(OBJS) $(SERVICE)
$(CC) $(LDFLAGS) -o timsieved \
! $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
! timsieved.pure: $(OBJS) $(SERVICE)
$(PURIFY) $(PUREOPT) \
$(CC) $(LDFLAGS) -o timsieved.pure \
! $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
clean:
rm -f *.o *.a Makefile.bak makedepend.log
