From owner-freebsd-stable@FreeBSD.ORG Thu Nov 9 06:49:27 2006 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD64E16A40F for ; Thu, 9 Nov 2006 06:49:27 +0000 (UTC) (envelope-from simonbiber@yahoo.com.au) Received: from filter.it.uts.edu.au (filter.it.uts.edu.au [138.25.8.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EB9943D46 for ; Thu, 9 Nov 2006 06:49:27 +0000 (GMT) (envelope-from simonbiber@yahoo.com.au) Received: from marcie.it.uts.edu.au (marcie.it.uts.edu.au [138.25.9.4]) by filter.it.uts.edu.au (Postfix) with ESMTP id DA233E02C6 for ; Thu, 9 Nov 2006 17:49:22 +1100 (EST) Received: from [0.0.0.0] (218-214-46-61.people.net.au [218.214.46.61]) by marcie.it.uts.edu.au (Postfix) with ESMTP id A611421298 for ; Thu, 9 Nov 2006 17:49:22 +1100 (EST) Message-ID: <4552CF70.1010101@yahoo.com.au> Date: Thu, 09 Nov 2006 17:49:20 +1100 From: Simon Biber User-Agent: Thunderbird 1.5.0.7 (Windows/20060909) MIME-Version: 1.0 To: freebsd-stable@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Error applying libarchive.patch X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 06:49:27 -0000 I tried installing FreeBSD Security Advisory FreeBSD-SA-06:24.libarchive The patch failed. Am I doing something wrong? Is it not designed for my system? oz# uname -a FreeBSD oz.caah.org 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Thu Oct 12 07:40:47 EST 2006 root@:/usr/obj/usr/src/sys/GENERIC i386 oz# patch < /home/sbiber/libarchive.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: lib/libarchive/archive_read_support_compression_none.c |=================================================================== |RCS file: /home/ncvs/src/lib/libarchive/archive_read_support_compression_none.c,v |retrieving revision 1.8 |diff -u -I__FBSDID -r1.8 archive_read_support_compression_none.c |--- lib/libarchive/archive_read_support_compression_none.c 29 Aug 2006 04:59:25 -0000 1.8 |+++ lib/libarchive/archive_read_support_compression_none.c 2 Nov 2006 05:17:28 -0000 -------------------------- Patching file lib/libarchive/archive_read_support_compression_none.c using Plan A... Hunk #1 failed at 257. Hunk #2 failed at 289. Hunk #3 failed at 307. Hunk #4 failed at 320. 4 out of 4 hunks failed--saving rejects to lib/libarchive/archive_read_support_compression_none.c.rej done -- Simon.