ports/118351: www/admuser: [PATCH]: GCC 4.1 fix, unbreak 7.x

[Philip M. Gollucci]

>Number:         118351
>Category:       ports
>Synopsis:       www/admuser: [PATCH]: GCC 4.1 fix, unbreak 7.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 30 12:50:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        8.0-CURRENT
>Organization:
Riderway Inc.
>Environment:
FreeBSD philip.hq.rws 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Tue Nov  6 16:28:12 EST 2007     pgollucci at philip.hq.rws:/usr/obj/usr/src/sys/RIDERWAY  i386

>Description:
GCC 4.1 static fix.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/admuser/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	3 Apr 2007 16:18:16 -0000	1.13
+++ Makefile	30 Nov 2007 12:41:31 -0000
@@ -20,13 +20,7 @@
 		--enable-language=English \
 		--enable-cgidir=${PREFIX}/www/cgi-bin \
 
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} >= 700000)
-BROKEN=		Does not compile on 7.X
-.endif
-
 pre-install:
 	@${MKDIR} ${PREFIX}/www/cgi-bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-admuser.c
===================================================================
RCS file: /home/ncvs/ports/www/admuser/files/patch-admuser.c,v
retrieving revision 1.1
diff -u -r1.1 patch-admuser.c
--- files/patch-admuser.c	23 Sep 2004 16:31:53 -0000	1.1
+++ files/patch-admuser.c	30 Nov 2007 12:42:45 -0000
@@ -1,6 +1,6 @@
---- admuser.c.orig	Wed Sep 22 17:11:45 2004
-+++ admuser.c	Thu Sep 23 14:25:33 2004
-@@ -22,6 +22,26 @@
+--- ./admuser.c.orig	2004-09-16 11:40:21.000000000 +0000
++++ ./admuser.c	2007-11-30 12:42:41.000000000 +0000
+@@ -38,6 +38,28 @@
  FILE           *fpw,
                 *tmp;
  
@@ -24,10 +24,12 @@
 +void sort_pwd_file(char *, char *, char *);
 +static void go_Authenticate(char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *);
 +
++static int htoi(unsigned char *);
++
  main(argc, argv)
      int             argc;
      char           *argv[];
-@@ -116,7 +136,7 @@
+@@ -132,7 +154,7 @@
      }
  
      if (strcmp(getenv("REQUEST_METHOD"), "GET") == 0) {
@@ -36,7 +38,7 @@
  	return;
      }
  
-@@ -153,7 +173,7 @@
+@@ -169,7 +191,7 @@
         getword(user,InputBuffer,'&');
         getword(pass,InputBuffer,'=');
         getword(pass,InputBuffer,'&');
@@ -45,7 +47,7 @@
      }
  
      // Reading password file
-@@ -1524,17 +1544,17 @@
+@@ -1540,17 +1562,17 @@
     char wuser[255];
     int  ok=0;
  


>Release-Note:
>Audit-Trail:
>Unformatted: