rpms/bes/devel bes-3.8.4-openssl.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bes.spec, 1.18, 1.19 sources, 1.5, 1.6 bes-3.6.2-includes.patch, 1.1, NONE bes-3.7.2-openssl.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Tue Jul 13 22:57:54 UTC 2010


Author: orion

Update of /cvs/pkgs/rpms/bes/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14456

Modified Files:
	.cvsignore bes.spec sources 
Added Files:
	bes-3.8.4-openssl.patch 
Removed Files:
	bes-3.6.2-includes.patch bes-3.7.2-openssl.patch 
Log Message:
* Tue Jul 13 2010 Orion Poplawski <orion at cora.nwra.com> - 3.8.4-1
- Update to 3.8.4
- Drop includes patch fixed upstream
- Rebase openssl patch
- Add COPYING to main package and -doc subpackage


bes-3.8.4-openssl.patch:
 SSLClient.cc |    4 ++++
 SSLServer.cc |    4 ++++
 2 files changed, 8 insertions(+)

--- NEW FILE bes-3.8.4-openssl.patch ---
diff -up bes-3.8.4/ppt/SSLClient.cc.openssl bes-3.8.4/ppt/SSLClient.cc
--- bes-3.8.4/ppt/SSLClient.cc.openssl	2010-05-17 12:28:43.000000000 -0600
+++ bes-3.8.4/ppt/SSLClient.cc	2010-07-13 16:42:14.401430420 -0600
@@ -79,7 +79,11 @@ SSLClient::initConnection()
     SSL_library_init() ;
     BESDEBUG( "ppt", "OK" << endl ) ;
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
     SSL_METHOD *method = NULL ;
+#else
+    const SSL_METHOD *method = NULL ;
+#endif
     SSL_CTX *context = NULL ;
 
     BESDEBUG( "ppt", "Creating method and context ... " << endl ) ;
diff -up bes-3.8.4/ppt/SSLServer.cc.openssl bes-3.8.4/ppt/SSLServer.cc
--- bes-3.8.4/ppt/SSLServer.cc.openssl	2010-05-17 12:28:43.000000000 -0600
+++ bes-3.8.4/ppt/SSLServer.cc	2010-07-13 16:41:41.552430112 -0600
@@ -83,7 +83,11 @@ SSLServer::initConnection()
     SSL_library_init() ;
     BESDEBUG( "ppt", "OK" << endl ) ;
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
     SSL_METHOD *method = NULL ;
+#else
+    const SSL_METHOD *method = NULL ;
+#endif
     SSL_CTX *context = NULL ;
     BESDEBUG( "ppt", "Creating method and context ... " << endl ) ;
     method = SSLv3_server_method() ;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bes/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Jul 2009 18:02:00 -0000	1.5
+++ .cvsignore	13 Jul 2010 22:57:53 -0000	1.6
@@ -1 +1 @@
-bes-3.7.2.tar.gz
+bes-3.8.4.tar.gz


Index: bes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bes/devel/bes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- bes.spec	22 Aug 2009 09:57:59 -0000	1.18
+++ bes.spec	13 Jul 2010 22:57:54 -0000	1.19
@@ -5,20 +5,19 @@
 %define besgroup %{name}
 
 Name:           bes
-Version:        3.7.2
-Release:        3%{?dist}
+Version:        3.8.4
+Release:        1%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opendap.org/download/BES.html
 Source0:        http://www.opendap.org/pub/source/bes-%{version}.tar.gz
-Patch1:         bes-3.6.2-includes.patch
-Patch2:         bes-3.7.2-openssl.patch
+Patch2:         bes-3.8.4-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libdap-devel >= 3.9.2
+BuildRequires:  libdap-devel >= 3.10.2
 BuildRequires:  readline-devel
 BuildRequires:  bzip2-devel zlib-devel
 # needed by ppt
@@ -64,7 +63,6 @@ Documentation of OPeNDAP BES.
 
 %prep
 %setup -q
-%patch1 -p1 -b .includes
 %patch2 -p1 -b .openssl
 chmod a-x dispatch/BESStreamResponseHandler*
 
@@ -95,9 +93,6 @@ sed -i.dist -e 's:=/tmp:=%{bescachedir}:
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-for file in config.guess depcomp missing config.sub install-sh ltmain.sh mkinstalldirs; do
-  chmod a+x $RPM_BUILD_ROOT%{_datadir}/bes/templates/conf/$file
-done
 mkdir -p $RPM_BUILD_ROOT%{bescachedir}
 mkdir -p $RPM_BUILD_ROOT%{bespkidir}/{cacerts,public}
 mkdir -p $RPM_BUILD_ROOT%{beslogdir}
@@ -122,7 +117,7 @@ exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog NEWS README
+%doc ChangeLog COPYING NEWS README
 %dir %{_sysconfdir}/bes/
 %config(noreplace) %{_sysconfdir}/bes/bes.conf
 %dir %{_datadir}/bes/
@@ -131,10 +126,10 @@ exit 0
 %{_datadir}/bes/*.xml
 %{_bindir}/beslistener
 %{_bindir}/besdaemon
+%{_bindir}/besregtest
 %{_bindir}/besstandalone
 %{_bindir}/besctl
 %{_bindir}/hyraxctl
-%{_bindir}/besregtest
 %{_bindir}/bescmdln
 %{_libdir}/*.so.*
 %{_libdir}/bes/
@@ -155,9 +150,15 @@ exit 0
 
 %files doc
 %defattr(-,root,root,-)
-%doc __distribution_docs/api-html/
+%doc COPYING __distribution_docs/api-html/
 
 %changelog
+* Tue Jul 13 2010 Orion Poplawski <orion at cora.nwra.com> - 3.8.4-1
+- Update to 3.8.4
+- Drop includes patch fixed upstream
+- Rebase openssl patch
+- Add COPYING to main package and -doc subpackage
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bes/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jul 2009 18:02:00 -0000	1.5
+++ sources	13 Jul 2010 22:57:54 -0000	1.6
@@ -1 +1 @@
-9f1711a363ab3c8b172301440ca9e88b  bes-3.7.2.tar.gz
+18d182bdcc266243908e9202511b0450  bes-3.8.4.tar.gz


--- bes-3.6.2-includes.patch DELETED ---


--- bes-3.7.2-openssl.patch DELETED ---



More information about the scm-commits mailing list