Lucas <lu...@sexy.is> wrote: > Lucas <lu...@sexy.is> wrote: > > Hello ports@, > > > > Find a update for net/prosody to 0.11.4. > > > > Lots of fixes and improvements happened since 0.11.2, which can be > > found in [1] and [2]. In particular, there is a fix for closing a file > > which can lead to "Too many open files", causing service disruption. > > > > Ports-wise, > > > > * Removed archivers/luazlib from MODLUA_RUN_DEPEDNS, as upstream > > dropped official support for it since 0.9 and moved it to community > > modules, with a security concerns comment. > > * Removed -I...s from --ldflags > > * Fixed patches/patch-util-src_table_c as it used arg unintialized. > > Patch was added make it C99-compliant. > > * Added patches/patch-util-src_pposix_c to shut up another C99 > > warning. I don't know if I solve it the correct way(tm), in the > > sense that I don't know the full implications of enabling > > _BSD_SOURCE in there. Help is appreciated in that regard. > > * Updated PLIST adding @so when needed. > > * portcheck complaints with "the following libraries in WANTLIB look > > like masked by RUN_DEPENDS: idn". make port-lib-depends-check and > > make lib-depends-check says everything is fine, tho. Removing idn > > from WANTLIB makes everyone happy, but I understand that every lib > > the port needs should be in WANTLIB, so I left it there. I couldn't > > find if any of the deps was pulling idn, so maybe it's just a false > > positive? > > * Take maintainership. > > > > Build and tested on amd64. > > > > [1]: https://prosody.im/doc/release/0.11.3 > > [2]: https://prosody.im/doc/release/0.11.4 > > > > -Lucas > > Biweekly bump, with last sent patch[1] incorporating fixes to README > and getting rid of SUBST_VARS+=FLAVOR attached below. > > [1]: https://marc.info/?l=openbsd-ports&m=158240030731042&w=2 > > -Lucas
Small updates after private feedback from solene@ and sthen@: * Removed touch of info logfile in post-install * Removed info logfile from PLIST * Removed share/examples/prosody/prosody.log from PLIST This changes together fix the install as it tried to put a file inside /var/prosody *before* creating it. I guess it didn't come up in my tests as I was already runninng prosody, probably performing an update instead of a clean install. -Lucas
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/prosody/Makefile,v retrieving revision 1.55 diff -u -p -u -p -r1.55 Makefile --- Makefile 12 Jul 2019 20:48:44 -0000 1.55 +++ Makefile 15 Mar 2020 15:48:30 -0000 @@ -1,21 +1,21 @@ # $OpenBSD: Makefile,v 1.55 2019/07/12 20:48:44 sthen Exp $ COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.11.2 +DISTNAME= prosody-0.11.4 CATEGORIES= net MASTER_SITES= https://prosody.im/downloads/source/ -REVISION= 1 HOMEPAGE= https://prosody.im/ +MAINTAINER= Lucas <lu...@sexy.is> + # MIT PERMIT_PACKAGE= Yes MAKE_FILE= makefile MODULES= lang/lua LIB_DEPENDS= devel/libidn -MODLUA_RUN_DEPENDS+= archivers/luazlib \ - databases/luadbi \ +MODLUA_RUN_DEPENDS+= databases/luadbi \ devel/lua-bitop \ devel/luafs \ security/luasec \ @@ -23,8 +23,6 @@ MODLUA_RUN_DEPENDS+= archivers/luazlib \ TEST_DEPENDS = ${MODLUA_RUN_DEPENDS} WANTLIB+= crypto idn -SUBST_VARS+= FLAVOR - CONFIGURE_STYLE=simple CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --sysconfdir="${SYSCONFDIR}/prosody" \ @@ -33,7 +31,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --with-lua-include="${MODLUA_INCL_DIR}" \ --c-compiler="${CC}" \ --linker="${CC}" \ - --ldflags="-I/usr/include -I${LOCALBASE}/include -L/usr/lib -L${LOCALBASE}/lib -shared" \ + --ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \ --cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC -std=c99" FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody @@ -50,6 +48,5 @@ post-install: ${PREFIX}/share/examples/prosody/certs/Makefile ${INSTALL_DATA} ${WRKSRC}/certs/openssl.cnf \ ${PREFIX}/share/examples/prosody/certs - touch ${PREFIX}/share/examples/prosody/prosody.log .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/prosody/distinfo,v retrieving revision 1.16 diff -u -p -u -p -r1.16 distinfo --- distinfo 7 Feb 2019 19:23:39 -0000 1.16 +++ distinfo 15 Feb 2020 16:39:56 -0000 @@ -1,2 +1,2 @@ -SHA256 (prosody-0.11.2.tar.gz) = iRH23Cm54MTt+eYdwj+iLXe8QsTK8ouAmrhDsvCOSDE= -SIZE (prosody-0.11.2.tar.gz) = 420689 +SHA256 (prosody-0.11.4.tar.gz) = tfJvo0PH8y9iQnIdaZHLNfXSoo0r9Z0rwympQFI3BP0= +SIZE (prosody-0.11.4.tar.gz) = 423518 Index: patches/patch-util-src_pposix_c =================================================================== RCS file: patches/patch-util-src_pposix_c diff -N patches/patch-util-src_pposix_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-util-src_pposix_c 15 Feb 2020 17:12:50 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +Define _BSD_SOURCE to make initgroups(3) visible + +Index: util-src/pposix.c +--- util-src/pposix.c.orig ++++ util-src/pposix.c +@@ -33,6 +33,11 @@ + #ifndef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 200809L + #endif ++#if defined(__OpenBSD__) ++#ifndef _BSD_SOURCE ++#define _BSD_SOURCE ++#endif ++#endif + + #include <stdlib.h> + #include <math.h> Index: patches/patch-util-src_table_c =================================================================== RCS file: /home/cvs/ports/net/prosody/patches/patch-util-src_table_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-util-src_table_c --- patches/patch-util-src_table_c 24 Nov 2017 12:47:34 -0000 1.1 +++ patches/patch-util-src_table_c 15 Feb 2020 16:42:22 -0000 @@ -13,7 +13,7 @@ Index: util-src/table.c lua_insert(L, 1); - for(int arg = n_args; arg >= 1; arg--) { -+ for(n_args; arg >= 1; arg--) { ++ for(arg = n_args; arg >= 1; arg--) { lua_rawseti(L, 1, arg); } Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/net/prosody/pkg/PLIST,v retrieving revision 1.14 diff -u -p -u -p -r1.14 PLIST --- pkg/PLIST 7 Feb 2019 19:23:39 -0000 1.14 +++ pkg/PLIST 15 Mar 2020 15:44:32 -0000 @@ -149,18 +149,18 @@ lib/prosody/util/array.lua lib/prosody/util/async.lua lib/prosody/util/cache.lua lib/prosody/util/caps.lua -lib/prosody/util/compat.so +@so lib/prosody/util/compat.so lib/prosody/util/dataforms.lua lib/prosody/util/datamanager.lua lib/prosody/util/datetime.lua lib/prosody/util/debug.lua lib/prosody/util/dependencies.lua -lib/prosody/util/encodings.so +@so lib/prosody/util/encodings.so lib/prosody/util/envload.lua lib/prosody/util/events.lua lib/prosody/util/filters.lua lib/prosody/util/format.lua -lib/prosody/util/hashes.so +@so lib/prosody/util/hashes.so lib/prosody/util/helpers.lua lib/prosody/util/hex.lua lib/prosody/util/hmac.lua @@ -176,12 +176,12 @@ lib/prosody/util/json.lua lib/prosody/util/logger.lua lib/prosody/util/mercurial.lua lib/prosody/util/multitable.lua -lib/prosody/util/net.so +@so lib/prosody/util/net.so lib/prosody/util/openssl.lua lib/prosody/util/paths.lua lib/prosody/util/pluginloader.lua -lib/prosody/util/poll.so -lib/prosody/util/pposix.so +@so lib/prosody/util/poll.so +@so lib/prosody/util/pposix.so lib/prosody/util/presence.lua lib/prosody/util/promise.lua lib/prosody/util/prosodyctl.lua @@ -189,7 +189,7 @@ lib/prosody/util/pubsub.lua lib/prosody/util/queue.lua lib/prosody/util/random.lua lib/prosody/util/rfc6724.lua -lib/prosody/util/ringbuffer.so +@so lib/prosody/util/ringbuffer.so lib/prosody/util/rsm.lua lib/prosody/util/sasl/ lib/prosody/util/sasl.lua @@ -202,18 +202,18 @@ lib/prosody/util/sasl_cyrus.lua lib/prosody/util/serialization.lua lib/prosody/util/session.lua lib/prosody/util/set.lua -lib/prosody/util/signal.so +@so lib/prosody/util/signal.so lib/prosody/util/sql.lua lib/prosody/util/sslconfig.lua lib/prosody/util/stanza.lua lib/prosody/util/startup.lua lib/prosody/util/statistics.lua lib/prosody/util/statsd.lua -lib/prosody/util/table.so +@so lib/prosody/util/table.so lib/prosody/util/template.lua lib/prosody/util/termcolours.lua lib/prosody/util/throttle.lua -lib/prosody/util/time.so +@so lib/prosody/util/time.so lib/prosody/util/timer.lua lib/prosody/util/uuid.lua lib/prosody/util/vcard.lua @@ -251,8 +251,4 @@ share/examples/prosody/prosody.cfg.lua @mode 770 @owner _prosody @group _prosody -share/examples/prosody/prosody.log -@mode 660 -@sample /var/prosody/prosody.log -@mode 770 @sample /var/prosody/ Index: pkg/README =================================================================== RCS file: /home/cvs/ports/net/prosody/pkg/README,v retrieving revision 1.10 diff -u -p -u -p -r1.10 README --- pkg/README 4 Sep 2018 12:46:18 -0000 1.10 +++ pkg/README 22 Feb 2020 18:56:54 -0000 @@ -40,8 +40,8 @@ Using Prosody in an OpenBSD environment 5) In case you decide to enable 'mod_storage_sql', the default SQLite3 driver has already been installed. If you like to use MySQL/MariaDB or - PostgreSQL for the database, please install luadbi-mysql,${FLAVOR} - or luadbi-pgsql,${FLAVOR} respectively. + PostgreSQL for the database, please install luadbi-mysql or luadbi-pgsql + respectively. For MySQL/MariaDB, also add the following to /etc/login.conf:
