On Mon, Dec 19, 2011 at 12:06:16AM +0100, viq wrote: > This updates prosody to the current version 0.8.2 and adds rc script. > README needs to be updated to reflect using it with rc script, but I was > at a loss on how to phrase it for now. Could use more testing and eyes, but > it works for me for quite a while now on i386.
Looks fine, though I have some comments inlined. > Apply with -E as patches were removed. > -- > viq > > ? TODO > ? UPDATE > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/prosody/Makefile,v > retrieving revision 1.14 > diff -u -d -r1.14 Makefile > --- Makefile 1 Aug 2011 02:13:45 -0000 1.14 > +++ Makefile 18 Dec 2011 23:02:29 -0000 > @@ -1,10 +1,9 @@ > -# $OpenBSD: Makefile,v 1.14 2011/08/01 02:13:45 jolan Exp $ > +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:37 espie Exp $ > > SHARED_ONLY= Yes > > COMMENT= communications server for Jabber/XMPP written in Lua > -DISTNAME= prosody-0.7.0 > -REVISION= 5 > +DISTNAME= prosody-0.8.2 > CATEGORIES= net > MASTER_SITES= http://prosody.im/downloads/source/ > > @@ -35,9 +34,13 @@ > --with-lua="${LOCALBASE}" \ > --c-compiler="${CC}" \ > --linker="${CC}" \ > + --ldflags="-I/usr/include -I${LOCALBASE}/include -L/usr/lib > -L${LOCALBASE}/lib -shared" \ > --cflags="${CFLAGS} -fPIC" > > FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody > + > +pre-configure: > + ${SUBST_CMD} ${WRKSRC}/prosody ${WRKSRC}/prosodyctl > > post-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/prosody > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/prosody/distinfo,v > retrieving revision 1.4 > diff -u -d -r1.4 distinfo > --- distinfo 25 Jul 2010 23:42:25 -0000 1.4 > +++ distinfo 18 Dec 2011 23:02:29 -0000 > @@ -1,5 +1,5 @@ > -MD5 (prosody-0.7.0.tar.gz) = ac1PTonb72aKYkDN5Bne3w== > -RMD160 (prosody-0.7.0.tar.gz) = LkC0+Ae2EglxxhH1LU3zJkqCy7k= > -SHA1 (prosody-0.7.0.tar.gz) = PzpsTyYqBiqcAnzIQ81oJxBPuLo= > -SHA256 (prosody-0.7.0.tar.gz) = qLgmgF3VUoJwbFaDwgKImbNyHrD4TT41wFCabBvDI5A= > -SIZE (prosody-0.7.0.tar.gz) = 177412 > +MD5 (prosody-0.8.2.tar.gz) = bpB78NCs8k8QEQgwILpv+w== > +RMD160 (prosody-0.8.2.tar.gz) = kIoE9dqnczxmq08J/VT7Uhdctww= > +SHA1 (prosody-0.8.2.tar.gz) = oCnE5p9tqvMyAGHmnJ+GOQ1+hFo= > +SHA256 (prosody-0.8.2.tar.gz) = 0DFRUPhIf8lgrfVs4FeYVChnmXX5xvP89CSDLSTqrmA= > +SIZE (prosody-0.8.2.tar.gz) = 212170 > Index: patches/patch-prosody > =================================================================== > RCS file: patches/patch-prosody > diff -N patches/patch-prosody > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-prosody 18 Dec 2011 23:02:29 -0000 > @@ -0,0 +1,9 @@ > +$OpenBSD$ > +--- prosody.orig Sun Nov 6 13:34:13 2011 > ++++ prosody Sun Nov 6 13:37:36 2011 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env lua > ++#!${PREFIX}/bin/lua Shouldn't this be TRUEPREFIX? > Index: patches/patch-prosodyctl > =================================================================== > RCS file: patches/patch-prosodyctl > diff -N patches/patch-prosodyctl > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-prosodyctl 18 Dec 2011 23:02:29 -0000 > @@ -0,0 +1,9 @@ > +$OpenBSD$ > +--- prosodyctl.orig Sun Nov 6 13:34:05 2011 > ++++ prosodyctl Sun Nov 6 13:37:23 2011 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env lua > ++#!${PREFIX}/bin/lua > + -- Prosody IM > + -- Copyright (C) 2008-2010 Matthew Wild > + -- Copyright (C) 2008-2010 Waqas Hussain Idem. > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/prosody/pkg/PLIST,v > retrieving revision 1.5 > diff -u -d -r1.5 PLIST > --- pkg/PLIST 10 Nov 2010 19:25:25 -0000 1.5 > +++ pkg/PLIST 18 Dec 2011 23:02:29 -0000 > @@ -5,25 +5,30 @@ > lib/prosody/ > lib/prosody/core/ > lib/prosody/core/certmanager.lua > -lib/prosody/core/componentmanager.lua > lib/prosody/core/configmanager.lua > -lib/prosody/core/eventmanager.lua > lib/prosody/core/hostmanager.lua > lib/prosody/core/loggingmanager.lua > lib/prosody/core/modulemanager.lua > -lib/prosody/core/offlinemanager.lua > lib/prosody/core/rostermanager.lua > lib/prosody/core/s2smanager.lua > lib/prosody/core/sessionmanager.lua > lib/prosody/core/stanza_router.lua > +lib/prosody/core/storagemanager.lua > lib/prosody/core/usermanager.lua > -lib/prosody/core/xmlhandlers.lua > lib/prosody/modules/ > +lib/prosody/modules/adhoc/ > +lib/prosody/modules/adhoc/adhoc.lib.lua > +lib/prosody/modules/adhoc/mod_adhoc.lua > +lib/prosody/modules/mod_admin_adhoc.lua > +lib/prosody/modules/mod_admin_telnet.lua > lib/prosody/modules/mod_announce.lua > +lib/prosody/modules/mod_auth_anonymous.lua > +lib/prosody/modules/mod_auth_cyrus.lua > +lib/prosody/modules/mod_auth_internal_hashed.lua > +lib/prosody/modules/mod_auth_internal_plain.lua > lib/prosody/modules/mod_bosh.lua > lib/prosody/modules/mod_component.lua > lib/prosody/modules/mod_compression.lua > -lib/prosody/modules/mod_console.lua > lib/prosody/modules/mod_dialback.lua > lib/prosody/modules/mod_disco.lua > lib/prosody/modules/mod_groups.lua > @@ -32,6 +37,8 @@ > lib/prosody/modules/mod_lastactivity.lua > lib/prosody/modules/mod_legacyauth.lua > lib/prosody/modules/mod_message.lua > +lib/prosody/modules/mod_motd.lua > +lib/prosody/modules/mod_offline.lua > lib/prosody/modules/mod_pep.lua > lib/prosody/modules/mod_ping.lua > lib/prosody/modules/mod_posix.lua > @@ -42,6 +49,8 @@ > lib/prosody/modules/mod_register.lua > lib/prosody/modules/mod_roster.lua > lib/prosody/modules/mod_saslauth.lua > +lib/prosody/modules/mod_storage_internal.lua > +lib/prosody/modules/mod_storage_sql.lua > lib/prosody/modules/mod_time.lua > lib/prosody/modules/mod_tls.lua > lib/prosody/modules/mod_uptime.lua > @@ -71,16 +80,20 @@ > lib/prosody/util/ > lib/prosody/util/array.lua > lib/prosody/util/broadcast.lua > +lib/prosody/util/caps.lua > lib/prosody/util/dataforms.lua > lib/prosody/util/datamanager.lua > lib/prosody/util/datetime.lua > lib/prosody/util/dependencies.lua > lib/prosody/util/events.lua > +lib/prosody/util/filters.lua > lib/prosody/util/helpers.lua > lib/prosody/util/hmac.lua > +lib/prosody/util/httpstream.lua > lib/prosody/util/import.lua > lib/prosody/util/iterators.lua > lib/prosody/util/jid.lua > +lib/prosody/util/json.lua > lib/prosody/util/logger.lua > lib/prosody/util/multitable.lua > lib/prosody/util/pluginloader.lua > @@ -95,11 +108,12 @@ > lib/prosody/util/serialization.lua > lib/prosody/util/set.lua > lib/prosody/util/stanza.lua > +lib/prosody/util/template.lua > lib/prosody/util/termcolours.lua > lib/prosody/util/timer.lua > lib/prosody/util/uuid.lua > lib/prosody/util/xmlrpc.lua > -lib/prosody/util/ztact.lua > +lib/prosody/util/xmppstream.lua > @man man/man1/prosodyctl.1 > sbin/prosody > sbin/prosodyctl > @@ -110,10 +124,12 @@ > @sample ${SYSCONFDIR}/prosody/ > share/examples/prosody/certs/ > @sample ${SYSCONFDIR}/prosody/certs/ > +share/examples/prosody/certs/Makefile > share/examples/prosody/certs/localhost.cert > @sample ${SYSCONFDIR}/prosody/certs/localhost.cert > share/examples/prosody/certs/localhost.key > @sample ${SYSCONFDIR}/prosody/certs/localhost.key > +share/examples/prosody/certs/openssl.cnf Shouldn't this be @sampled? -- Cheers, Jasper "Stay Hungry. Stay Foolish"
