+++ /dev/null
-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, ¶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]",
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.7.1.ebuild,v 1.2 2009/03/01 06:00:57 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
-HOMEPAGE="http://siproxd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc static"
-# TODO: debug can be used but dmalloc is breaking the build
-# upstream has been contacted, see bug 2649238 in their bugtracker
-
-RDEPEND=">=net-libs/libosip-3.0.0"
-# debug? ( dev-libs/dmalloc[threads] )"
-DEPEND="${RDEPEND}
- doc? ( app-text/docbook-sgml-utils
- app-text/docbook-sgml-dtd:4.2 )"
-# docbook-sgml-utils is for building doc
-# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it
-
-pkg_setup() {
- enewgroup siproxd
- enewuser siproxd -1 -1 /dev/null siproxd
-}
-
-src_prepare() {
- # to be sure doc is not compiled nor installed with -doc
- # quickiest way to get it disabled, other way would be patching .in file
- # upstream has been contacted, see bug 2649325 in their bugtracker
- if ! use doc; then
- sed -i -e 's/test "$docbook2/test "/' configure \
- || die "patching configure failed"
- fi
-
- # make the daemon run as user 'siproxd' by default
- sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
- || die "patching doc/siproxd.conf.example failed"
-}
-
-src_configure() {
- # NOTE: $(use flag && use_enable flag) is to avoid a bug
- # that makes --disable like --enable, see bug #205765
- # static-libosip2 make it link statically against libosip2
- # static build static version of plugins, forced to true
- # upstream has been contacted, see bug 2649286 in their bugtracker
- econf \
- $(use static && use_enable static static-libosip2) \
- --enable-static
- #$(use debug && use_enable debug dmalloc) \
-
- # statically linked plugins to libosip2 causes a shared lib linking with
- # static lib (gcc seems not to like it : portable issue it says).
- # there was also DT_TEXREL issue and stripping of static plugins failed
- # so shared lib has to be used for plugins
- # upstream has been contacted, see bug 2649351 in their bugtracker
- if use static; then
- sed -i -r -e \
- "s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \
- src/Makefile || die "patching src/Makefile failed"
- sed -i -e \
- "s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \
- src/Makefile || die "patching src/Makefile failed"
- fi
-}
-
-src_install() {
- einstall || die "einstall failed"
-
- newinitd "${FILESDIR}"/${PN}.rc6 ${PN} || die "newinitd failed"
-
- dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
- doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS \
- || die "dodoc failed"
-
- if use doc; then
- dodoc doc/RFC3261_compliance.txt || die "dodoc failed"
- # auto-generated doc is not auto-installed
- # upstream has been contacted, see bug 2649333 in their bugtracker
- dohtml -r doc/html/ || die "dohtml failed"
- # pdf is not build all the time
- if built_with_use app-text/docbook-sgml-utils jadetex; then
- dodoc doc/pdf/*.pdf || die "dodoc failed"
- fi
- fi
-
- if use examples; then
- docinto examples
- dodoc doc/sample_*.txt || die "dodoc failed"
- fi
-
- # set up siproxd directories
- keepdir /var/{lib,run}/${PN} || die "keepdir failed"
- fowners siproxd:siproxd /var/{lib,run}/${PN} || die "fowners failed"
-}
-
-pkg_postinst() {
- if use static; then
- elog "static USE flag does not build a _fully_ statically linked binary"
- elog "only libosip2 and libosipparser2 are statically linked"
- elog "In addition, plugins are dynamically linked with those libs"
- fi
-}
projects / gentoo.git / commitdiff