Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Mar 2009 16:46:07 -0400
From:      L Campbell <llc2w@virginia.edu>
To:        freebsd-questions@freebsd.org
Subject:   Re: [pkg_add] PACKAGESITE weirdness - URL not correct for  dependencies?
Message-ID:  <792298050903261346m67896d1eo75694509494ff5f8@mail.gmail.com>
In-Reply-To: <792298050903261238y47cd2c01j6f645ad27d59dd84@mail.gmail.com>
References:  <792298050903261237o4d57a47dpb99861279ee9b4f6@mail.gmail.com> <792298050903261238y47cd2c01j6f645ad27d59dd84@mail.gmail.com>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
Okay, so apparently there's some serious weirdness in the logic in
src/usr.sbin/pkg_install/lib/url.c, in fileGetURL. This function takes
two parameters, base and spec, and has the following behavior --

* if spec is a valid URL, it's used unchanged as the path to the remote package.
* if base is non-NULL, the last two '/'s are chopped off and "All/" +
package name + ".tbz" is used as the result.
* if PKG_ADD_BASE is set in the environment, it's concatenated with
the package name and ".tbz"

When fileGetURL is called on the dependencies by pkg_do in
add/perform.c, it always gets passed the remote URL of the parent
package as the base and the package name as the spec, so the second
branch is always taken.

Unfortunately, this doesn't work with the PACKAGESITE code in
add/main.c, because fileGetURL is expecting the base argument to be of
the form "http://host/directory/package.tbz", as in
"www/lighttpd-1.4.22.tbz". The problem is, when using PACKAGESITE, the
actual URL (in my case) is just "http://host/lighttpd-1.4.22.tbz", so
that gets incorrectly chopped down to "http:/" + "Add/" +
"lighttpd-1.4.22.tbz".

It works fine if your PACKAGESITE puts all the packages in the "All/"
subdirectory (as I think the official ones do), but at the very least,
that's an undocumented constraint.

My solution was to add another case into fileGetURL which gets
overrides the three currently in there and is invoked if and only if
PACKAGESITE is set in the environment.

The following patch makes it work for me --

--- usr.sbin/pkg_install/lib/url.c.orig 2009-03-26 19:56:12.000000000 +0000
+++ usr.sbin/pkg_install/lib/url.c      2009-03-26 20:41:44.000000000 +0000
@@ -57,7 +57,21 @@
         * to construct a composite one out of that and the basename we were
         * handed as a dependency.
         */
-       if (base) {
+       if (getenv("PACKAGESITE")) {
+               if (strlcpy(fname, getenv("PACKAGESITE"), sizeof(fname))
+                       >= sizeof(fname)) {
+                       return NULL;
+               }
+               if (strlcat(fname, spec, sizeof(fname))
+                       >= sizeof(fname)) {
+                       return NULL;
+               }
+               if (strlcat(fname, ".tbz", sizeof(fname))
+                       >= sizeof(fname)) {
+                       return NULL;
+               }
+       }
+       else if (base) {
            strcpy(fname, base);
            /*
             * Advance back two slashes to get to the root of the package

Though I think, in the long-run I'm just going to put all my packages
in http://10.0.0.4/All/ and call it a day -- I hate maintaining a
bunch of patches for stuff.

:(



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?792298050903261346m67896d1eo75694509494ff5f8>