From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 3 19:00:41 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 6E88816A4E8 for ; Sun, 3 Sep 2006 19:00:41 +0000 (UTC) (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 7647A43D45 for ; Sun, 3 Sep 2006 19:00:40 +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 k83J0ddR000629 for ; Sun, 3 Sep 2006 19:00:40 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k83J0dZj000626; Sun, 3 Sep 2006 19:00:39 GMT (envelope-from gnats) Resent-Date: Sun, 3 Sep 2006 19:00:39 GMT Resent-Message-Id: <200609031900.k83J0dZj000626@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, Jonas Kvinge Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47EB216A4DD for ; Sun, 3 Sep 2006 18:57:42 +0000 (UTC) (envelope-from jonas@emptyglass.night-light.net) Received: from emptyglass.night-light.net (emptyglass.night-light.net [81.191.68.120]) by mx1.FreeBSD.org (Postfix) with ESMTP id B557B43D45 for ; Sun, 3 Sep 2006 18:57:41 +0000 (GMT) (envelope-from jonas@emptyglass.night-light.net) Received: from emptyglass.night-light.net (smmsp@localhost.night-light.net [127.0.0.1]) by emptyglass.night-light.net (8.13.7/8.13.6) with ESMTP id k83IvW0v011168 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sun, 3 Sep 2006 20:57:32 +0200 (CEST) (envelope-from jonas@emptyglass.night-light.net) Received: (from root@localhost) by emptyglass.night-light.net (8.13.7/8.13.6/Submit) id k83IvWba011167; Sun, 3 Sep 2006 20:57:32 +0200 (CEST) (envelope-from jonas) Message-Id: <200609031857.k83IvWba011167@emptyglass.night-light.net> Date: Sun, 3 Sep 2006 20:57:32 +0200 (CEST) From: Jonas Kvinge To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102826: ircproxy X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jonas Kvinge List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2006 19:00:41 -0000 >Number: 102826 >Category: ports >Synopsis: ircproxy >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 03 19:00:38 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jonas Kvinge >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD emptyglass.night-light.net 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jul 15 21:58:50 CEST 2006 drowned@emptyglass.night-light.net:/usr/obj/usr/src/sys/EMPTYGLASS i386 >Description: Update port to version 1.2.42.pre3 >How-To-Repeat: >Fix: --- ircproxy.diff begins here --- diff -ruN ircproxy.old/Makefile ircproxy/Makefile --- ircproxy.old/Makefile Sun Sep 3 20:24:38 2006 +++ ircproxy/Makefile Sun Sep 3 20:24:37 2006 @@ -6,10 +6,10 @@ # PORTNAME= ircproxy -PORTVERSION= 1.2.42d.pre2 +PORTVERSION= 1.2.42d.pre3 CATEGORIES= irc MASTER_SITES= http://www.ircproxy.night-light.net/files/ -DISTNAME= ircproxy-1.2.42d.pre2 +DISTNAME= ircproxy-1.2.42d.pre3 MAINTAINER= jonas@night-light.net COMMENT= An IRC proxy/bouncer daemon diff -ruN ircproxy.old/distinfo ircproxy/distinfo --- ircproxy.old/distinfo Sun Sep 3 20:24:38 2006 +++ ircproxy/distinfo Sun Sep 3 20:46:51 2006 @@ -1,3 +1,3 @@ -MD5 (ircproxy-1.2.42d.pre2.tar.gz) = f3b5d9800b78ebda3346b137a5489671 -SHA256 (ircproxy-1.2.42d.pre2.tar.gz) = c8d1370db589cc1778f581e60a5107defe3d1eed3ada46c40544f4f9ca968f58 -SIZE (ircproxy-1.2.42d.pre2.tar.gz) = 239968 +MD5 (ircproxy-1.2.42d.pre3.tar.gz) = 6fbb849489912e6dabedba3f35ba782c +SHA256 (ircproxy-1.2.42d.pre3.tar.gz) = 1d66b58ce596e45c0168327d795211452e5a7db061e968b9ee678ad894ba36b6 +SIZE (ircproxy-1.2.42d.pre3.tar.gz) = 239450 diff -ruN ircproxy.old/pkg-deinstall ircproxy/pkg-deinstall --- ircproxy.old/pkg-deinstall Sun Sep 3 20:24:38 2006 +++ ircproxy/pkg-deinstall Sun Sep 3 20:24:38 2006 @@ -4,7 +4,7 @@ # Deinstallation script for FreeBSD ports # Written by Jonas Kvinge # -# Last modified: Jonas Kvinge (26.08.2006) +# Last modified: Jonas Kvinge (03.09.2006) # BINFILE=ircproxyd @@ -14,12 +14,12 @@ if [ "$2" = "DEINSTALL" ]; then - grep -q "^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh" /etc/crontab >/dev/null 2>&1 - if [ $? -eq 0 ]; then - sed -i -e "s:^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh::" /etc/crontab - sed -i -e '/^$/d' /etc/crontab - rm -f /etc/crontab-e - fi + #grep -q "^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh" /etc/crontab >/dev/null 2>&1 + #if [ $? -eq 0 ]; then + # sed -i -e "s:^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh::" /etc/crontab + # sed -i -e '/^$/d' /etc/crontab + # rm -f /etc/crontab-e + #fi if [ -f $PIDFILE ] && [ -r $PIDFILE ] ; then PID=`cat "$PIDFILE"` diff -ruN ircproxy.old/pkg-install ircproxy/pkg-install --- ircproxy.old/pkg-install Sun Sep 3 20:24:38 2006 +++ ircproxy/pkg-install Sun Sep 3 20:24:38 2006 @@ -4,7 +4,7 @@ # Installation script for FreeBSD ports # Written by Jonas Kvinge # -# Last modified: Jonas Kvinge (26.08.2006) +# Last modified: Jonas Kvinge (03.09.2006) # BINFILE="ircproxyd" @@ -28,12 +28,13 @@ sed -i -e "s:^IRCPROXYPIDFILE=.*:IRCPROXYPIDFILE=${PIDFILE}:" ${PKG_PREFIX}/sbin/ircproxy.sh || exit 1 rm -f ${PKG_PREFIX}/sbin/ircproxy.sh-e - grep -q "^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh" /etc/crontab >/dev/null 2>&1 - if [ ! $? -eq 0 ] ; then - cat <>/etc/crontab || exit 1 -*/5 * * * * root $PKG_PREFIX/sbin/ircproxy.sh -EOF - fi + #grep -q "^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh" /etc/crontab >/dev/null 2>&1 + #if [ ! $? -eq 0 ] ; then + # cat <>/etc/crontab || exit 1 + #*/5 * * * * root $PKG_PREFIX/sbin/ircproxy.sh + #EOF + #fi + fi diff -ruN ircproxy.old/pkg-plist ircproxy/pkg-plist --- ircproxy.old/pkg-plist Sun Sep 3 20:24:39 2006 +++ ircproxy/pkg-plist Sun Sep 3 20:24:38 2006 @@ -3,5 +3,6 @@ sbin/ircproxy.sh etc/ircproxy/ircproxy-listen.conf etc/ircproxy/ircproxy-access.conf +etc/ircproxy/ircproxy-user.conf etc/ircproxy/ircproxy-conn.conf @dirrm etc/ircproxy --- ircproxy.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: