--- Makefile (revision 516111) +++ Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= prosody -PORTVERSION= 0.11.2 -PORTREVISION= 2 +PORTVERSION= 0.11.3 +PORTREVISION= 0 CATEGORIES= net-im MASTER_SITES= http://prosody.im/downloads/source/ \ http://redundancy.redundancy.org/mirror/ @@ -14,27 +14,30 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 \ - ${LUA_MODLIBDIR}/ssl.so:security/luasec-51 \ - ${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat-51 \ - ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51 \ - ${LUA_MODLIBDIR}/bit.so:devel/lua51-bitop +RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket \ + ${LUA_MODLIBDIR}/ssl.so:security/luasec \ + ${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat \ + ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \ + ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop LIB_DEPENDS= libidn.so:dns/libidn -USES= compiler:c11 cpe gmake lua:51 shebangfix ssl -SHEBANG_FILES= prosody prosodyctl +USES= compiler:c11 cpe gmake lua:52 ssl LUA_PREMK= yes HAS_CONFIGURE= yes -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -CONFIGURE_ARGS= --ostype=freebsd \ - --c-compiler="${CC}" \ - --linker="${CC}" \ - --with-lua-include="${LUA_INCDIR}" \ +CONFIGURE_ARGS= --prefix="${PREFIX}" \ + --datadir="/var/db/prosody" \ + --lua-version="${LUA_VER}" \ --lua-suffix="${LUA_VER_STR}" \ --with-lua-include="${LUA_INCDIR}" \ --with-lua-lib="${LUA_LIBDIR}" \ - --prefix="${PREFIX}" + --with-random=arc4random \ + --c-compiler="${CC}" \ + --cflags="${CFLAGS}" \ + --add-cflags="-fPIC -std=c99 -I/usr/local/include -I${OPENSSLINC}" \ + --linker="${CC}" \ + --ldflags="${LDFLAGS}" \ + --add-ldflags="-shared -L/usr/local/lib -L${OPENSSLLIB}" \ + --no-example-certs MAKEFILE= GNUmakefile USERS= prosody @@ -48,18 +51,6 @@ PROSODY_GROUP=${GROUPS} \ PROSODY_GROUP_regex=\b${GROUPS}\b -OPTIONS_DEFINE= LUAJIT -LUAJIT_DESC= Run prosody using luajit -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit - -.include - -.if ${PORT_OPTIONS:MLUAJIT} -lua_CMD= ${LOCALBASE}/bin/luajit -.else -lua_CMD= ${LOCALBASE}/bin/${LUA_CMD} -.endif - post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so --- distinfo (revision 516111) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548801952 -SHA256 (prosody-0.11.2.tar.gz) = 8911f6dc29b9e0c4edf9e61dc23fa22d77bc42c4caf28b809ab843b2f08e4831 -SIZE (prosody-0.11.2.tar.gz) = 420689 +TIMESTAMP = 1572266441 +SHA256 (prosody-0.11.3.tar.gz) = cfdabd6f42a9fc5db300221967c518c26bd4b6e62def721c1626894d6325bf87 +SIZE (prosody-0.11.3.tar.gz) = 424098 --- files/patch-GNUmakefile (revision 516111) +++ files/patch-GNUmakefile (working copy) @@ -1,5 +1,5 @@ ---- GNUmakefile.orig 2018-12-01 14:51:46.042219000 +0000 -+++ GNUmakefile 2018-12-01 14:52:30.212140000 +0000 +--- GNUmakefile.orig 2019-10-28 19:01:52.415208000 +0100 ++++ GNUmakefile 2019-10-28 19:02:47.367580000 +0100 @@ -6,7 +6,7 @@ MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules SOURCE = $(DESTDIR)$(LIBDIR)/prosody @@ -9,7 +9,7 @@ INSTALLEDSOURCE = $(LIBDIR)/prosody INSTALLEDCONFIG = $(SYSCONFDIR) -@@ -57,7 +57,7 @@ +@@ -57,9 +57,10 @@ $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam $(INSTALL_DATA) certs/* $(CONFIG)/certs $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 @@ -17,4 +17,7 @@ + $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version $(MAKE) install -C util-src ++ $(MAKE) install -C tools/migration + clean: + rm -f prosody.install --- files/pkg-deinstall.in (revision 516111) +++ files/pkg-deinstall.in (working copy) @@ -17,7 +17,7 @@ echo " pw groupdel -n %%GROUPS%%" echo "" echo " and to remove all server data:" - echo " rm -rf /usr/local/var/lib/prosody" + echo " rm -rf /var/db/prosody" echo "" ;; esac --- files/prosody.in (revision 516111) +++ files/prosody.in (working copy) @@ -15,13 +15,13 @@ . /etc/rc.subr name="prosody" -rcvar=prosody_enable -command="%%PREFIX%%/bin/prosodyctl" +rcvar="prosody_enable" +command="prosodyctl" load_rc_config $name prosody_enable=${prosody_enable:-"NO"} -pidfile=${prosody_pidfile:-"%%PREFIX%%/var/lib/prosody/prosody.pid"} +pidfile=${prosody_pidfile:-"/var/db/prosody/prosody.pid"} extra_commands="reload status" @@ -31,6 +31,8 @@ restart_cmd="$stop_cmd; $start_cmd" status_cmd="prosody_cmd status" +export PATH="%%PREFIX%%/bin:$PATH" + prosody_start() { config="%%PREFIX%%/etc/prosody/prosody.cfg.lua" --- pkg-plist (revision 516111) +++ pkg-plist (working copy) @@ -1,13 +1,11 @@ bin/prosody bin/prosodyctl +bin/prosody-migrator %%ETCDIR%%/certs/GNUmakefile -%%ETCDIR%%/certs/example.com.crt -%%ETCDIR%%/certs/example.com.key %%ETCDIR%%/certs/localhost.cnf -%%ETCDIR%%/certs/localhost.crt -%%ETCDIR%%/certs/localhost.key %%ETCDIR%%/certs/makefile %%ETCDIR%%/certs/openssl.cnf +@sample %%ETCDIR%%/migrator.cfg.lua.sample @sample %%ETCDIR%%/prosody.cfg.lua.sample %%LUA_LIBDIR%%/prosody/core/certmanager.lua %%LUA_LIBDIR%%/prosody/core/configmanager.lua @@ -23,6 +21,10 @@ %%LUA_LIBDIR%%/prosody/core/statsmanager.lua %%LUA_LIBDIR%%/prosody/core/storagemanager.lua %%LUA_LIBDIR%%/prosody/core/usermanager.lua +%%LUA_LIBDIR%%/prosody/migrator/jabberd14.lua +%%LUA_LIBDIR%%/prosody/migrator/mtools.lua +%%LUA_LIBDIR%%/prosody/migrator/prosody_files.lua +%%LUA_LIBDIR%%/prosody/migrator/prosody_sql.lua %%LUA_LIBDIR%%/prosody/modules/adhoc/adhoc.%%LUA_LIBDIR%%.lua %%LUA_LIBDIR%%/prosody/modules/adhoc/mod_adhoc.lua %%LUA_LIBDIR%%/prosody/modules/mod_admin_adhoc.lua @@ -144,6 +146,7 @@ %%LUA_LIBDIR%%/prosody/util/cache.lua %%LUA_LIBDIR%%/prosody/util/caps.lua %%LUA_LIBDIR%%/prosody/util/compat.so +%%LUA_LIBDIR%%/prosody/util/crand.so %%LUA_LIBDIR%%/prosody/util/dataforms.lua %%LUA_LIBDIR%%/prosody/util/datamanager.lua %%LUA_LIBDIR%%/prosody/util/datetime.lua @@ -216,4 +219,4 @@ %%LUA_LIBDIR%%/prosody/util/xmppstream.lua %%LUA_LIBDIR%%/prosody/util/xpcall.lua man/man1/prosodyctl.1.gz -@dir(%%PROSODY_USER%%,%%PROSODY_GROUP%%,) var/%%LUA_LIBDIR%%/prosody +@dir(%%PROSODY_USER%%,%%PROSODY_GROUP%%,) /var/db/prosody