From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 3 00:30:19 2005 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 D2E2B16A41F for ; Thu, 3 Nov 2005 00:30:19 +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 0248343D49 for ; Thu, 3 Nov 2005 00:30:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA30UHWt001989 for ; Thu, 3 Nov 2005 00:30:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA30UHE9001980; Thu, 3 Nov 2005 00:30:17 GMT (envelope-from gnats) Resent-Date: Thu, 3 Nov 2005 00:30:17 GMT Resent-Message-Id: <200511030030.jA30UHE9001980@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, infofarmer@gmail.com Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3F4216A41F for ; Thu, 3 Nov 2005 00:22:40 +0000 (GMT) (envelope-from sat@proxy.gubkin.ru) Received: from proxy.gubkin.ru (proxy.gubkin.ru [193.233.78.245]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B5E443D46 for ; Thu, 3 Nov 2005 00:22:40 +0000 (GMT) (envelope-from sat@proxy.gubkin.ru) Received: from proxy.gubkin.ru (localhost [127.0.0.1]) by proxy.gubkin.ru (8.13.3/8.13.3) with ESMTP id jA30MZPf096507 for ; Thu, 3 Nov 2005 03:22:35 +0300 (MSK) (envelope-from sat@proxy.gubkin.ru) Received: (from sat@localhost) by proxy.gubkin.ru (8.13.3/8.13.3/Submit) id jA30MZ7Z096506; Thu, 3 Nov 2005 03:22:35 +0300 (MSK) (envelope-from sat) Message-Id: <200511030022.jA30MZ7Z096506@proxy.gubkin.ru> Date: Thu, 3 Nov 2005 03:22:35 +0300 (MSK) From: Andrew Pantyukhin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/88420: update comms/conserver-com to 8.1.12 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: infofarmer@gmail.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2005 00:30:20 -0000 >Number: 88420 >Category: ports >Synopsis: update comms/conserver-com to 8.1.12 >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: Thu Nov 03 00:30:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrew Pantyukhin >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD proxy.gubkin.ru 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #6: Thu Oct 20 19:33:42 MSD 2005 sat@proxy.gubkin.ru:/usr/obj/usr/src/sys/SATPROXYGUB i386 >Description: - Update to 8.1.12 - Add http to MASTER_SITES - Minor fixes >How-To-Repeat: >Fix: The default config file is not compatible with FreeBSD 6.0 due to change in dev naming (cuaa -> cuad). --- conserver-com.diff begins here --- diff -urN /usr/ports/comms/conserver-com/Makefile conserver-com/Makefile --- /usr/ports/comms/conserver-com/Makefile Tue Feb 1 08:29:00 2005 +++ conserver-com/Makefile Thu Nov 3 02:28:13 2005 @@ -6,9 +6,10 @@ # PORTNAME= conserver -PORTVERSION= 8.1.11 +PORTVERSION= 8.1.12 CATEGORIES= comms -MASTER_SITES= ftp://ftp.conserver.com/conserver/ +MASTER_SITES= ftp://ftp.conserver.com/conserver/ \ + http://www.conserver.com/ PKGNAMESUFFIX= -com MAINTAINER= kuriyama@FreeBSD.org diff -urN /usr/ports/comms/conserver-com/distinfo conserver-com/distinfo --- /usr/ports/comms/conserver-com/distinfo Tue Feb 1 08:29:00 2005 +++ conserver-com/distinfo Thu Nov 3 02:24:56 2005 @@ -1,2 +1,2 @@ -MD5 (conserver-8.1.11.tar.gz) = 94259cd71f38e94b3f247768e3bc731f -SIZE (conserver-8.1.11.tar.gz) = 299281 +MD5 (conserver-8.1.12.tar.gz) = 1fb356224f018625be5c3d35529a4ac6 +SIZE (conserver-8.1.12.tar.gz) = 303891 diff -urN /usr/ports/comms/conserver-com/files/conserver.sh conserver-com/files/conserver.sh --- /usr/ports/comms/conserver-com/files/conserver.sh Sat Oct 25 17:11:16 2003 +++ conserver-com/files/conserver.sh Thu Nov 3 02:46:12 2005 @@ -8,17 +8,15 @@ . %%RC_SUBR%% -name=conserver +name="conserver" rcvar=`set_rcvar` -command=%%PREFIX%%/sbin/conserver +command=%%PREFIX%%/sbin/${name} pidfile=/var/run/conserver.pid required_files=%%PREFIX%%/etc/conserver.cf -# set defaults -[ -z "$conserver_enable" ] && conserver_enable=NO -[ -z "$conserver_flags" ] && conserver_flags="-d" - load_rc_config $name +: ${conserver_enable="NO"} +: ${conserver_flags="-d"} run_rc_command "$1" diff -urN /usr/ports/comms/conserver-com/files/patch-conserver-Makefile.in conserver-com/files/patch-conserver-Makefile.in --- /usr/ports/comms/conserver-com/files/patch-conserver-Makefile.in Thu Jan 1 03:00:00 1970 +++ conserver-com/files/patch-conserver-Makefile.in Thu Nov 3 03:08:52 2005 @@ -0,0 +1,10 @@ +--- conserver/Makefile.in.orig Thu Nov 3 03:03:03 2005 ++++ conserver/Makefile.in Thu Nov 3 03:05:55 2005 +@@ -66,6 +66,6 @@ + $(MKDIR) $(DESTDIR)$(exampledir) + $(INSTALL) conserver.rc $(DESTDIR)$(exampledir) + $(MKDIR) $(DESTDIR)$(pkglibdir) +- $(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert ++ $(INSTALL_PROGRAM) convert $(DESTDIR)$(sbindir)/conserver-convert + + .PHONY: clean distclean install diff -urN /usr/ports/comms/conserver-com/files/patch-conserver.cf conserver-com/files/patch-conserver.cf --- /usr/ports/comms/conserver-com/files/patch-conserver.cf Sun Dec 7 07:31:49 2003 +++ conserver-com/files/patch-conserver.cf Thu Jan 1 03:00:00 1970 @@ -1,16 +0,0 @@ ---- conserver.cf/conserver.cf.orig Sun Nov 9 08:45:41 2003 -+++ conserver.cf/conserver.cf Wed Dec 3 17:51:49 2003 -@@ -50,10 +50,10 @@ - motd "just a simple ssh to localhost"; - } - --# connect to /dev/ttya --console ttya { -+# connect to /dev/cuaa0 -+console cuaa0 { - type device; -- device /dev/ttya; parity none; baud 9600; -+ device /dev/cuaa0; parity none; baud 9600; - idlestring "#"; - idletimeout 5m; # send a '#' every 5 minutes of idle - timestamp ""; # no timestamps on this console diff -urN /usr/ports/comms/conserver-com/files/patch-conserver.cf-conserver.cf conserver-com/files/patch-conserver.cf-conserver.cf --- /usr/ports/comms/conserver-com/files/patch-conserver.cf-conserver.cf Thu Jan 1 03:00:00 1970 +++ conserver-com/files/patch-conserver.cf-conserver.cf Thu Nov 3 01:45:09 2005 @@ -0,0 +1,16 @@ +--- conserver.cf/conserver.cf.orig Sun Nov 9 08:45:41 2003 ++++ conserver.cf/conserver.cf Wed Dec 3 17:51:49 2003 +@@ -50,10 +50,10 @@ + motd "just a simple ssh to localhost"; + } + +-# connect to /dev/ttya +-console ttya { ++# connect to /dev/cuaa0 ++console cuaa0 { + type device; +- device /dev/ttya; parity none; baud 9600; ++ device /dev/cuaa0; parity none; baud 9600; + idlestring "#"; + idletimeout 5m; # send a '#' every 5 minutes of idle + timestamp ""; # no timestamps on this console diff -urN /usr/ports/comms/conserver-com/pkg-plist conserver-com/pkg-plist --- /usr/ports/comms/conserver-com/pkg-plist Sat Oct 25 17:11:15 2003 +++ conserver-com/pkg-plist Thu Nov 3 03:10:21 2005 @@ -4,4 +4,5 @@ %%EXAMPLESDIR%%/conserver.passwd %%EXAMPLESDIR%%/conserver.rc sbin/conserver +sbin/conserver-convert @dirrm %%EXAMPLESDIR%% --- conserver-com.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: