From owner-freebsd-hackers@FreeBSD.ORG Tue Aug 26 21:23:50 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 1B2631065671 for ; Tue, 26 Aug 2008 21:23:50 +0000 (UTC) (envelope-from andenore@freebsd.org) Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58]) by mx1.freebsd.org (Postfix) with ESMTP id B1F178FC08 for ; Tue, 26 Aug 2008 21:23:49 +0000 (UTC) (envelope-from andenore@freebsd.org) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; format=flowed; delsp=yes; charset=utf-8 Received: from osl1sminn1.broadpark.no ([80.202.4.59]) by osl1smout1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with ESMTP id <0K6800EAX8RK9P50@osl1smout1.broadpark.no> for freebsd-hackers@freebsd.org; Tue, 26 Aug 2008 23:23:44 +0200 (CEST) Received: from duckjen.nextgentel.no ([84.48.58.232]) by osl1sminn1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with ESMTP id <0K680075N8RJ59RI@osl1sminn1.broadpark.no> for freebsd-hackers@freebsd.org; Tue, 26 Aug 2008 23:23:44 +0200 (CEST) Date: Tue, 26 Aug 2008 23:18:50 +0200 To: Garrett Cooper From: Anders Nore References: <1d3ed48c0808211456h779bec94n9b6597c66f7741b2@mail.gmail.com> <1d3ed48c0808211500i4445b443t4a67da7cf514adaa@mail.gmail.com> <7d6fde3d0808222236t45103e4eseb8f174ffb89fdca@mail.gmail.com> Message-id: In-reply-to: <7d6fde3d0808222236t45103e4eseb8f174ffb89fdca@mail.gmail.com> User-Agent: Opera Mail/9.50 (FreeBSD) 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: Tue, 26 Aug 2008 21:23:50 -0000 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