[news.software.b] Problems with 2.11 Patches

bob%aargh.cis.ohio-state.edu@osu-eddie.UUCP (Bob Sutterfield) (08/11/87)

	I am *finally* installing the 2.11 news distribution, Part01
through Part20, plus Patch01 through Patch08.  In trying to apply each
of the Patches in turn, they all succeeded except for Patch04, of
which Hunk #3 of the patch to inews.c was rejected.  The rest of
Patches 05 through 08 worked fine in all respects, but I'm not sure
what to do to make inews.c correct, if anything.  The following was
left in inews.c.rej:

***************
*** 156,162 ****
  #ifdef	LOCKF
  	lockf(fileno(actfp), F_ULOCK, 0);
  #else	/* !LOCKF */
! 	UNLINK(ACTIVE, bfr);
  #endif /* V7 */
  #endif	/* !BSD4_2 */
  	if (argc > 1 && !strcmp(*(argv+1), "-U")) {
--- 154,160 ----
  #ifdef	LOCKF
  	lockf(fileno(actfp), F_ULOCK, 0);
  #else	/* !LOCKF */
! 	UNLINK(bfr);
  #endif /* V7 */
  #endif	/* !BSD4_2 */
  	if (argc > 1 && !strcmp(*(argv+1), "-U")) {

	After applying the rest of the Patches, that section of the
code looks plausible, but the activity there is pretty sensitive (:-)
so it seems better to make sure.  Is it safe to proceed under the
assumption that Patches subsequent to #4 have left inews.c in the
correct state, even though that one hunk was rejected?
	If that isn't safe, where could I find a known-good copy of
2.11 inews.c, at Patchlevel 8?  UUnet, best I can tell, has the
distribution in the original form (Parts + Patches) for anonymous FTP
access, rather than in individual source files, which won't help my
case very much.
	Thanks very much for any help!
-=-
 Bob Sutterfield, Department of Computer and Information Science
 The Ohio State University; 2036 Neil Ave. Columbus OH USA 43210-1277
 bob@ohio-state.{arpa,csnet} or ...!cbosgd!osu-eddie!bob
 soon: bob@aargh.cis.ohio-state.edu