summaryrefslogtreecommitdiff
path: root/misc/openoffice
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2002-12-25 16:29:59 +0000
committerjdolecek <jdolecek@pkgsrc.org>2002-12-25 16:29:59 +0000
commitcbb1ae7a141a9808293b9410a471af9ee5a6c5ae (patch)
treecd995e75fb9f78aeacf27c654bd0f447229e7af1 /misc/openoffice
parentc0b400978377cbadc629ba3d271354ddac152295 (diff)
downloadpkgsrc-cbb1ae7a141a9808293b9410a471af9ee5a6c5ae.tar.gz
fix umask handling in solenv/bin/deliver.pl
this fixes PR pkg/17967 by Alan Barrett
Diffstat (limited to 'misc/openoffice')
-rw-r--r--misc/openoffice/distinfo3
-rw-r--r--misc/openoffice/patches/patch-ep46
2 files changed, 48 insertions, 1 deletions
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 4febeabca8a..af122a8a31e 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/12/25 16:24:40 jdolecek Exp $
+$NetBSD: distinfo,v 1.14 2002/12/25 16:29:59 jdolecek Exp $
SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd
Size (oo_641_src.tar.bz2) = 109167758 bytes
@@ -125,3 +125,4 @@ SHA1 (patch-el) = b83e66e2fbddc6055bd2dae0a13441d1c82100d2
SHA1 (patch-em) = 86a0387f4c6f42bb78cae0abe8c21e9871556786
SHA1 (patch-en) = 8b74f0bf2b5fa998624a1e5478fc0710a7a644e1
SHA1 (patch-eo) = dca9afb678c9cf87ed16e352f839a82917663d10
+SHA1 (patch-ep) = ca62bf9a949519bf3d54002d350be17f0d53c463
diff --git a/misc/openoffice/patches/patch-ep b/misc/openoffice/patches/patch-ep
new file mode 100644
index 00000000000..9afa1484aa2
--- /dev/null
+++ b/misc/openoffice/patches/patch-ep
@@ -0,0 +1,46 @@
+$NetBSD: patch-ep,v 1.1 2002/12/25 16:30:00 jdolecek Exp $
+
+--- ../solenv/bin/deliver.pl.orig Tue Dec 24 16:45:57 2002
++++ ../solenv/bin/deliver.pl Tue Dec 24 17:20:07 2002
+@@ -102,7 +102,7 @@
+ $module = 0; # module name
+ $base_dir = 0; # path to module base directory
+ $dlst_file = 0; # path to d.lst
+-$umask = 22; # default file/directory creation mask
++$umask = 022; # default file/directory creation mask
+ $dest = 0; # optional destination path
+
+ @action_data = (); # LoL with all action data
+@@ -245,7 +245,7 @@
+ print "MKDIR: $path\n";
+ }
+ else {
+- mkpath($path, 0, 0777-$umask);
++ mkpath($path, 0, 0777 & ~$umask);
+ }
+ }
+
+@@ -285,7 +285,7 @@
+
+ $umask = umask();
+ if ( !defined($umask) ) {
+- $umask = 22;
++ $umask = 022;
+ }
+
+ $common_outdir = $ENV{COMMON_OUTDIR};
+@@ -535,11 +535,11 @@
+ my $mode = shift;
+ my $file = shift;
+
+- if ( $mode%2 == 1 ) {
+- $mode = 0777 - $umask;
++ if ( ($mode & 0111) != 0 ) { # any execute bits?
++ $mode = 0777 & ~$umask;
+ }
+ else {
+- $mode = 0666 - $umask;
++ $mode = 0666 & ~$umask;
+ }
+ chmod($mode, $file);
+ }