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,5 @@
  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 only in patch2:
  91 unchanged:
  92 --- openais-1.1.1.orig/debian/patches/2102-fix-saMsgDispatch-deadlock
  93 +++ openais-1.1.1/debian/patches/2102-fix-saMsgDispatch-deadlock
  94 @@ -0,0 +1,43 @@
  95 +Description: Fix a deadlock in the Msg service
  96 +Origin: upstream, commit:r2102
  97 +
  98 +Index: lib/msg.c
  99 +===================================================================
 100 +--- a/lib/msg.c        (revision 2101)
 101 ++++ b/lib/msg.c        (revision 2102)
 102 +@@ -295,7 +295,7 @@
 103 +               {
 104 +               case MESSAGE_RES_MSG_QUEUEOPEN_CALLBACK:
 105 +                       if (callbacks.saMsgQueueOpenCallback == NULL) {
 106 +-                              continue;
 107 ++                              break;
 108 +                       }
 109 +                       res_lib_msg_queueopen_callback =
 110 +                               (struct res_lib_msg_queueopen_callback *)dispatch_data;
 111 +@@ -324,7 +324,7 @@
 112 +
 113 +               case MESSAGE_RES_MSG_QUEUEGROUPTRACK_CALLBACK:
 114 +                       if (callbacks.saMsgQueueGroupTrackCallback == NULL) {
 115 +-                              continue;
 116 ++                              break;
 117 +                       }
 118 +                       res_lib_msg_queuegrouptrack_callback =
 119 +                               (struct res_lib_msg_queuegrouptrack_callback *)dispatch_data;
 120 +@@ -354,7 +354,7 @@
 121 +
 122 +               case MESSAGE_RES_MSG_MESSAGEDELIVERED_CALLBACK:
 123 +                       if (callbacks.saMsgMessageDeliveredCallback == NULL) {
 124 +-                              continue;
 125 ++                              break;
 126 +                       }
 127 +                       res_lib_msg_messagedelivered_callback =
 128 +                               (struct res_lib_msg_messagedelivered_callback *)dispatch_data;
 129 +@@ -367,7 +367,7 @@
 130 +
 131 +               case MESSAGE_RES_MSG_MESSAGERECEIVED_CALLBACK:
 132 +                       if (callbacks.saMsgMessageReceivedCallback == NULL) {
 133 +-                              continue;
 134 ++                              break;
 135 +                       }
 136 +                       res_lib_msg_messagereceived_callback =
 137 +                               (struct res_lib_msg_messagereceived_callback *)dispatch_data;
 138 only in patch2:
 139 unchanged:
 140 --- openais-1.1.1.orig/debian/patches/2100-fix-saLckDispatch-deadlock
 141 +++ openais-1.1.1/debian/patches/2100-fix-saLckDispatch-deadlock
 142 @@ -0,0 +1,43 @@
 143 +Description: Fix a deadlock in the Lck service
 144 +Origin: upstream, commit:r2100
 145 +
 146 +Index: lib/lck.c
 147 +===================================================================
 148 +--- a/lib/lck.c        (revision 2099)
 149 ++++ b/lib/lck.c        (revision 2100)
 150 +@@ -345,7 +345,7 @@
 151 +               switch (dispatch_data->id) {
 152 +               case MESSAGE_RES_LCK_RESOURCEOPEN_CALLBACK:
 153 +                       if (callbacks.saLckResourceOpenCallback == NULL) {
 154 +-                              continue;
 155 ++                              break;
 156 +                       }
 157 +                       res_lib_lck_resourceopen_callback =
 158 +                               (struct res_lib_lck_resourceopen_callback *)dispatch_data;
 159 +@@ -374,7 +374,7 @@
 160 +
 161 +               case MESSAGE_RES_LCK_LOCKGRANT_CALLBACK:
 162 +                       if (callbacks.saLckLockGrantCallback == NULL) {
 163 +-                              continue;
 164 ++                              break;
 165 +                       }
 166 +                       res_lib_lck_lockgrant_callback =
 167 +                               (struct res_lib_lck_lockgrant_callback *)dispatch_data;
 168 +@@ -421,7 +421,7 @@
 169 +
 170 +               case MESSAGE_RES_LCK_LOCKWAITER_CALLBACK:
 171 +                       if (callbacks.saLckLockWaiterCallback == NULL) {
 172 +-                              continue;
 173 ++                              break;
 174 +                       }
 175 +                       res_lib_lck_lockwaiter_callback =
 176 +                               (struct res_lib_lck_lockwaiter_callback *)dispatch_data;
 177 +@@ -451,7 +451,7 @@
 178 +
 179 +               case MESSAGE_RES_LCK_RESOURCEUNLOCK_CALLBACK:
 180 +                       if (callbacks.saLckResourceUnlockCallback == NULL) {
 181 +-                              continue;
 182 ++                              break;
 183 +                       }
 184 +                       res_lib_lck_resourceunlock_callback =
 185 +                               (struct res_lib_lck_resourceunlock_callback *)dispatch_data;
 186 only in patch2:
 187 unchanged:
 188 --- openais-1.1.1.orig/debian/patches/2098-fix-saCkptDispatch-deadlock
 189 +++ openais-1.1.1/debian/patches/2098-fix-saCkptDispatch-deadlock
 190 @@ -0,0 +1,25 @@
 191 +Description: Fix a deadlock in the Ckpt service
 192 +Origin: upstream, commit:r2098
 193 +
 194 +Index: lib/ckpt.c
 195 +===================================================================
 196 +--- a/lib/ckpt.c       (revision 2097)
 197 ++++ b/lib/ckpt.c       (revision 2098)
 198 +@@ -365,7 +365,7 @@
 199 +               switch (dispatch_data->id) {
 200 +               case MESSAGE_RES_CKPT_CHECKPOINT_CHECKPOINTOPENASYNC:
 201 +                       if (callbacks.saCkptCheckpointOpenCallback == NULL) {
 202 +-                              continue;
 203 ++                              break;
 204 +                       }
 205 +                       res_lib_ckpt_checkpointopenasync = (struct res_lib_ckpt_checkpointopenasync *) dispatch_data;
 206 +
 207 +@@ -409,7 +409,7 @@
 208 +
 209 +               case MESSAGE_RES_CKPT_CHECKPOINT_CHECKPOINTSYNCHRONIZEASYNC:
 210 +                       if (callbacks.saCkptCheckpointSynchronizeCallback == NULL) {
 211 +-                              continue;
 212 ++                              break;
 213 +                       }
 214 +
 215 +                       res_lib_ckpt_checkpointsynchronizeasync = (struct res_lib_ckpt_checkpointsynchronizeasync *) dispatch_data;
 216 only in patch2:
 217 unchanged:
 218 --- openais-1.1.1.orig/debian/patches/2101-fix-saClmDispatch-deadlock
 219 +++ openais-1.1.1/debian/patches/2101-fix-saClmDispatch-deadlock
 220 @@ -0,0 +1,25 @@
 221 +Description: Fix a deadlock in the Clm service
 222 +Origin: upstream, commit:r2101
 223 +
 224 +Index: lib/clm.c
 225 +===================================================================
 226 +--- a/lib/clm.c        (revision 2100)
 227 ++++ b/lib/clm.c        (revision 2101)
 228 +@@ -319,7 +319,7 @@
 229 +
 230 +               case MESSAGE_RES_CLM_TRACKCALLBACK:
 231 +                       if (callbacks.saClmClusterTrackCallback == NULL) {
 232 +-                              continue;
 233 ++                              break;
 234 +                       }
 235 +                       res_lib_clm_clustertrack = (struct res_lib_clm_clustertrack *)dispatch_data;
 236 +                       error = SA_AIS_OK;
 237 +@@ -350,7 +350,7 @@
 238 +
 239 +               case MESSAGE_RES_CLM_NODEGETCALLBACK:
 240 +                       if (callbacks.saClmClusterNodeGetCallback == NULL) {
 241 +-                              continue;
 242 ++                              break;
 243 +                       }
 244 +                       res_clm_nodegetcallback = (struct res_clm_nodegetcallback *)dispatch_data;
 245 +                       marshall_from_mar_clm_cluster_node_t (