Date: Sun, 19 Sep 2004 15:02:20 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jmelo@freebsdbrasil.com.br Subject: ports/71902: [PATCH] www/admuser: unbreak on 5.x Message-ID: <20040919070220.026893E9CE6@utopia.leeym.com> Resent-Message-ID: <200409190710.i8J7ASAa065034@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 71902
>Category: ports
>Synopsis: [PATCH] www/admuser: unbreak on 5.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 19 07:10:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:
- add patch file and unbreak this port on 5.x
Added file(s):
- files/patch-admuser.c
Port maintainer (jmelo@freebsdbrasil.com.br) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- admuser-2.3_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/admuser/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- Makefile 17 Sep 2004 22:35:31 -0000 1.6
+++ Makefile 19 Sep 2004 07:01:09 -0000
@@ -20,15 +20,7 @@
--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>
Index: files/patch-admuser.c
===================================================================
RCS file: files/patch-admuser.c
diff -N files/patch-admuser.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-admuser.c 19 Sep 2004 07:01:09 -0000
@@ -0,0 +1,47 @@
+--- admuser.c.orig Sun Sep 19 14:17:05 2004
++++ admuser.c Sun Sep 19 14:28:46 2004
+@@ -22,6 +22,26 @@
+ FILE *fpw,
+ *tmp;
+
++void getword(char *word, char *line, char stop);
++void Herror(char *msg, FILE *fpw, FILE *tmp);
++static void fix_string(unsigned char *str);
++void getconf(char *ConfigFile, char *PwdFile, char *BgColor, char *TxColor, char *TiColor, char *RuColor, char *Logo, char *Width, char *Height, char *Header, char *BgImage);
++void read_pwd_file(char *pwdfile, char *ticolor, char *header, char *msg, char *fuser, char *msg2, int from, char *search);
++void change_user(char *arg, char *ticolor, char *header, char *msg);
++void go_change_user(char *user, char *pass, char *olduser, char *pwdfile, char *ticolor, char *header, int from);
++void remove_user(char *user, char *pwdfile, char *ticolor, char *header, char *wfrom);
++void expire_pwd(char *arg, char *ticolor, char *header, char *msg);
++void disable_user(char *arg, char *ticolor, char *header);
++void authfiles(char *file);
++void enable_user(char *arg, char *ticolor, char *header);
++void add_user(char *arg, char *ticolor, char *header, char *msg);
++void go_add_user(char *user, char *pass, char *pwdfile, char *ticolor, char *header);
++static void UserForm(char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, char *width, char *height, char *header, char *bgimage, char *PwdFile, char *authpwd);
++void confirm_remove_user(char *arg, char *ticolor, char *header);
++void sort_pwd_file(char *arg, char *ticolor, char *header);
++static void go_Authenticate(char *user, char *pass, char *authpwd, char *pwdfile, char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, char *width, char *height, char *header, char *bgimage);
++static int htoi(unsigned char *s);
++
+ 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
--- admuser-2.3_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040919070220.026893E9CE6>