Tags 784778 +patch
thanks
oops really attatched this time.
During a binNMU of condor for the gsoap transition, the following error was
encountered on all architectures:
/«PKGBUILDDIR»/src/condor_schedd.V6/soap_scheddStub.cpp: In function 'bool
stub_prefix(const char*, const soap*, int, int, DCpermission, bool,
soap_schedd::condor__Transaction*&, soap_schedd::condor__Status&,
ScheddTransaction*&)':
/«PKGBUILDDIR»/src/condor_schedd.V6/soap_scheddStub.cpp:289:36: error: no matching
function for call to 'condor_sockaddr::condor_sockaddr(const soap::<anonymous
union>*)'
condor_sockaddr addr(&soap->peer);
The attatched debdiff made the package build in my sid amd64 chroot. It has not
been tested beyond that. It will be uploaded to raspbian soon after merging it
with existing raspbian changes. I have no intent to NMU in Debian.
diff -Nru condor-8.2.3~dfsg.1/debian/changelog
condor-8.2.3~dfsg.1/debian/changelog
--- condor-8.2.3~dfsg.1/debian/changelog 2015-01-16 17:59:28.000000000
+0000
+++ condor-8.2.3~dfsg.1/debian/changelog 2015-05-13 20:02:27.000000000
+0000
@@ -1,3 +1,11 @@
+condor (8.2.3~dfsg.1-6+plugwash1) unreleased; urgency=medium
+
+ * Fix use of peer field in struct soap for new unions (Closes: 784778)
+ * Bump build-dependency on gsoap because i'm pretty sure the above
+ fix will break builds with older gsoap.
+
+ -- Peter Michael Green <[email protected]> Wed, 13 May 2015 19:59:14 +0000
+
condor (8.2.3~dfsg.1-6) unstable; urgency=medium
[Alex Waite]
diff -Nru condor-8.2.3~dfsg.1/debian/control condor-8.2.3~dfsg.1/debian/control
--- condor-8.2.3~dfsg.1/debian/control 2015-01-15 09:00:38.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/control 2015-05-13 20:02:15.000000000 +0000
@@ -35,7 +35,7 @@
chrpath,
libldap2-dev | libldap-dev,
help2man,
- gsoap (>= 2.7.17-1~),
+ gsoap (>= 2.8.22-1~),
libboost-test-dev,
libboost-python-dev,
libkrb5-dev,
diff -Nru condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22
condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22
--- condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22 1970-01-01
00:00:00.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22 2015-05-13
20:22:31.000000000 +0000
@@ -0,0 +1,38 @@
+Description: Fix for gsoap 2.8.22
+ Fix use of peer field in struct soap for new unions (Closes: 784778)
+Author: Peter Michael Green <[email protected]>
+Bug-Debian: https://bugs.debian.org/784778
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- condor-8.2.3~dfsg.1.orig/src/condor_schedd.V6/soap_scheddStub.cpp
++++ condor-8.2.3~dfsg.1/src/condor_schedd.V6/soap_scheddStub.cpp
+@@ -86,7 +86,7 @@ verify(DCpermission perm,
+
+
+ if (daemonCore->Verify("SOAP",perm,
+- &soap->peer,
++ &soap->peer.addr,
+ soap->user ? (char*)soap->user : NULL) !=
USER_AUTH_SUCCESS)
+ {
+ status.code = FAIL;
+@@ -286,7 +286,7 @@ stub_prefix(const char* stub_name, //
+ ASSERT(entry->qmgmt_state);
+ // tell qmgmt info about our client - addr and
user
+ ASSERT(soap);
+- condor_sockaddr addr(&soap->peer);
++ condor_sockaddr addr(&soap->peer.addr);
+ entry->qmgmt_state->set(addr, (const char*)soap->user);
+ }
+
diff -Nru condor-8.2.3~dfsg.1/debian/patches/series
condor-8.2.3~dfsg.1/debian/patches/series
--- condor-8.2.3~dfsg.1/debian/patches/series 2015-01-16 17:53:02.000000000
+0000
+++ condor-8.2.3~dfsg.1/debian/patches/series 2015-05-13 20:21:39.000000000
+0000
@@ -14,3 +14,4 @@
noformat_arg
as-needed-libs-ftbfs.patch
qsub_sentinel_robustness
+fix-gsoap-2.8.22
