Attachment 119431 Details for Bug 161962 – file.diff

[patch] file.diff

file.diff (text/plain), 8.25 KB, created by R.Mahmatkhanov on 2011-10-24 13:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2011-10-24 13:40:00 UTC

Size: 8.25 KB

patch

obsolete

>diff --git a/Makefile b/Makefile
>index 3345efd..338d0c9 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -6,14 +6,16 @@
> #
> 
> PORTNAME=	ejabberd
>-PORTVERSION=	2.1.8
>-PORTREVISION=	2
>+PORTVERSION=	2.1.9
> CATEGORIES=	net-im
> MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
> 
> MAINTAINER=	ashish@FreeBSD.org
> COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
>+
> BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
> RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
> LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
>@@ -40,9 +42,6 @@ SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
> 		USERS=${USERS} GROUPS=${GROUPS}
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
> 
>-LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
>-
> .include <bsd.port.pre.mk>
> 
> USE_OPENSSL=	yes
>diff --git a/distinfo b/distinfo
>index 700c776..3f0b39c 100644
>--- a/distinfo
>+++ b/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (ejabberd-2.1.8.tar.gz) = dedf7684f9e96efbbc12f08f175096ef50b3f75b284bd27d172eaf75cecded7f
>-SIZE (ejabberd-2.1.8.tar.gz) = 3382833
>+SHA256 (ejabberd-2.1.9.tar.gz) = f97f2daad497d9d9979455b67ce31e2ddbd3a3cd638a97b2e1d76a6ac8758781
>+SIZE (ejabberd-2.1.9.tar.gz) = 1872544
>diff --git a/files/patch-.._ebin_ejabberd.app b/files/patch-.._ebin_ejabberd.app
>deleted file mode 100644
>index 4b146ce..0000000
>--- a/files/patch-.._ebin_ejabberd.app
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/net-im/ejabberd/files/patch-.._ebin_ejabberd.app,v 1.1 2011/06/24 13:49:46 ashish Exp $
>-
>---- ../ebin/ejabberd.app.orig
>-+++ ../ebin/ejabberd.app
>-@@ -2,7 +2,7 @@
>- 
>- {application, ejabberd,
>-  [{description, "ejabberd"},
>--  {vsn, "2.1.7"},
>-+  {vsn, "2.1.8"},
>-   {modules, [acl,
>- 	     adhoc,
>- 	     configure,
>diff --git a/files/patch-ejabberd.app b/files/patch-ejabberd.app
>deleted file mode 100644
>index 82b3297..0000000
>--- a/files/patch-ejabberd.app
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/net-im/ejabberd/files/patch-ejabberd.app,v 1.1 2011/06/24 13:49:46 ashish Exp $
>-
>---- ejabberd.app.orig
>-+++ ejabberd.app
>-@@ -2,7 +2,7 @@
>- 
>- {application, ejabberd,
>-  [{description, "ejabberd"},
>--  {vsn, "2.1.7"},
>-+  {vsn, "2.1.8"},
>-   {modules, [acl,
>- 	     adhoc,
>- 	     configure,
>diff --git a/pkg-descr b/pkg-descr
>index c6555ea..5f2b3b5 100644
>--- a/pkg-descr
>+++ b/pkg-descr
>@@ -1,4 +1,4 @@
>-ejabberd is a high performance Free and Open Source distributed 
>+ejabberd is a high performance Free and Open Source distributed
> fault-tolerant instant messaging Jabber server.
> 
> Key features include:
>diff --git a/pkg-plist b/pkg-plist
>index 7538abf..f831866 100644
>--- a/pkg-plist
>+++ b/pkg-plist
>@@ -4,6 +4,7 @@
> @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.defaults.example %D/%%ETCDIR%%/%%PORTNAME%%.defaults; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.defaults; fi
> @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; fi
> @exec [ ! -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc ] && cp %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc
>+%%PAM%%etc/pam.d/%%PORTNAME%%
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
>@@ -14,6 +15,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
>+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_scram.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
>@@ -43,6 +45,8 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_local.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_logger_h.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_loglevel.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_node_groups.beam
>+%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam
>+%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_piefxis.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_rdbms.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_receiver.beam
>@@ -61,18 +65,13 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_update.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web_admin.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_zlib.beam
>-%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam
>-%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam
>-%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam
>-%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/epam.beam
>-%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
>-%%PAM%%etc/pam.d/%%PORTNAME%%
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter_yecc.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_pool.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_utils.beam
>+%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/epam.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/extauth.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_iq_handler.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_mod.beam
>@@ -147,6 +146,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_dag.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree_odbc.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam
>+%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_fsm.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mnesia.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pg2_backport.beam
>@@ -155,6 +155,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription_odbc.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/randoms.beam
>+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/scram.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/sha.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/shaper.beam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep.beam
>@@ -184,6 +185,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_http.hrl
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_web_admin.hrl
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/http_bind.hrl
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/captcha.sh
>+%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/expat_erl.so
> lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/iconv_erl.so
>@@ -220,7 +222,6 @@ sbin/%%PORTNAME%%ctl
> %%PORTDOCS%%%%DOCSDIR%%/dev.html
> %%PORTDOCS%%%%DOCSDIR%%/discorus.png
> %%PORTDOCS%%%%DOCSDIR%%/guide.html
>-%%PORTDOCS%%%%DOCSDIR%%/guide.pdf
> %%PORTDOCS%%%%DOCSDIR%%/logo.png
> %%PORTDOCS%%%%DOCSDIR%%/msrl-dit-deep.png
> %%PORTDOCS%%%%DOCSDIR%%/msrl-dit-flat.png
>@@ -250,6 +251,7 @@ sbin/%%PORTNAME%%ctl
> %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.6.txt
> %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.7.txt
> %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.8.txt
>+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.9.txt
> %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
> %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
> %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png

Actions: View | Diff

Attachments on bug 161962: 119431