From 072105660f9bcb046408a3a271b9597c03adb76d Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Fri, 28 Aug 2009 07:42:17 +0000
Subject: [PATCH] Upgrade the rest of the branches to svn1613 with new openssl

---
 .cvsignore              |  2 +-
 sources                 |  2 +-
 znc-0.075-openssl.patch | 15 +++++++++++++++
 znc.spec                | 18 ++++++++++++++----
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 znc-0.075-openssl.patch

diff --git a/.cvsignore b/.cvsignore
index f79430a..8e591ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-znc-0.075.svn1608.tar.bz2
+znc-0.075.svn1613.tar.bz2
diff --git a/sources b/sources
index d855888..28aabd4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2
+285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2
diff --git a/znc-0.075-openssl.patch b/znc-0.075-openssl.patch
new file mode 100644
index 0000000..f5dbbbc
--- /dev/null
+++ b/znc-0.075-openssl.patch
@@ -0,0 +1,15 @@
+diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
+--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
++++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
+@@ -990,7 +990,11 @@ private:
+ 	CS_STRING			m_sSSLBuffer;
+ 	SSL 				*m_ssl;
+ 	SSL_CTX				*m_ssl_ctx;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD		*m_ssl_method;
++#else
+ 	SSL_METHOD			*m_ssl_method;
++#endif
+ 	unsigned int		m_iRequireClientCertFlags;
+ 
+ 	FPCertVerifyCB		m_pCerVerifyCB;
diff --git a/znc.spec b/znc.spec
index 6c58a30..7979a50 100644
--- a/znc.spec
+++ b/znc.spec
@@ -1,12 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        5.svn1608%{?dist}
+Release:        8.svn1613%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1608.tar.bz2 
+# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1613.tar.bz2 
+Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,8 +44,9 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
-#chmod -x modules/q.cpp
+chmod -x modules/q.cpp
 
 %build
 %configure \
@@ -126,6 +128,14 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 28 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-5.svn1608
 - Upgrade to svn 1608