Attachment 169070 Details for Bug 208450 – proposed diff

[patch] proposed diff

ejabberd.diff (text/plain), 8.37 KB, created by Ashish SHUKLA on 2016-04-07 09:06:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2016-04-07 09:06:42 UTC

Size: 8.37 KB

patch

obsolete

>diff -urN /usr/ports/net-im/ejabberd/Makefile ejabberd/Makefile
>--- /usr/ports/net-im/ejabberd/Makefile	2016-04-01 19:47:44.000000000 +0530
>+++ ejabberd/Makefile	2016-04-07 14:19:30.302895824 +0530
>@@ -2,13 +2,12 @@
> # $FreeBSD: head/net-im/ejabberd/Makefile 412348 2016-04-01 14:17:44Z mat $
> 
> PORTNAME=	ejabberd
>-PORTVERSION=	16.02
>-PORTREVISION=	2
>+PORTVERSION=	16.03
> CATEGORIES=	net-im
> MASTER_SITES=	http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
> 		http://distfiles.pirateparty.in/ashish/:deps \
> 		LOCAL/ashish:deps
>-DISTFILES+=	${DISTNAME}.tgz:p1 ejabberd-deps-5.tar.xz:deps
>+DISTFILES+=	${DISTNAME}.tgz:p1 ejabberd-deps-6.tar.xz:deps
> 
> MAINTAINER=	ashish@FreeBSD.org
> COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
>@@ -32,7 +31,7 @@
> NOPRECIOUSMAKEVARS=	yes
> CPE_VENDOR=	process-one
> 
>-OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK REDIS SQLITE TOOLS FULLXML
>+OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK ZLIB REDIS SQLITE TOOLS FULLXML
> OPTIONS_DEFAULT=	ICONV
> 
> EJABBERD_LIBDIR=lib/erlang/lib
>@@ -67,6 +66,7 @@
> SQLITE_CONFIGURE_ENABLE=sqlite
> TOOLS_CONFIGURE_ENABLE=	tools
> FULLXML_CONFIGURE_ENABLE=	full-xml
>+ZLIB_CONFIGURE_ENABLE=	zlib
> SQLITE_USE=		SQLITE=yes
> ICONV_USES=		iconv:wchar_t
> ICONV_LDFLAGS=		${ICONV_LIB}
>diff -urN /usr/ports/net-im/ejabberd/distinfo ejabberd/distinfo
>--- /usr/ports/net-im/ejabberd/distinfo	2016-03-11 23:30:06.000000000 +0530
>+++ ejabberd/distinfo	2016-04-03 01:49:39.724794958 +0530
>@@ -1,4 +1,4 @@
>-SHA256 (ejabberd-16.02.tgz) = 98388050864d8c3717c581ece5381c473cd89729b7d0c2ee059735e9ff892a7a
>-SIZE (ejabberd-16.02.tgz) = 1679966
>-SHA256 (ejabberd-deps-5.tar.xz) = b2b53f165f3a1bb5aeb472ab0f3583175f8a7e7cb676c2b422e751aec4ff116e
>-SIZE (ejabberd-deps-5.tar.xz) = 24471888
>+SHA256 (ejabberd-16.03.tgz) = c253864e02ba5ca938ce3b0c8ca1b558a5349a163c196fa70fd5b78f5798e3a9
>+SIZE (ejabberd-16.03.tgz) = 1694054
>+SHA256 (ejabberd-deps-6.tar.xz) = 48dcf91af3854c58af5adf1c2194eab9e6c69ce5802b8a5885cbc587d3d84e71
>+SIZE (ejabberd-deps-6.tar.xz) = 24230724
>diff -urN /usr/ports/net-im/ejabberd/pkg-plist ejabberd/pkg-plist
>--- /usr/ports/net-im/ejabberd/pkg-plist	2016-03-14 11:07:05.000000000 +0530
>+++ ejabberd/pkg-plist	2016-04-07 14:21:04.174889314 +0530
>@@ -62,6 +62,7 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_odbc.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_redis.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_socket.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql_pt.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_system_monitor.beam
>@@ -77,6 +78,7 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter_yecc.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_pool.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_utils.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/elixir_logger_backend.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/ext_mod.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/extauth.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_iq_handler.beam
>@@ -109,6 +111,7 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mam.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_metrics.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log.beam
>@@ -150,6 +153,8 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_hometree.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_hometree_odbc.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mb.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mix.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mix_odbc.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_online.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_pep.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_pep_odbc.beam
>@@ -182,6 +187,7 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_ctl.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_http.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sm.hrl
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sql_pt.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_web_admin.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/eldap.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/http_bind.hrl
>@@ -229,11 +235,11 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-1.0.2/include/esip.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-1.0.2/include/esip_lib.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-1.0.2/priv/lib/esip_drv.so
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib.app
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib_app.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib_sup.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/priv/lib/ezlib_drv.so
>+%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib.app
>+%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib.beam
>+%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib_app.beam
>+%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/ebin/ezlib_sup.beam
>+%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-1.0.1/priv/lib/ezlib_drv.so
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-1.0.1/ebin/fast_tls.app
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-1.0.1/ebin/fast_tls.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-1.0.1/ebin/fast_tls_app.beam
>@@ -253,11 +259,11 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-1.1.3/include/fxml_gen.hrl
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-1.1.3/priv/lib/fxml.so
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-1.1.3/priv/lib/fxml_stream.so
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.1/ebin/fast_yaml.app
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.1/ebin/fast_yaml.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.1/ebin/fast_yaml_app.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.1/ebin/fast_yaml_sup.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.1/priv/lib/fast_yaml.so
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.3/ebin/fast_yaml.app
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.3/ebin/fast_yaml.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.3/ebin/fast_yaml_app.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.3/ebin/fast_yaml_sup.beam
>+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-1.0.3/priv/lib/fast_yaml.so
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-0.1.7/ebin/glc.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-0.1.7/ebin/glc_code.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-0.1.7/ebin/glc_lib.beam
>@@ -319,7 +325,6 @@
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib_basic.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib_bit32.beam
>-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib_debug.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib_io.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib_math.beam
> %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-1/ebin/luerl_lib_os.beam

Actions: View | Diff

Attachments on bug 208450: 169070