diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-06-12 22:17:51 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-06-12 22:17:51 +0000 |
| commit | 3dc11612eecdcb6f0c253f5d555d8d39e7f7a43a (patch) | |
| tree | 809963e5c1bfb3407b9dad006c1f9f312e534a5f /ports-mgmt/pkg_install | |
| parent | Forced commit to note that these patches were obtained from devel/boehm-gc. (diff) | |
Fix a bug where the wrong path to pkg_add could result when doing recursive
pkg_adds.
Reported by: kris
Notes
Notes:
svn path=/head/; revision=111363
Diffstat (limited to 'ports-mgmt/pkg_install')
| -rw-r--r-- | ports-mgmt/pkg_install/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/pkg_install/files/patch-add | 44 |
2 files changed, 24 insertions, 21 deletions
diff --git a/ports-mgmt/pkg_install/Makefile b/ports-mgmt/pkg_install/Makefile index 6cfe447fea7e..a9125223f8f0 100644 --- a/ports-mgmt/pkg_install/Makefile +++ b/ports-mgmt/pkg_install/Makefile @@ -7,6 +7,7 @@ PORTNAME= pkg_install PORTVERSION= 20040530 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://people.FreeBSD.org/~marcus/ diff --git a/ports-mgmt/pkg_install/files/patch-add b/ports-mgmt/pkg_install/files/patch-add index cf34e018f7cb..363f51835c26 100644 --- a/ports-mgmt/pkg_install/files/patch-add +++ b/ports-mgmt/pkg_install/files/patch-add @@ -9,27 +9,6 @@ diff -ruN add.orig/add.h add/add.h extern char FirstPen[]; extern add_mode_t AddMode; -diff -ruN add.orig/main.c add/main.c ---- add.orig/main.c Thu Apr 15 15:23:52 2004 -+++ add/main.c Thu Apr 15 15:44:17 2004 -@@ -39,6 +39,7 @@ - char *Owner = NULL; - char *Group = NULL; - char *PkgName = NULL; -+char *PkgAddCmd = NULL; - char *Directory = NULL; - char FirstPen[FILENAME_MAX]; - add_mode_t AddMode = NORMAL; -@@ -84,7 +85,9 @@ - char **start; - char *cp, *packagesite = NULL, *remotepkg = NULL, *ptr; - static char temppackageroot[MAXPATHLEN]; -+ static char pkgaddpath[MAXPATHLEN]; - -+ PkgAddCmd = realpath(argv[0], pkgaddpath); - start = argv; - while ((ch = getopt(argc, argv, Options)) != -1) { - switch(ch) { diff -ruN add.orig/perform.c add/perform.c --- add.orig/perform.c Thu Apr 15 15:23:52 2004 +++ add/perform.c Thu Apr 15 15:32:10 2004 @@ -65,3 +44,26 @@ diff -ruN add.orig/perform.c add/perform.c if (!Force) ++code; } +--- add/main.c.orig Sat May 8 19:45:31 2004 ++++ add/main.c Sat Jun 12 18:13:03 2004 +@@ -39,6 +39,7 @@ + char *Owner = NULL; + char *Group = NULL; + char *PkgName = NULL; ++char *PkgAddCmd = NULL; + char *Directory = NULL; + char FirstPen[FILENAME_MAX]; + add_mode_t AddMode = NORMAL; +@@ -86,7 +87,12 @@ + char **start; + char *cp, *packagesite = NULL, *remotepkg = NULL, *ptr; + static char temppackageroot[MAXPATHLEN]; ++ static char pkgaddpath[MAXPATHLEN]; + ++ if (*argv[0] != '/' && strchr(argv[0], '/')) ++ PkgAddCmd = realpath(argv[0], pkgaddpath); ++ else ++ PkgAddCmd = argv[0]; + start = argv; + while ((ch = getopt(argc, argv, Options)) != -1) { + switch(ch) { |