Attachment #200556 for bug #234123

View | Details | Raw Unified | Return to bug 234123
Collapse All | Expand All

Lines 1-7 Link Here

(-)ejabberd/Makefile (-3 / +12 lines)
1	# $FreeBSD: head/net-im/ejabberd/Makefile 487283 2018-12-12 08:15:08Z ashish $	1	# $FreeBSD: head/net-im/ejabberd/Makefile 487283 2018-12-12 08:15:08Z ashish $
2		2
3	PORTNAME= ejabberd	3	PORTNAME= ejabberd
4	PORTVERSION= 18.12	4	PORTVERSION= 18.12.1
5	CATEGORIES= net-im	5	CATEGORIES= net-im
6		6
7	MAINTAINER= ashish@FreeBSD.org	7	MAINTAINER= ashish@FreeBSD.org
Lines 18-28 Link Here
18	libpng.so:graphics/png \	18	libpng.so:graphics/png \
19	libwebp.so:graphics/webp	19	libwebp.so:graphics/webp
20		20
		21	USES= cpe gmake pkgconfig shebangfix ssl jpeg autoreconf:build
		22
21	USERS= ejabberd	23	USERS= ejabberd
22	GROUPS= ${USERS}	24	GROUPS= ${USERS}
23		25
24	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
25	USES= cpe gmake pkgconfig shebangfix ssl jpeg autoreconf:build
26	USE_RC_SUBR= ${PORTNAME}	27	USE_RC_SUBR= ${PORTNAME}
27	NOPRECIOUSMAKEVARS= yes	28	NOPRECIOUSMAKEVARS= yes
28	CPE_VENDOR= process-one	29	CPE_VENDOR= process-one
Lines 116-122 Link Here
116	SQLITE3_VER= 1.1.6	117	SQLITE3_VER= 1.1.6
117	STRINGPREP_VER= 1.0.14	118	STRINGPREP_VER= 1.0.14
118	STUN_VER= 1.0.26	119	STUN_VER= 1.0.26
119	XMPP_VER= 1.2.7	120	XMPP_VER= 1.2.8
120		121
121	OPTIONS_SUB= yes	122	OPTIONS_SUB= yes
122	RIAK_DESC= Riak database support	123	RIAK_DESC= Riak database support
Lines 154-159 Link Here
154	ICONV_USES= iconv:wchar_t	155	ICONV_USES= iconv:wchar_t
155	ICONV_LDFLAGS= ${ICONV_LIB}	156	ICONV_LDFLAGS= ${ICONV_LIB}
156	DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes	157	DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes
		158
		159	pre-everything::
		160	@if pkg query %n-%v net-im/ejabberd; then \
		161	${ECHO_MSG} needs to be uninstalled, before this port build could proceed. ; \
		162	${ECHO_MSG} For details: https://github.com/processone/ejabberd/issues/2194 ; \
		163	${ECHO_MSG} Sorry for the inconvenience. ; \
		164	exit 1; \
		165	fi
157		166
158	post-patch:	167	post-patch:
159	@${REINPLACE_CMD} -e 's,^convert,${LOCALBASE}/bin/convert,' ${WRKSRC}/tools/captcha.sh	168	@${REINPLACE_CMD} -e 's,^convert,${LOCALBASE}/bin/convert,' ${WRKSRC}/tools/captcha.sh

Lines 1-6 Link Here

(-)ejabberd/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1544595554	1	TIMESTAMP = 1545907645
2	SHA256 (processone-ejabberd-18.12_GH0.tar.gz) = 9a9ca33dd2d8dc580ae10765449d71201dea6b3c7ca86f4710f5046545e0b271	2	SHA256 (processone-ejabberd-18.12.1_GH0.tar.gz) = 7646d6acd3c0b94e4ed5e1d1c61a32bb4026b90a752942b7f80157d1fa014a97
3	SIZE (processone-ejabberd-18.12_GH0.tar.gz) = 1779381	3	SIZE (processone-ejabberd-18.12.1_GH0.tar.gz) = 1781813
4	SHA256 (erlang-lager-lager-3.6.7_GH0.tar.gz) = 74af1b94f87882128e584c25162a497ccffc1f255840db2c69fc4f9c20c523cb	4	SHA256 (erlang-lager-lager-3.6.7_GH0.tar.gz) = 74af1b94f87882128e584c25162a497ccffc1f255840db2c69fc4f9c20c523cb
5	SIZE (erlang-lager-lager-3.6.7_GH0.tar.gz) = 266527	5	SIZE (erlang-lager-lager-3.6.7_GH0.tar.gz) = 266527
6	SHA256 (processone-p1_utils-1.0.13_GH0.tar.gz) = 8f21fc0472c314572ebb066d624cb5463cf5b016e18b7fd7dca9dca2a4589382	6	SHA256 (processone-p1_utils-1.0.13_GH0.tar.gz) = 8f21fc0472c314572ebb066d624cb5463cf5b016e18b7fd7dca9dca2a4589382
Lines 13-20 Link Here
13	SIZE (processone-stringprep-1.0.14_GH0.tar.gz) = 95662	13	SIZE (processone-stringprep-1.0.14_GH0.tar.gz) = 95662
14	SHA256 (processone-fast_xml-1.1.34_GH0.tar.gz) = 8615f77a1448e297af25f85261b6e4a84952af797da2e317c8ec71fe2fe779ac	14	SHA256 (processone-fast_xml-1.1.34_GH0.tar.gz) = 8615f77a1448e297af25f85261b6e4a84952af797da2e317c8ec71fe2fe779ac
15	SIZE (processone-fast_xml-1.1.34_GH0.tar.gz) = 93530	15	SIZE (processone-fast_xml-1.1.34_GH0.tar.gz) = 93530
16	SHA256 (processone-xmpp-1.2.7_GH0.tar.gz) = 18225169e4550e9b11d9da98c65a51771ed710cab8ea51b62380563ed818e7fe	16	SHA256 (processone-xmpp-1.2.8_GH0.tar.gz) = 75c12a71153905ca53d7b732fb5d0589cf0dc3d045d1f8d343023db42f94c688
17	SIZE (processone-xmpp-1.2.7_GH0.tar.gz) = 460260	17	SIZE (processone-xmpp-1.2.8_GH0.tar.gz) = 460500
18	SHA256 (processone-fast_yaml-1.0.17_GH0.tar.gz) = d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08	18	SHA256 (processone-fast_yaml-1.0.17_GH0.tar.gz) = d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08
19	SIZE (processone-fast_yaml-1.0.17_GH0.tar.gz) = 49925	19	SIZE (processone-fast_yaml-1.0.17_GH0.tar.gz) = 49925
20	SHA256 (davisp-jiffy-0.14.8_GH0.tar.gz) = 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d	20	SHA256 (davisp-jiffy-0.14.8_GH0.tar.gz) = 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d




--- Makefile.in.orig	2018-12-21 09:44:15 UTC
+++ Makefile.in
@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
 LIBDIR =  $(DESTDIR)@libdir@

 
 # /share/doc/ejabberd
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -62,10 +62,10 @@ SQLDIR = $(PRIVDIR)/sql
 LUADIR = $(PRIVDIR)/lua
 
 # /var/lib/ejabberd/
-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd

 
 # /var/lib/ejabberd/.erlang.cookie
 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
@@ -132,7 +132,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(
 VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
 
 ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))

 MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
 TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
 TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
@@ -202,9 +202,7 @@ install: all copy-files
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)

 	$(SED) -e "s*{{rootdir}}*@prefix@*g" \
 		-e "s*{{installuser}}*@INSTALLUSER@*g" \
 		-e "s*{{bindir}}*@bindir@*g" \
@@ -213,16 +211,15 @@ install: all copy-files
 		-e "s*{{localstatedir}}*@localstatedir@*g" \
 		-e "s*{{docdir}}*@docdir@*g" \
 		-e "s*{{erl}}*@ERL@*g" \

 	# Elixir binaries
 	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
 	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
@@ -257,11 +254,13 @@ install: all copy-files
 	chmod -R 750 $(LOGDIR)
 	#
 	# Documentation

Lines 1-11 Link Here

(-)ejabberd/files/patch-configure.ac (-3 / +3 lines)
1	--- configure.ac.orig 2018-04-25 10:30:00 UTC	1	--- configure.ac.orig 2018-12-21 09:44:15 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4	# Process this file with autoconf to produce a configure script.	4	# Process this file with autoconf to produce a configure script.
5		5
6	AC_PREREQ(2.53)	6	AC_PREREQ(2.53)
7	-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null \|\| echo 0.0` \| sed 's/-g.*//;s/-/./' \| tr -d '\012']), [ejabberd@process-one.net], [ejabberd])	7	-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null \|\| echo 0.0` \| sed 's/-g.*//;s/-/./' \| tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
8	+AC_INIT(ejabberd, %%PORTVERSION%%, [ejabberd@process-one.net], [ejabberd])	8	+AC_INIT(ejabberd, 18.12.1, [ejabberd@process-one.net], [ejabberd])
9	REQUIRE_ERLANG_MIN="6.4 (Erlang/OTP 17.5)"	9	REQUIRE_ERLANG_MIN="8.0 (Erlang/OTP 19.0)"
10	REQUIRE_ERLANG_MAX="100.0.0 (No Max)"	10	REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
11		11

Lines 1-6 Link Here

(-)ejabberd/files/patch-ejabberdctl.template (-3 / +3 lines)
1	--- ejabberdctl.template.orig 2017-12-14 20:47:43 UTC	1	--- ejabberdctl.template.orig 2018-12-27 10:21:03 UTC
2	+++ ejabberdctl.template	2	+++ ejabberdctl.template
3	@@ -58,8 +58,8 @@ done	3	@@ -56,8 +56,8 @@ done
4		4
5	# define ejabberd variables if not already defined from the command line	5	# define ejabberd variables if not already defined from the command line
6	: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"	6	: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
Lines 11-17 Link Here
11	: "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"	11	: "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
12	: "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"	12	: "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
13	[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"	13	[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
14	@@ -79,7 +79,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then	14	@@ -77,7 +77,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
15	ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"	15	ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
16	fi	16	fi
17	fi	17	fi

Lines 247-252 Link Here

(-)ejabberd/pkg-plist (+1 lines)
247	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_router.hrl	247	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_router.hrl
248	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sm.hrl	248	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sm.hrl
249	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sql_pt.hrl	249	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sql_pt.hrl
		250	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_stacktrace.hrl
250	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_web_admin.hrl	251	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_web_admin.hrl
251	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/eldap.hrl	252	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/eldap.hrl
252	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/http_bind.hrl	253	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/http_bind.hrl

Return to bug 234123

Lines 1-4 Link Here

(-)ejabberd/files/patch-Makefile.in (-7 / +7 lines)
1	--- Makefile.in.orig 2017-11-20 12:14:44 UTC	1	--- Makefile.in.orig 2018-12-21 09:44:15 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@	3	@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
4	LIBDIR = $(DESTDIR)@libdir@	4	LIBDIR = $(DESTDIR)@libdir@
Lines 9-16 Link Here
9		9
10	# /share/doc/ejabberd	10	# /share/doc/ejabberd
11	PACKAGE_TARNAME = @PACKAGE_TARNAME@	11	PACKAGE_TARNAME = @PACKAGE_TARNAME@
12	@@ -59,10 +59,10 @@ JSDIR = $(PRIVDIR)/js	12	@@ -62,10 +62,10 @@ SQLDIR = $(PRIVDIR)/sql
13	SQLDIR = $(PRIVDIR)/sql	13	LUADIR = $(PRIVDIR)/lua
14		14
15	# /var/lib/ejabberd/	15	# /var/lib/ejabberd/
16	-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd	16	-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
Lines 23-29 Link Here
23		23
24	# /var/lib/ejabberd/.erlang.cookie	24	# /var/lib/ejabberd/.erlang.cookie
25	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie	25	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
26	@@ -123,7 +123,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),	26	@@ -132,7 +132,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(
27	VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))	27	VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
28		28
29	ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))	29	ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
Lines 32-38 Link Here
32	MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)	32	MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
33	TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))	33	TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
34	TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))	34	TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
35	@@ -183,9 +183,7 @@ install: all copy-files	35	@@ -202,9 +202,7 @@ install: all copy-files
36	#	36	#
37	# Configuration files	37	# Configuration files
38	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)	38	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
Lines 43-49 Link Here
43	$(SED) -e "s{{rootdir}}@prefix@*g" \	43	$(SED) -e "s{{rootdir}}@prefix@*g" \
44	-e "s{{installuser}}@INSTALLUSER@*g" \	44	-e "s{{installuser}}@INSTALLUSER@*g" \
45	-e "s{{bindir}}@bindir@*g" \	45	-e "s{{bindir}}@bindir@*g" \
46	@@ -194,16 +192,15 @@ install: all copy-files	46	@@ -213,16 +211,15 @@ install: all copy-files
47	-e "s{{localstatedir}}@localstatedir@*g" \	47	-e "s{{localstatedir}}@localstatedir@*g" \
48	-e "s{{docdir}}@docdir@*g" \	48	-e "s{{docdir}}@docdir@*g" \
49	-e "s{{erl}}@ERL@*g" \	49	-e "s{{erl}}@ERL@*g" \
Lines 64-70 Link Here
64	# Elixir binaries	64	# Elixir binaries
65	[ -d $(BINDIR) ] \|\| $(INSTALL) -d -m 755 $(BINDIR)	65	[ -d $(BINDIR) ] \|\| $(INSTALL) -d -m 755 $(BINDIR)
66	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex \|\| true	66	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex \|\| true
67	@@ -238,11 +235,13 @@ install: all copy-files	67	@@ -257,11 +254,13 @@ install: all copy-files
68	chmod -R 750 $(LOGDIR)	68	chmod -R 750 $(LOGDIR)
69	#	69	#
70	# Documentation	70	# Documentation