info - pledge stdio rpath wpath cpath getpw tty proc exec

infokey - stdio rpath wpath cpath tty
makeinfo - stdio rpath wpath cpath getpw
install-info - stdio rpath wpath cpath proc exec
texindex - stdio rpath wpath cpath tmppath
ok schwarze

5 files changed, 26 insertions, 5 deletions

diff --git a/gnu/usr.bin/texinfo/info/info.c b/gnu/usr.bin/texinfo/info/info.c
index 44f9cb8c169..999947ab46f 100644
--- a/gnu/usr.bin/texinfo/info/info.c
+++ b/gnu/usr.bin/texinfo/info/info.c
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.9 2006/07/17 16:12:36 espie Exp $
+   $Id: info.c,v 1.10 2015/11/14 23:06:06 deraadt Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004 Free Software Foundation, Inc.
@@ -156,6 +156,11 @@ main (int argc, char **argv)
   setlocale (LC_ALL, "");
 #endif
 
+  if (pledge ("stdio rpath wpath getpw cpath tty proc exec", NULL) == -1) {
+    fprintf (stderr, _("%s: pledge\n"), program_name);
+    exit (1);
+  }
+
 #ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/gnu/usr.bin/texinfo/info/infokey.c b/gnu/usr.bin/texinfo/info/infokey.c
index bfb3323b4ba..bb8b5f86389 100644
--- a/gnu/usr.bin/texinfo/info/infokey.c
+++ b/gnu/usr.bin/texinfo/info/infokey.c
@@ -1,5 +1,5 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.1.1.2 2006/07/17 16:03:45 espie Exp $
+   $Id: infokey.c,v 1.2 2015/11/14 23:06:06 deraadt Exp $
 
    Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
@@ -97,6 +97,11 @@ main (int argc, char **argv)
   setlocale (LC_ALL, "");
 #endif
 
+  if (pledge ("stdio rpath wpath cpath tty", NULL) == -1) {
+      perror("pledge");
+      exit(1);
+  }    
+
 #ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/gnu/usr.bin/texinfo/makeinfo/makeinfo.c b/gnu/usr.bin/texinfo/makeinfo/makeinfo.c
index c946a945986..1e55048caea 100644
--- a/gnu/usr.bin/texinfo/makeinfo/makeinfo.c
+++ b/gnu/usr.bin/texinfo/makeinfo/makeinfo.c
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.8 2006/07/17 16:12:36 espie Exp $
+   $Id: makeinfo.c,v 1.9 2015/11/14 23:06:06 deraadt Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -550,6 +550,11 @@ main (int argc, char **argv)
   setlocale (LC_COLLATE, "");
 #endif
 
+  if (pledge ("stdio rpath wpath cpath getpw", NULL) == -1) {
+    perror ("pledge");
+    exit (1);
+  }
+
 #ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/gnu/usr.bin/texinfo/util/install-info.c b/gnu/usr.bin/texinfo/util/install-info.c
index 5ff3d572d70..d4f7e5d9012 100644
--- a/gnu/usr.bin/texinfo/util/install-info.c
+++ b/gnu/usr.bin/texinfo/util/install-info.c
@@ -1,5 +1,5 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.8 2006/07/17 16:12:36 espie Exp $
+   $Id: install-info.c,v 1.9 2015/11/14 23:06:06 deraadt Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
    Foundation, Inc.
@@ -1164,6 +1164,9 @@ main (int argc, char **argv)
   setlocale (LC_ALL, "");
 #endif
 
+  if (pledge ("stdio rpath wpath cpath proc exec", NULL) == -1)
+    pfatal_with_name ("pledge");
+
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
diff --git a/gnu/usr.bin/texinfo/util/texindex.c b/gnu/usr.bin/texinfo/util/texindex.c
index b70915fe56c..b4a912ee549 100644
--- a/gnu/usr.bin/texinfo/util/texindex.c
+++ b/gnu/usr.bin/texinfo/util/texindex.c
@@ -1,5 +1,5 @@
 /* texindex -- sort TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.5 2006/07/17 16:12:36 espie Exp $
+   $Id: texindex.c,v 1.6 2015/11/14 23:06:06 deraadt Exp $
 
    Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
    2002, 2003, 2004 Free Software Foundation, Inc.
@@ -162,6 +162,9 @@ main (int argc, char **argv)
   setlocale (LC_ALL, "");
 #endif
 
+  if (pledge ("stdio rpath wpath cpath tmppath", NULL) == -1)
+    pfatal_with_name ("pledge");
+
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);