From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 25 19:20:08 2010 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 A0BC41065670 for ; Thu, 25 Nov 2010 19:20:08 +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 5CA158FC18 for ; Thu, 25 Nov 2010 19:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAPJK8fN055468 for ; Thu, 25 Nov 2010 19:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAPJK8M1055467; Thu, 25 Nov 2010 19:20:08 GMT (envelope-from gnats) Resent-Date: Thu, 25 Nov 2010 19:20:08 GMT Resent-Message-Id: <201011251920.oAPJK8M1055467@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, Ivan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23FF41065672 for ; Thu, 25 Nov 2010 19:18:15 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 10DCC8FC0A for ; Thu, 25 Nov 2010 19:18:15 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id oAPJIE3P017192 for ; Thu, 25 Nov 2010 19:18:14 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id oAPJIE4x017191; Thu, 25 Nov 2010 19:18:14 GMT (envelope-from nobody) Message-Id: <201011251918.oAPJIE4x017191@red.freebsd.org> Date: Thu, 25 Nov 2010 19:18:14 GMT From: Ivan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/152576: PATCH net-im/prosody: change maintainer and update to 0.7.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: Thu, 25 Nov 2010 19:20:08 -0000 >Number: 152576 >Category: ports >Synopsis: PATCH net-im/prosody: change maintainer and update to 0.7.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: Thu Nov 25 19:20:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Ivan >Release: FreeBSD 8.1-RELEASE i386 GENERIC >Organization: >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # ./prosody # ./prosody/files # ./prosody/files/patch-Makefile # ./prosody/files/patch-configure # ./prosody/files/pkg-deinstall.in # ./prosody/files/pkg-install.in # ./prosody/files/prosody.in # ./prosody/files/patch-util-src-Makefile # ./prosody/files/patch-prosody-cfg-lua-dist # ./prosody/Makefile # ./prosody/distinfo # ./prosody/pkg-descr # ./prosody/pkg-plist # echo c - ./prosody mkdir -p ./prosody > /dev/null 2>&1 echo c - ./prosody/files mkdir -p ./prosody/files > /dev/null 2>&1 echo x - ./prosody/files/patch-Makefile sed 's/^X//' >./prosody/files/patch-Makefile << '8d700d79fd99710bce1e42211574f60e' X--- Makefile.orig 2010-06-13 03:23:01.000000000 +0300 X+++ Makefile 2010-09-25 15:13:40.000000000 +0300 X@@ -6,7 +6,7 @@ X MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules X SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody X DATA = $(DESTDIR)$(DATADIR) X-MAN = $(DESTDIR)$(PREFIX)/share/man X+MAN = $(DESTDIR)$(PREFIX)/man X X INSTALLEDSOURCE = $(PREFIX)/lib/prosody X INSTALLEDCONFIG = $(SYSCONFDIR) X@@ -36,7 +36,9 @@ X install -m644 certs/* $(CONFIG)/certs X install -m644 plugins/*.lua $(MODULES) X install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 X- test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua X+ install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample X+ install -d $(CONFIG)/tools X+ install -m644 tools/* $(CONFIG)/tools X test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true X $(MAKE) install -C util-src X 8d700d79fd99710bce1e42211574f60e echo x - ./prosody/files/patch-configure sed 's/^X//' >./prosody/files/patch-configure << '37589d44d6f07b57d62f2fc6d82848db' X--- configure.orig 2010-06-13 03:23:01.000000000 +0300 X+++ configure 2010-09-25 00:32:42.000000000 +0300 X@@ -5,17 +5,18 @@ X PREFIX=/usr/local X SYSCONFDIR="$PREFIX/etc/prosody" X DATADIR="$PREFIX/var/lib/prosody" X-LUA_SUFFIX="" X-LUA_DIR="/usr" X-LUA_BINDIR="/usr/bin" X-LUA_INCDIR="/usr/include" X-LUA_LIBDIR="/usr/lib" X+#LUA_SUFFIX="" X+LUA_DIR="/usr/local" X+LUA_BINDIR="/usr/local/bin" X+#LUA_INCDIR="/usr/local/include/lua51" X+#LUA_LIBDIR="/usr/local/lib/lua51" X IDN_LIB=idn X+IDN_LIBDIR="/usr/local/lib" X OPENSSL_LIB=crypto X-CC=gcc X+#CC=gcc X LD=gcc X X-CFLAGS="-fPIC -Wall" X+#CFLAGS="-fPIC -Wall" X LDFLAGS="-shared" X X # Help X@@ -26,7 +27,7 @@ X X --help This help. X --ostype=OS Use one of the OS presets. X- May be one of: debian, macosx, linux X+ May be one of: debian, macosx, linux, freebsd X --prefix=DIR Prefix where Prosody should be installed. X Default is $PREFIX X --sysconfdir=DIR Location where the config file should be installed. X@@ -158,6 +159,15 @@ X CFLAGS="-Wall -fPIC" X LDFLAGS="-shared" X fi X+ if [ "$OSTYPE" = "freebsd" ] X+ then X+ LUA_INCDIR_SET=yes X+ LUA_LIBDIR_SET=yes X+ CFLAGS="-fPIC -D_POSIX_SOURCE -I${PREFIX}/include" X+ LFLAGS="-lm -shared -L${PREFIX}/lib" X+ LUA_SUFFIX_SET=yes X+ LUA_LIB=lua X+ fi X fi X X if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ] X@@ -306,9 +316,9 @@ X REQUIRE_CONFIG=$REQUIRE_CONFIG X IDN_LIB=$IDN_LIB X OPENSSL_LIB=$OPENSSL_LIB X-CFLAGS=$CFLAGS X+CFLAGS+=$CFLAGS X LDFLAGS=$LDFLAGS X-CC=$CC X+CC?=$CC X LD=$LD X X EOF 37589d44d6f07b57d62f2fc6d82848db echo x - ./prosody/files/pkg-deinstall.in sed 's/^X//' >./prosody/files/pkg-deinstall.in << '0d43263efa5df183ae187cbead94290f' X#!/bin/sh X# X# $FreeBSD: ports/net-im/prosody/files/pkg-deinstall.in,v 1.1 2009/07/14 06:30:55 pgollucci Exp $ X# X Xcase $2 in XPOST-DEINSTALL) X echo "===> post-deinstallation information for $1:" X echo "" X echo " Note:" X echo " Prosody related user accounts and groups were not removed." X echo "" X echo " To remove the 'prosody' user and the 'prosody' group which were" X echo " created by a default installation of this package, run" X echo "" X echo " pw userdel -n prosody" X echo " pw groupdel -n prosody" X echo "" X echo " Remove user profile" X echo " rm -rf /usr/local/var/lib/prosody" X echo "" X ;; X*) X ;; Xesac Xexit 0 0d43263efa5df183ae187cbead94290f echo x - ./prosody/files/pkg-install.in sed 's/^X//' >./prosody/files/pkg-install.in << '3e712b8eab15599f4f8c6b61bd3c252f' X#!/bin/sh X# X# $FreeBSD: ports/net-im/prosody/files/pkg-install.in,v 1.3 2009/08/08 07:56:06 pav Exp $ X# X XPW=/usr/sbin/pw XUID=242 XGID=$UID XUSER="prosody" XGROUP="prosody" XPREFIX="%%PREFIX%%" X Xcase $2 in X XPRE-INSTALL) X X if ${PW} group show "${GROUP}" 2>/dev/null; then X echo "You already have a group \"${GROUP}\", so I will use it." X else X if ${PW} groupadd ${GROUP} -g ${GID}; then X echo "Added group \"${GROUP}\"." X else X echo "Adding group \"${GROUP}\" failed..." X exit 1 X fi X fi X X if ${PW} user show "${USER}" 2>/dev/null; then X echo "You already have a user \"${USER}\", so I will use it." X else X if ${PW} useradd ${USER} -u ${UID} -g daemon -h - \ X -d "/nonexistent" -s /usr/sbin/nologin -c "Prosody XMPP Server" X then X echo "Added user \"${USER}\"." X else X echo "Adding user \"${USER}\" failed..." X exit 1 X fi X fi X ;; X XPOST-INSTALL) X chown "${USER}:${GROUP}" $PREFIX/var/lib/prosody X for file in `find $PREFIX/etc/prosody -type f`; do X if [ ! -s "${file%.sample}" ]; then X cp -p $file ${file%.sample} X fi X done X ;; X*) X echo "?" X;; Xesac Xexit 0 3e712b8eab15599f4f8c6b61bd3c252f echo x - ./prosody/files/prosody.in sed 's/^X//' >./prosody/files/prosody.in << '5270e67d3358a589c5fe4645ede0caf6' X#!/bin/sh X X# $FreeBSD: ports/net-im/prosody/files/prosody.in,v 1.4 2010/06/13 00:47:57 lx Exp $ X# X# PROVIDE: prosody X# REQUIRE: LOGIN X# KEYWORD: shutdown X# X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf X# to enable this service: X# X# prosody_enable (bool): Set to NO by default. X# Set it to YES to enable Prosody X X. /etc/rc.subr X Xname="prosody" Xrcvar=`set_rcvar` Xpidfile="%%PREFIX%%/var/lib/prosody/prosody.pid" Xcommand="%%PREFIX%%/bin/prosodyctl" X Xload_rc_config $name X Xprosody=${prosody_enable-"NO"} X Xextra_commands="status" X Xstart_cmd="prosody_cmd start" Xstop_cmd="prosody_cmd stop" Xrestart_cmd="$stop_cmd; $start_cmd" Xstatus_cmd="prosody_cmd status" X Xprosody_cmd() X{ X %%PREFIX%%/bin/prosodyctl $1 X} X Xrun_rc_command "$1" 5270e67d3358a589c5fe4645ede0caf6 echo x - ./prosody/files/patch-util-src-Makefile sed 's/^X//' >./prosody/files/patch-util-src-Makefile << '2da9fa05af938db8318ac0febef439f4' X--- util-src/Makefile.orig 2010-06-13 03:23:02.000000000 +0300 X+++ util-src/Makefile 2010-09-25 00:41:23.000000000 +0300 X@@ -1,10 +1,11 @@ X X include ../config.unix X X-LUA_SUFFIX?=5.1 X-LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX) X+LUA_SUFFIX?=51 X+LUA_INCDIR?=/usr/local/include/lua$(LUA_SUFFIX) X LUA_LIB?=lua$(LUA_SUFFIX) X IDN_LIB?=idn X+IDN_LIBDIR=/usr/local/lib X OPENSSL_LIB?=crypto X CC?=gcc X LD?=gcc X@@ -15,8 +16,8 @@ X $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $< X X .o.so: X- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; X- $(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn -lcrypto X+# MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; X+ $(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -L$(IDN_LIBDIR) -l$(IDN_LIB) -lcrypto X X all: encodings.so hashes.so pposix.so signal.so X 2da9fa05af938db8318ac0febef439f4 echo x - ./prosody/files/patch-prosody-cfg-lua-dist sed 's/^X//' >./prosody/files/patch-prosody-cfg-lua-dist << '796fd6830ead94ffeb4a6d7a8ffa91d2' X--- prosody.cfg.lua.dist.orig 2010-11-25 20:32:53.000000000 +0200 X+++ prosody.cfg.lua.dist 2010-11-25 20:46:28.000000000 +0200 X@@ -54,7 +54,7 @@ X "register"; -- Allow users to register on this server using a client and change passwords X X -- Other specific functionality X- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. X+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. X --"console"; -- Opens admin telnet interface on localhost port 5582 X --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" X --"httpserver"; -- Serve static files from a directory over HTTP X@@ -73,6 +73,9 @@ X -- "iq"; X }; X X+pidfile = "/usr/local/var/lib/prosody/prosody.pid" X+daemonize = true X+ X -- Disable account creation by default, for security X -- For more information see http://prosody.im/doc/creating_accounts X allow_registration = false; X@@ -90,7 +93,7 @@ X X -- Logging configuration X -- For advanced logging see http://prosody.im/doc/logging X-log = "prosody.log"; X+log = "/var/log/prosody.log"; X debug = false; -- Log debug messages? X X ----------- Virtual hosts ----------- 796fd6830ead94ffeb4a6d7a8ffa91d2 echo x - ./prosody/Makefile sed 's/^X//' >./prosody/Makefile << '94cd1846eac6e6036f45800a98214453' X# New ports collection makefile for: prosody X# Date created: 25 June 2009 X# Whom: Andrew Lewis X# X# $FreeBSD: ports/net-im/prosody/Makefile,v 1.7 2010/06/13 00:47:57 lx Exp $ X# X XPORTNAME= prosody XPORTVERSION= 0.7.0 XPORTREVISION= 0 XCATEGORIES= net-im XMASTER_SITES= http://prosody.im/downloads/source/ X XMAINTAINER= icegloom@gmail.com XCOMMENT= A simple extensible XMPP server written in Lua X XBUILD_DEPENDS= ${LOCALBASE}/include/stringprep.h:${PORTSDIR}/dns/libidn XRUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket \ X ${LUA_MODLIBDIR}/ssl.so:${PORTSDIR}/security/luasec \ X ${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \ X ${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem X XUSE_RC_SUBR= prosody XMAN1= prosodyctl.1 XMANCOMPRESSED= no X XUSE_LUA= 5.1 XWANT_LUA_VER= 5.1 X XHAS_CONFIGURE= yes XCONFIGURE_ARGS+="--ostype=freebsd" XCONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}" X XSUB_FILES= pkg-install pkg-deinstall X Xpre-install: X ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL X ${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl X Xpost-install: X ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL X X.include 94cd1846eac6e6036f45800a98214453 echo x - ./prosody/distinfo sed 's/^X//' >./prosody/distinfo << '0e4d4a8e4582d71ee6ce3303c64b83a4' XMD5 (prosody-0.7.0.tar.gz) = 69cd4f4e89dbef668a6240cde419dedf XSHA256 (prosody-0.7.0.tar.gz) = a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390 XSIZE (prosody-0.7.0.tar.gz) = 177412 0e4d4a8e4582d71ee6ce3303c64b83a4 echo x - ./prosody/pkg-descr sed 's/^X//' >./prosody/pkg-descr << 'ef8f0d9ae7df9265932160058a4abe03' XProsody is a flexible communications server for Jabber/XMPP written in Lua. It Xaims to be easy to use, and light on resources. For developers it aims to be Xeasy to extend and give a flexible system on which to rapidly develop added Xfunctionality, or prototype new protocols. X XWWW: http://www.prosody.im/ ef8f0d9ae7df9265932160058a4abe03 echo x - ./prosody/pkg-plist sed 's/^X//' >./prosody/pkg-plist << 'b99aa4098e6fe43e047353d65deb840f' Xbin/prosody Xbin/prosodyctl Xetc/rc.d/prosody Xlib/prosody/core/certmanager.lua Xlib/prosody/core/componentmanager.lua Xlib/prosody/core/configmanager.lua Xlib/prosody/core/eventmanager.lua Xlib/prosody/core/hostmanager.lua Xlib/prosody/core/loggingmanager.lua Xlib/prosody/core/modulemanager.lua Xlib/prosody/core/offlinemanager.lua Xlib/prosody/core/rostermanager.lua Xlib/prosody/core/s2smanager.lua Xlib/prosody/core/sessionmanager.lua Xlib/prosody/core/stanza_router.lua Xlib/prosody/core/usermanager.lua Xlib/prosody/core/xmlhandlers.lua Xlib/prosody/modules/mod_announce.lua Xlib/prosody/modules/mod_bosh.lua Xlib/prosody/modules/mod_component.lua Xlib/prosody/modules/mod_compression.lua Xlib/prosody/modules/mod_console.lua Xlib/prosody/modules/mod_dialback.lua Xlib/prosody/modules/mod_disco.lua Xlib/prosody/modules/mod_groups.lua Xlib/prosody/modules/mod_httpserver.lua Xlib/prosody/modules/mod_iq.lua Xlib/prosody/modules/mod_lastactivity.lua Xlib/prosody/modules/mod_legacyauth.lua Xlib/prosody/modules/mod_message.lua Xlib/prosody/modules/mod_pep.lua Xlib/prosody/modules/mod_ping.lua Xlib/prosody/modules/mod_posix.lua Xlib/prosody/modules/mod_presence.lua Xlib/prosody/modules/mod_privacy.lua Xlib/prosody/modules/mod_private.lua Xlib/prosody/modules/mod_proxy65.lua Xlib/prosody/modules/mod_register.lua Xlib/prosody/modules/mod_roster.lua Xlib/prosody/modules/mod_saslauth.lua Xlib/prosody/modules/mod_time.lua Xlib/prosody/modules/mod_tls.lua Xlib/prosody/modules/mod_uptime.lua Xlib/prosody/modules/mod_vcard.lua Xlib/prosody/modules/mod_version.lua Xlib/prosody/modules/mod_watchregistrations.lua Xlib/prosody/modules/mod_welcome.lua Xlib/prosody/modules/muc/mod_muc.lua Xlib/prosody/modules/muc/muc.lib.lua Xlib/prosody/net/adns.lua Xlib/prosody/net/connlisteners.lua Xlib/prosody/net/dns.lua Xlib/prosody/net/http.lua Xlib/prosody/net/httpclient_listener.lua Xlib/prosody/net/httpserver.lua Xlib/prosody/net/httpserver_listener.lua Xlib/prosody/net/multiplex_listener.lua Xlib/prosody/net/server.lua Xlib/prosody/net/server_event.lua Xlib/prosody/net/server_select.lua Xlib/prosody/net/xmppclient_listener.lua Xlib/prosody/net/xmppcomponent_listener.lua Xlib/prosody/net/xmppserver_listener.lua Xlib/prosody/prosody.version Xlib/prosody/util/array.lua Xlib/prosody/util/broadcast.lua Xlib/prosody/util/dataforms.lua Xlib/prosody/util/datamanager.lua Xlib/prosody/util/datetime.lua Xlib/prosody/util/dependencies.lua Xlib/prosody/util/encodings.so Xlib/prosody/util/events.lua Xlib/prosody/util/hashes.so Xlib/prosody/util/helpers.lua Xlib/prosody/util/hmac.lua Xlib/prosody/util/import.lua Xlib/prosody/util/iterators.lua Xlib/prosody/util/jid.lua Xlib/prosody/util/logger.lua Xlib/prosody/util/multitable.lua Xlib/prosody/util/pluginloader.lua Xlib/prosody/util/pposix.so Xlib/prosody/util/prosodyctl.lua Xlib/prosody/util/sasl.lua Xlib/prosody/util/sasl/anonymous.lua Xlib/prosody/util/sasl/digest-md5.lua Xlib/prosody/util/sasl/plain.lua Xlib/prosody/util/sasl/scram.lua Xlib/prosody/util/sasl_cyrus.lua Xlib/prosody/util/serialization.lua Xlib/prosody/util/set.lua Xlib/prosody/util/signal.so Xlib/prosody/util/stanza.lua Xlib/prosody/util/termcolours.lua Xlib/prosody/util/timer.lua Xlib/prosody/util/uuid.lua Xlib/prosody/util/xmlrpc.lua Xlib/prosody/util/ztact.lua Xman/man1/prosodyctl.1.gz X@dirrm lib/prosody/util/sasl X@dirrm lib/prosody/util X@dirrm lib/prosody/net X@dirrm lib/prosody/modules/muc X@dirrm lib/prosody/modules X@dirrm lib/prosody/core X@dirrm lib/prosody X b99aa4098e6fe43e047353d65deb840f exit >Release-Note: >Audit-Trail: >Unformatted: