From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 1 22:51:45 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73A4216A4D0 for ; Thu, 1 Jul 2004 22:51:45 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64A9143D58 for ; Thu, 1 Jul 2004 22:51:45 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i61MoGRV012716 for ; Thu, 1 Jul 2004 22:50:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i61MoG4L012715; Thu, 1 Jul 2004 22:50:16 GMT (envelope-from gnats) Resent-Date: Thu, 1 Jul 2004 22:50:16 GMT Resent-Message-Id: <200407012250.i61MoG4L012715@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, martijn@pacno.net Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A535716A4CE for ; Thu, 1 Jul 2004 22:40:33 +0000 (GMT) Received: from post-22.mail.nl.demon.net (post-22.mail.nl.demon.net [194.159.73.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id 188C843D45 for ; Thu, 1 Jul 2004 22:40:29 +0000 (GMT) (envelope-from root@pacno.net) Received: from hostage.demon.nl ([82.161.93.5]:56962) by post-22.mail.nl.demon.net with esmtp (Exim 4.34) id 1BgACr-000CnE-Qv for FreeBSD-gnats-submit@freebsd.org; Thu, 01 Jul 2004 22:39:03 +0000 Received: from localhost (localhost [127.0.0.1]) by hostage.demon.nl (Postfix) with ESMTP id 5C21F4225 for ; Fri, 2 Jul 2004 00:38:56 +0200 (CEST) Received: from hostage.demon.nl ([127.0.0.1]) by localhost (drain.pacno.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00133-10 for ; Fri, 2 Jul 2004 00:38:03 +0200 (CEST) Received: by hostage.demon.nl (Postfix, from userid 0) id 93E69420F; Fri, 2 Jul 2004 00:37:58 +0200 (CEST) Message-Id: <20040701223758.93E69420F@hostage.demon.nl> Date: Fri, 2 Jul 2004 00:37:58 +0200 (CEST) From: martijn@pacno.net To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/68573: Upgrade net/jabber-aim to version 20040131 (supersedes ports/67689 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 22:51:45 -0000 >Number: 68573 >Category: ports >Synopsis: Upgrade net/jabber-aim to version 20040131 (supersedes ports/67689 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jul 01 22:50:16 GMT 2004 >Closed-Date: >Last-Modified: >Originator: martijn@pacno.net >Release: FreeBSD 5.2.1-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD 5.2.1-RELEASE-p8 >Description: The port is out of date. This PR is a revised version of ports/67689 >How-To-Repeat: Try to build to current port, it won't even find the source on the net >Fix: diff -rudN net/jabber-aim.orig/Makefile net/jabber-aim/Makefile --- net/jabber-aim.orig/Makefile Tue Jun 29 08:33:43 2004 +++ net/jabber-aim/Makefile Fri Jul 2 00:37:09 2004 @@ -2,16 +2,15 @@ # Date created: 14 Apr 2002 # Whom: Sean Chittenden # -# $FreeBSD: ports/net/jabber-aim/Makefile,v 1.8 2004/06/29 06:33:43 vs Exp $ +# $FreeBSD$ PORTNAME= aim -PORTVERSION= 0.9.24c -PORTREVISION= 1 +PORTVERSION= 20040131 CATEGORIES= net -MASTER_SITES= http://download.jabber.org/dists/transports/aim-transport/ +MASTER_SITES= http://aim-transport.jabberstudio.org/ PKGNAMEPREFIX= jabber- PKGNAMESUFFIX= -transport -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-stable-${PORTVERSION}b DIST_SUBDIR= jabber MAINTAINER= seanc@FreeBSD.org @@ -19,9 +18,10 @@ BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber +WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-stable-${PORTVERSION} PLIST_FILES= lib/jabber/aimtrans.so USE_GMAKE= yes -USE_AUTOCONF_VER= 213 +USE_AUTOCONF_VER= 259 CONFIGURE_ARGS+=--with-jabberd=${LOCALBASE}/include/jabber CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include/pth diff -rudN net/jabber-aim.orig/Makefile.rej net/jabber-aim/Makefile.rej --- net/jabber-aim.orig/Makefile.rej Thu Jan 1 01:00:00 1970 +++ net/jabber-aim/Makefile.rej Fri Jul 2 00:09:50 2004 @@ -0,0 +1,47 @@ +*************** +*** 5,15 **** + # $FreeBSD: ports/net/jabber-aim/Makefile,v 1.7 2004/03/14 06:17:06 ade Exp $ + + PORTNAME= aim-transport +- PORTVERSION= 20040131 + CATEGORIES= net +- MASTER_SITES= http://aim-transport.jabberstudio.org/ + PKGNAMEPREFIX= jabber- +- DISTNAME= ${PORTNAME}-stable-${PORTVERSION}b + DIST_SUBDIR= jabber + + MAINTAINER= seanc@FreeBSD.org +--- 5,15 ---- + # $FreeBSD: ports/net/jabber-aim/Makefile,v 1.7 2004/03/14 06:17:06 ade Exp $ + + PORTNAME= aim-transport ++ PORTVERSION= 0.9.24c ++ PORTREVISION= 1 + CATEGORIES= net ++ MASTER_SITES= http://download.jabber.org/dists/transports/aim-transport/ + PKGNAMEPREFIX= jabber- + DIST_SUBDIR= jabber + + MAINTAINER= seanc@FreeBSD.org +*************** +*** 17,26 **** + + BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber + +- WRKSRC= ${WRKDIR}/${PORTNAME}-stable-${PORTVERSION} + PLIST_FILES= lib/jabber/aimtrans.so + USE_GMAKE= yes +- USE_AUTOCONF_VER= 257 + + CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber + +--- 17,25 ---- + + BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber + + PLIST_FILES= lib/jabber/aimtrans.so + USE_GMAKE= yes ++ USE_AUTOCONF_VER= 213 + + CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber + diff -rudN net/jabber-aim.orig/distinfo net/jabber-aim/distinfo --- net/jabber-aim.orig/distinfo Wed Mar 31 05:10:01 2004 +++ net/jabber-aim/distinfo Fri Jul 2 00:13:20 2004 @@ -1,2 +1,2 @@ -MD5 (jabber/aim-transport-0.9.24c.tar.gz) = a3c18654d41ebfaa3c74117004bf7d93 -SIZE (jabber/aim-transport-0.9.24c.tar.gz) = 298241 +MD5 (jabber/aim-transport-stable-20040131b.tar.gz) = 804469a50824691adcfa2cec71dbf6df +SIZE (jabber/aim-transport-stable-20040131b.tar.gz) = 400742 diff -rudN net/jabber-aim.orig/files/patch-aa net/jabber-aim/files/patch-aa --- net/jabber-aim.orig/files/patch-aa Fri Apr 19 06:22:50 2002 +++ net/jabber-aim/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,41 +0,0 @@ ---- src/sessions.c Tue Nov 27 04:14:37 2001 -+++ /usr/ports/distfiles/jabber/sessions.c.orig Wed Jan 30 09:07:47 2002 -@@ -221,6 +221,29 @@ - return 1; - } - -+static int aim_icbmparaminfo(aim_session_t* sess, aim_frame_t* fr, ...) -+{ -+ struct aim_icbmparameters *params; -+ va_list ap; -+ -+ va_start(ap, fr); -+ params = va_arg(ap, struct aim_icbmparameters *); -+ va_end(ap); -+ -+ /* -+ * Set these to your taste, or client medium. Setting minmsginterval -+ * higher is good for keeping yourself from getting flooded (esp -+ * if you're on a slow connection or something where that would be -+ * useful). -+ */ -+ params->maxmsglen = 8000; -+ params->minmsginterval = 0; /* in milliseconds */ -+ -+ aim_seticbmparam(sess, params); -+ -+ return 1; -+} -+ - int at_conninitdone_admin(aim_session_t *sess, - aim_frame_t *command, ...) - { -@@ -411,6 +434,8 @@ - AIM_CB_SPECIAL_CONNERR, at_parse_connerr, 0); - aim_conn_addhandler(sess, bosconn, 0x0001, 0x001f, - at_memrequest, 0); -+ aim_conn_addhandler(sess, bosconn, 0x0004, 0x0005, -+ aim_icbmparaminfo, 0); - - - am = pmalloco(s->p, sizeof(_at_mio)); >Release-Note: >Audit-Trail: >Unformatted: