Attachment 116147 Details for Bug 158061 – file.diff

[patch] file.diff

file.diff (text/plain), 11.67 KB, created by yuri on 2011-06-20 06:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yuri

Created: 2011-06-20 06:40:05 UTC

Size: 11.67 KB

patch

obsolete

>diff -ruN net-im.orig/sofia-sip/Makefile net-im/sofia-sip/Makefile
>--- net-im.orig/sofia-sip/Makefile	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/sofia-sip/Makefile	2011-06-19 22:28:00.000000000 -0700
>@@ -0,0 +1,33 @@
>+# New ports collection makefile for:	sofia-sip
>+# Date created:				June 20 2011
>+# Whom:					Yuri <yuri@tsoft.com>
>+#
>+# $FreeBSD$
>+#   $MCom$
>+#
>+
>+PORTNAME=	sofia-sip
>+PORTVERSION=    1.12.11
>+CATEGORIES=	net-im
>+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTVERSION}
>+
>+MAINTAINER=	yuri@tsoft.com
>+COMMENT=	SIP telephony protocol library
>+
>+LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20
>+
>+BUILD_DEPENDS=	${LOCALBASE}/include/glib-2.0/gobject/gobject.h:${PORTSDIR}/devel/glib20
>+RUN_DEPENDS=    ${LOCALBASE}/lib/libglib-2.0.so.0:${PORTSDIR}/devel/glib20
>+
>+GNU_CONFIGURE=	yes
>+USE_GMAKE=	yes
>+USE_OPENSSL=	yes
>+CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS}" \
>+		LIBS="${PTHREAD_LIBS}" \
>+                CFLAGS=-I/usr/local/include
>+CONFIGURE_ARGS+=--prefix=${PREFIX}
>+
>+MAN1=		sip-date.1 sip-options.1 localinfo.1 addrinfo.1 stunc.1 sip-dig.1
>+
>+.include <bsd.port.mk>
>diff -ruN net-im.orig/sofia-sip/distinfo net-im/sofia-sip/distinfo
>--- net-im.orig/sofia-sip/distinfo	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/sofia-sip/distinfo	2011-06-19 16:36:25.000000000 -0700
>@@ -0,0 +1,2 @@
>+SHA256 (sofia-sip-1.12.11.tar.gz) = 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81
>+SIZE (sofia-sip-1.12.11.tar.gz) = 2927808
>diff -ruN net-im.orig/sofia-sip/files/patch-upstream-sres_blocking net-im/sofia-sip/files/patch-upstream-sres_blocking
>--- net-im.orig/sofia-sip/files/patch-upstream-sres_blocking	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/sofia-sip/files/patch-upstream-sres_blocking	2011-06-19 16:45:39.000000000 -0700
>@@ -0,0 +1,14 @@
>+--- libsofia-sip-ua/sresolv/sres_blocking.c.orig	2011-06-19 16:42:23.000000000 -0700
>++++ libsofia-sip-ua/sresolv/sres_blocking.c	2011-06-19 16:43:41.000000000 -0700
>+@@ -171,9 +171,9 @@
>+       sres_resolver_timer(c->resolver, -1);
>+     }
>+     else for (i = 0; i < c->block->n_sockets; i++) {
>+-      if (c->block->fds[i].revents | POLLERR)
>++      if (c->block->fds[i].revents & POLLERR)
>+ 	sres_resolver_error(c->resolver, c->block->fds[i].fd);
>+-      if (c->block->fds[i].revents | POLLIN)
>++      if (c->block->fds[i].revents & POLLIN)
>+ 	sres_resolver_receive(c->resolver, c->block->fds[i].fd);
>+     }
>+ #elif HAVE_SELECT
>diff -ruN net-im.orig/sofia-sip/pkg-descr net-im/sofia-sip/pkg-descr
>--- net-im.orig/sofia-sip/pkg-descr	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/sofia-sip/pkg-descr	2011-06-19 16:49:02.000000000 -0700
>@@ -0,0 +1,11 @@
>+Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF
>+RFC3261 specification (see the feature table). It can be used as a building
>+block for SIP client software for uses such as VoIP, IM, and many other
>+real-time and person-to-person communication services. The primary target
>+platform for Sofia-SIP is GNU/Linux. Sofia-SIP is based on a SIP stack
>+developed at the Nokia Research Center. Sofia-SIP is licensed under the LGPL.
>+
>+WWW: http://sofia-sip.sourceforge.net/
>+
>+- Yuri
>+yuri@tsoft.com
>diff -ruN net-im.orig/sofia-sip/pkg-plist net-im/sofia-sip/pkg-plist
>--- net-im.orig/sofia-sip/pkg-plist	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/sofia-sip/pkg-plist	2011-06-18 15:40:26.000000000 -0700
>@@ -0,0 +1,135 @@
>+bin/addrinfo
>+bin/localinfo
>+bin/stunc
>+bin/sip-options
>+bin/sip-date
>+bin/sip-dig
>+share/sofia-sip/tag_dll.awk
>+share/sofia-sip/msg_parser.awk
>+include/sofia-sip-1.12/sofia-sip/su_types.h
>+include/sofia-sip-1.12/sofia-sip/su.h
>+include/sofia-sip-1.12/sofia-sip/su_errno.h
>+include/sofia-sip-1.12/sofia-sip/su_addrinfo.h
>+include/sofia-sip-1.12/sofia-sip/su_localinfo.h
>+include/sofia-sip-1.12/sofia-sip/su_wait.h
>+include/sofia-sip-1.12/sofia-sip/su_alloc.h
>+include/sofia-sip-1.12/sofia-sip/su_alloc_stat.h
>+include/sofia-sip-1.12/sofia-sip/su_strlst.h
>+include/sofia-sip-1.12/sofia-sip/su_vector.h
>+include/sofia-sip-1.12/sofia-sip/su_time.h
>+include/sofia-sip-1.12/sofia-sip/su_tag.h
>+include/sofia-sip-1.12/sofia-sip/su_tag_class.h
>+include/sofia-sip-1.12/sofia-sip/su_tagarg.h
>+include/sofia-sip-1.12/sofia-sip/su_tag_io.h
>+include/sofia-sip-1.12/sofia-sip/su_tag_inline.h
>+include/sofia-sip-1.12/sofia-sip/htable.h
>+include/sofia-sip-1.12/sofia-sip/htable2.h
>+include/sofia-sip-1.12/sofia-sip/rbtree.h
>+include/sofia-sip-1.12/sofia-sip/heap.h
>+include/sofia-sip-1.12/sofia-sip/su_debug.h
>+include/sofia-sip-1.12/sofia-sip/su_log.h
>+include/sofia-sip-1.12/sofia-sip/su_config.h
>+include/sofia-sip-1.12/sofia-sip/su_bm.h
>+include/sofia-sip-1.12/sofia-sip/su_md5.h
>+include/sofia-sip-1.12/sofia-sip/su_uniqueid.h
>+include/sofia-sip-1.12/sofia-sip/tstdef.h
>+include/sofia-sip-1.12/sofia-sip/su_os_nw.h
>+include/sofia-sip-1.12/sofia-sip/su_string.h
>+include/sofia-sip-1.12/sofia-sip/string0.h
>+include/sofia-sip-1.12/sofia-sip/su_configure.h
>+include/sofia-sip-1.12/sofia-sip/sofia_features.h
>+include/sofia-sip-1.12/sofia-sip/bnf.h
>+include/sofia-sip-1.12/sofia-sip/hostdomain.h
>+include/sofia-sip-1.12/sofia-sip/sresolv.h
>+include/sofia-sip-1.12/sofia-sip/sres_sip.h
>+include/sofia-sip-1.12/sofia-sip/base64.h
>+include/sofia-sip-1.12/sofia-sip/token64.h
>+include/sofia-sip-1.12/sofia-sip/uniqueid.h
>+include/sofia-sip-1.12/sofia-sip/sdp.h
>+include/sofia-sip-1.12/sofia-sip/sdp_tag.h
>+include/sofia-sip-1.12/sofia-sip/url.h
>+include/sofia-sip-1.12/sofia-sip/url_tag.h
>+include/sofia-sip-1.12/sofia-sip/url_tag_class.h
>+include/sofia-sip-1.12/sofia-sip/msg_protos.h
>+include/sofia-sip-1.12/sofia-sip/msg_mime_protos.h
>+include/sofia-sip-1.12/sofia-sip/msg.h
>+include/sofia-sip-1.12/sofia-sip/msg_header.h
>+include/sofia-sip-1.12/sofia-sip/msg_types.h
>+include/sofia-sip-1.12/sofia-sip/msg_mclass.h
>+include/sofia-sip-1.12/sofia-sip/msg_mclass_hash.h
>+include/sofia-sip-1.12/sofia-sip/msg_parser.h
>+include/sofia-sip-1.12/sofia-sip/msg_addr.h
>+include/sofia-sip-1.12/sofia-sip/msg_date.h
>+include/sofia-sip-1.12/sofia-sip/msg_buffer.h
>+include/sofia-sip-1.12/sofia-sip/msg_tag_class.h
>+include/sofia-sip-1.12/sofia-sip/msg_mime.h
>+include/sofia-sip-1.12/sofia-sip/sip_hclasses.h
>+include/sofia-sip-1.12/sofia-sip/sip_protos.h
>+include/sofia-sip-1.12/sofia-sip/sip_tag.h
>+include/sofia-sip-1.12/sofia-sip/sip_extra.h
>+include/sofia-sip-1.12/sofia-sip/sip.h
>+include/sofia-sip-1.12/sofia-sip/sip_util.h
>+include/sofia-sip-1.12/sofia-sip/sip_header.h
>+include/sofia-sip-1.12/sofia-sip/sip_parser.h
>+include/sofia-sip-1.12/sofia-sip/sip_tag_class.h
>+include/sofia-sip-1.12/sofia-sip/sip_status.h
>+include/sofia-sip-1.12/sofia-sip/sip_hclasses.h.in
>+include/sofia-sip-1.12/sofia-sip/sip_protos.h.in
>+include/sofia-sip-1.12/sofia-sip/sip_tag.h.in
>+include/sofia-sip-1.12/sofia-sip/sip_extra.h.in
>+include/sofia-sip-1.12/sofia-sip/http_protos.h
>+include/sofia-sip-1.12/sofia-sip/http_tag.h
>+include/sofia-sip-1.12/sofia-sip/http.h
>+include/sofia-sip-1.12/sofia-sip/http_header.h
>+include/sofia-sip-1.12/sofia-sip/http_parser.h
>+include/sofia-sip-1.12/sofia-sip/http_tag_class.h
>+include/sofia-sip-1.12/sofia-sip/http_status.h
>+include/sofia-sip-1.12/sofia-sip/http_hclasses.h
>+include/sofia-sip-1.12/sofia-sip/stun.h
>+include/sofia-sip-1.12/sofia-sip/stun_common.h
>+include/sofia-sip-1.12/sofia-sip/stun_tag.h
>+include/sofia-sip-1.12/sofia-sip/soa.h
>+include/sofia-sip-1.12/sofia-sip/soa_session.h
>+include/sofia-sip-1.12/sofia-sip/soa_add.h
>+include/sofia-sip-1.12/sofia-sip/soa_tag.h
>+include/sofia-sip-1.12/sofia-sip/tport.h
>+include/sofia-sip-1.12/sofia-sip/tport_tag.h
>+include/sofia-sip-1.12/sofia-sip/tport_plugins.h
>+include/sofia-sip-1.12/sofia-sip/nta.h
>+include/sofia-sip-1.12/sofia-sip/nta_stateless.h
>+include/sofia-sip-1.12/sofia-sip/nta_tport.h
>+include/sofia-sip-1.12/sofia-sip/nta_tag.h
>+include/sofia-sip-1.12/sofia-sip/sl_utils.h
>+include/sofia-sip-1.12/sofia-sip/nth.h
>+include/sofia-sip-1.12/sofia-sip/nth_tag.h
>+include/sofia-sip-1.12/sofia-sip/nea.h
>+include/sofia-sip-1.12/sofia-sip/nea_tag.h
>+include/sofia-sip-1.12/sofia-sip/auth_common.h
>+include/sofia-sip-1.12/sofia-sip/auth_client.h
>+include/sofia-sip-1.12/sofia-sip/auth_digest.h
>+include/sofia-sip-1.12/sofia-sip/auth_module.h
>+include/sofia-sip-1.12/sofia-sip/auth_plugin.h
>+include/sofia-sip-1.12/sofia-sip/auth_client_plugin.h
>+include/sofia-sip-1.12/sofia-sip/nua.h
>+include/sofia-sip-1.12/sofia-sip/nua_tag.h
>+include/sofia-sip-1.12/sofia-sip/su_source.h
>+include/sofia-sip-1.12/sofia-sip/su_glib.h
>+include/sofia-sip-1.12/sofia-resolv/sres.h
>+include/sofia-sip-1.12/sofia-resolv/sres_config.h
>+include/sofia-sip-1.12/sofia-resolv/sres_async.h
>+include/sofia-sip-1.12/sofia-resolv/sres_cache.h
>+include/sofia-sip-1.12/sofia-resolv/sres_record.h
>+lib/libsofia-sip-ua.so.6
>+lib/libsofia-sip-ua.so
>+lib/libsofia-sip-ua.la
>+lib/libsofia-sip-ua.a
>+lib/libsofia-sip-ua-glib.so.3
>+lib/libsofia-sip-ua-glib.so
>+lib/libsofia-sip-ua-glib.la
>+lib/libsofia-sip-ua-glib.a
>+lib/pkgconfig/sofia-sip-ua.pc
>+lib/pkgconfig/sofia-sip-ua-glib.pc
>+@dirrm include/sofia-sip-1.12/sofia-resolv
>+@dirrm include/sofia-sip-1.12/sofia-sip
>+@dirrm include/sofia-sip-1.12
>+@dirrm share/sofia-sip
>diff -ruN net-im.orig/telepathy-sofiasip/Makefile net-im/telepathy-sofiasip/Makefile
>--- net-im.orig/telepathy-sofiasip/Makefile	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/telepathy-sofiasip/Makefile	2011-06-19 22:28:47.000000000 -0700
>@@ -0,0 +1,29 @@
>+# New ports collection makefile for:	telepathy-sofiasip
>+# Date created:				June 20 2011
>+# Whom:					Yuri <yuri@tsoft.com>
>+#
>+# $FreeBSD$
>+#   $MCom$
>+#
>+
>+PORTNAME=	telepathy-sofiasip
>+PORTVERSION=    0.4.5
>+CATEGORIES=	net-im
>+MASTER_SITES=      ${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=tp-sofiasip/${PORTNAME}/${PORTVERSION}
>+
>+MAINTAINER=	yuri@tsoft.com
>+COMMENT=	SIP (sofia-sip) Connection Manager for Telepathy Framework
>+
>+LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20
>+
>+BUILD_DEPENDS=	${LOCALBASE}/include/sofia-sip-1.12/sofia-sip/su.h:${PORTSDIR}/net-im/sofia-sip
>+RUN_DEPENDS=	${LOCALBASE}/lib/libsofia-sip-ua.so:${PORTSDIR}/net-im/sofia-sip
>+
>+GNU_CONFIGURE=	yes
>+USE_GMAKE=	yes
>+USE_OPENSSL=	yes
>+CONFIGURE_ENV=	CFLAGS=-I/usr/local/include
>+CONFIGURE_ARGS+=--prefix=${PREFIX}
>+
>+.include <bsd.port.mk>
>diff -ruN net-im.orig/telepathy-sofiasip/distinfo net-im/telepathy-sofiasip/distinfo
>--- net-im.orig/telepathy-sofiasip/distinfo	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/telepathy-sofiasip/distinfo	2011-06-19 16:57:50.000000000 -0700
>@@ -0,0 +1,2 @@
>+SHA256 (telepathy-sofiasip-0.4.5.tar.gz) = f9baca55d9c5c1ca8f70b2907ec865498081db005bab3a08c952a1e92146bb27
>+SIZE (telepathy-sofiasip-0.4.5.tar.gz) = 419746
>diff -ruN net-im.orig/telepathy-sofiasip/pkg-descr net-im/telepathy-sofiasip/pkg-descr
>--- net-im.orig/telepathy-sofiasip/pkg-descr	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/telepathy-sofiasip/pkg-descr	2011-06-19 16:50:23.000000000 -0700
>@@ -0,0 +1,11 @@
>+Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF
>+RFC3261 specification (see the feature table). It can be used as a building
>+block for SIP client software for uses such as VoIP, IM, and many other
>+real-time and person-to-person communication services. The primary target
>+platform for Sofia-SIP is GNU/Linux. Sofia-SIP is based on a SIP stack
>+developed at the Nokia Research Center. Sofia-SIP is licensed under the LGPL.
>+
>+WWW: http://sofia-sip.sourceforge.net/
>+
>+- Yuri
>+yuri@tsoft.com
>diff -ruN net-im.orig/telepathy-sofiasip/pkg-plist net-im/telepathy-sofiasip/pkg-plist
>--- net-im.orig/telepathy-sofiasip/pkg-plist	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/telepathy-sofiasip/pkg-plist	2011-06-19 17:03:59.000000000 -0700
>@@ -0,0 +1,5 @@
>+bin/telepathy-sofiasip
>+share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.sofiasip.service
>+share/telepathy/managers/sofiasip.manager
>+@dirrmtry share/telepathy/managers
>+@dirrmtry share/telepathy

Actions: View | Diff

Attachments on bug 158061: 116147