From 4562baf1c651c2a19ab1e3f3b35152cd56bc4e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 6 Mar 2012 09:28:17 +0100
Subject: [PATCH] New version

- Removed unused ldap-deprecated patch
- Dropped strict aliasing patch
- Built with libdb-5.2
---
 .gitignore                      |  5 +----
 exim-4.61-ldap-deprecated.patch | 10 ----------
 exim-4.69-strictaliasing.patch  | 11 -----------
 exim.spec                       | 14 +++++++++-----
 sources                         |  2 +-
 5 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 exim-4.61-ldap-deprecated.patch
 delete mode 100644 exim-4.69-strictaliasing.patch

diff --git a/.gitignore b/.gitignore
index 3f3e4c8..d4101b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-sa-exim-4.2.tar.gz
-exim-4.72.tar.bz2
-/exim-4.73.tar.bz2
-/exim-4.76.tar.bz2
+exim-*.tar.bz2
diff --git a/exim-4.61-ldap-deprecated.patch b/exim-4.61-ldap-deprecated.patch
deleted file mode 100644
index ffad7ac..0000000
--- a/exim-4.61-ldap-deprecated.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- exim-4.61/src/lookups/ldap.c.orig	2006-04-07 16:02:48.000000000 +0100
-+++ exim-4.61/src/lookups/ldap.c	2006-04-07 16:02:00.000000000 +0100
-@@ -33,6 +33,7 @@ static void dummy(int x) { dummy(x-1); }
- 
- /* Include LDAP headers */
- 
-+#define LDAP_DEPRECATED 1
- #include <lber.h>
- #include <ldap.h>
- 
diff --git a/exim-4.69-strictaliasing.patch b/exim-4.69-strictaliasing.patch
deleted file mode 100644
index 7eb9d13..0000000
--- a/exim-4.69-strictaliasing.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up exim-4.69/src/exim.h.strictaliasing exim-4.69/src/exim.h
---- exim-4.69/src/exim.h.strictaliasing	2009-08-18 15:10:42.000000000 +0200
-+++ exim-4.69/src/exim.h	2009-08-18 15:16:01.000000000 +0200
-@@ -484,6 +484,7 @@ union sockaddr_46 {
-   #if HAVE_IPV6
-   struct sockaddr_in6 v6;
-   #endif
-+  struct sockaddr g;
- };
- 
- /* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined
diff --git a/exim.spec b/exim.spec
index 943ec2a..7f10420 100644
--- a/exim.spec
+++ b/exim.spec
@@ -13,8 +13,8 @@
 
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.76
-Release: 9%{?dist}
+Version: 4.77
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -62,12 +62,11 @@ Patch21: exim-4.63-localhost-is-local.patch
 Patch22: exim-4.66-greylist-conf.patch
 Patch23: exim-4.67-smarthost-config.patch
 Patch25: exim-4.69-dynlookup-config.patch
-Patch26: exim-4.69-strictaliasing.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
+BuildRequires: libdb-devel openssl-devel openldap-devel pam-devel
 %if 0%{?buildsa}
 BuildRequires: lynx
 %endif
@@ -216,7 +215,6 @@ greylisting unconditional.
 %patch22 -p1 -b .grey
 %patch23 -p1 -b .smarthost
 %patch25 -p1 -b .dynconfig
-%patch26 -p1 -b .strictaliasing
 
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -606,6 +604,12 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Feb 29 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 4.77-1
+- New version
+- Removed unused ldap-deprecated patch
+- Dropped strict aliasing patch
+- Built with libdb-5.2
+
 * Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 4.76-9
 - Rebuild against PCRE 8.30
 
diff --git a/sources b/sources
index 5e3db47..bde3674 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58e784b33c7a2ab335ec6400346d6362  exim-4.76.tar.bz2
+5d746275f2cc85845567f9d5eb84a57a  exim-4.77.tar.bz2