Path: utzoo!attcan!uunet!husc6!bloom-beacon!tut.cis.ohio-state.edu!mailrus!ames!elroy!devvax!lwall
From: lwall@devvax.JPL.NASA.GOV (Larry Wall)
Newsgroups: comp.sources.bugs
Subject: Re:  patch 2.0 patch #12
Message-ID: <2313@devvax.JPL.NASA.GOV>
Date: 23 Jun 88 18:52:14 GMT
References: <583@hscfvax.harvard.edu>
Reply-To: lwall@devvax.JPL.NASA.GOV (Larry Wall)
Organization: Jet Propulsion Laboratory, Pasadena, CA.
Lines: 298

In article <583@hscfvax.harvard.edu> mohamed@hscfvax.harvard.edu (Mohamed Ellozy) writes:
: The bad news about patch #12 is that it has three hunks that fail, the
: first of patch.c, patch.man and Makefile.SH.
: 
: The good news is that these patches are easy to apply by hand, and that
: after applying them patch compiles on my machine, a VAX running Ultrix 1.2.


oops.


I was fooling around with a new version of dist's patch generator, and managed
to muck up the version states.  If you just edit the three reject files and
change Exp to Locked, you can apply the rejected hunks.  Or change them in
the original patch.  If you haven't applied the patch yet, here's a corrected
version (I've cancelled the old one):

System: patch version 2.0
Patch #: 12
Priority: LOW
Subject: some faulty declarations

Description:
	Certain systems were producing compilation errors and warnings due
	to some faulty declarations.

Fix:	From rn, say "| patch -p -N -d DIR", where DIR is your patch source
	directory.  Outside of rn, say "cd DIR; patch -p -N  #define PATCHLEVEL 12

Index: MANIFEST
12a13
> config.h.SH              3 Produces config.h.

Index: Makefile.SH
Prereq: 2.0.1.1
*** Makefile.SH.old	Wed Jun 22 21:18:32 1988
--- Makefile.SH	Wed Jun 22 21:18:32 1988
***************
*** 3,11 ****
  esac
  echo "Extracting Makefile (with variable substitutions)"
  cat >Makefile <Makefile <