From jadawin@huppa.tuxaco.net  Thu Nov  8 15:39:54 2007
Return-Path: <jadawin@huppa.tuxaco.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A94616A419
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Nov 2007 15:39:54 +0000 (UTC)
	(envelope-from jadawin@huppa.tuxaco.net)
Received: from huppa.tuxaco.net (huppa.tuxaco.net [91.121.19.193])
	by mx1.freebsd.org (Postfix) with ESMTP id 1960613C49D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Nov 2007 15:39:53 +0000 (UTC)
	(envelope-from jadawin@huppa.tuxaco.net)
Received: from localhost (unknown [127.0.0.1])
	by huppa.tuxaco.net (Postfix) with ESMTP id D8113FA0F;
	Thu,  8 Nov 2007 16:41:42 +0100 (CET)
Received: from huppa.tuxaco.net ([127.0.0.1])
	by localhost (huppa.tuxaco.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 0CH3+yBif+c5; Thu,  8 Nov 2007 16:41:40 +0100 (CET)
Received: by huppa.tuxaco.net (Postfix, from userid 1001)
	id A3AD2FA08; Thu,  8 Nov 2007 16:41:40 +0100 (CET)
Message-Id: <20071108154140.A3AD2FA08@huppa.tuxaco.net>
Date: Thu,  8 Nov 2007 16:41:40 +0100 (CET)
From: Philippe Audeoud <jadawin@tuxaco.net>
Reply-To: Philippe Audeoud <jadawin@tuxaco.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jmelo@freebsd.org
Subject: [patch] www/chpasswd : unbreak gcc42
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117928
>Category:       ports
>Synopsis:       [patch] www/chpasswd : unbreak gcc42
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jmelo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 08 15:40:01 UTC 2007
>Closed-Date:    Wed Nov 28 11:53:47 UTC 2007
>Last-Modified:  Wed Nov 28 12:00:02 UTC 2007
>Originator:     Philippe Audeoud
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD huppa.tuxaco.net 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Tue Mar 20 16:05:42 CET 2007 root@:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	- unbreak gcc42
	- Bump PORTREVISION
	- update MASTER_SITES
>How-To-Repeat:
	
>Fix:

	

--- patch-chpasswd begins here ---
diff -ruN www/chpasswd/Makefile www/chpasswd.orig/Makefile
--- www/chpasswd/Makefile	2007-11-08 15:14:12.000000000 +0000
+++ www/chpasswd.orig/Makefile	2007-11-08 14:54:54.000000000 +0000
@@ -7,9 +7,9 @@
 
 PORTNAME=	chpasswd
 PORTVERSION=	2.2.3
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	SF
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	orsochpasswd
 
 MAINTAINER=	jmelo@FreeBSD.org
@@ -21,10 +21,16 @@
 		--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.mk>
+.include <bsd.port.post.mk>
diff -ruN www/chpasswd/files/patch-chpasswd.c www/chpasswd.orig/files/patch-chpasswd.c
--- www/chpasswd/files/patch-chpasswd.c	2007-11-08 15:11:52.000000000 +0000
+++ www/chpasswd.orig/files/patch-chpasswd.c	2007-11-08 14:54:54.000000000 +0000
@@ -1,17 +1,8 @@
---- chpasswd.c.orig	2005-05-09 13:05:08.000000000 +0000
-+++ chpasswd.c	2007-11-08 15:10:11.000000000 +0000
-@@ -282,7 +282,7 @@
- }
- 
- 
--static int
-+int
- htoi(s)
-         unsigned char   *s;
- {
-@@ -664,6 +664,16 @@
- }
- 
+--- 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);
  
 +void getword(char *, char *, char);
 +void Herror(char *);
--- patch-chpasswd ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jmelo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 8 15:40:40 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117928 
State-Changed-From-To: open->closed 
State-Changed-By: jmelo 
State-Changed-When: Wed Nov 28 11:53:46 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117928: commit references a PR
Date: Wed, 28 Nov 2007 11:53:46 +0000 (UTC)

 jmelo       2007-11-28 11:53:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/chpasswd         Makefile 
     www/chpasswd/files   patch-chpasswd.c 
   Log:
   - unbreak gcc42
   - Bump portrevision
   - update mastersites.
   
   PR:             ports/117928
   Submitted by:   Philippe Audeoud <jadawin@tuxaco.net>
   Approved by:    portmgr (linimon)
   
   Revision  Changes    Path
   1.14      +3 -9      ports/www/chpasswd/Makefile
   1.2       +14 -5     ports/www/chpasswd/files/patch-chpasswd.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
