Hello community, here is the log from the commit of package siproxd checked in at Thu Feb 28 18:53:33 CET 2008. -------- --- siproxd/siproxd.changes 2008-01-13 11:07:10.000000000 +0100 +++ /mounts/work_users/ro/STABLE/siproxd/siproxd.changes 2008-02-28 18:51:31.248464000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 18:51:24 CET 2008 - ro@suse.de + +- fix build with current libosip2 + +------------------------------------------------------------------- New: ---- siproxd-md5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ siproxd.spec ++++++ --- /var/tmp/diff_new_pack.ft1194/_old 2008-02-28 18:53:19.000000000 +0100 +++ /var/tmp/diff_new_pack.ft1194/_new 2008-02-28 18:53:19.000000000 +0100 @@ -10,17 +10,19 @@ # norootforbuild + Name: siproxd BuildRequires: libosip2-devel License: GPL v2 or later Group: Productivity/Networking/Other Summary: A SIP masquerading proxy with RTP support Version: 0.6.99 -Release: 1 +Release: 13 AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://siproxd.sourceforge.net/ Source: siproxd_libosip2-3.tar.bz2 +Patch: siproxd-md5.patch %description Siprox is an proxy/masquerading daemon for the SIP protocol. It handles @@ -37,6 +39,7 @@ %prep %setup -q -n siproxd-0.7.0 +%patch %build autoreconf --install --force @@ -62,7 +65,9 @@ %{_sbindir}/siproxd %changelog -* Sun Jan 13 2008 - ro@suse.de +* Thu Feb 28 2008 ro@suse.de +- fix build with current libosip2 +* Sun Jan 13 2008 ro@suse.de - update to snapshot version - Converting to use libosip2-3.x.x This means older libosip2 versions before 3.0.0 @@ -105,11 +110,11 @@ - increased DNS cache - included RTCP support and a de-jitter feature (submitted by Hans Carlos Hofmann) -* Wed May 16 2007 - ro@suse.de +* Wed May 16 2007 ro@suse.de - use libosip2-devel in buildrequires -* Tue Jun 20 2006 - ro@suse.de +* Wed Jun 21 2006 ro@suse.de - update to 0.5.13 incorporating previous cvs fixes -* Fri Jun 16 2006 - ro@suse.de +* Fri Jun 16 2006 ro@suse.de - update to 0.5.12 Major changes since 0.5.11: A "Short-Dial" feature is now available. @@ -124,32 +129,32 @@ - REGISTER response generated from siproxd includes a Contact header. - some I64 architecture issues -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Aug 05 2005 - cthiel@suse.de +* Fri Aug 05 2005 cthiel@suse.de - update to version 0.5.11 -* Fri Feb 04 2005 - ro@suse.de +* Fri Feb 04 2005 ro@suse.de - update to 0.5.10 -* Tue Nov 09 2004 - ro@suse.de +* Tue Nov 09 2004 ro@suse.de - update to 0.5.9 -* Thu Jul 29 2004 - ro@suse.de +* Thu Jul 29 2004 ro@suse.de - fix build after libosip update -* Mon Jun 28 2004 - ro@suse.de +* Mon Jun 28 2004 ro@suse.de - update to 0.5.7 -* Wed Apr 28 2004 - ro@suse.de +* Wed Apr 28 2004 ro@suse.de - update to current version (0.5.5) -* Sun Mar 07 2004 - ro@suse.de +* Sun Mar 07 2004 ro@suse.de - update to 0.5.4 -* Mon Feb 02 2004 - ro@suse.de +* Mon Feb 02 2004 ro@suse.de - update to 0.5.2 -* Sun Jan 11 2004 - adrian@suse.de +* Sun Jan 11 2004 adrian@suse.de - build as user -* Thu Nov 27 2003 - ro@suse.de +* Thu Nov 27 2003 ro@suse.de - update to 0.5.0 - main binary moved to /usr/sbin -* Mon Oct 13 2003 - ro@suse.de +* Mon Oct 13 2003 ro@suse.de - update to 0.4.1 -* Fri Sep 26 2003 - ro@suse.de +* Fri Sep 26 2003 ro@suse.de - update to 0.3.6b -* Tue Jun 10 2003 - ro@suse.de +* Tue Jun 10 2003 ro@suse.de - created package (version 0.3.2) ++++++ siproxd-md5.patch ++++++ --- src/auth.c +++ src/auth.c @@ -367,25 +367,25 @@ OUT HASHHEX SessionKey ) { - MD5_CTX Md5Ctx; + osip_MD5_CTX Md5Ctx; HASH HA1; - MD5Init(&Md5Ctx); - if (pszUserName) MD5Update(&Md5Ctx, pszUserName, strlen(pszUserName)); - MD5Update(&Md5Ctx, ":", 1); - if (pszRealm) MD5Update(&Md5Ctx, pszRealm, strlen(pszRealm)); - MD5Update(&Md5Ctx, ":", 1); - if (pszPassword) MD5Update(&Md5Ctx, pszPassword, strlen(pszPassword)); - MD5Final(HA1, &Md5Ctx); + osip_MD5Init(&Md5Ctx); + if (pszUserName) osip_MD5Update(&Md5Ctx, pszUserName, strlen(pszUserName)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszRealm) osip_MD5Update(&Md5Ctx, pszRealm, strlen(pszRealm)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszPassword) osip_MD5Update(&Md5Ctx, pszPassword, strlen(pszPassword)); + osip_MD5Final(HA1, &Md5Ctx); if ((pszAlg!=NULL) && (osip_strcasecmp(pszAlg, "md5-sess") == 0)) { - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, HA1, HASHLEN); - MD5Update(&Md5Ctx, ":", 1); - if (pszNonce) MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); - MD5Update(&Md5Ctx, ":", 1); - if (pszCNonce) MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce)); - MD5Final(HA1, &Md5Ctx); + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, HA1, HASHLEN); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszNonce) osip_MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszCNonce) osip_MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce)); + osip_MD5Final(HA1, &Md5Ctx); }; CvtHex(HA1, SessionKey); } @@ -403,57 +403,57 @@ OUT HASHHEX Response /* request-digest or response-digest */ ) { - MD5_CTX Md5Ctx; + osip_MD5_CTX Md5Ctx; HASH HA2; HASH RespHash; HASHHEX HA2Hex; /* calculate H(A2) */ - MD5Init(&Md5Ctx); - if (pszMethod) MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod)); - MD5Update(&Md5Ctx, ":", 1); - if (pszDigestUri)MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri)); + osip_MD5Init(&Md5Ctx); + if (pszMethod) osip_MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszDigestUri)osip_MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri)); if (pszQop!=NULL) { goto auth_withqop; }; /* auth_withoutqop: */ - MD5Final(HA2, &Md5Ctx); + osip_MD5Final(HA2, &Md5Ctx); CvtHex(HA2, HA2Hex); /* calculate response */ - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, HA1, HASHHEXLEN); - MD5Update(&Md5Ctx, ":", 1); - if (pszNonce) MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); - MD5Update(&Md5Ctx, ":", 1); + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, HA1, HASHHEXLEN); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszNonce) osip_MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); + osip_MD5Update(&Md5Ctx, ":", 1); goto end; auth_withqop: - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, HEntity, HASHHEXLEN); - MD5Final(HA2, &Md5Ctx); + osip_MD5Update(&Md5Ctx, ":", 1); + osip_MD5Update(&Md5Ctx, HEntity, HASHHEXLEN); + osip_MD5Final(HA2, &Md5Ctx); CvtHex(HA2, HA2Hex); /* calculate response */ - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, HA1, HASHHEXLEN); - MD5Update(&Md5Ctx, ":", 1); - if (pszNonce) MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); - MD5Update(&Md5Ctx, ":", 1); - if (pszNonceCount)MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount)); - MD5Update(&Md5Ctx, ":", 1); - if (pszCNonce) MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce)); - MD5Update(&Md5Ctx, ":", 1); - if (pszQop) MD5Update(&Md5Ctx, pszQop, strlen(pszQop)); - MD5Update(&Md5Ctx, ":", 1); + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, HA1, HASHHEXLEN); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszNonce) osip_MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszNonceCount)osip_MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszCNonce) osip_MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce)); + osip_MD5Update(&Md5Ctx, ":", 1); + if (pszQop) osip_MD5Update(&Md5Ctx, pszQop, strlen(pszQop)); + osip_MD5Update(&Md5Ctx, ":", 1); end: - MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN); - MD5Final(RespHash, &Md5Ctx); + osip_MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN); + osip_MD5Final(RespHash, &Md5Ctx); CvtHex(RespHash, Response); } --- src/sip_utils.c +++ src/sip_utils.c @@ -773,13 +773,13 @@ if (strncmp(param->gvalue, magic_cookie, strlen(magic_cookie))==0) { /* calculate MD5 hash */ - MD5_CTX Md5Ctx; + osip_MD5_CTX Md5Ctx; HASH HA1; - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, param->gvalue, + osip_MD5Init(&Md5Ctx); + osip_MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue)); - MD5Final(HA1, &Md5Ctx); + osip_MD5Final(HA1, &Md5Ctx); CvtHex(HA1, hashstring); DEBUGC(DBCLASS_BABBLE, "existing branch -> branch hash [%s]", @@ -799,53 +799,53 @@ */ if (hashstring[0] == '\0') { /* calculate MD5 hash */ - MD5_CTX Md5Ctx; + osip_MD5_CTX Md5Ctx; HASH HA1; char *tmp; - MD5Init(&Md5Ctx); + osip_MD5Init(&Md5Ctx); /* topmost via */ osip_via_to_str(via, &tmp); if (tmp) { - MD5Update(&Md5Ctx, tmp, strlen(tmp)); + osip_MD5Update(&Md5Ctx, tmp, strlen(tmp)); osip_free(tmp); } /* Tag in To header */ osip_to_get_tag(sip_msg->to, ¶m); if (param && param->gvalue) { - MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue)); + osip_MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue)); } /* Tag in From header */ osip_from_get_tag(sip_msg->from, ¶m); if (param && param->gvalue) { - MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue)); + osip_MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue)); } /* Call-ID */ call_id = osip_message_get_call_id(sip_msg); osip_call_id_to_str(call_id, &tmp); if (tmp) { - MD5Update(&Md5Ctx, tmp, strlen(tmp)); + osip_MD5Update(&Md5Ctx, tmp, strlen(tmp)); osip_free(tmp); } /* CSeq number (but not method) */ tmp = osip_cseq_get_number(sip_msg->cseq); if (tmp) { - MD5Update(&Md5Ctx, tmp, strlen(tmp)); + osip_MD5Update(&Md5Ctx, tmp, strlen(tmp)); } /* Request URI */ osip_uri_to_str(sip_msg->req_uri, &tmp); if (tmp) { - MD5Update(&Md5Ctx, tmp, strlen(tmp)); + osip_MD5Update(&Md5Ctx, tmp, strlen(tmp)); osip_free(tmp); } - MD5Final(HA1, &Md5Ctx); + osip_MD5Final(HA1, &Md5Ctx); CvtHex(HA1, hashstring); DEBUGC(DBCLASS_BABBLE, "non-existing branch -> branch hash [%s]", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de