← Back to branch summary

~ubuntu-branches/ubuntu/trusty/globus-gridftp-server/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/globus-gridftp-server-futureproof.patch

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2012-02-25 08:14:53 UTC
  • Revision ID: package-import@ubuntu.com-20120225081453-3mrxk70bjpcdoooq
Tags: 6.5-5
* The last update broke backwards compatibility and should have bumped
  the soname - so do it now
* Add patch from upstream to reduce the chance of backward incompatible
  changes in the future

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/globus-gridftp-server-futureproof.patch
 
1
diff -ur globus_gridftp_server-6.5.orig/globus_gridftp_server.h globus_gridftp_server-6.5/globus_gridftp_server.h
 
2
--- globus_gridftp_server-6.5.orig/globus_gridftp_server.h      2011-09-01 07:42:24.000000000 +0200
 
3
+++ globus_gridftp_server-6.5/globus_gridftp_server.h   2012-03-06 14:01:14.851067852 +0100
 
4
@@ -232,6 +232,15 @@
 
5
  */
 
6
 typedef globus_gridftp_server_control_stat_t    globus_gfs_stat_t;
 
7
 
 
8
+
 
9
+/*
 
10
+ *  globus_gfs_operation_info_t
 
11
+ * 
 
12
+ * Internal operation info.  This handle is passed with the info structs
 
13
+ * Its data should not be accessed.
 
14
+ */
 
15
+typedef struct globus_l_gfs_data_op_info_s *  globus_gfs_op_info_t;
 
16
+
 
17
 /*
 
18
  *  globus_gfs_data_finished_info_t
 
19
  * 
 
20
@@ -299,7 +308,6 @@
 
21
     char *                              username;
 
22
     /** home directory of authenticated user */
 
23
     char *                              home_dir;
 
24
-    
 
25
 } globus_gfs_session_finished_info_t;
 
26
 
 
27
 /*
 
28
@@ -341,6 +349,9 @@
 
29
         globus_gfs_stat_finished_info_t stat;
 
30
         globus_gfs_transfer_finished_info_t transfer;
 
31
     } info;
 
32
+
 
33
+    /** op info */
 
34
+    globus_gfs_op_info_t                op_info;
 
35
 } globus_gfs_finished_info_t;
 
36
 
 
37
 /*
 
38
@@ -376,6 +387,9 @@
 
39
     int *                               eof_count;
 
40
     /** number of nodes (size of eof_count array) */    
 
41
     int                                 node_count;
 
42
+
 
43
+    /** op info */
 
44
+    globus_gfs_op_info_t                op_info;
 
45
 } globus_gfs_event_info_t;
 
46
 
 
47
 /*
 
48
@@ -424,8 +438,17 @@
 
49
     char *                              expected_checksum;
 
50
     /** expected checksum algorithm */
 
51
     char *                              expected_checksum_alg;
 
52
+    
 
53
+    /** op info */
 
54
+    globus_gfs_op_info_t                op_info;
 
55
 } globus_gfs_transfer_info_t;
 
56
 
 
57
+ 
 
58
+/*
 
59
+* maintain backward source compatibility after member rename
 
60
+*/
 
61
+#define rnfr_pathname from_pathname
 
62
+
 
63
 /*
 
64
  *  globus_gfs_command_info_t
 
65
  * 
 
66
@@ -460,6 +483,9 @@
 
67
 
 
68
     /** Authorization assertion */
 
69
     char *                              authz_assert; 
 
70
+
 
71
+    /** op info */
 
72
+    globus_gfs_op_info_t                op_info;
 
73
 } globus_gfs_command_info_t;
 
74
 
 
75
 /*
 
76
@@ -507,6 +533,9 @@
 
77
     /* if this is set, the data channel will use it instead
 
78
         of the default session credential */
 
79
     gss_cred_id_t                       del_cred;
 
80
+
 
81
+    /** op info */
 
82
+    globus_gfs_op_info_t                op_info;
 
83
 } globus_gfs_data_info_t;
 
84
 
 
85
 /*
 
86
@@ -526,6 +555,9 @@
 
87
     globus_bool_t                       internal;
 
88
     /** pathname to stat */
 
89
     char *                              pathname;
 
90
+
 
91
+    /** op info */
 
92
+    globus_gfs_op_info_t                op_info;
 
93
 } globus_gfs_stat_info_t;
 
94
 
 
95
 typedef struct globus_gfs_session_info_s
 
96
@@ -538,6 +570,9 @@
 
97
     char *                              subject;
 
98
     char *                              cookie;
 
99
     char *                              host_id;
 
100
+
 
101
+    /** op info */
 
102
+    globus_gfs_op_info_t                op_info;
 
103
 } globus_gfs_session_info_t;
 
104
 
 
105
 typedef enum globus_gfs_brain_reason_e
 
106
@@ -1801,6 +1836,8 @@
 
107
      * value is FALSE when not known or not used. */
 
108
     globus_bool_t                       final;
 
109
 
 
110
+    /** op info */
 
111
+    globus_gfs_op_info_t                op_info;
 
112
 } globus_gfs_acl_object_desc_t;
 
113
 
 
114
 /* return values for authorization functions */
 
115
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
 
116
--- globus_gridftp_server-6.5.orig/pkgdata/pkg_data_src.gpt.in  2012-03-06 14:02:35.417089125 +0100
 
117
+++ globus_gridftp_server-6.5/pkgdata/pkg_data_src.gpt.in       2012-03-06 14:02:21.733262609 +0100
 
118
@@ -1,7 +1,7 @@
 
119
 <?xml version="1.0" encoding="UTF-8"?>
 
120
 <!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
 
121
 <gpt_package_metadata Format_Version="0.02" Name="globus_gridftp_server">
 
122
-    <Aging_Version Major="6" Minor="5" Age="6"/>
 
123
+    <Aging_Version Major="6" Minor="5" Age="0"/>
 
124
     <Description>Globus GridFTP Server</Description>
 
125
     <Functional_Group>GridFTP</Functional_Group>
 
126
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP@-@DIRT_BRANCH_ID@"/>