From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 21 21:30:07 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E64771065670 for ; Tue, 21 Jul 2009 21:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8D2F48FC20 for ; Tue, 21 Jul 2009 21:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6LLU70S043016 for ; Tue, 21 Jul 2009 21:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6LLU7Sd043013; Tue, 21 Jul 2009 21:30:07 GMT (envelope-from gnats) Resent-Date: Tue, 21 Jul 2009 21:30:07 GMT Resent-Message-Id: <200907212130.n6LLU7Sd043013@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrew Lewis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1D8E106566C for ; Tue, 21 Jul 2009 21:21:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id DFC438FC08 for ; Tue, 21 Jul 2009 21:21:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6LLL8dD075033 for ; Tue, 21 Jul 2009 21:21:08 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n6LLL8MX075032; Tue, 21 Jul 2009 21:21:08 GMT (envelope-from nobody) Message-Id: <200907212121.n6LLL8MX075032@www.freebsd.org> Date: Tue, 21 Jul 2009 21:21:08 GMT From: Andrew Lewis To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/136970: Update port: net-im/prosody to 0.5.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2009 21:30:08 -0000 >Number: 136970 >Category: ports >Synopsis: Update port: net-im/prosody to 0.5.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 21 21:30:07 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Andrew Lewis >Release: 7.1-RELEASE-p6 >Organization: Private >Environment: FreeBSD foo.bar 7.1-RELEASE-p6 FreeBSD 7.1-RELEASE-p6 #4: Wed Jun 24 14:25:56 UTC 2009 toor@foo.bar:/usr/obj/usr/src/sys/ADAMANTIUM71 i386 >Description: - Update to 0.5.0 - Fix building on AMD64 - Fix disrespect of CFLAGS, CC - Fix port to use reserved GID/UID, patches as follows for: /usr/ports/GIDs: 86a87 > prosody:*:242: /usr/ports/UIDs: 96a97 > prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/net-im/prosody/Makefile /var/ports/net-im/prosody/Makefile --- /usr/ports/net-im/prosody/Makefile 2009-07-14 06:36:53.000000000 +0000 +++ /var/ports/net-im/prosody/Makefile 2009-07-21 21:01:22.000000000 +0000 @@ -6,7 +6,7 @@ # PORTNAME= prosody -PORTVERSION= 0.4.2 +PORTVERSION= 0.5.0 CATEGORIES= net-im MASTER_SITES= http://prosody.im/downloads/source/ @@ -19,8 +19,7 @@ ${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat USE_RC_SUBR= prosody - -ONLY_FOR_ARCHS= i386 +MAN1= prosodyctl.1 USE_LUA= 5.1 WANT_LUA_VER= 5.1 diff -ruN /usr/ports/net-im/prosody/distinfo /var/ports/net-im/prosody/distinfo --- /usr/ports/net-im/prosody/distinfo 2009-07-14 06:30:55.000000000 +0000 +++ /var/ports/net-im/prosody/distinfo 2009-07-21 19:44:50.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (prosody-0.4.2.tar.gz) = 2669478311b3a67522669acdf03cf85c -SHA256 (prosody-0.4.2.tar.gz) = 4ba7a58832a15cc942dbc1dfcdfbc0157a8dfae3b940ee5a6743e7870433803f -SIZE (prosody-0.4.2.tar.gz) = 114291 +MD5 (prosody-0.5.0.tar.gz) = c7e79e765617150bf0dd491be682ffd5 +SHA256 (prosody-0.5.0.tar.gz) = bb82615b6311512888b62568faf4c5baa3631abb2fb048479ed2eef8faae4fb2 +SIZE (prosody-0.5.0.tar.gz) = 134292 diff -ruN /usr/ports/net-im/prosody/files/patch-configure /var/ports/net-im/prosody/files/patch-configure --- /usr/ports/net-im/prosody/files/patch-configure 2009-07-14 06:30:55.000000000 +0000 +++ /var/ports/net-im/prosody/files/patch-configure 2009-07-21 20:33:19.000000000 +0000 @@ -1,6 +1,6 @@ ---- orig.configure 2009-06-12 14:35:23.000000000 +0000 -+++ configure 2009-06-25 19:03:24.000000000 +0000 -@@ -5,11 +5,11 @@ +--- configure.orig 2009-07-20 14:00:03.000000000 +0000 ++++ configure 2009-07-21 20:19:47.000000000 +0000 +@@ -5,17 +5,17 @@ PREFIX=/usr/local SYSCONFDIR="$PREFIX/etc/prosody" DATADIR="$PREFIX/var/lib/prosody" @@ -14,7 +14,15 @@ +#LUA_LIBDIR="/usr/lib" IDN_LIB=idn OPENSSL_LIB=crypto - CC=gcc +-CC=gcc ++#CC=gcc + LD=gcc + +-CFLAGS="-fPIC -Wall" ++#CFLAGS="-fPIC -Wall" + LFLAGS="-shared" + + # Help @@ -26,7 +26,7 @@ --help This help. @@ -32,7 +40,7 @@ + then + LUA_INCDIR_SET=yes + LUA_LIBDIR_SET=yes -+ CFLAGS="-D_POSIX_SOURCE -I${LOCALBASE}/include" ++ CFLAGS="-fPIC -D_POSIX_SOURCE -I${LOCALBASE}/include" + LFLAGS="-lm -shared -L${LOCALBASE}/lib" + LUA_SUFFIX_SET=yes + LUA_LIB=lua @@ -40,3 +48,15 @@ fi if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ] +@@ -298,9 +307,9 @@ + REQUIRE_CONFIG=$REQUIRE_CONFIG + IDN_LIB=$IDN_LIB + OPENSSL_LIB=$OPENSSL_LIB +-CFLAGS=$CFLAGS ++CFLAGS+=$CFLAGS + LFLAGS=$LFLAGS +-CC=$CC ++CC?=$CC + LD=$LD + + EOF diff -ruN /usr/ports/net-im/prosody/files/pkg-install.in /var/ports/net-im/prosody/files/pkg-install.in --- /usr/ports/net-im/prosody/files/pkg-install.in 2009-07-14 06:30:55.000000000 +0000 +++ /var/ports/net-im/prosody/files/pkg-install.in 2009-07-21 20:38:01.000000000 +0000 @@ -4,7 +4,7 @@ # PW=/usr/sbin/pw -UID=1789 +UID=242 GID=$UID USER="prosody" GROUP="prosody" diff -ruN /usr/ports/net-im/prosody/files/prosody.cfg.lua.install.in /var/ports/net-im/prosody/files/prosody.cfg.lua.install.in --- /usr/ports/net-im/prosody/files/prosody.cfg.lua.install.in 2009-07-14 06:30:55.000000000 +0000 +++ /var/ports/net-im/prosody/files/prosody.cfg.lua.install.in 2009-07-21 20:25:12.000000000 +0000 @@ -56,6 +56,7 @@ "version"; -- Replies to server version requests "uptime"; -- Report how long server has been running "time"; -- Let others know the time here on this server + "pep"; -- Enables users to publish their mood, activity, playing music and more "ping"; -- Replies to XMPP pings with pongs -- Other specific functionality diff -ruN /usr/ports/net-im/prosody/pkg-plist /var/ports/net-im/prosody/pkg-plist --- /usr/ports/net-im/prosody/pkg-plist 2009-07-14 06:30:55.000000000 +0000 +++ /var/ports/net-im/prosody/pkg-plist 2009-07-21 19:52:48.000000000 +0000 @@ -1,8 +1,5 @@ bin/prosody bin/prosodyctl -%%ETCDIR%%/certs/localhost.cert -%%ETCDIR%%/certs/localhost.key -%%ETCDIR%%/prosody.cfg.lua lib/prosody/core/actions.lua lib/prosody/core/componentmanager.lua lib/prosody/core/configmanager.lua @@ -13,25 +10,33 @@ lib/prosody/core/modulemanager.lua lib/prosody/core/objectmanager.lua lib/prosody/core/offlinemanager.lua -lib/prosody/core/presencemanager.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/usermanager.lua lib/prosody/core/xmlhandlers.lua +lib/prosody/fallbacks/bit.lua lib/prosody/modules/mod_actions_http.lua +lib/prosody/modules/mod_announce.lua lib/prosody/modules/mod_bosh.lua lib/prosody/modules/mod_component.lua lib/prosody/modules/mod_console.lua lib/prosody/modules/mod_debug.lua lib/prosody/modules/mod_dialback.lua lib/prosody/modules/mod_disco.lua +lib/prosody/modules/mod_groups.lua lib/prosody/modules/mod_httpserver.lua +lib/prosody/modules/mod_iq.lua lib/prosody/modules/mod_legacyauth.lua +lib/prosody/modules/mod_message.lua lib/prosody/modules/mod_muc.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 +lib/prosody/modules/mod_presence.lua +lib/prosody/modules/mod_privacy.lua lib/prosody/modules/mod_private.lua lib/prosody/modules/mod_register.lua lib/prosody/modules/mod_roster.lua @@ -42,6 +47,8 @@ lib/prosody/modules/mod_uptime.lua lib/prosody/modules/mod_vcard.lua lib/prosody/modules/mod_version.lua +lib/prosody/modules/mod_watchregistrations.lua +lib/prosody/modules/mod_welcome.lua lib/prosody/modules/mod_xmlrpc.lua lib/prosody/net/adns.lua lib/prosody/net/connlisteners.lua @@ -54,6 +61,7 @@ lib/prosody/net/xmppclient_listener.lua lib/prosody/net/xmppcomponent_listener.lua lib/prosody/net/xmppserver_listener.lua +lib/prosody/prosody.version lib/prosody/util/array.lua lib/prosody/util/dataforms.lua lib/prosody/util/datamanager.lua @@ -63,11 +71,14 @@ lib/prosody/util/encodings.so lib/prosody/util/events.lua lib/prosody/util/hashes.so +lib/prosody/util/hmac.lua lib/prosody/util/import.lua lib/prosody/util/iterators.lua lib/prosody/util/jid.lua lib/prosody/util/logger.lua +lib/prosody/util/muc.lua lib/prosody/util/multitable.lua +lib/prosody/util/pluginloader.lua lib/prosody/util/pposix.so lib/prosody/util/prosodyctl.lua lib/prosody/util/pubsub.lua @@ -81,10 +92,9 @@ lib/prosody/util/uuid.lua lib/prosody/util/xmlrpc.lua lib/prosody/util/ztact.lua -@dirrm %%ETCDIR%%/certs -@dirrm %%ETCDIR%% @dirrm lib/prosody/util @dirrm lib/prosody/net @dirrm lib/prosody/modules +@dirrm lib/prosody/fallbacks @dirrm lib/prosody/core @dirrm lib/prosody >Release-Note: >Audit-Trail: >Unformatted: