Attachment 175612 Details for Bug 212729 – svn diff for version 1.6.11

[patch] svn diff for version 1.6.11

freeswitch-1.6.11.svn.diff.txt (text/plain), 10.66 KB, created by Šimun Mikecin on 2016-10-11 08:07:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Šimun Mikecin

Created: 2016-10-11 08:07:26 UTC

Size: 10.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 423642)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	freeswitch
>-PORTVERSION=	1.6.8
>-PORTREVISION=	1
>+PORTVERSION=	1.6.11
> CATEGORIES=	net
> MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
> 		http://files.freeswitch.org/releases/sounds/:sounds
>@@ -17,10 +16,14 @@
> LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
> 		libcurl.so:ftp/curl \
> 		libpcre.so:devel/pcre \
>+		libspeexdsp.so:audio/speexdsp \
> 		libspeex.so:audio/speex \
> 		libldns.so:dns/ldns \
> 		libopus.so:audio/opus \
>-		libsndfile.so:audio/libsndfile
>+		libsndfile.so:audio/libsndfile \
>+		libfreetype.so:print/freetype2 \
>+		libpng16.so:graphics/png \
>+		libjbig.so:graphics/jbigkit
> 
> CONFLICTS_BUILD=	xmlrpc-c-*
> 
>@@ -27,7 +30,7 @@
> BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
> ONLY_FOR_ARCHS=	amd64
> 
>-USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz
>+USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz iconv libedit ssl
> USE_LDCONFIG=	yes
> 
> ALL_MODULES_DESC=	Build all modules
>@@ -47,6 +50,7 @@
> NO_OPTIONS_SORT=	yes
> OPTIONS_SUB=		yes
> 
>+ALL_MODULES_CONFLICTS_BUILD+=	apr
> ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
> 
> GNU_CONFIGURE=		yes
>@@ -67,11 +71,13 @@
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MALL_MODULES}
>+USE_XORG=	x11
> BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
> 		${LOCALBASE}/bin/aclocal:devel/automake
> RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa
> LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
>-		libopencv_legacy.so:graphics/opencv2 \
>+		libopencv_gpu.so:graphics/opencv2 \
>+		libopencv_core.so:graphics/opencv2-core \
> 		libhiredis.so:databases/hiredis \
> 		libmemcached.so:databases/libmemcached \
> 		libSoundTouch.so:audio/soundtouch \
>@@ -84,9 +90,8 @@
> 		libnetsnmp.so:net-mgmt/net-snmp \
> 		libvlc.so:multimedia/vlc \
> 		libyaml.so:textproc/libyaml \
>-		libMagickWand-6.so:graphics/ImageMagick-nox11
>+		libMagickCore-6.so:graphics/ImageMagick-nox11
> USE_OPENLDAP=	yes
>-USE_OPENSSL=	yes
> .endif
> 
> EDPRE=	freeswitch-sounds
>Index: distinfo
>===================================================================
>--- distinfo	(revision 423642)
>+++ distinfo	(working copy)
>@@ -1,5 +1,6 @@
>-SHA256 (freeswitch-1.6.8.tar.xz) = a9834667c0afc164631611b4862acd6411e4e6ddb706e4af4b51eab4adbe4fc1
>-SIZE (freeswitch-1.6.8.tar.xz) = 33460304
>+TIMESTAMP = 1476110002
>+SHA256 (freeswitch-1.6.11.tar.xz) = c1744fbe8c5d0b478dc493f3b4c5eca8ba3a010df1de034eff738ffb2aea0668
>+SIZE (freeswitch-1.6.11.tar.xz) = 33467096
> SHA256 (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9
> SIZE (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 14619493
> SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
>Index: files/extrapatch-modules.conf
>===================================================================
>--- files/extrapatch-modules.conf	(revision 423642)
>+++ files/extrapatch-modules.conf	(working copy)
>@@ -1,17 +1,17 @@
>---- modules.conf.orig	2016-05-05 16:42:20.000000000 -0400
>-+++ modules.conf	2016-05-06 16:42:38.276496730 -0400
>-@@ -1,161 +1,161 @@
>+--- modules.conf.orig	2016-08-25 12:35:35 UTC
>++++ modules.conf
>+@@ -1,162 +1,162 @@
> -#applications/mod_abstraction
> -#applications/mod_av
> -#applications/mod_avmd
>-+applications/mod_abstraction
>-+applications/mod_av
>-+applications/mod_avmd
> -#applications/mod_bert
> -#applications/mod_blacklist
> -#applications/mod_callcenter
> -#applications/mod_cidlookup
> -#applications/mod_cluechoo
>++applications/mod_abstraction
>++applications/mod_av
>++applications/mod_avmd
> +applications/mod_bert
> +applications/mod_blacklist
> +applications/mod_callcenter
>@@ -69,6 +69,7 @@
> +applications/mod_redis
> +applications/mod_rss
>  applications/mod_sms
>+ #applications/mod_sms_flowroute
> -#applications/mod_snapshot
> -#applications/mod_snom
> -#applications/mod_sonar
>Index: files/freeswitch.in
>===================================================================
>--- files/freeswitch.in	(revision 423642)
>+++ files/freeswitch.in	(working copy)
>@@ -27,4 +27,8 @@
> 
> command_args="-nc"
> 
>+pidfile="/var/run/${name}/${name}.pid"
>+
>+stop_cmd="${command} -stop ; sleep 5 ; check_pidfile ${pidfile} ${command} | xargs kill -KILL ; rm ${pidfile}"
>+
> run_rc_command "$1"
>Index: files/patch-build_config_ltmain.sh
>===================================================================
>--- files/patch-build_config_ltmain.sh	(nonexistent)
>+++ files/patch-build_config_ltmain.sh	(working copy)
>@@ -0,0 +1,15 @@
>+--- build/config/ltmain.sh.orig	2016-08-25 12:36:38 UTC
>++++ build/config/ltmain.sh
>+@@ -2260,9 +2260,9 @@ func_mode_install ()
>+ 
>+       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
>+ 
>+-      if test -n "$stripme" && test -n "$old_striplib"; then
>+-	func_show_eval "$old_striplib $oldlib" 'exit $?'
>+-      fi
>++#      if test -n "$stripme" && test -n "$old_striplib"; then
>++#	func_show_eval "$old_striplib $oldlib" 'exit $?'
>++#      fi
>+ 
>+       # Do each command in the postinstall commands.
>+       func_execute_cmds "$old_postinstall_cmds" 'exit $?'
>
>Property changes on: files/patch-build_config_ltmain.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 423642)
>+++ files/patch-configure	(nonexistent)
>@@ -1,11 +0,0 @@
>---- configure.orig	2016-05-18 22:49:18.753911000 +0000
>-+++ configure	2016-05-18 22:49:38.480978000 +0000
>-@@ -20062,7 +20062,7 @@
>- fi
>- 
>- 
>--for luaversion in lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
>-+for luaversion in lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
>- 
>-   succeeded=no
>- 
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-libs_sofia-sip_config.h.in
>===================================================================
>--- files/patch-libs_sofia-sip_config.h.in	(nonexistent)
>+++ files/patch-libs_sofia-sip_config.h.in	(working copy)
>@@ -0,0 +1,12 @@
>+--- libs/sofia-sip/config.h.in.orig	2016-08-25 12:36:03 UTC
>++++ libs/sofia-sip/config.h.in
>+@@ -518,7 +518,9 @@
>+ #undef _POSIX_SOURCE
>+ 
>+ /* Little Endian */
>++#ifndef __BYTE_ORDER
>+ #undef __BYTE_ORDER
>++#endif
>+ 
>+ /* Define to empty if `const' does not conform to ANSI C. */
>+ #undef const
>
>Property changes on: files/patch-libs_sofia-sip_config.h.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c
>===================================================================
>--- files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c	(revision 423642)
>+++ files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c	(nonexistent)
>@@ -1,12 +0,0 @@
>---- src/mod/applications/mod_avmd/avmd_fast_acosf.c.orig	2016-05-05 20:42:20 UTC
>-+++ src/mod/applications/mod_avmd/avmd_fast_acosf.c
>-@@ -23,6 +23,9 @@
>- #include "avmd_fast_acosf.h"
>- #include "avmd_options.h"
>-
>-+#ifndef MAP_POPULATE
>-+#define MAP_POPULATE 0
>-+#endif
>-
>- typedef union {
>-     uint32_t i;
>
>Property changes on: files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_mod_applications_mod__http__cache_mod__http__cache.c
>===================================================================
>--- files/patch-src_mod_applications_mod__http__cache_mod__http__cache.c	(nonexistent)
>+++ files/patch-src_mod_applications_mod__http__cache_mod__http__cache.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/mod/applications/mod_http_cache/mod_http_cache.c.orig	2016-08-25 12:35:35 UTC
>++++ src/mod/applications/mod_http_cache/mod_http_cache.c
>+@@ -38,6 +38,8 @@
>+ 
>+ #include <stdlib.h>
>+ 
>++char *strndup(const char *str, size_t len);
>++
>+ /* 253 max domain size + '/' + NUL byte */
>+ #define DOMAIN_BUF_SIZE 255
>+ 
>
>Property changes on: files/patch-src_mod_applications_mod__http__cache_mod__http__cache.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 423642)
>+++ pkg-plist	(working copy)
>@@ -24,6 +24,7 @@
> include/freeswitch/switch_cpp.h
> include/freeswitch/switch_curl.h
> include/freeswitch/switch_dso.h
>+include/freeswitch/switch_estimators.h
> include/freeswitch/switch_event.h
> include/freeswitch/switch_frame.h
> include/freeswitch/switch_hashtable.h
>@@ -632,6 +633,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/acl.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/alsa.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/cdr_csv.conf.xml
>@@ -689,6 +691,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/shout.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/skinny.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/smpp.conf.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sms_flowroute.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/sofia.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/spandsp.conf.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/switch.conf.xml

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 212729: 174832 | 175030 | 175033 | 175059 | 175612