Attachment #19803 for bug #35100

View | Details | Raw Unified | Return to bug 35100
Collapse All | Expand All




#

PORTNAME=	aolserver
PORTVERSION=	3.4.2
CATEGORIES=	www
MASTER_SITES=	ftp://ftp.aolserver.com/aolserver/
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

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:

.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/${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}/${PORTNAME}/servers/server1/modules/nslog
	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/log

# Startup file
	@if [ ! -f ${PREFIX}/etc/rc.d/aolserver.sh ]; then \

Line 1 Link Here

(-)aolserver-new/distinfo (-1 / +1 lines)
1	MD5 (aolserver-3.4-src.tar.gz) = 45ed3ed31ac373bc4951b4f1ecb09da3	1	MD5 (aolserver-3.4.2-src.tar.gz) = 51d4336535c171782e8f5abeb5689cca

Line 0 Link Here

(-)aolserver-new/files/patch-a (+11 lines)
	1	--- include/Makefile.global Fri Feb 15 11:39:00 2002
	2	+++ include/Makefile.global.new Fri Feb 15 11:39:00 2002
	3	@@ -259,7 +259,7 @@
	4	TCL76_DIR=tcl7.6
	5	ifeq (bsd, $(findstring bsd, $(PLATFORM)))
	6	TCL76_LIB=libtcl76.a
	7	- TCL8X_LIB=libtcl83g.a
	8	+ TCL8X_LIB=libtcl8.3g.a
	9	else
	10	TCL76_LIB=libtcl7.6.a
	11	TCL8X_LIB=libtcl8.3g.a




--- 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);
+	    }
 	}
     }
 




--- 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;
 }
 
 /*

Lines 159-166 Link Here

(-)aolserver-new/pkg-plist (-1 / +1 lines)
159	@dirrm aolserver/lib/tcl8.3/tcltest1.0	159	@dirrm aolserver/lib/tcl8.3/tcltest1.0
160	@dirrm aolserver/lib/tcl8.3	160	@dirrm aolserver/lib/tcl8.3
161	@dirrm aolserver/lib	161	@dirrm aolserver/lib
162	@dirrm aolserver/servers/server1/modules/nsperm
163	@dirrm aolserver/servers/server1/modules/nslog	162	@dirrm aolserver/servers/server1/modules/nslog
		163	@dirrm aolserver/servers/server1/modules/nsperm
164	@dirrm aolserver/servers/server1/modules	164	@dirrm aolserver/servers/server1/modules
165	@dirrm aolserver/servers/server1/pages	165	@dirrm aolserver/servers/server1/pages
166	@dirrm aolserver/servers/server1	166	@dirrm aolserver/servers/server1

Return to bug 35100

Lines 6-12 Link Here

(-)aolserver-new/Makefile (-9 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= aolserver	8	PORTNAME= aolserver
9	PORTVERSION= 3.4	9	PORTVERSION= 3.4.2
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= ftp://ftp.aolserver.com/aolserver/	11	MASTER_SITES= ftp://ftp.aolserver.com/aolserver/
12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Lines 20-28 Link Here
20	INSTALL_TARGET= install INST=${PREFIX}/${PORTNAME}	20	INSTALL_TARGET= install INST=${PREFIX}/${PORTNAME}
21		21
22	post-extract:	22	post-extract:
23	${MV} ${WRKSRC}/include/Makefile.global ${WRKSRC}/include/Makefile.global.orig
24	${SED} s/tcl83/tcl8.3/ ${WRKSRC}/include/Makefile.global.orig > ${WRKSRC}/include/Makefile.global
25	${RM} ${WRKSRC}/include/Makefile.global.orig
26	find ${WRKSRC} -name CVS \| xargs ${RM} -rf	23	find ${WRKSRC} -name CVS \| xargs ${RM} -rf
27		24
28	post-install:	25	post-install:
Lines 31-45 Link Here
31	.for header in nsd/nsd.h	28	.for header in nsd/nsd.h
32	${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/${PORTNAME}/include	29	${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/${PORTNAME}/include
33	.endfor	30	.endfor
		31	${RM} ${PREFIX}/${PORTNAME}/include/*.orig
34		32
35	# Other documentation	33	# Other documentation
36	${MKDIR} ${PREFIX}/share/doc/aolserver	34	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
37	${TAR} -C ${WRKSRC} -c -f - ChangeLog README \| ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -	35	${TAR} -C ${WRKSRC} -c -f - ChangeLog README \| ${TAR} -C ${PREFIX}/share/doc/${PORTNAME} -x -f -
38	${TAR} -C ${WRKSRC}/doc -c -f - . \| ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -	36	${TAR} -C ${WRKSRC}/doc -c -f - . \| ${TAR} -C ${PREFIX}/share/doc/${PORTNAME} -x -f -
39		37
40	# Permissions	38	# Permissions
41	${CHOWN} nobody:nogroup ${PREFIX}/aolserver/servers/server1/modules/nslog	39	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/servers/server1/modules/nslog
42	${CHOWN} nobody:nogroup ${PREFIX}/aolserver/log	40	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/log
43		41
44	# Startup file	42	# Startup file
45	@if [ ! -f ${PREFIX}/etc/rc.d/aolserver.sh ]; then \	43	@if [ ! -f ${PREFIX}/etc/rc.d/aolserver.sh ]; then \

Line 0 Link Here

(-)aolserver-new/files/patch-b (+40 lines)
	1	--- nsd/nsmain.c Tue Apr 3 18:13:15 2001
	2	+++ nsd/nsmain.c.new Fri Feb 15 12:22:04 2002
	3	@@ -311,16 +311,10 @@
	4	/*
	5	* Verify the uid/gid args.
	6	*/
	7	-
	8	- if (garg != NULL) {
	9	- gid = Ns_GetGid(garg);
	10	- if (gid < 0) {
	11	- gid = atoi(garg);
	12	- if (gid == 0) {
	13	- Ns_Fatal("nsmain: invalid group '%s'", garg);
	14	- }
	15	- }
	16	- }
	17	+ /* Reversed the order so this will actually work
	18	+ * Jon Griffin <jon@jongriffin.com> 01/27/2001
	19	+ *
	20	+ */
	21	if (uarg != NULL) {
	22	uid = Ns_GetUid(uarg);
	23	gid = Ns_GetUserGid(uarg);
	24	@@ -329,6 +323,16 @@
	25	}
	26	if (uid == 0) {
	27	Ns_Fatal("nsmain: invalid user '%s'", uarg);
	28	+ }
	29	+ }
	30	+
	31	+ if (garg != NULL) {
	32	+ gid = Ns_GetGid(garg);
	33	+ if (gid < 0) {
	34	+ gid = atoi(garg);
	35	+ if (gid == 0) {
	36	+ Ns_Fatal("nsmain: invalid group '%s'", garg);
	37	+ }
	38	}
	39	}
	40

Line 0 Link Here

(-)aolserver-new/files/patch-c (+24 lines)
	1	--- tcl8.3.2/unix/tclUnixPipe.c Thu Aug 17 17:46:15 2000
	2	+++ tcl8.3.2/unix/tclUnixPipe.c.new Fri Feb 15 12:30:19 2002
	3	@@ -950,12 +950,16 @@
	4	* nonblocking, the read will never block.
	5	*/
	6
	7	- bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
	8	- if (bytesRead > -1) {
	9	- return bytesRead;
	10	+ while (1) {
	11	+ bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
	12	+ if (bytesRead > -1) {
	13	+ return bytesRead;
	14	+ }
	15	+ if ( errno != EINTR ) {
	16	+ *errorCodePtr = errno;
	17	+ return -1;
	18	+ }
	19	}
	20	- *errorCodePtr = errno;
	21	- return -1;
	22	}
	23
	24	/*