From owner-freebsd-hackers@FreeBSD.ORG Wed Aug 27 00:32:10 2008 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98D12106564A for ; Wed, 27 Aug 2008 00:32:10 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.157]) by mx1.freebsd.org (Postfix) with ESMTP id 0C5018FC12 for ; Wed, 27 Aug 2008 00:32:09 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: by fg-out-1718.google.com with SMTP id l26so1880874fgb.35 for ; Tue, 26 Aug 2008 17:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=Uylrno6K3zS8dtc4f3lhOZA+z67DHeK4BxYZfBbH+Gs=; b=CQBv3sIEitkjWBbyQ2FtoZBfZ1YUKRdQZzi9PfjWxVoN5UvfDwZK4TI39DqAji4ka9 Zh5YOO0ru1aHPTZ92cCin6KkJd0RZHPyvOi3rkhiKuQwer1lu8Ft6PvtbY3CcKPvbyAY Pna5KVEjagjYtn3xXSNRkC1G7U/OBSWT/Fr6I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=QE7HJc5Tdga9qccp/gx0W/9XS/Of6k1Zxv762LT+kuJg7yBcL6aWrO+jvdUQi9oYfw 2xYpEOqeiC3C7KMZW10IKgxtVeDMx2RXyeRh7uGcEJjbN+DRx6vocUEQGf0rACuJaG/8 AnNsl5Lbu1b6GFTa1ON4QaUwHmyWISfXlK98o= Received: by 10.86.82.16 with SMTP id f16mr4837740fgb.16.1219797128777; Tue, 26 Aug 2008 17:32:08 -0700 (PDT) Received: by 10.86.62.14 with HTTP; Tue, 26 Aug 2008 17:32:08 -0700 (PDT) Message-ID: <7d6fde3d0808261732w2dba8451ufd6683bc08d55a85@mail.gmail.com> Date: Tue, 26 Aug 2008 17:32:08 -0700 From: "Garrett Cooper" To: "Anders Nore" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1d3ed48c0808211456h779bec94n9b6597c66f7741b2@mail.gmail.com> <1d3ed48c0808211500i4445b443t4a67da7cf514adaa@mail.gmail.com> <7d6fde3d0808222236t45103e4eseb8f174ffb89fdca@mail.gmail.com> Cc: "freebsd-hackers@freebsd.org" Subject: Re: pkg_improved GSoC 2008 finished X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2008 00:32:10 -0000 On Tue, Aug 26, 2008 at 2:18 PM, Anders Nore wrote: > On Sat, 23 Aug 2008 07:36:02 +0200, Garrett Cooper > wrote: >> >> How about this? >> >> For standalone packages, specify: >> >> Makefile.inc <-- redefine variables here. >> pkg_install/ <-- sources go here. >> >> Seems like a simple solution ;). >> >> As for diff, you probably what to use: >> >> --exclude-from=SCM_patterns.txt >> >> where SCM_patterns.txt consists of: >> -------------- >> CVS >> .git >> .svn >> .CC >> -------------- >> ... etc. >> >> As for patch, `patch -p0 < pkg_install.patch' does the trick if you do >> `diff -Naur .'. >> >> Cheers and good work on finishing off this awesome task. I'll gladly >> write up tests for you if you like =], >> -Garrett > > > I've been making a lot of mistakes trying to make correct patches, but I > think I finally got a hang of it now :) > I'd really appreciate some tests if you're willing to write some. > > I've also discovered two bugs in all -CURRENT, -RELENG_7 and -RELENG_7_0 of > pkg_install: > > 1. Bug in pkg_info -W, it does not handle empty @cwd's correctly in the > packinglist, so if you have any packages with an empty @cwd before the files > listed it will not show as installed by a package. > e.g., if you have the kdeadmin-4.1.0 package installed, one of the files it > installs is `/usr/local/kde4/libdata/ldconfig/kdeadmin4' but running > `pkg_info -W /usr/local/kde4/libdata/ldconfig/kdeadmin4' will not show that > it installed by kdeadmin-4.1.0. > > 2. Bug in pkg_add, adding two packages where the first package recursively > pkg_add's dependencies using slave mode will cause an `pkg_add: fatal error > during execution: getcwd'. Because it doesn't save and recover previous > working directories correctly. > e.g., if you delete packages "joe-3.5,1", "gettext-0.16.1_3" and "zip-2.32", > and run `pkg_add -r joe zip' this error will occur as joe depends on > gettext. If you run `pkg_add -r zip joe' this error will not occur. > > Here's a patch for these errors: > http://home.no.net/andenore/patches/pkg_install_bugfix-2008-08-26_RELENG_7.diff > Can someone confirm these bugs, and if the patch is suitable? > > > Thanks a bunch, > Anders Nore I'll look through the diff at a later date to determine what new features you've added, but I'll be sure to add regression tests soon via Python / dev-pynose (sometime tonight if at all possible -- automation and testing Cisco stuff is eating up a lot of my free time :(...). Cheers, -Garrett