[globus-gridftp-server/el5] The last update broke backward compatibility and should have bumped
Mattias Ellert
ellert at fedoraproject.org
Wed Mar 7 02:23:22 UTC 2012
commit a4b892e4cb5c89aa28c259b11eba37a6b268d379
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Mar 7 03:21:14 2012 +0100
The last update broke backward compatibility and should have bumped
the soname - so bump it now
- Add patch from upstream to reduce the chance of backward incompatible
changes in the future
globus-gridftp-server-futureproof.patch | 126 +++++++++++++++++++++++++++++++
globus-gridftp-server.spec | 10 ++-
2 files changed, 135 insertions(+), 1 deletions(-)
---
diff --git a/globus-gridftp-server-futureproof.patch b/globus-gridftp-server-futureproof.patch
new file mode 100644
index 0000000..bed0a73
--- /dev/null
+++ b/globus-gridftp-server-futureproof.patch
@@ -0,0 +1,126 @@
+diff -ur globus_gridftp_server-6.5.orig/globus_gridftp_server.h globus_gridftp_server-6.5/globus_gridftp_server.h
+--- globus_gridftp_server-6.5.orig/globus_gridftp_server.h 2011-09-01 07:42:24.000000000 +0200
++++ globus_gridftp_server-6.5/globus_gridftp_server.h 2012-03-06 14:01:14.851067852 +0100
+@@ -232,6 +232,15 @@
+ */
+ typedef globus_gridftp_server_control_stat_t globus_gfs_stat_t;
+
++
++/*
++ * globus_gfs_operation_info_t
++ *
++ * Internal operation info. This handle is passed with the info structs
++ * Its data should not be accessed.
++ */
++typedef struct globus_l_gfs_data_op_info_s * globus_gfs_op_info_t;
++
+ /*
+ * globus_gfs_data_finished_info_t
+ *
+@@ -299,7 +308,6 @@
+ char * username;
+ /** home directory of authenticated user */
+ char * home_dir;
+-
+ } globus_gfs_session_finished_info_t;
+
+ /*
+@@ -341,6 +349,9 @@
+ globus_gfs_stat_finished_info_t stat;
+ globus_gfs_transfer_finished_info_t transfer;
+ } info;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_finished_info_t;
+
+ /*
+@@ -376,6 +387,9 @@
+ int * eof_count;
+ /** number of nodes (size of eof_count array) */
+ int node_count;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_event_info_t;
+
+ /*
+@@ -424,8 +438,17 @@
+ char * expected_checksum;
+ /** expected checksum algorithm */
+ char * expected_checksum_alg;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_transfer_info_t;
+
++
++/*
++* maintain backward source compatibility after member rename
++*/
++#define rnfr_pathname from_pathname
++
+ /*
+ * globus_gfs_command_info_t
+ *
+@@ -460,6 +483,9 @@
+
+ /** Authorization assertion */
+ char * authz_assert;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_command_info_t;
+
+ /*
+@@ -507,6 +533,9 @@
+ /* if this is set, the data channel will use it instead
+ of the default session credential */
+ gss_cred_id_t del_cred;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_data_info_t;
+
+ /*
+@@ -526,6 +555,9 @@
+ globus_bool_t internal;
+ /** pathname to stat */
+ char * pathname;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_stat_info_t;
+
+ typedef struct globus_gfs_session_info_s
+@@ -538,6 +570,9 @@
+ char * subject;
+ char * cookie;
+ char * host_id;
++
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_session_info_t;
+
+ typedef enum globus_gfs_brain_reason_e
+@@ -1801,6 +1836,8 @@
+ * value is FALSE when not known or not used. */
+ globus_bool_t final;
+
++ /** op info */
++ globus_gfs_op_info_t op_info;
+ } globus_gfs_acl_object_desc_t;
+
+ /* return values for authorization functions */
+diff -ur globus_gridftp_server-6.5.orig/pkgdata/pkg_data_src.gpt.in globus_gridftp_server-6.5/pkgdata/pkg_data_src.gpt.in
+--- globus_gridftp_server-6.5.orig/pkgdata/pkg_data_src.gpt.in 2012-03-06 14:02:35.417089125 +0100
++++ globus_gridftp_server-6.5/pkgdata/pkg_data_src.gpt.in 2012-03-06 14:02:21.733262609 +0100
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
+ <gpt_package_metadata Format_Version="0.02" Name="globus_gridftp_server">
+- <Aging_Version Major="6" Minor="5" Age="6"/>
++ <Aging_Version Major="6" Minor="5" Age="0"/>
+ <Description>Globus GridFTP Server</Description>
+ <Functional_Group>GridFTP</Functional_Group>
+ <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index 50a0c04..c7c6e8a 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -9,7 +9,7 @@
Name: globus-gridftp-server
%global _name %(tr - _ <<< %{name})
Version: 6.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Globus Toolkit - Globus GridFTP Server
Group: System Environment/Libraries
@@ -24,6 +24,7 @@ Source8: GLOBUS-GRIDFTP
Patch0: %{name}-deps.patch
Patch1: %{name}-funcgrp.patch
Patch2: %{name}-pathmax.patch
+Patch3: %{name}-futureproof.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-xio%{?_isa} >= 3
@@ -102,6 +103,7 @@ Globus GridFTP Server Development Files
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -218,6 +220,12 @@ fi
%defattr(-,root,root,-)
%changelog
+* Mon Mar 05 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-3
+- The last update broke backward compatibility and should have bumped
+ the soname - so bump it now
+- Add patch from upstream to reduce the chance of backward incompatible
+ changes in the future
+
* Wed Jan 18 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-2
- Portability fixes
- Fix broken links in README file
More information about the scm-commits
mailing list