Fix the build with recent GCC.

Reported by:	kris
Approved by:	portmgr (marcus), fjoe (mentor, implicit), maintainer

2 files changed, 72 insertions, 7 deletions

diff --git a/www/admuser/Makefile b/www/admuser/Makefile
index 7088e7798d58..8333c7bd6fa1 100644
--- a/www/admuser/Makefile
+++ b/www/admuser/Makefile
@@ -20,15 +20,9 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/etc/admuser \
 		--enable-language=English \
 		--enable-cgidir=${PREFIX}/www/cgi-bin \
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 pre-install:
 	@${MKDIR} ${PREFIX}/www/cgi-bin
 
 #BROKEN=		"Install fails"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/admuser/files/patch-admuser.c b/www/admuser/files/patch-admuser.c
new file mode 100644
index 000000000000..f979202527af
--- /dev/null
+++ b/www/admuser/files/patch-admuser.c
@@ -0,0 +1,71 @@
+--- admuser.c.orig	Wed Sep 22 17:11:45 2004
++++ admuser.c	Thu Sep 23 14:25:33 2004
+@@ -22,6 +22,26 @@
+ FILE           *fpw,
+                *tmp;
+ 
++void getword(char *, char *, char);
++void Herror(char *, FILE *, FILE *);
++static void fix_string(unsigned char *);
++void getconf(char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *);
++void read_pwd_file(char *, char *, char *, char *, char *, char *, int, char *);
++void change_user(char *, char *, char *, char *);
++void go_change_user(char *, char *, char *, char *, char *, char *, int);
++void remove_user(char *, char *, char *, char *, char *);
++void read_pwd_file(char *, char *, char *, char *, char *, char *, int, char *);
++void expire_pwd(char *, char *, char *, char *);
++void disable_user(char *, char *, char *);
++void authfiles(char *);
++void enable_user(char *, char *, char *);
++void add_user(char *, char *, char *, char *);
++void go_add_user(char *, char *, char *, char *, char *);
++void confirm_remove_user(char *, char *, char *);
++static void UserForm(char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *);
++void sort_pwd_file(char *, char *, char *);
++static void go_Authenticate(char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *, char *);
++
+ main(argc, argv)
+     int             argc;
+     char           *argv[];
+@@ -116,7 +136,7 @@
+     }
+ 
+     if (strcmp(getenv("REQUEST_METHOD"), "GET") == 0) {
+-	UserForm(BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage,PwdFile);
++	UserForm(BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage,PwdFile,null);
+ 	return;
+     }
+ 
+@@ -153,7 +173,7 @@
+        getword(user,InputBuffer,'&');
+        getword(pass,InputBuffer,'=');
+        getword(pass,InputBuffer,'&');
+-       go_Authenticate(user, pass, PwdFile, BgColor, TxColor, TiColor, RuColor, Logo, Width, Height, Header, BgImage);
++       go_Authenticate(user, pass, null, PwdFile, BgColor, TxColor, TiColor, RuColor, Logo, Width, Height, Header, BgImage);
+     }
+ 
+     // Reading password file
+@@ -1524,17 +1544,17 @@
+    char wuser[255];
+    int  ok=0;
+ 
+-   if(access(authpwd, F_OK) != 0) {
+-      sprintf(Msg, "%s: %s",msg40, authpwd);
++   if(access(pwdfile, F_OK) != 0) {
++      sprintf(Msg, "%s: %s",msg40, pwdfile);
+       Xerror(Msg);
+    }
+-   if(access(authpwd, R_OK) != 0) {
+-      sprintf(Msg, "%s: %s",msg41, authpwd);
++   if(access(pwdfile, R_OK) != 0) {
++      sprintf(Msg, "%s: %s",msg41, pwdfile);
+       Xerror(Msg);
+    }
+    authfiles(pwdfile);
+-   if((fpw=fopen(authpwd, "r")) == NULL) {
+-      sprintf(Msg, "%s %s",msg41, authpwd);
++   if((fpw=fopen(pwdfile, "r")) == NULL) {
++      sprintf(Msg, "%s %s",msg41, pwdfile);
+       Herror(Msg, fpw, tmp);
+       return;
+    }