summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-18 18:29:19 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-18 18:29:19 +0000
commita83bb210a87c2d0ddaa2880443d8a70e58035e31 (patch)
tree429bb96bfdeddca46aaded4ad3c27c7c0c696411 /net-misc/siproxd/files
parentMasked adobe-flash-10.1 and fixed sci-chemistry/* entries (diff)
downloadgentoo-2-a83bb210a87c2d0ddaa2880443d8a70e58035e31.tar.gz
gentoo-2-a83bb210a87c2d0ddaa2880443d8a70e58035e31.tar.bz2
gentoo-2-a83bb210a87c2d0ddaa2880443d8a70e58035e31.zip
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/siproxd/files')
-rw-r--r--net-misc/siproxd/files/siproxd-0.5.11-configure-docs.diff28
-rw-r--r--net-misc/siproxd/files/siproxd-0.7.0-guide.diff11
-rw-r--r--net-misc/siproxd/files/siproxd-0.7.0-libosip-3.1.0.diff213
3 files changed, 0 insertions, 252 deletions
diff --git a/net-misc/siproxd/files/siproxd-0.5.11-configure-docs.diff b/net-misc/siproxd/files/siproxd-0.5.11-configure-docs.diff
deleted file mode 100644
index 1ba0ad3a397a..000000000000
--- a/net-misc/siproxd/files/siproxd-0.5.11-configure-docs.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- siproxd-0.5.11/configure.in.orig 2005-05-07 16:43:13.333858336 +0200
-+++ siproxd-0.5.11/configure.in 2005-05-07 16:52:22.980299376 +0200
-@@ -72,10 +72,21 @@
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- AC_PROG_LN_S
--AC_CHECK_PROG(docbook2pdf,docbook2pdf,yes,)
--AM_CONDITIONAL(have_docbook2pdf,test "$docbook2pdf" = "yes")
--AC_CHECK_PROG(docbook2html,docbook2html,yes,)
--AM_CONDITIONAL(have_docbook2html,test "$docbook2html" = "yes")
-+
-+AC_MSG_CHECKING(build statically linked executable)
-+AC_ARG_ENABLE(docs,
-+ [ --enable-docs build pdf/html documentation],
-+ build_docs="$enableval";
-+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-+if test "x$build_docs" = "xyes"; then
-+ AC_CHECK_PROG(docbook2pdf,docbook2pdf,yes,)
-+ AM_CONDITIONAL(have_docbook2pdf,test "$docbook2pdf" = "yes")
-+ AC_CHECK_PROG(docbook2html,docbook2html,yes,)
-+ AM_CONDITIONAL(have_docbook2html,test "$docbook2html" = "yes")
-+else
-+ AM_CONDITIONAL(have_docbook2pdf,false)
-+ AM_CONDITIONAL(have_docbook2html,false)
-+fi
-
- dnl
- dnl add
diff --git a/net-misc/siproxd/files/siproxd-0.7.0-guide.diff b/net-misc/siproxd/files/siproxd-0.7.0-guide.diff
deleted file mode 100644
index 9e1af6361ecf..000000000000
--- a/net-misc/siproxd/files/siproxd-0.7.0-guide.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/doc/siproxd_guide.sgml b/doc/siproxd_guide.sgml
---- a/doc/siproxd_guide.sgml 2007-05-23 22:51:54.000000000 +0200
-+++ b/doc/siproxd_guide.sgml 2008-01-22 16:30:42.000000000 +0100
-@@ -74,6 +74,7 @@
- "helping technologies" WILL DO CONFLICT with siproxd and result
- in a mess.</para>
- </sect1>
-+ </chapter>
-
- <!-- Chapter 1: Overview -->
- <chapter label="1" id="Overview">
diff --git a/net-misc/siproxd/files/siproxd-0.7.0-libosip-3.1.0.diff b/net-misc/siproxd/files/siproxd-0.7.0-libosip-3.1.0.diff
deleted file mode 100644
index f486c865de6f..000000000000
--- a/net-misc/siproxd/files/siproxd-0.7.0-libosip-3.1.0.diff
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -ur a/src/auth.c b/src/auth.c
---- a/src/auth.c 2008-01-19 17:07:14.000000000 +0100
-+++ b/src/auth.c 2008-02-24 22:01:53.346694612 +0100
-@@ -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);
- }
-
-diff -ur a/src/sip_utils.c b/src/sip_utils.c
---- a/src/sip_utils.c 2008-01-19 17:07:14.000000000 +0100
-+++ b/src/sip_utils.c 2008-02-24 22:01:53.346694612 +0100
-@@ -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, &param);
- 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, &param);
- 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]",