head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.168
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.166
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.164
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.162
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.160
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.158
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.156
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.154
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.152
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.150
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.148
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.146
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.144
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.142
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.140
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.138
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.136
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.134
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.132
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.130
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.128
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.126
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.124
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.120
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.100
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.122
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.118
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.116
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.114
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.112
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.110
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.108
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.106
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.104
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.102
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.98
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.96
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.94
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.92
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.90
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.88
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.86
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.84
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.82
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.80
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.78
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.76
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.74
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.72
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.70
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.68
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.66
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.64
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.62
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.60
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.58
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.56
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.54
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.52
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.50
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.48
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.46
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.44
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.42
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.40
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.38
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.36
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.34
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.32
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.30
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.28
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.26
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.24
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.22
	pkgsrc-2008Q1:1.1.0.20
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.18
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.16
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.14
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.12
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.10
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.8
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.6
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.4
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.02.13.23.20.32;	author joerg;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.02.13.23.20.32;	author salo;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.02.14.15.04.11;	author salo;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Don't use shiped PCRE version, since it is very old and most likely
vulnerable. Bump revision.
@
text
@$NetBSD$

--- 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 " "
@


1.1.2.1
log
@file patch-an was added on branch pkgsrc-2005Q4 on 2006-02-13 23:20:32 +0000
@
text
@d1 50
@


1.1.2.2
log
@Pullup ticket 1130 - requested by Joerg Sonnenberger
security fix for exim3

Revisions pulled up:
- pkgsrc/mail/exim3/Makefile			1.30
- pkgsrc/mail/exim3/distinfo			1.8
- pkgsrc/mail/exim3/patches/patch-ai		1.1
- pkgsrc/mail/exim3/patches/patch-aj		1.1
- pkgsrc/mail/exim3/patches/patch-ak		1.1
- pkgsrc/mail/exim3/patches/patch-al		1.1
- pkgsrc/mail/exim3/patches/patch-am		1.1
- pkgsrc/mail/exim3/patches/patch-an		1.1

   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Mon Feb 13 23:20:32 UTC 2006

   Modified Files:
   	pkgsrc/mail/exim3: Makefile distinfo
   Added Files:
   	pkgsrc/mail/exim3/patches: patch-ai patch-aj patch-ak patch-al
   		patch-am patch-an

   Log Message:
   Don't use shiped PCRE version, since it is very old and most likely
   vulnerable. Bump revision.
@
text
@a0 50
$NetBSD: patch-an,v 1.1.2.1 2006/02/14 15:04:11 salo 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 " "
@