From girgen@partitur.se  Fri Jan  1 19:32:25 1999
Received: from d1o29.telia.com (d1o29.telia.com [194.236.214.241])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id TAA01103
          for <FreeBSD-gnats-submit@freebsd.org>; Fri, 1 Jan 1999 19:32:24 -0800 (PST)
          (envelope-from girgen@partitur.se)
Received: from stordatan.telia.com (t1o29p75.telia.com [194.236.214.75])
	by d1o29.telia.com (8.8.8/8.8.5) with ESMTP id EAA22640
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 2 Jan 1999 04:32:00 +0100 (MET)
Received: (from girgen@localhost)
	by stordatan.telia.com (8.9.1/8.9.1) id EAA55041;
	Sat, 2 Jan 1999 04:31:33 +0100 (CET)
	(envelope-from girgen@partitur.se)
Message-Id: <199901020331.EAA55041@stordatan.telia.com>
Date: Sat, 2 Jan 1999 04:31:33 +0100 (CET)
From: girgen@partitur.se
Reply-To: girgen@partitur.se
To: FreeBSD-gnats-submit@freebsd.org
Subject: sudo fails [patch included]
X-Send-Pr-Version: 3.2

>Number:         9268
>Category:       ports
>Synopsis:       sudo fails [patch included]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    erich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan  1 19:40:00 PST 1999
>Closed-Date:    Sun Jan 10 10:48:54 PST 1999
>Last-Modified:  Sun Jan 10 10:50:08 PST 1999
>Originator:     Palle Girgensohn
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
Partitur
>Environment:

	

>Description:
Sudo has been updated, and the port fails fetching the distribution.

	

>How-To-Repeat:
cd /usr/ports/sudo && make
	

>Fix:
diff -urN sudo.old/Makefile sudo/Makefile
--- sudo.old/Makefile	Sat Jan  2 03:52:03 1999
+++ sudo/Makefile	Sat Jan  2 03:52:38 1999
@@ -6,8 +6,8 @@
 # $Id: Makefile,v 1.14 1998/10/27 04:54:42 asami Exp $
 #
 
-DISTNAME=	cu-sudo.v1.5.6p5
-PKGNAME=	sudo-1.5.6.5
+DISTNAME=	cu-sudo.v1.5.7p4
+PKGNAME=	sudo-1.5.7.4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cs.colorado.edu/pub/sysadmin/sudo/
 EXTRACT_SUFX=	.tar.Z
@@ -16,7 +16,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-C2 --with-skey --with-fbsdops
-WRKSRC=		${WRKDIR}/sudo.v1.5.6p5
+WRKSRC=		${WRKDIR}/sudo.v1.5.7p4
 MAN5=		sudoers.5
 MAN8=		sudo.8 visudo.8
 
diff -urN sudo.old/patches/patch-aa sudo/patches/patch-aa
--- sudo.old/patches/patch-aa	Fri Oct 23 16:29:32 1998
+++ sudo/patches/patch-aa	Sat Jan  2 04:12:33 1999
@@ -1,30 +1,29 @@
---- configure.orig	Sun Sep 20 04:25:10 1998
-+++ configure	Fri Oct 23 00:17:09 1998
-@@ -48,6 +48,8 @@
+--- /usr/ports/security/sudo/work2/sudo.v1.5.7p4/configure	Tue Nov 24 05:40:24 1998
++++ configure	Sat Jan  2 04:07:08 1999
+@@ -22,6 +22,8 @@
  ac_help="$ac_help
    --with-csops            add CSOps standard options"
  ac_help="$ac_help
 +  --with-fbsdops          add FreeBSD standard options"
 +ac_help="$ac_help
-   --enable-log-host       Log the hostname in the log file
-   --disable-log-host      Do not log hostname in the log file (default)"
+   --with-skey             enable S/Key support "
  ac_help="$ac_help
-@@ -579,8 +581,8 @@
+   --with-opie             enable OPIE support "
+@@ -665,8 +667,8 @@
  
  test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
  test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
--test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/etc'
+-test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
 -test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
-+test "$sbindir" = '${exec_prefix}/sbin' || sbindir='$(exec_prefix)/etc'
++test "$sbindir" = '${exec_prefix}/sbin' || sbindir='$(exec_prefix)/sbin'
 +test "$sysconfdir" = '${prefix}/etc' || sysconfdir='/etc'
  
  
  # Check whether --with-CC or --without-CC was given.
-@@ -940,7 +942,20 @@
- 
+@@ -2068,6 +2070,20 @@
+   echo "$ac_t""no" 1>&6
  fi
  
--
 +# Check whether --with-fbsdops or --without-fbsdops was given.
 +if test "${with_fbsdops+set}" = set; then
 +  withval="$with_fbsdops"
@@ -39,10 +38,10 @@
 +  esac
 +fi
 +    
+ 
  # Extract the first word of "egrep", so it can be a program name with args.
  set dummy egrep; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -5008,7 +5023,7 @@
+@@ -7000,7 +7016,7 @@
  fi
  
  if test "$with_skey" = "yes"; then
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->erich 
Responsible-Changed-By: steve 
Responsible-Changed-When: Sat Jan 2 12:22:18 PST 1999 
Responsible-Changed-Why:  
Over to port's maintainer. 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Jan 10 10:48:54 PST 1999 
State-Changed-Why:  
Updated to version 1.5.7.4 as part of PR ports/9346. 
>Unformatted:
