From nobody@FreeBSD.org  Fri Nov 30 10:06:59 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3526016A419
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 30 Nov 2007 10:06:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BABE13C465
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 30 Nov 2007 10:06:15 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id lAUA5Jjt016787
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 30 Nov 2007 10:05:19 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id lAUA5JxX016786;
	Fri, 30 Nov 2007 10:05:19 GMT
	(envelope-from nobody)
Message-Id: <200711301005.lAUA5JxX016786@www.freebsd.org>
Date: Fri, 30 Nov 2007 10:05:19 GMT
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: www/chpasswd: [PATCH]: GCC4.1 Fix, unbreak 7.x
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         118347
>Category:       ports
>Synopsis:       www/chpasswd: [PATCH]: GCC4.1 Fix, unbreak 7.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jmelo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 30 10:10:00 UTC 2007
>Closed-Date:    Wed Dec 26 13:46:38 UTC 2007
>Last-Modified:  Wed Dec 26 13:46:38 UTC 2007
>Originator:     Philip M. Gollucci
>Release:        8.0-CURRENT
>Organization:
Riderway Inc.
>Environment:
FreeBSD goku.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Nov  4 01:36:52 EDT 2007     pgollucci@home.p6m7g8.net:/usr/obj/usr/src/sys/HOME  i386

>Description:
static fix.... yada yada

http://sarg.sourceforge.net/chpasswd.php
(patch linked here)

previous files/patch-chpasswd.c is not needed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/chpasswd/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	3 Apr 2007 16:20:02 -0000	1.13
+++ Makefile	30 Nov 2007 09:56:29 -0000
@@ -19,13 +19,8 @@
 
 CONFIGURE_ARGS=	--prefix=${PREFIX}/etc/chpasswd \
 		--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
+		--enable-cgidir=${PREFIX}/www/cgi-bin \
+		--enable-maintainer-mode
 
 pre-install:
 	@${MKDIR} ${PREFIX}/www/cgi-bin
@@ -33,4 +28,4 @@
 post-install:
 	@${ECHO} 'Remember, passwd and log file must be owned by httpd user, or chmod 777'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/www/chpasswd/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- files/patch-Makefile.in	13 Feb 2004 15:17:15 -0000	1.1
+++ files/patch-Makefile.in	30 Nov 2007 09:50:00 -0000
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed Feb 11 14:56:26 2004
-+++ Makefile.in	Wed Feb 11 14:57:15 2004
+--- ./Makefile.in.orig	1999-09-10 13:13:16.000000000 -0400
++++ ./Makefile.in	2007-11-30 04:49:23.000000000 -0500
 @@ -1,13 +1,13 @@
  # Makefile.in for chpasswd.cgi
  
Index: files/patch-chpasswd.c
===================================================================
RCS file: /home/ncvs/ports/www/chpasswd/files/patch-chpasswd.c,v
retrieving revision 1.1
diff -u -r1.1 patch-chpasswd.c
--- files/patch-chpasswd.c	23 Sep 2004 07:19:35 -0000	1.1
+++ files/patch-chpasswd.c	30 Nov 2007 10:01:52 -0000
@@ -1,19 +1,56 @@
---- chpasswd.c.orig	Fri Apr 11 01:54:02 2003
-+++ chpasswd.c	Wed Sep 22 15:46:47 2004
-@@ -23,6 +23,16 @@
- static void vrfyauth(IpAuth,PwdLogFile,PwdFile,SmtpUser,SmtpSubject);
- eperror(s);
+--- ./chpasswd.c.orig	2007-11-30 05:01:14.000000000 -0500
++++ ./chpasswd.c	2007-11-30 05:01:48.000000000 -0500
+@@ -253,6 +253,26 @@
+     return;
+ }
  
-+void getword(char *, char *, char);
-+void Herror(char *);
-+void Hmsg(char *);
-+void putline(FILE *, char *);
-+void Changed(char *, char *, char *, char *, char *, char *, char *);
-+void NotFound(char *, char *, char *, char *, char *, char *, char *);
-+void rulefail(char *, char *, char *);
-+static void strip_latin(char *);
-+void sendmail(char *, char *, char *);
++static int
++htoi(s)
++        unsigned char   *s;
++{
++        int     value;
++        char    c;
 +
- main(argc, argv)
-     int             argc;
-     char           *argv[];
++        c = s[0];
++        if (isupper(c))
++                c = tolower(c);
++        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
++
++        c = s[1];
++        if (isupper(c))
++                c = tolower(c);
++        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
++
++        return (value);
++}
++
+ 
+ static void
+ fixpwd(str)
+@@ -282,26 +302,6 @@
+ }
+ 
+ 
+-static int
+-htoi(s)
+-        unsigned char   *s;
+-{
+-        int     value;
+-        char    c;
+-
+-        c = s[0];
+-        if (isupper(c))
+-                c = tolower(c);
+-        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
+-
+-        c = s[1];
+-        if (isupper(c))
+-                c = tolower(c);
+-        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
+-
+-        return (value);
+-}
+-
+ 
+ void
+ rulefail(char *minchar, char *minnum, char *minspec)


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jmelo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Nov 30 10:13:08 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118347 

From: "Philip M. Gollucci" <philip@ridecharge.com>
To: bug-followup@FreeBSD.org,  pgollucci@p6m7g8.com
Cc:  
Subject: Re: ports/118347: www/chpasswd: [PATCH]: GCC4.1 Fix, unbreak 7.x
Date: Fri, 30 Nov 2007 05:32:25 -0500

 --------------000709050706060209090303
 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
 Content-Transfer-Encoding: 7bit
 
 sorry didn't delete some local mods I had in the Makefile.
 
 
 
 --------------000709050706060209090303
 Content-Type: text/plain; name="www_chpasswd.diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="www_chpasswd.diff.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/chpasswd/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 --- Makefile	3 Apr 2007 16:20:02 -0000	1.13
 +++ Makefile	30 Nov 2007 10:08:18 -0000
 @@ -21,16 +21,10 @@
  		--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
  
  post-install:
  	@${ECHO} 'Remember, passwd and log file must be owned by httpd user, or chmod 777'
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: files/patch-Makefile.in
 ===================================================================
 RCS file: /home/ncvs/ports/www/chpasswd/files/patch-Makefile.in,v
 retrieving revision 1.1
 diff -u -r1.1 patch-Makefile.in
 --- files/patch-Makefile.in	13 Feb 2004 15:17:15 -0000	1.1
 +++ files/patch-Makefile.in	30 Nov 2007 09:50:00 -0000
 @@ -1,5 +1,5 @@
 ---- Makefile.in.orig	Wed Feb 11 14:56:26 2004
 -+++ Makefile.in	Wed Feb 11 14:57:15 2004
 +--- ./Makefile.in.orig	1999-09-10 13:13:16.000000000 -0400
 ++++ ./Makefile.in	2007-11-30 04:49:23.000000000 -0500
  @@ -1,13 +1,13 @@
   # Makefile.in for chpasswd.cgi
   
 Index: files/patch-chpasswd.c
 ===================================================================
 RCS file: /home/ncvs/ports/www/chpasswd/files/patch-chpasswd.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-chpasswd.c
 --- files/patch-chpasswd.c	23 Sep 2004 07:19:35 -0000	1.1
 +++ files/patch-chpasswd.c	30 Nov 2007 10:01:52 -0000
 @@ -1,19 +1,56 @@
 ---- chpasswd.c.orig	Fri Apr 11 01:54:02 2003
 -+++ chpasswd.c	Wed Sep 22 15:46:47 2004
 -@@ -23,6 +23,16 @@
 - static void vrfyauth(IpAuth,PwdLogFile,PwdFile,SmtpUser,SmtpSubject);
 - eperror(s);
 +--- ./chpasswd.c.orig	2007-11-30 05:01:14.000000000 -0500
 ++++ ./chpasswd.c	2007-11-30 05:01:48.000000000 -0500
 +@@ -253,6 +253,26 @@
 +     return;
 + }
   
 -+void getword(char *, char *, char);
 -+void Herror(char *);
 -+void Hmsg(char *);
 -+void putline(FILE *, char *);
 -+void Changed(char *, char *, char *, char *, char *, char *, char *);
 -+void NotFound(char *, char *, char *, char *, char *, char *, char *);
 -+void rulefail(char *, char *, char *);
 -+static void strip_latin(char *);
 -+void sendmail(char *, char *, char *);
 ++static int
 ++htoi(s)
 ++        unsigned char   *s;
 ++{
 ++        int     value;
 ++        char    c;
  +
 - main(argc, argv)
 -     int             argc;
 -     char           *argv[];
 ++        c = s[0];
 ++        if (isupper(c))
 ++                c = tolower(c);
 ++        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
 ++
 ++        c = s[1];
 ++        if (isupper(c))
 ++                c = tolower(c);
 ++        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
 ++
 ++        return (value);
 ++}
 ++
 + 
 + static void
 + fixpwd(str)
 +@@ -282,26 +302,6 @@
 + }
 + 
 + 
 +-static int
 +-htoi(s)
 +-        unsigned char   *s;
 +-{
 +-        int     value;
 +-        char    c;
 +-
 +-        c = s[0];
 +-        if (isupper(c))
 +-                c = tolower(c);
 +-        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
 +-
 +-        c = s[1];
 +-        if (isupper(c))
 +-                c = tolower(c);
 +-        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
 +-
 +-        return (value);
 +-}
 +-
 + 
 + void
 + rulefail(char *minchar, char *minnum, char *minspec)
 
 --------------000709050706060209090303--

From: "Philip M. Gollucci" <philip@ridecharge.com>
To: bug-followup@FreeBSD.org,  pgollucci@p6m7g8.com
Cc:  
Subject: Re: ports/118347: www/chpasswd: [PATCH]: GCC4.1 Fix, unbreak 7.x
Date: Fri, 30 Nov 2007 06:25:25 -0500

 --------------020308030600060307040008
 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
 Content-Transfer-Encoding: 7bit
 
 sorry, I goofed the Makefile portion -- this is correct.
 -- 
 -----------------------------------------------------------------
 Philip M. Gollucci (philip@ridecharge.com)
 c:323.219.4708 o:703.749.9295x206
 Senior System Admin - Riderway, Inc.
 http://riderway.com / http://ridecharge.com
 1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB  B89E 1324 9B4F EC88 A0BF
 
 Work like you don't need the money,
 love like you'll never get hurt,
 and dance like nobody's watching.
 
 --------------020308030600060307040008
 Content-Type: text/plain; name="www_chpasswd.diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="www_chpasswd.diff.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/chpasswd/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 --- Makefile	3 Apr 2007 16:20:02 -0000	1.13
 +++ Makefile	30 Nov 2007 10:08:18 -0000
 @@ -21,16 +21,10 @@
  		--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
  
  post-install:
  	@${ECHO} 'Remember, passwd and log file must be owned by httpd user, or chmod 777'
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: files/patch-Makefile.in
 ===================================================================
 RCS file: /home/ncvs/ports/www/chpasswd/files/patch-Makefile.in,v
 retrieving revision 1.1
 diff -u -r1.1 patch-Makefile.in
 --- files/patch-Makefile.in	13 Feb 2004 15:17:15 -0000	1.1
 +++ files/patch-Makefile.in	30 Nov 2007 09:50:00 -0000
 @@ -1,5 +1,5 @@
 ---- Makefile.in.orig	Wed Feb 11 14:56:26 2004
 -+++ Makefile.in	Wed Feb 11 14:57:15 2004
 +--- ./Makefile.in.orig	1999-09-10 13:13:16.000000000 -0400
 ++++ ./Makefile.in	2007-11-30 04:49:23.000000000 -0500
  @@ -1,13 +1,13 @@
   # Makefile.in for chpasswd.cgi
   
 Index: files/patch-chpasswd.c
 ===================================================================
 RCS file: /home/ncvs/ports/www/chpasswd/files/patch-chpasswd.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-chpasswd.c
 --- files/patch-chpasswd.c	23 Sep 2004 07:19:35 -0000	1.1
 +++ files/patch-chpasswd.c	30 Nov 2007 10:01:52 -0000
 @@ -1,19 +1,56 @@
 ---- chpasswd.c.orig	Fri Apr 11 01:54:02 2003
 -+++ chpasswd.c	Wed Sep 22 15:46:47 2004
 -@@ -23,6 +23,16 @@
 - static void vrfyauth(IpAuth,PwdLogFile,PwdFile,SmtpUser,SmtpSubject);
 - eperror(s);
 +--- ./chpasswd.c.orig	2007-11-30 05:01:14.000000000 -0500
 ++++ ./chpasswd.c	2007-11-30 05:01:48.000000000 -0500
 +@@ -253,6 +253,26 @@
 +     return;
 + }
   
 -+void getword(char *, char *, char);
 -+void Herror(char *);
 -+void Hmsg(char *);
 -+void putline(FILE *, char *);
 -+void Changed(char *, char *, char *, char *, char *, char *, char *);
 -+void NotFound(char *, char *, char *, char *, char *, char *, char *);
 -+void rulefail(char *, char *, char *);
 -+static void strip_latin(char *);
 -+void sendmail(char *, char *, char *);
 ++static int
 ++htoi(s)
 ++        unsigned char   *s;
 ++{
 ++        int     value;
 ++        char    c;
  +
 - main(argc, argv)
 -     int             argc;
 -     char           *argv[];
 ++        c = s[0];
 ++        if (isupper(c))
 ++                c = tolower(c);
 ++        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
 ++
 ++        c = s[1];
 ++        if (isupper(c))
 ++                c = tolower(c);
 ++        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
 ++
 ++        return (value);
 ++}
 ++
 + 
 + static void
 + fixpwd(str)
 +@@ -282,26 +302,6 @@
 + }
 + 
 + 
 +-static int
 +-htoi(s)
 +-        unsigned char   *s;
 +-{
 +-        int     value;
 +-        char    c;
 +-
 +-        c = s[0];
 +-        if (isupper(c))
 +-                c = tolower(c);
 +-        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
 +-
 +-        c = s[1];
 +-        if (isupper(c))
 +-                c = tolower(c);
 +-        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
 +-
 +-        return (value);
 +-}
 +-
 + 
 + void
 + rulefail(char *minchar, char *minnum, char *minspec)
 
 --------------020308030600060307040008--
State-Changed-From-To: open->closed 
State-Changed-By: jmelo 
State-Changed-When: Wed Dec 26 13:46:16 UTC 2007 
State-Changed-Why:  
It was already fixed. Thanks anyway! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118347 
>Unformatted:
