mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
- Update to 2.3.2.
- Unbreak port. PR: ports/117638 Submitted by: Felippe de Meirelles Motta <lippe@freebsdbrasil.com.br>
This commit is contained in:
parent
f823d24bfd
commit
7f60d8d026
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=204562
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= admuser
|
||||
PORTVERSION= 2.3.1
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 2.3.2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://sarg.sourceforge.net/
|
||||
|
||||
@ -22,10 +21,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX}/etc/admuser \
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if (${OSVERSION} >= 700000)
|
||||
BROKEN= Does not compile on 7.X
|
||||
.endif
|
||||
|
||||
pre-install:
|
||||
@${MKDIR} ${PREFIX}/www/cgi-bin
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (admuser-2.3.1.tar.gz) = 33f9e597e13b5cfd67224d1afb5fd7f6
|
||||
SHA256 (admuser-2.3.1.tar.gz) = e2dfdde33369b77a870fdfa3c296aa96f8156cce1193cb7d8be66a8358d89b17
|
||||
SIZE (admuser-2.3.1.tar.gz) = 81718
|
||||
MD5 (admuser-2.3.2.tar.gz) = 2f8f5078ea3ce28b6def3f3cb82b450d
|
||||
SHA256 (admuser-2.3.2.tar.gz) = c74eed6b4c9af7204d50b47cba8f2c5effe6dac7f938b5a540983ab18b144c19
|
||||
SIZE (admuser-2.3.2.tar.gz) = 54780
|
||||
|
@ -1,71 +0,0 @@
|
||||
--- 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;
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
etc/admuser/admuser.conf
|
||||
etc/admuser/admuser.log
|
||||
%%ETCDIR%%/admuser.conf
|
||||
%%ETCDIR%%/admuser.log
|
||||
www/cgi-bin/admuser.cgi
|
||||
@dirrm etc/admuser
|
||||
@dirrm %%ETCDIR%%
|
||||
@dirrmtry www/cgi-bin
|
||||
|
Loading…
Reference in New Issue
Block a user