From f543a683b0b76526a1fac6ae770b40b888ddf523 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Fri, 15 Aug 2014 14:13:21 -0400
Subject: Drop patch for #231147, fixed in 1.12.2

---
 krb5-1.10-doublelog.patch | 14 --------------
 krb5.spec                 |  3 +--
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 krb5-1.10-doublelog.patch

diff --git a/krb5-1.10-doublelog.patch b/krb5-1.10-doublelog.patch
deleted file mode 100644
index c20075c..0000000
--- a/krb5-1.10-doublelog.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't double-log (actually, don't process /etc/krb5.conf twice) just
-because we built with --sysconfdir=/etc.  RT#3277
-
---- krb5/src/include/Makefile.in
-+++ krb5/src/include/Makefile.in
-@@ -67,6 +67,8 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(
- 		  -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
- 		  -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
- 		  -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
-+		  -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \
-+		  -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+' \
- 		  -e 's+@DYNOBJEXT+$(DYNOBJEXT)+'
- 
- OSCONFSRC = $(srcdir)/osconf.hin
diff --git a/krb5.spec b/krb5.spec
index b9f8980..9d87a1c 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -84,7 +84,6 @@ Patch23: krb5-1.3.1-dns.patch
 Patch29: krb5-1.10-kprop-mktemp.patch
 Patch30: krb5-1.3.4-send-pr-tempfile.patch
 Patch39: krb5-1.12-api.patch
-Patch56: krb5-1.10-doublelog.patch
 Patch59: krb5-1.10-kpasswd_tcp.patch
 Patch60: krb5-1.12.1-pam.patch
 Patch63: krb5-1.12-selinux-label.patch
@@ -339,7 +338,6 @@ ln -s NOTICE LICENSE
 %patch29 -p1 -b .kprop-mktemp
 %patch30 -p1 -b .send-pr-tempfile
 %patch39 -p1 -b .api
-%patch56 -p1 -b .doublelog
 %patch59 -p1 -b .kpasswd_tcp
 %patch71 -p1 -b .dirsrv-accountlock %{?_rawbuild}
 %patch86 -p0 -b .debuginfo
@@ -1045,6 +1043,7 @@ exit 0
 * Fri Aug 15 2014 Nalin Dahyabhai <nalin@redhat.com> - 1.12.2-1
 - update to 1.12.2
   - drop patch for RT#7820, merged in 1.12.2
+  - drop patch for #231147, fixed as RT#3277 in 1.12.2
 - replace older proposed changes for ksu with backports of the changes
   after review and merging upstream (#1015559, #1026099, #1118347)
 
-- 
cgit