From Cy.Schubert@uumail.gov.bc.ca  Sun Apr 23 19:05:55 2000
Return-Path: <Cy.Schubert@uumail.gov.bc.ca>
Received: from point.osg.gov.bc.ca (point.osg.gov.bc.ca [142.32.102.44])
	by hub.freebsd.org (Postfix) with ESMTP id 08DE237B608
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Apr 2000 19:05:55 -0700 (PDT)
	(envelope-from Cy.Schubert@uumail.gov.bc.ca)
Received: (from daemon@localhost)
	by point.osg.gov.bc.ca (8.8.7/8.8.8) id TAA23446
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Apr 2000 19:05:49 -0700
Received: from passer.osg.gov.bc.ca(142.32.110.29)
 via SMTP by point.osg.gov.bc.ca, id smtpda23444; Sun Apr 23 19:05:31 2000
Received: (from uucp@localhost)
	by passer.osg.gov.bc.ca (8.9.3/8.9.1) id TAA29844
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Apr 2000 19:05:31 -0700 (PDT)
Received: from cwsys9.cwsent.com(10.2.2.1), claiming to be "cwsys.cwsent.com"
 via SMTP by passer9.cwsent.com, id smtpdj29834; Sun Apr 23 19:04:34 2000
Received: (from cy@localhost)
	by cwsys.cwsent.com (8.9.3/8.9.1) id TAA09826;
	Sun, 23 Apr 2000 19:04:33 -0700 (PDT)
Message-Id: <200004240204.TAA09826@cwsys.cwsent.com>
Date: Sun, 23 Apr 2000 19:04:33 -0700 (PDT)
From: Cy.Schubert@uumail.gov.bc.ca
Reply-To: Cy.Schubert@uumail.gov.bc.ca
To: FreeBSD-gnats-submit@freebsd.org
Subject: GNU Patch 2.5.4 Port
X-Send-Pr-Version: 3.2

>Number:         18184
>Category:       ports
>Synopsis:       GNU Patch 2.5.4 Port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    petef
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 23 19:10:01 PDT 2000
>Closed-Date:    Fri Nov 16 15:32:25 PST 2001
>Last-Modified:  Fri Nov 16 15:32:59 PST 2001
>Originator:     Cy Schubert
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
UNIX Group, ITSD, ISTA, Province of BC
>Environment:

FreeBSD cwsys 4.0-STABLE FreeBSD 4.0-STABLE #0: Sat Apr 22 21:54:10 PDT 2000     root@:/usr/opt/cvs-400s-000422/src/sys/compile/CWSYS  i386

>Description:

Patch 2.1 that is shipped with FreeBSD dies on a malformed patch
error when the patch contains a large offset.

>How-To-Repeat:

diff -urPN 4.0-RELEASE/src 4.0-STABLE/src > patch.diff

can be configured through an environment variable or a command line
argument).

The other option is a port.  This allows the two versions of patch to
co-exist for a while until people are comfortable with the new
version and the patch that is shipped with FreeBSD is upgraded.  It
is requested that patch be upgraded in 5.0-CURRENT (but not 4.x)
as well.
 
GNU patch port in shar format follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch
#	patch/files
#	patch/files/md5
#	patch/patches
#	patch/patches/patch-aa
#	patch/pkg
#	patch/pkg/COMMENT
#	patch/pkg/DESCR
#	patch/pkg/PLIST
#	patch/Makefile
#
echo c - patch
mkdir -p patch > /dev/null 2>&1
echo c - patch/files
mkdir -p patch/files > /dev/null 2>&1
echo x - patch/files/md5
sed 's/^X//' >patch/files/md5 << 'END-of-patch/files/md5'
XMD5 (patch-2.5.4.tar.gz) = ee5ae84d115f051d87fcaaef3b4ae782
END-of-patch/files/md5
echo c - patch/patches
mkdir -p patch/patches > /dev/null 2>&1
echo x - patch/patches/patch-aa
sed 's/^X//' >patch/patches/patch-aa << 'END-of-patch/patches/patch-aa'
X--- configure.orig	Sun Aug 29 23:44:34 1999
X+++ configure	Sun Apr 23 10:48:24 2000
X@@ -2449,7 +2449,7 @@
X 
X 
X for ac_func in _doprintf isascii fseeko memcmp mktemp \
X-  pathconf raise setmode sigaction sigprocmask sigsetmask strerror
X+  pathconf raise sigaction sigprocmask sigsetmask strerror
X do
X echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
X echo "configure:2456: checking for $ac_func" >&5
END-of-patch/patches/patch-aa
echo c - patch/pkg
mkdir -p patch/pkg > /dev/null 2>&1
echo x - patch/pkg/COMMENT
sed 's/^X//' >patch/pkg/COMMENT << 'END-of-patch/pkg/COMMENT'
XGNU version of 'patch' utility
END-of-patch/pkg/COMMENT
echo x - patch/pkg/DESCR
sed 's/^X//' >patch/pkg/DESCR << 'END-of-patch/pkg/DESCR'
XThis directory contains the release of GNU Patch.
XAll bugs reported for previous test releases have been fixed.
XSome bugs surely remain.
END-of-patch/pkg/DESCR
echo x - patch/pkg/PLIST
sed 's/^X//' >patch/pkg/PLIST << 'END-of-patch/pkg/PLIST'
Xbin/gpatch
END-of-patch/pkg/PLIST
echo x - patch/Makefile
sed 's/^X//' >patch/Makefile << 'END-of-patch/Makefile'
X# New ports collection makefile for:	GNU patch
X# Date created:		23 April 2000
X# Whom:			Cy SChubert
X#
X# $FreeBSD: ports/devel/patch/Makefile,v$
X#
X
XPORTNAME=	gpatch
XPORTVERSION=	2.5.4
XCATEGORIES=	devel
XMASTER_SITES=   ${MASTER_SITE_GNU}
XMASTER_SITE_SUBDIR=	patch
XDISTNAME=       patch-${PORTVERSION}
X
XMAINTAINER=	Cy.Schubert@osg.gov.bc.ca
X
XY2K=		http://www.gnu.org/software/year2000.html
X
XGNU_CONFIGURE=	yes
XCONFIGURE_ARGS=	--program-prefix=g
XMAN1=		gpatch.1
X
X# joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
X
Xpost-install:
X	${CHMOD} g-s ${PREFIX}/bin/gpatch
X	chgrp ${BINGRP} ${PREFIX}/bin/gpatch
X
X.include <bsd.port.mk>
END-of-patch/Makefile
exit


>Fix:
>Release-Note:
>Audit-Trail:

From: Ben Smithurst <ben@scientia.demon.co.uk>
To: Cy.Schubert@uumail.gov.bc.ca
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/18184: GNU Patch 2.5.4 Port
Date: Mon, 24 Apr 2000 15:33:37 +0100

 Cy.Schubert@uumail.gov.bc.ca wrote:
 
 > sed 's/^X//' >patch/Makefile << 'END-of-patch/Makefile'
 > X# New ports collection makefile for:	GNU patch
 > X# Date created:		23 April 2000
 > X# Whom:			Cy SChubert
 > X#
 > X# $FreeBSD: ports/devel/patch/Makefile,v$
 > X#
 
 uh. ports/devel/patch already exists, why is a new one needed?  The only
 real difference I see is the '--program-prefix=g', but I'm not sure
 that's needed as the patch in the base system is GNU patch anyway, just
 an older version.  I'd suggest you just send an update for the existing
 devel/patch port instead.
 
 -- 
 Ben Smithurst / ben@scientia.demon.co.uk / PGP: 0x99392F7D
 

From: Cy Schubert <cschuber@uumail.gov.bc.ca>
To: Ben Smithurst <ben@scientia.demon.co.uk>
Cc: Cy.Schubert@uumail.gov.bc.ca, FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/18184: GNU Patch 2.5.4 Port 
Date: Tue, 25 Apr 2000 08:06:49 -0700

 In message <20000424153337.G86507@strontium.scientia.demon.co.uk>, Ben Smithurs
 t writes:
 > Cy.Schubert@uumail.gov.bc.ca wrote:
 > 
 > > sed 's/^X//' >patch/Makefile << 'END-of-patch/Makefile'
 > > X# New ports collection makefile for:	GNU patch
 > > X# Date created:		23 April 2000
 > > X# Whom:			Cy SChubert
 > > X#
 > > X# $FreeBSD: ports/devel/patch/Makefile,v$
 > > X#
 > 
 > uh. ports/devel/patch already exists, why is a new one needed?  The only
 > real difference I see is the '--program-prefix=g', but I'm not sure
 > that's needed as the patch in the base system is GNU patch anyway, just
 > an older version.  I'd suggest you just send an update for the existing
 > devel/patch port instead.
 > 
 > -- 
 > Ben Smithurst / ben@scientia.demon.co.uk / PGP: 0x99392F7D
 
 I see it now.  Wasn't looking hard enough.  Could we then upgade the
 port to 2.5.4 instead, e.g. change this request to upgrade the port?
 
 The "g" prefix would be nice too.
 
 
 Regards,                       Phone:  (250)387-8437
 Cy Schubert                      Fax:  (250)387-5766
 Team Leader, Sun/DEC Team   Internet:  Cy.Schubert@osg.gov.bc.ca
 Open Systems Group, ITSD, ISTA
 Province of BC            
 
 I see it now.  Wasn't looking hard enough.
 
 
 
 Regards,                       Phone:  (250)387-8437
 Cy Schubert                      Fax:  (250)387-5766
 Team Leader, Sun/DEC Team   Internet:  Cy.Schubert@osg.gov.bc.ca
 Open Systems Group, ITSD, ISTA
 Province of BC            
 
 
Responsible-Changed-From-To: freebsd-ports->ache 
Responsible-Changed-By: steve 
Responsible-Changed-When: Sat Apr 29 16:22:45 PDT 2000 
Responsible-Changed-Why:  
Over to port's maintainer. 
Responsible-Changed-From-To: ache->petef 
Responsible-Changed-By: ache 
Responsible-Changed-When: Fri Nov 16 14:10:18 PST 2001 
Responsible-Changed-Why:  
Over to maintainer 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=18184 
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Fri Nov 16 15:32:25 PST 2001 
State-Changed-Why:  
I've already updated this to 2.5.4, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=18184 
>Unformatted:
