From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 4 12:40:04 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 946841065670 for ; Wed, 4 Aug 2010 12:40:04 +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 57D4A8FC13 for ; Wed, 4 Aug 2010 12:40:04 +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 o74Ce4su018479 for ; Wed, 4 Aug 2010 12:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o74Ce47c018478; Wed, 4 Aug 2010 12:40:04 GMT (envelope-from gnats) Resent-Date: Wed, 4 Aug 2010 12:40:04 GMT Resent-Message-Id: <201008041240.o74Ce47c018478@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, Michael Pounov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3679B1065672 for ; Wed, 4 Aug 2010 12:34:36 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 0AA5A8FC0C for ; Wed, 4 Aug 2010 12:34:36 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o74CYZvJ014286 for ; Wed, 4 Aug 2010 12:34:35 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o74CYZRT014285; Wed, 4 Aug 2010 12:34:35 GMT (envelope-from nobody) Message-Id: <201008041234.o74CYZRT014285@www.freebsd.org> Date: Wed, 4 Aug 2010 12:34:35 GMT From: Michael Pounov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/149270: ipsec-tools is broken in CURRENT 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: Wed, 04 Aug 2010 12:40:04 -0000 >Number: 149270 >Category: ports >Synopsis: ipsec-tools is broken in CURRENT >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 04 12:40:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Michael Pounov >Release: FreeBSD 9.0-CURRENT >Organization: AITNET >Environment: FreeBSD smurf.insecurebg.org 9.0-CURRENT FreeBSD 9.0-CURRENT #5: Fri Jul 30 18:11:06 EEST 2010 root@smurf.insecurebg.org:/usr/obj/usr/src/sys/GENERIC.ALIEN i386 >Description: ipsec-tools is broken in current. This patch files fix Makefile of port dir and fix isakmp_cfg source file. Change login and logout functions and remove ut structure. >How-To-Repeat: cd /usr/ports/security/ipsec-tools; make install >Fix: patch < ipsec-tools_fbsd90.patch Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/ipsec-tools/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 20 Mar 2010 15:12:15 -0000 1.26 +++ Makefile 4 Aug 2010 11:18:17 -0000 @@ -60,7 +60,7 @@ .include .if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx +LDFLAGS+= -lulog .endif .ifdef(WITH_DEBUG) --- work/ipsec-tools-0.7.3/src/racoon/isakmp_cfg.c 2008-11-27 17:25:20.000000000 +0200 +++ work/ipsec-tools-0.7.3/src/racoon/isakmp_cfg_new.c 2010-08-04 14:58:27.000000000 +0300 @@ -38,7 +38,8 @@ #include #include -#include +#include +#include #if defined(__APPLE__) && defined(__MACH__) #include #endif @@ -1651,8 +1652,7 @@ int inout; { int error = 0; - struct utmp ut; - char term[UT_LINESIZE]; + char term[8]; char addr[NI_MAXHOST]; if (usr == NULL || usr[0]=='\0') { @@ -1665,33 +1665,20 @@ switch (inout) { case ISAKMP_CFG_LOGIN: - strncpy(ut.ut_name, usr, UT_NAMESIZE); - ut.ut_name[UT_NAMESIZE - 1] = '\0'; - - strncpy(ut.ut_line, term, UT_LINESIZE); - ut.ut_line[UT_LINESIZE - 1] = '\0'; - GETNAMEINFO_NULL(raddr, addr); - strncpy(ut.ut_host, addr, UT_HOSTSIZE); - ut.ut_host[UT_HOSTSIZE - 1] = '\0'; - ut.ut_time = time(NULL); - plog(LLV_INFO, LOCATION, NULL, "Accounting : '%s' logging on '%s' from %s.\n", - ut.ut_name, ut.ut_line, ut.ut_host); - - login(&ut); + term, usr, addr); + ulog_login(term, usr, addr); break; case ISAKMP_CFG_LOGOUT: - plog(LLV_INFO, LOCATION, NULL, "Accounting : '%s' unlogging from '%s'.\n", usr, term); - logout(term); - + ulog_logout(term); break; default: plog(LLV_ERROR, LOCATION, NULL, "Unepected inout\n"); >Release-Note: >Audit-Trail: >Unformatted: