openais_1.1.1-1~hardy1~invirt2.debdiff

   1 diff -u openais-1.1.1/debian/control openais-1.1.1/debian/control
   2 --- openais-1.1.1/debian/control
   3 +++ openais-1.1.1/debian/control
   4 @@ -5,7 +5,7 @@
   5  Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>,
   6   Guido Günther <agx@sigxcpu.org>
   7  Standards-Version: 3.8.3
   8 -Build-Depends: debhelper (>> 5), libcorosync-dev (>= 1.1.0), pkg-config, groff
   9 +Build-Depends: debhelper (>> 5), libcorosync-dev (>= 1.1.0), pkg-config, groff, quilt
  10  Vcs-Git: git://git.debian.org/debian-ha/openais.git
  11  Vcs-Browser: http://git.debian.org/?p=debian-ha/openais.git;a=summary
  12
  13 @@ -14,6 +14,7 @@
  14  Architecture: any
  15  Breaks: cman (<< 3.0.0)
  16  Depends: ${shlibs:Depends}, libopenais3 (= ${binary:Version})
  17 +Provides: invirt-openais
  18  Description: Standards-based cluster framework (daemon and modules)
  19   The openais project is a project to implement a production quality
  20   "Revised BSD" licensed implementation of the SA Forum's Application
  21 diff -u openais-1.1.1/debian/changelog openais-1.1.1/debian/changelog
  22 --- openais-1.1.1/debian/changelog
  23 +++ openais-1.1.1/debian/changelog
  24 @@ -1,3 +1,12 @@
  25 +openais (1.1.1-1~hardy1~invirt2) hardy; urgency=low
  26 +
  27 +  * Backport to Hardy.
  28 +  * Include r2098-2102 from openais to fix deadlocks in the Lck service.
  29 +  * Provide invirt-openais, so that invirt-cluster-config can depend on a
  30 +    version of openais with the Lck patch.
  31 +
  32 + -- Evan Broder <broder@xvm.mit.edu>  Sat, 29 May 2010 17:18:51 -0400
  33 +
  34  openais (1.1.1-1) unstable; urgency=low
  35
  36    * [8fe08bb] add watch file
  37 diff -u openais-1.1.1/debian/rules openais-1.1.1/debian/rules
  38 --- openais-1.1.1/debian/rules
  39 +++ openais-1.1.1/debian/rules
  40 @@ -5,7 +5,9 @@
  41
  42  export OPENAIS_BUILD=$(if $(findstring debug,$(DEB_BUILD_OPTIONS)),DEBUG)
  43
  44 -configure-stamp:
  45 +include /usr/share/quilt/quilt.make
  46 +
  47 +configure-stamp: patch
  48         ./configure --prefix=/usr \
  49                     --sysconfdir=/etc \
  50                      --libexecdir=/usr/lib/ \
  51 @@ -14,7 +16,7 @@
  52  build: configure-stamp
  53         make
  54
  55 -clean:
  56 +clean: unpatch
  57         dh_testdir
  58         -$(MAKE) distclean
  59         dh_clean configure-stamp
  60 only in patch2:
  61 unchanged:
  62 --- openais-1.1.1.orig/debian/patches/2099-fix-saTmrDispatch-deadlock
  63 +++ openais-1.1.1/debian/patches/2099-fix-saTmrDispatch-deadlock
  64 @@ -0,0 +1,15 @@
  65 +Description: Fix a deadlock in the Tmr service
  66 +Origin: upstream, commit:r2099
  67 +
  68 +===================================================================
  69 +--- a/lib/tmr.c        (revision 2098)
  70 ++++ b/lib/tmr.c        (revision 2099)
  71 +@@ -226,7 +226,7 @@
  72 +               switch (dispatch_data->id) {
  73 +               case MESSAGE_RES_TMR_TIMEREXPIREDCALLBACK:
  74 +                       if (callbacks.saTmrTimerExpiredCallback == NULL) {
  75 +-                              continue;
  76 ++                              break;
  77 +                       }
  78 +
  79 +                       res_lib_tmr_timerexpiredcallback =
  80 only in patch2:
  81 unchanged:
  82 --- openais-1.1.1.orig/debian/patches/series
  83 +++ openais-1.1.1/debian/patches/series
  84 @@ -0,0 +1,6 @@
  85 +2098-fix-saCkptDispatch-deadlock
  86 +2099-fix-saTmrDispatch-deadlock
  87 +2100-fix-saLckDispatch-deadlock
  88 +2101-fix-saClmDispatch-deadlock
  89 +2102-fix-saMsgDispatch-deadlock
  90 +invirt_bump_locks
  91 only in patch2:
  92 unchanged:
  93 --- openais-1.1.1.orig/debian/patches/2102-fix-saMsgDispatch-deadlock
  94 +++ openais-1.1.1/debian/patches/2102-fix-saMsgDispatch-deadlock
  95 @@ -0,0 +1,43 @@
  96 +Description: Fix a deadlock in the Msg service
  97 +Origin: upstream, commit:r2102
  98 +
  99 +Index: lib/msg.c
 100 +===================================================================
 101 +--- a/lib/msg.c        (revision 2101)
 102 ++++ b/lib/msg.c        (revision 2102)
 103 +@@ -295,7 +295,7 @@
 104 +               {
 105 +               case MESSAGE_RES_MSG_QUEUEOPEN_CALLBACK:
 106 +                       if (callbacks.saMsgQueueOpenCallback == NULL) {
 107 +-                              continue;
 108 ++                              break;
 109 +                       }
 110 +                       res_lib_msg_queueopen_callback =
 111 +                               (struct res_lib_msg_queueopen_callback *)dispatch_data;
 112 +@@ -324,7 +324,7 @@
 113 +
 114 +               case MESSAGE_RES_MSG_QUEUEGROUPTRACK_CALLBACK:
 115 +                       if (callbacks.saMsgQueueGroupTrackCallback == NULL) {
 116 +-                              continue;
 117 ++                              break;
 118 +                       }
 119 +                       res_lib_msg_queuegrouptrack_callback =
 120 +                               (struct res_lib_msg_queuegrouptrack_callback *)dispatch_data;
 121 +@@ -354,7 +354,7 @@
 122 +
 123 +               case MESSAGE_RES_MSG_MESSAGEDELIVERED_CALLBACK:
 124 +                       if (callbacks.saMsgMessageDeliveredCallback == NULL) {
 125 +-                              continue;
 126 ++                              break;
 127 +                       }
 128 +                       res_lib_msg_messagedelivered_callback =
 129 +                               (struct res_lib_msg_messagedelivered_callback *)dispatch_data;
 130 +@@ -367,7 +367,7 @@
 131 +
 132 +               case MESSAGE_RES_MSG_MESSAGERECEIVED_CALLBACK:
 133 +                       if (callbacks.saMsgMessageReceivedCallback == NULL) {
 134 +-                              continue;
 135 ++                              break;
 136 +                       }
 137 +                       res_lib_msg_messagereceived_callback =
 138 +                               (struct res_lib_msg_messagereceived_callback *)dispatch_data;
 139 only in patch2:
 140 unchanged:
 141 --- openais-1.1.1.orig/debian/patches/2100-fix-saLckDispatch-deadlock
 142 +++ openais-1.1.1/debian/patches/2100-fix-saLckDispatch-deadlock
 143 @@ -0,0 +1,43 @@
 144 +Description: Fix a deadlock in the Lck service
 145 +Origin: upstream, commit:r2100
 146 +
 147 +Index: lib/lck.c
 148 +===================================================================
 149 +--- a/lib/lck.c        (revision 2099)
 150 ++++ b/lib/lck.c        (revision 2100)
 151 +@@ -345,7 +345,7 @@
 152 +               switch (dispatch_data->id) {
 153 +               case MESSAGE_RES_LCK_RESOURCEOPEN_CALLBACK:
 154 +                       if (callbacks.saLckResourceOpenCallback == NULL) {
 155 +-                              continue;
 156 ++                              break;
 157 +                       }
 158 +                       res_lib_lck_resourceopen_callback =
 159 +                               (struct res_lib_lck_resourceopen_callback *)dispatch_data;
 160 +@@ -374,7 +374,7 @@
 161 +
 162 +               case MESSAGE_RES_LCK_LOCKGRANT_CALLBACK:
 163 +                       if (callbacks.saLckLockGrantCallback == NULL) {
 164 +-                              continue;
 165 ++                              break;
 166 +                       }
 167 +                       res_lib_lck_lockgrant_callback =
 168 +                               (struct res_lib_lck_lockgrant_callback *)dispatch_data;
 169 +@@ -421,7 +421,7 @@
 170 +
 171 +               case MESSAGE_RES_LCK_LOCKWAITER_CALLBACK:
 172 +                       if (callbacks.saLckLockWaiterCallback == NULL) {
 173 +-                              continue;
 174 ++                              break;
 175 +                       }
 176 +                       res_lib_lck_lockwaiter_callback =
 177 +                               (struct res_lib_lck_lockwaiter_callback *)dispatch_data;
 178 +@@ -451,7 +451,7 @@
 179 +
 180 +               case MESSAGE_RES_LCK_RESOURCEUNLOCK_CALLBACK:
 181 +                       if (callbacks.saLckResourceUnlockCallback == NULL) {
 182 +-                              continue;
 183 ++                              break;
 184 +                       }
 185 +                       res_lib_lck_resourceunlock_callback =
 186 +                               (struct res_lib_lck_resourceunlock_callback *)dispatch_data;
 187 only in patch2:
 188 unchanged:
 189 --- openais-1.1.1.orig/debian/patches/2098-fix-saCkptDispatch-deadlock
 190 +++ openais-1.1.1/debian/patches/2098-fix-saCkptDispatch-deadlock
 191 @@ -0,0 +1,25 @@
 192 +Description: Fix a deadlock in the Ckpt service
 193 +Origin: upstream, commit:r2098
 194 +
 195 +Index: lib/ckpt.c
 196 +===================================================================
 197 +--- a/lib/ckpt.c       (revision 2097)
 198 ++++ b/lib/ckpt.c       (revision 2098)
 199 +@@ -365,7 +365,7 @@
 200 +               switch (dispatch_data->id) {
 201 +               case MESSAGE_RES_CKPT_CHECKPOINT_CHECKPOINTOPENASYNC:
 202 +                       if (callbacks.saCkptCheckpointOpenCallback == NULL) {
 203 +-                              continue;
 204 ++                              break;
 205 +                       }
 206 +                       res_lib_ckpt_checkpointopenasync = (struct res_lib_ckpt_checkpointopenasync *) dispatch_data;
 207 +
 208 +@@ -409,7 +409,7 @@
 209 +
 210 +               case MESSAGE_RES_CKPT_CHECKPOINT_CHECKPOINTSYNCHRONIZEASYNC:
 211 +                       if (callbacks.saCkptCheckpointSynchronizeCallback == NULL) {
 212 +-                              continue;
 213 ++                              break;
 214 +                       }
 215 +
 216 +                       res_lib_ckpt_checkpointsynchronizeasync = (struct res_lib_ckpt_checkpointsynchronizeasync *) dispatch_data;
 217 only in patch2:
 218 unchanged:
 219 --- openais-1.1.1.orig/debian/patches/2101-fix-saClmDispatch-deadlock
 220 +++ openais-1.1.1/debian/patches/2101-fix-saClmDispatch-deadlock
 221 @@ -0,0 +1,25 @@
 222 +Description: Fix a deadlock in the Clm service
 223 +Origin: upstream, commit:r2101
 224 +
 225 +Index: lib/clm.c
 226 +===================================================================
 227 +--- a/lib/clm.c        (revision 2100)
 228 ++++ b/lib/clm.c        (revision 2101)
 229 +@@ -319,7 +319,7 @@
 230 +
 231 +               case MESSAGE_RES_CLM_TRACKCALLBACK:
 232 +                       if (callbacks.saClmClusterTrackCallback == NULL) {
 233 +-                              continue;
 234 ++                              break;
 235 +                       }
 236 +                       res_lib_clm_clustertrack = (struct res_lib_clm_clustertrack *)dispatch_data;
 237 +                       error = SA_AIS_OK;
 238 +@@ -350,7 +350,7 @@
 239 +
 240 +               case MESSAGE_RES_CLM_NODEGETCALLBACK:
 241 +                       if (callbacks.saClmClusterNodeGetCallback == NULL) {
 242 +-                              continue;
 243 ++                              break;
 244 +                       }
 245 +                       res_clm_nodegetcallback = (struct res_clm_nodegetcallback *)dispatch_data;
 246 +                       marshall_from_mar_clm_cluster_node_t (
 247 only in patch2:
 248 unchanged:
 249 --- openais-1.1.1.orig/debian/patches/invirt_bump_locks
 250 +++ openais-1.1.1/debian/patches/invirt_bump_locks
 251 @@ -0,0 +1,11 @@
 252 +--- a/include/ipc_lck.h       2010-05-29 17:05:43.000000000 -0400
 253 ++++ b/include/ipc_lck.h   2010-05-29 17:06:22.000000000 -0400
 254 +@@ -75,7 +75,7 @@
 255 + * can be obtained via the library call saLckLimitGet
 256 + * by passing the appropriate limitId (see saLck.h).
 257 + */
 258 +-#define LCK_MAX_NUM_LOCKS 4096
 259 ++#define LCK_MAX_NUM_LOCKS 524288
 260 +
 261 + struct req_lib_lck_resourceopen {
 262 +       coroipc_request_header_t header __attribute__((aligned(8)));