From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 29 19:10:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDC1C16A420 for ; Mon, 29 Oct 2007 19:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A6DC013C4B2 for ; Mon, 29 Oct 2007 19:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9TJA2qU016506 for ; Mon, 29 Oct 2007 19:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9TJA2dE016505; Mon, 29 Oct 2007 19:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 29 Oct 2007 19:10:02 GMT Resent-Message-Id: <200710291910.l9TJA2dE016505@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Felippe de Meirelles Motta" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 798AE16A41A for ; Mon, 29 Oct 2007 19:02:00 +0000 (UTC) (envelope-from lippe@freebsdbrasil.com.br) Received: from capeta.freebsdbrasil.com.br (vrrp.freebsdbrasil.com.br [200.210.70.30]) by mx1.freebsd.org (Postfix) with SMTP id 17D0B13C4A3 for ; Mon, 29 Oct 2007 19:01:56 +0000 (UTC) (envelope-from lippe@freebsdbrasil.com.br) Received: (qmail 60209 invoked from network); 29 Oct 2007 16:35:26 -0200 Received: from unknown (HELO shire.freebsdbrasil.com.br) (lippe@freebsdbrasil.com.br@201.48.151.226) by capeta.freebsdbrasil.com.br with SMTP; 29 Oct 2007 16:35:26 -0200 Message-Id: <1193682887.18267@shire.freebsdbrasil.com.br> Date: Mon, 29 Oct 2007 16:34:47 -0200 From: "Felippe de Meirelles Motta" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: jmelo@FreeBSD.org Subject: ports/117638: Update version [www/admuser] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 19:10:02 -0000 >Number: 117638 >Category: ports >Synopsis: Update version [www/admuser] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 29 19:10:02 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Felippe de Meirelles Motta >Release: FreeBSD 7.0-CURRENT-200708 >Organization: FreeBSD Brasil LTDA >Environment: FreeBSD devel.bh.freebsdbrasil.com.br 7.0-CURRENT-200708 FreeBSD 7.0-CURRENT-200708 #2: Sat Sep 22 15:47:32 BRT 2007 root@devel.bh.freebsdbrasil.com.br:/usr/obj/usr/src/sys/DEVEL i386 >Description: - Update version to 2.3.2; - Now compile in -CURRENT; - Remove unnecessary patch to admuser.c Tested in my tinderbox on CURRENT only! >How-To-Repeat: >Fix: --- admuser.diff begins here --- ? work 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 29 Oct 2007 18:23:02 -0000 @@ -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 @@ .include -.if (${OSVERSION} >= 700000) -BROKEN= Does not compile on 7.X -.endif - pre-install: @${MKDIR} ${PREFIX}/www/cgi-bin Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/admuser/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 30 Dec 2005 21:36:38 -0000 1.5 +++ distinfo 29 Oct 2007 18:23:02 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/admuser/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 24 Feb 2006 16:59:35 -0000 1.2 +++ pkg-plist 29 Oct 2007 18:23:02 -0000 @@ -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 Index: files/patch-admuser.c =================================================================== RCS file: files/patch-admuser.c diff -N files/patch-admuser.c --- files/patch-admuser.c 23 Sep 2004 16:31:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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; - } --- admuser.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: