diff options
author | joerg <joerg> | 2006-02-13 23:20:32 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-02-13 23:20:32 +0000 |
commit | ea58c1f91efee84efb51f699168cff95b9a048a2 (patch) | |
tree | b3568c5c35e5d0e57c6e06c1ab018606ec9f914e /mail | |
parent | fdfa77231b34f0dc1fd0a7ea7d2fb99196a0047f (diff) | |
download | pkgsrc-ea58c1f91efee84efb51f699168cff95b9a048a2.tar.gz |
Don't use shiped PCRE version, since it is very old and most likely
vulnerable. Bump revision.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/exim3/Makefile | 5 | ||||
-rw-r--r-- | mail/exim3/distinfo | 8 | ||||
-rw-r--r-- | mail/exim3/patches/patch-ai | 13 | ||||
-rw-r--r-- | mail/exim3/patches/patch-aj | 13 | ||||
-rw-r--r-- | mail/exim3/patches/patch-ak | 13 | ||||
-rw-r--r-- | mail/exim3/patches/patch-al | 13 | ||||
-rw-r--r-- | mail/exim3/patches/patch-am | 26 | ||||
-rw-r--r-- | mail/exim3/patches/patch-an | 50 |
8 files changed, 138 insertions, 3 deletions
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 3c7c2285ba0..4ff46c8c2a4 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2006/01/21 00:22:58 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2006/02/13 23:20:32 joerg Exp $ DISTNAME= exim-3.36 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= mail net MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \ http://public.planetmirror.com.au/pub/exim/exim3/ @@ -100,4 +100,5 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR} ${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8 +.include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/exim3/distinfo b/mail/exim3/distinfo index e02ed13f4e9..4e9eb9946ad 100644 --- a/mail/exim3/distinfo +++ b/mail/exim3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/01/20 23:09:42 joerg Exp $ +$NetBSD: distinfo,v 1.8 2006/02/13 23:20:32 joerg Exp $ SHA1 (exim-3.36.tar.bz2) = 2a06a2858ebf8cdedf2e41fa3f258b5e468e270d RMD160 (exim-3.36.tar.bz2) = 2654601eaf54fc15c1ebeabfee53c828f2fd22dd @@ -11,3 +11,9 @@ SHA1 (patch-ae) = 0a01f3cfd2bfe59577edcb09b0f2f355185e28f0 SHA1 (patch-af) = bb171d4048ab3f802243dfec1aade86c0a7e0d21 SHA1 (patch-ag) = 9248e3fde82fed7a464c28f3335d4c419c038a03 SHA1 (patch-ah) = e8b0d19451581548f3ba838a99d2460dacff2613 +SHA1 (patch-ai) = db1d47bd5db3fb20f472f13e59b8147599cc9709 +SHA1 (patch-aj) = 90059f7df6f9ef11554a663110aa3573fbf0a5f9 +SHA1 (patch-ak) = 59ec9e8726c00237d631349cf963b2a5112d75d6 +SHA1 (patch-al) = dd1263e5d8dd18c6ea1bfbe79cee74d3bc76f4c4 +SHA1 (patch-am) = 26f66062bb133340ed2b336008673a78bd017e9e +SHA1 (patch-an) = 7d40d720613b88772bb69993ffbfc754c9310acb diff --git a/mail/exim3/patches/patch-ai b/mail/exim3/patches/patch-ai new file mode 100644 index 00000000000..ce00e23cec6 --- /dev/null +++ b/mail/exim3/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2006/02/13 23:20:32 joerg Exp $ + +--- src/exim.h.orig 2006-02-12 21:26:40.000000000 +0100 ++++ src/exim.h +@@ -322,7 +322,7 @@ extern int ferror(FILE *); + + /* The header from the PCRE regex package */ + +-#include "pcre/pcre.h" ++#include <pcre.h> + + /* Exim includes are in several files */ + diff --git a/mail/exim3/patches/patch-aj b/mail/exim3/patches/patch-aj new file mode 100644 index 00000000000..ce1e3d5a09d --- /dev/null +++ b/mail/exim3/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2006/02/13 23:20:32 joerg Exp $ + +--- src/exim_dumpdb.c.orig 2006-02-12 21:30:01.000000000 +0100 ++++ src/exim_dumpdb.c +@@ -14,7 +14,7 @@ + #include <sys/stat.h> + + #include <pwd.h> /* Because used in includes below */ +-#include "pcre/pcre.h" /* Ditto */ ++#include <pcre.h> /* Ditto */ + #define MAXPACKET 1024 /* Ditto */ + + #include "macros.h" diff --git a/mail/exim3/patches/patch-ak b/mail/exim3/patches/patch-ak new file mode 100644 index 00000000000..8023f2cc57c --- /dev/null +++ b/mail/exim3/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2006/02/13 23:20:32 joerg Exp $ + +--- src/exim_fixdb.c.orig 2006-02-12 21:27:24.000000000 +0100 ++++ src/exim_fixdb.c +@@ -18,7 +18,7 @@ + #include <sys/stat.h> + + #include <pwd.h> /* Because used in includes below */ +-#include "pcre/pcre.h" /* Ditto */ ++#include <pcre.h> /* Ditto */ + #define MAXPACKET 1024 /* Ditto */ + + #include "macros.h" diff --git a/mail/exim3/patches/patch-al b/mail/exim3/patches/patch-al new file mode 100644 index 00000000000..ae9de04a045 --- /dev/null +++ b/mail/exim3/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2006/02/13 23:20:32 joerg Exp $ + +--- src/exim_tidydb.c.orig 2006-02-12 21:27:48.000000000 +0100 ++++ src/exim_tidydb.c +@@ -36,7 +36,7 @@ This argument is required. */ + #include <sys/stat.h> + + #include <pwd.h> /* Because used in includes below */ +-#include "pcre/pcre.h" /* Ditto */ ++#include <pcre.h> /* Ditto */ + #define MAXPACKET 1024 /* Ditto */ + + #include "macros.h" diff --git a/mail/exim3/patches/patch-am b/mail/exim3/patches/patch-am new file mode 100644 index 00000000000..9411234df6a --- /dev/null +++ b/mail/exim3/patches/patch-am @@ -0,0 +1,26 @@ +$NetBSD: patch-am,v 1.1 2006/02/13 23:20:32 joerg Exp $ + +--- scripts/MakeLinks.orig 2006-02-12 21:30:42.000000000 +0100 ++++ scripts/MakeLinks +@@ -39,21 +39,6 @@ ln -s ../../src/libident/support.c + ln -s ../../src/libident/version.c version.c + cd .. + +-# Likewise for the PCRE regular expression library +-mkdir pcre +-cd pcre +-ln -s ../../src/pcre/Makefile Makefile +-ln -s ../../src/pcre/config.h config.h +-ln -s ../../src/pcre/dftables.c dftables.c +-ln -s ../../src/pcre/internal.h internal.h +-ln -s ../../src/pcre/pcre.h pcre.h +-ln -s ../../src/pcre/maketables.c maketables.c +-ln -s ../../src/pcre/get.c get.c +-ln -s ../../src/pcre/pcre.c pcre.c +-ln -s ../../src/pcre/pcretest.c pcretest.c +-ln -s ../../src/pcre/study.c study.c +-cd .. +- + # Likewise for the lookups + mkdir lookups + cd lookups diff --git a/mail/exim3/patches/patch-an b/mail/exim3/patches/patch-an new file mode 100644 index 00000000000..1ffb01b836f --- /dev/null +++ b/mail/exim3/patches/patch-an @@ -0,0 +1,50 @@ +$NetBSD: patch-an,v 1.1 2006/02/13 23:20:32 joerg Exp $ + +--- OS/Makefile-Base.orig 2006-02-12 21:31:59.000000000 +0100 ++++ OS/Makefile-Base +@@ -79,7 +79,7 @@ config.h: Makefile buildconfig ../src/co + # This is the real default target for all the various exim binaries and + # scripts, once the configuring stuff is done. + +-allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \ ++allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ + ../util/exigrep ../util/eximstats ../util/exiqsumm \ + ../util/transport-filter.pl ../util/convert4r3 \ + exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \ +@@ -207,7 +207,7 @@ OBJ_EXIM = accept.o child.o daemon.o dbf + route.o search.o smtp_in.o smtp_out.o spool_in.o spool_out.o \ + store.o string.o tls.o tod.o transport.o tree.o verify.o $(EXIM_PERL) + +-exim: libident/libident.a pcre/libpcre.a lookups/lookups.a auths/auths.a \ ++exim: libident/libident.a lookups/lookups.a auths/auths.a \ + directors/directors.a routers/routers.a transports/transports.a \ + $(OBJ_EXIM) version.c + awk '{ print ($$1+1) }' cnumber.h > cnumber.temp +@@ -215,10 +215,10 @@ exim: libident/libident.a pcre/libpcre + $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c + /bin/rm -f exim + $(PURIFY) $(CC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \ +- libident/libident.a pcre/libpcre.a directors/directors.a \ ++ libident/libident.a directors/directors.a \ + routers/routers.a transports/transports.a lookups/lookups.a \ + auths/auths.a \ +- $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \ ++ $(LIBS) -lpcre $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \ + $(DBMLIB) $(LIBRESOLV) $(LOOKUP_LIBS) $(PERL_LIBS) $(TLS_LIBS) + @if [ x"$(STRIP_COMMAND)" != x"" ]; then $(STRIP_COMMAND) exim; fi + $(EXIM_CHMOD) +@@ -293,12 +293,12 @@ MONBIN = em_StripChart.o $(EXIMON_TEXTPO + + OBJ_MONBIN = dummies.o spool_in.o store.o string.o tree.o $(MONBIN) + +-eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \ ++eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \ + ../exim_monitor/em_version.c + $(CC) -o em_version.o -c \ + $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c + $(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \ +- $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \ ++ $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \ + $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc + @if [ x"$(STRIP_COMMAND)" != x"" ]; then $(STRIP_COMMAND) eximon.bin; fi + @echo " " |