From nobody@FreeBSD.org  Mon Feb 18 18:10:16 2002
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9746437B41C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Feb 2002 18:10:07 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g1J2A7r99763;
	Mon, 18 Feb 2002 18:10:07 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200202190210.g1J2A7r99763@freefall.freebsd.org>
Date: Mon, 18 Feb 2002 18:10:07 -0800 (PST)
From: Jose Abelardo Martinez <jamartinez@altern.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Upgrade aolserver from 3.4 to 3.4.2
X-Send-Pr-Version: www-1.0

>Number:         35100
>Category:       ports
>Synopsis:       Upgrade aolserver from 3.4 to 3.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jkoshy
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 18 18:20:01 PST 2002
>Closed-Date:    Thu Mar 28 01:05:05 PST 2002
>Last-Modified:  Thu Mar 28 01:05:05 PST 2002
>Originator:     Jose Abelardo Martinez
>Release:        4.5-RELEASE
>Organization:
>Environment:
FreeBSD publico.ovaintra.com.mx 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan 28 14:31:56 GMT 2002    murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC  i386      
>Description:
Upgrade aolserver to latest version (3.4.2)
Added files:
     files/patch-a
     files/patch-b
     files/patch-c
>How-To-Repeat:
      
>Fix:
diff -ruN aolserver/Makefile aolserver-new/Makefile
--- aolserver/Makefile	Mon Feb 18 16:53:06 2002
+++ aolserver-new/Makefile	Mon Feb 18 16:34:39 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	aolserver
-PORTVERSION=	3.4
+PORTVERSION=	3.4.2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.aolserver.com/aolserver/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -20,9 +20,6 @@
 INSTALL_TARGET=	install INST=${PREFIX}/${PORTNAME}
 
 post-extract:
-	${MV} ${WRKSRC}/include/Makefile.global ${WRKSRC}/include/Makefile.global.orig
-	${SED} s/tcl83/tcl8.3/ ${WRKSRC}/include/Makefile.global.orig > ${WRKSRC}/include/Makefile.global
-	${RM} ${WRKSRC}/include/Makefile.global.orig
 	find ${WRKSRC} -name CVS | xargs ${RM} -rf
 
 post-install:
@@ -31,15 +28,16 @@
 .for header in nsd/nsd.h
 	 ${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/${PORTNAME}/include
 .endfor
+	 ${RM} ${PREFIX}/${PORTNAME}/include/*.orig
 
 # Other documentation
-	 ${MKDIR} ${PREFIX}/share/doc/aolserver
-	 ${TAR} -C ${WRKSRC} -c -f - ChangeLog README | ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -
-	 ${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -
+	 ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	 ${TAR} -C ${WRKSRC} -c -f - ChangeLog README | ${TAR} -C ${PREFIX}/share/doc/${PORTNAME} -x -f -
+	 ${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${PREFIX}/share/doc/${PORTNAME} -x -f -
 
 # Permissions
-	${CHOWN} nobody:nogroup ${PREFIX}/aolserver/servers/server1/modules/nslog
-	${CHOWN} nobody:nogroup ${PREFIX}/aolserver/log
+	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/servers/server1/modules/nslog
+	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/log
 
 # Startup file
 	@if [ ! -f ${PREFIX}/etc/rc.d/aolserver.sh ]; then \
diff -ruN aolserver/distinfo aolserver-new/distinfo
--- aolserver/distinfo	Mon Feb 18 16:53:06 2002
+++ aolserver-new/distinfo	Mon Feb 18 16:34:39 2002
@@ -1 +1 @@
-MD5 (aolserver-3.4-src.tar.gz) = 45ed3ed31ac373bc4951b4f1ecb09da3
+MD5 (aolserver-3.4.2-src.tar.gz) = 51d4336535c171782e8f5abeb5689cca
diff -ruN aolserver/files/patch-a aolserver-new/files/patch-a
--- aolserver/files/patch-a	Wed Dec 31 18:00:00 1969
+++ aolserver-new/files/patch-a	Mon Feb 18 16:34:39 2002
@@ -0,0 +1,11 @@
+--- include/Makefile.global	Fri Feb 15 11:39:00 2002
++++ include/Makefile.global.new	Fri Feb 15 11:39:00 2002
+@@ -259,7 +259,7 @@
+ TCL76_DIR=tcl7.6
+ ifeq (bsd, $(findstring bsd, $(PLATFORM)))
+   TCL76_LIB=libtcl76.a
+-  TCL8X_LIB=libtcl83g.a
++  TCL8X_LIB=libtcl8.3g.a
+ else
+   TCL76_LIB=libtcl7.6.a
+   TCL8X_LIB=libtcl8.3g.a
diff -ruN aolserver/files/patch-b aolserver-new/files/patch-b
--- aolserver/files/patch-b	Wed Dec 31 18:00:00 1969
+++ aolserver-new/files/patch-b	Mon Feb 18 16:34:39 2002
@@ -0,0 +1,40 @@
+--- nsd/nsmain.c	Tue Apr  3 18:13:15 2001
++++ nsd/nsmain.c.new	Fri Feb 15 12:22:04 2002
+@@ -311,16 +311,10 @@
+     /*
+      * Verify the uid/gid args.
+      */
+-
+-    if (garg != NULL) {
+-	gid = Ns_GetGid(garg);
+-	if (gid < 0) {
+-	    gid = atoi(garg);
+-	    if (gid == 0) {
+-		Ns_Fatal("nsmain: invalid group '%s'", garg);
+-	    }
+-	}
+-    }
++    /* Reversed the order so this will actually work
++     * Jon Griffin <jon@jongriffin.com> 01/27/2001
++     *
++    */
+     if (uarg != NULL) {
+ 	uid = Ns_GetUid(uarg);
+ 	gid = Ns_GetUserGid(uarg);
+@@ -329,6 +323,16 @@
+ 	}
+ 	if (uid == 0) {
+ 	    Ns_Fatal("nsmain: invalid user '%s'", uarg);
++	}
++    }
++
++    if (garg != NULL) {
++	gid = Ns_GetGid(garg);
++	if (gid < 0) {
++	    gid = atoi(garg);
++	    if (gid == 0) {
++		Ns_Fatal("nsmain: invalid group '%s'", garg);
++	    }
+ 	}
+     }
+ 
diff -ruN aolserver/files/patch-c aolserver-new/files/patch-c
--- aolserver/files/patch-c	Wed Dec 31 18:00:00 1969
+++ aolserver-new/files/patch-c	Mon Feb 18 16:34:39 2002
@@ -0,0 +1,24 @@
+--- tcl8.3.2/unix/tclUnixPipe.c	Thu Aug 17 17:46:15 2000
++++ tcl8.3.2/unix/tclUnixPipe.c.new	Fri Feb 15 12:30:19 2002
+@@ -950,12 +950,16 @@
+      * nonblocking, the read will never block.
+      */
+ 
+-    bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
+-    if (bytesRead > -1) {
+-        return bytesRead;
++    while (1) {
++        bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
++        if (bytesRead > -1) {
++           return bytesRead;
++        }
++        if ( errno != EINTR ) {
++           *errorCodePtr = errno;
++           return -1;
++        }
+     }
+-    *errorCodePtr = errno;
+-    return -1;
+ }
+ 
+ /*
diff -ruN aolserver/pkg-plist aolserver-new/pkg-plist
--- aolserver/pkg-plist	Mon Feb 18 16:53:06 2002
+++ aolserver-new/pkg-plist	Mon Feb 18 16:34:39 2002
@@ -159,8 +159,8 @@
 @dirrm aolserver/lib/tcl8.3/tcltest1.0
 @dirrm aolserver/lib/tcl8.3
 @dirrm aolserver/lib
-@dirrm aolserver/servers/server1/modules/nsperm
 @dirrm aolserver/servers/server1/modules/nslog
+@dirrm aolserver/servers/server1/modules/nsperm
 @dirrm aolserver/servers/server1/modules
 @dirrm aolserver/servers/server1/pages
 @dirrm aolserver/servers/server1
      
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->jkoshy 
Responsible-Changed-By: jkoshy 
Responsible-Changed-When: Tue Mar 26 01:43:10 PST 2002 
Responsible-Changed-Why:  
Take this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=35100 
State-Changed-From-To: open->closed 
State-Changed-By: jkoshy 
State-Changed-When: Thu Mar 28 01:04:03 PST 2002 
State-Changed-Why:  
Patch committed with a few changes (`make package' was not correct). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=35100 
>Unformatted:
