From owner-freebsd-current@FreeBSD.ORG Thu Feb 19 01:25:27 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 835A316A4CE for ; Thu, 19 Feb 2004 01:25:27 -0800 (PST) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77F0D43D1F for ; Thu, 19 Feb 2004 01:25:26 -0800 (PST) (envelope-from ru@ip.net.ua) Received: from ru.office.ipnet (ws-80.office.ipnet [10.71.1.80]) by tigra.ip.net.ua (8.12.10/8.12.9) with ESMTP id i1J9R1Id082072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 19 Feb 2004 11:28:02 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by ru.office.ipnet (8.12.10/8.12.10/Submit) id i1J9OJlq005581; Thu, 19 Feb 2004 11:24:19 +0200 (EET) (envelope-from ru) Date: Thu, 19 Feb 2004 11:24:19 +0200 From: Ruslan Ermilov To: Andrey Chernov , current@freebsd.org, roberto@keltia.freenix.fr, nate@root.org, des@des.no Message-ID: <20040219092419.GF5351@ip.net.ua> References: <20040219004721.GA48357@nagual.pp.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="aZoGpuMECXJckB41" Content-Disposition: inline In-Reply-To: <20040219004721.GA48357@nagual.pp.ru> User-Agent: Mutt/1.5.6i X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) Subject: Re: How to perform regex upgrade? (vendor branches) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2004 09:25:27 -0000 --aZoGpuMECXJckB41 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 19, 2004 at 03:47:23AM +0300, Andrey Chernov wrote: > To whom it may interest. > Since I am fear now to deal with vendor branches (while latest issue stil= l=20 > unclear, was it done right or wrong, and at the moment of writing this I= =20 > believe it is right), I prefer to inform about my future=20 > actions beforehead.=20 >=20 > As you can read in > ftp://ftp.gnu.org/gnu/regex/README > GNU stops to update regex as standalone library. Since I want to upgrade > our grep to 2.4.2, I must to upgrade libregex first to version which is > included into grep 2.4.2. I found it compatible. This is 3 files only > (regex.c regex.h posix/regex.h). It means all other files of > gnu/lib/libregex (configure, NEWS, etc. will be removed). The question is > the same as the latest getopt* removal issue we discuss: how they can be > removed properly, from HEAD branch or somehow else? Remember, this files > still may be actual for not regex-upgraded FreeBSD 5 and 4. >=20 Simple: 1. You import the new version on the vendor (FSF) branch that comprises of three files only. The version should that of glibc, say v_X_Y. 2. You remove old files from the vendor (FSF) branch that were not imported with this last upgrade, i.e. those that are on the FSF branch but don't have the v_X_Y tag. (You verify this step by checking out -rFSF and -rv_x_y -- this should produce the same output.) 3. You merge conflicts between FSF and HEAD (on HEAD), should there be any. 4. You remove all locally modified in files from HEAD that are no longer needed, so that HEAD either (preferably) fully matches the FSF branch, or only contains the necessary differences. Have a moment and take a look into ~ru/import/ on freefall. Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --aZoGpuMECXJckB41 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFANIDDUkv4P6juNwoRAkLVAJ9Fg8KCr8gDM1RkPMNnGfaKCUpoqACfY9uW cRm3F0zCC7D7laNbs0VkBsE= =H49U -----END PGP SIGNATURE----- --aZoGpuMECXJckB41--