From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 22 23:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 5E3DB16A41F for ; Sun, 22 Jan 2006 23:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2878043D79 for ; Sun, 22 Jan 2006 23:40:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0MNe3OY038874 for ; Sun, 22 Jan 2006 23:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0MNe3wb038871; Sun, 22 Jan 2006 23:40:03 GMT (envelope-from gnats) Resent-Date: Sun, 22 Jan 2006 23:40:03 GMT Resent-Message-Id: <200601222340.k0MNe3wb038871@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, Peter van Dijk Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D4C716A41F for ; Sun, 22 Jan 2006 23:33:28 +0000 (GMT) (envelope-from peter@dataloss.nl) Received: from useful.dataloss.nl (useful.dataloss.nl [80.84.249.161]) by mx1.FreeBSD.org (Postfix) with SMTP id 848B243D45 for ; Sun, 22 Jan 2006 23:33:27 +0000 (GMT) (envelope-from peter@dataloss.nl) Received: (qmail 22152 invoked by uid 1001); 22 Jan 2006 23:33:25 -0000 Message-Id: <20060122233325.22151.qmail@useful.dataloss.nl> Date: 22 Jan 2006 23:33:25 -0000 From: Peter van Dijk To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92173: maintainer update bitlbee 1.0.1 (with security fix) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Peter van Dijk List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2006 23:40:22 -0000 >Number: 92173 >Category: ports >Synopsis: maintainer update bitlbee 1.0.1 (with security fix) >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: Sun Jan 22 23:40:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Peter van Dijk >Release: FreeBSD 6.0-RELEASE sparc64 >Organization: - >Environment: >Description: This patch updates irc/bitlbee to 1.0.1; the optional MSN6 bit has important security fixes in this update. Makefile uses OPTIONS now. >How-To-Repeat: >Fix: --- irc/bitlbee/Makefile Mon Jan 9 17:34:16 2006 +++ irc/bitlbee/Makefile Sun Jan 22 16:57:25 2006 @@ -6,26 +6,21 @@ # PORTNAME= bitlbee -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= irc -MASTER_SITES= http://get.bitlbee.org/src/:bitlbee \ - http://get.bitlbee.org/patches/:patches -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:bitlbee -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= http://get.bitlbee.org/src/ PATCH_SITES= http://get.bitlbee.org/patches/ MAINTAINER= peter@dataloss.nl COMMENT= An IRC to other chat networks gateway -.if defined(WITH_MSN) && defined(WITH_MSN6_FEATURES) -# don't use DISTNAME as old patch applies fine to new release -DISTFILES+= ${PORTNAME}-1.0-msn6.akke.patch:patches +.if defined(WITH_MSN6_FEATURES) +PATCHFILES+= ${DISTNAME}-msn6.akke.diff .endif .if defined(WITH_LDAP) -PATCHFILES+= ${DISTNAME}-ldap.diff +PATCHFILES+= ${PORTNAME}-1.0-ldap.diff .endif MAN5= bitlbee.conf.5 @@ -37,9 +32,13 @@ USE_GETOPT_LONG=yes PKGMESSAGE= ${WRKDIR}/pkg-message +OPTIONS= MSN "Enable MSN protocol support" On \ + MSN6_FEATURES "Enable MSN6 features (icons, etc)" Off \ + LDAP "Enable LDAP authentication support" Off + CONFIGURE_ARGS= --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee -.if defined(WITH_MSN) +.if defined(WITH_MSN) || defined(WITH_MSN6_FEATURES) LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--msn=1 .else @@ -49,30 +48,6 @@ .if defined(WITH_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+=--ldap=${LOCALBASE} -.endif - -pre-configure: -.if !defined(WITH_MSN) - @${ECHO_CMD} "Type \"make -DWITH_MSN\" if you want to enable MSN and Jabber/SSL support." -.else - @${ECHO_CMD} "MSN and Jabber/SSL support will be enabled." - -. if !defined(WITH_MSN6_FEATURES) - @${ECHO_CMD} "Type \"make -DWITH_MSN6_FEATURES\" if you want to enable MSN 6 features, like buddy icons" -. else - @${ECHO_CMD} "MSN 6 features will be enabled." -. endif -.endif - -.if !defined(WITH_LDAP) - @${ECHO_CMD} "Type \"make -DWITH_LDAP\" if you want to enable LDAP authentication." -.else - @${ECHO_CMD} "LDAP authentication will be enabled." -.endif - -post-patch: -.if defined(WITH_MSN) && defined(WITH_MSN6_FEATURES) - @${PATCH} ${PATCH_ARGS} -p1 < ${DISTDIR}/${PORTNAME}-1.0-msn6.akke.patch .endif post-build: --- irc/bitlbee/distinfo Mon Dec 12 11:35:45 2005 +++ irc/bitlbee/distinfo Sun Jan 22 16:51:42 2006 @@ -1,9 +1,9 @@ -MD5 (bitlbee-1.0.tar.gz) = f3ae3beda45e6f7d3fdd77e377f0876d -SHA256 (bitlbee-1.0.tar.gz) = 90e845c46b953e62a3991b331ad7755131c6701f5fc265212a02392e35bff030 -SIZE (bitlbee-1.0.tar.gz) = 453937 +MD5 (bitlbee-1.0.1.tar.gz) = a4d7daa9b64898dd41a3a6d104692d9a +SHA256 (bitlbee-1.0.1.tar.gz) = 5f8e82717195c0e51353b93a20826f2ea38fd2be28094cfef48bd489a040e58a +SIZE (bitlbee-1.0.1.tar.gz) = 458676 +MD5 (bitlbee-1.0.1-msn6.akke.diff) = 7b36e8d50d7d7a7c11619d7729b61e76 +SHA256 (bitlbee-1.0.1-msn6.akke.diff) = 72c532c2c49b4cf1e99ce46a0c2f59c15cb2851aac8185acf78d0ecad5061a2c +SIZE (bitlbee-1.0.1-msn6.akke.diff) = 83568 MD5 (bitlbee-1.0-ldap.diff) = f6641ed9b36ca2ceae292370200452fb SHA256 (bitlbee-1.0-ldap.diff) = 2da18c740b1c1ff6851f3a52ab0100cec251d9e1683c281a306cbbc21e6847f5 SIZE (bitlbee-1.0-ldap.diff) = 7240 -MD5 (bitlbee-1.0-msn6.akke.patch) = 5964b15b9982ddaf923346e83737c6af -SHA256 (bitlbee-1.0-msn6.akke.patch) = bbab3e5a0c0be255b55a60d44d19356f1dcae9556768dcc2ea82dd123edd19eb -SIZE (bitlbee-1.0-msn6.akke.patch) = 85638 --- irc/bitlbee/pkg-plist Sat Oct 16 21:59:02 2004 +++ irc/bitlbee/pkg-plist Sun Jan 22 17:06:46 2006 @@ -4,4 +4,4 @@ etc/bitlbee/bitlbee.conf.orig etc/bitlbee/motd.txt.orig @dirrm %%DATADIR%% -@dirrm etc/bitlbee +@dirrmtry etc/bitlbee >Release-Note: >Audit-Trail: >Unformatted: