diff options
author | tonnerre <tonnerre@pkgsrc.org> | 2008-07-13 20:57:50 +0000 |
---|---|---|
committer | tonnerre <tonnerre@pkgsrc.org> | 2008-07-13 20:57:50 +0000 |
commit | f3ef634c5b2d05fd2dd9297210be0422b043283c (patch) | |
tree | 472ef19ac468db40e86726b534d8c6e7bd461a40 /time/wyrd | |
parent | 27a7a5a3c811b84467f289bdd1c7d1ec8f73f4d6 (diff) | |
download | pkgsrc-f3ef634c5b2d05fd2dd9297210be0422b043283c.tar.gz |
Add patches for wyrd privilege escalation (CVE-2008-0806). Thanks, agc!
Diffstat (limited to 'time/wyrd')
-rw-r--r-- | time/wyrd/Makefile | 3 | ||||
-rw-r--r-- | time/wyrd/distinfo | 4 | ||||
-rw-r--r-- | time/wyrd/patches/patch-ab | 28 | ||||
-rw-r--r-- | time/wyrd/patches/patch-ac | 13 |
4 files changed, 46 insertions, 2 deletions
diff --git a/time/wyrd/Makefile b/time/wyrd/Makefile index 8ed9e42d12b..faa17343d49 100644 --- a/time/wyrd/Makefile +++ b/time/wyrd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:39 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2008/07/13 20:57:50 tonnerre Exp $ # DISTNAME= wyrd-1.4.1 +PKGREVISION= 1 CATEGORIES= time MASTER_SITES= http://www.eecs.umich.edu/~pelzlpj/wyrd/ diff --git a/time/wyrd/distinfo b/time/wyrd/distinfo index 93696e52143..3b81ca7990b 100644 --- a/time/wyrd/distinfo +++ b/time/wyrd/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/07/24 23:03:35 wiz Exp $ +$NetBSD: distinfo,v 1.2 2008/07/13 20:57:50 tonnerre Exp $ SHA1 (wyrd-1.4.1.tar.gz) = 5d34bdef0ae5a28f47ac7fc927fe60639926a568 RMD160 (wyrd-1.4.1.tar.gz) = cb6ce509c140f97123a544aaf94d390d59811e9f Size (wyrd-1.4.1.tar.gz) = 198530 bytes SHA1 (patch-aa) = d4ad2bbfbc1e493797d4c078863e233b9422b5d3 +SHA1 (patch-ab) = 1e9df7b2ac5adc59937363d957dd9dd97fe8203e +SHA1 (patch-ac) = 4f48b6ce3efc43c39a15c4c05dc4f52cd4f77b11 diff --git a/time/wyrd/patches/patch-ab b/time/wyrd/patches/patch-ab new file mode 100644 index 00000000000..226f8493926 --- /dev/null +++ b/time/wyrd/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.1 2008/07/13 20:57:50 tonnerre Exp $ + +--- interface_main.ml.orig 2006-07-17 00:29:41.000000000 +0200 ++++ interface_main.ml +@@ -884,9 +884,9 @@ let handle_view_keybindings (iface : int + in + Hashtbl.iter find_binding Rcfile.table_commandstr_command; + let sorted_list = List.fast_sort Pervasives.compare !bindings in +- let out_channel = open_out Rcfile.tmpfile in ++ let out_channel = Rcfile.tmpfd in + List.iter (output_string out_channel) sorted_list; +- close_out out_channel; ++ flush out_channel; + def_prog_mode (); + endwin (); + let _ = Unix.system ("less " ^ Rcfile.tmpfile) in +@@ -1640,8 +1640,9 @@ let handle_keypress_normal key (iface : + let i = draw_msg iface in + handle_refresh i reminders + |Rcfile.Quit -> +- let new_iface = {iface with run_wyrd = false} in +- (new_iface, reminders) ++ let out_channel = Rcfile.tmpfd in ++ close_out out_channel;Sys.remove Rcfile.tmpfile;let new_iface = {iface with run_wyrd = false} in ++ (new_iface, reminders) + with Not_found -> + let _ = beep () in + draw_error iface "key is not bound." false; diff --git a/time/wyrd/patches/patch-ac b/time/wyrd/patches/patch-ac new file mode 100644 index 00000000000..24aeff471fd --- /dev/null +++ b/time/wyrd/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2008/07/13 20:57:50 tonnerre Exp $ + +--- rcfile.ml.orig 2006-07-17 00:29:41.000000000 +0200 ++++ rcfile.ml +@@ -128,7 +128,7 @@ let inverse_color_table = Hashtbl.create + (* Final hash table that maps from object to color_pair index *) + let object_palette = Hashtbl.create 20 + +-let tmpfile = "/tmp/wyrd-tmp." ^ (string_of_int (Unix.getuid ())) ++let tmpfile,tmpfd = Filename.open_temp_file "wyrd" "-temp" + + + (* Turn colors on and off *) |