summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsheldonh <sheldonh@FreeBSD.org>2000-03-15 09:18:12 +0000
committersheldonh <sheldonh@FreeBSD.org>2000-03-15 09:18:12 +0000
commit87a0ee8fd64ec5f1e02e3bef4a0de750d7bede50 (patch)
treea5ec34dcaa24fe6415d82f2615b805f72de42971
parent5ca3e267fb3f5d13f0aca197046fde27ba5247fb (diff)
downloadFreeBSD-src-87a0ee8fd64ec5f1e02e3bef4a0de750d7bede50.zip
FreeBSD-src-87a0ee8fd64ec5f1e02e3bef4a0de750d7bede50.tar.gz
Do not preserve UIDs, permissions nor flags of package system files in
tar files. This fixes clean-up problems during package creation and does not affect the actual files to be included in the package. The fix submitted on the attributed PR was identical to the one obtained from NetBSD. PR: 17386 Reported by: Adrian Filipi-Martin <adrian@ubergeeks.com> Obtained from: NetBSD
-rw-r--r--usr.sbin/pkg_install/lib/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index b39ecf3..a2c2f3b 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -414,9 +414,9 @@ copy_file(char *dir, char *fname, char *to)
char cmd[FILENAME_MAX];
if (fname[0] == '/')
- snprintf(cmd, FILENAME_MAX, "cp -p -r %s %s", fname, to);
+ snprintf(cmd, FILENAME_MAX, "cp -r %s %s", fname, to);
else
- snprintf(cmd, FILENAME_MAX, "cp -p -r %s/%s %s", dir, fname, to);
+ snprintf(cmd, FILENAME_MAX, "cp -r %s/%s %s", dir, fname, to);
if (vsystem(cmd)) {
cleanup(0);
errx(2, "could not perform '%s'", cmd);
OpenPOWER on IntegriCloud