[pkgsrc/pkgsrc-2004Q4]: pkgsrc/pkgtools/pkg_install/files/lib Pullup ticket 2...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a69605812360
branches:  pkgsrc-2004Q4
changeset: 485898:a69605812360
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Feb 15 13:59:21 2005 +0000

description:
Pullup ticket 272 - requested by Robert T. Retzlaff
pkg_add preserve modes of entries in binary packages

Revisions pulled up:
- pkgsrc/pkgtools/pkg_install/files/lib/ftpio.c   1.14
- pkgsrc/pkgtools/pkg_install/files/lib/version.h 1.39

   Module Name:    pkgsrc
   Committed By:   agc
   Date:           Fri Jan  7 11:58:12 UTC 2005

   Modified Files:
           pkgsrc/pkgtools/pkg_install/files/lib: ftpio.c version.h

   Log Message:
   Sync changes with src/:

   + extract files on ftp pkg_adds with the 'p' flag to tar, to preserve
     modes of entries in the binary package.  (Addresses PR 28826 from
     Tyler Retzlaff)

   Bump version to 20050106

diffstat:

 pkgtools/pkg_install/files/lib/ftpio.c   |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r d73b7a249c76 -r a69605812360 pkgtools/pkg_install/files/lib/ftpio.c
--- a/pkgtools/pkg_install/files/lib/ftpio.c    Tue Feb 15 06:32:07 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/ftpio.c    Tue Feb 15 13:59:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpio.c,v 1.12 2004/11/02 00:44:00 erh Exp $   */
+/*     $NetBSD: ftpio.c,v 1.12.2.1 2005/02/15 13:59:21 salo Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.12 2004/11/02 00:44:00 erh Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.12.2.1 2005/02/15 13:59:21 salo Exp $");
 #endif
 
 /*-
@@ -1238,7 +1238,7 @@
                        errx(EXIT_FAILURE, "don't know how to decompress %s, sorry", pkg);
 
                /* yes, this is gross, but needed for borken ftp(1) */
-               (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -%sx -f - | tee /dev/stderr )\"\n",
+               (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -%sxp -f - | tee /dev/stderr )\"\n",
                    pkg, dir,
                    decompress_cmd != NULL ? "--use-compress-program" : "",
                    decompress_cmd != NULL ? decompress_cmd : "",
diff -r d73b7a249c76 -r a69605812360 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Tue Feb 15 06:32:07 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Tue Feb 15 13:59:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.37 2004/12/10 21:14:40 erh Exp $ */
+/*     $NetBSD: version.h,v 1.37.2.1 2005/02/15 13:59:21 salo Exp $    */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20041209"
+#define PKGTOOLS_VERSION "20050106"
 
 #endif /* _INST_LIB_VERSION_H_ */