Avoid to conflict with stdout/stderr in stdio.h.

2 files changed, 66 insertions, 1 deletions

diff --git a/security/openvas-client/distinfo b/security/openvas-client/distinfo
index f10b312f07e..ddb386ab574 100644
--- a/security/openvas-client/distinfo
+++ b/security/openvas-client/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/04 01:12:18 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2009/12/09 05:19:36 obache Exp $
 
 SHA1 (openvas-client-2.0.1.tar.gz) = 07ada2cb7538da072c27a3a1cf58f9c6152d5e64
 RMD160 (openvas-client-2.0.1.tar.gz) = aa966e1e9911b63e5fee48d947cda5f0b036dd0a
 Size (openvas-client-2.0.1.tar.gz) = 629551 bytes
+SHA1 (patch-aa) = ffca8ce1116a4014e1a65f53536e0fc4faeeb675
diff --git a/security/openvas-client/patches/patch-aa b/security/openvas-client/patches/patch-aa
new file mode 100644
index 00000000000..361d1250f31
--- /dev/null
+++ b/security/openvas-client/patches/patch-aa
@@ -0,0 +1,64 @@
+$NetBSD: patch-aa,v 1.1 2009/12/09 05:19:36 obache Exp $
+
+avoid to conflict with stdout/stderr in stdio.h.
+
+--- src/openvas-lib/openvas_ssh_login.c.orig	2008-12-17 09:29:56.000000000 +0000
++++ src/openvas-lib/openvas_ssh_login.c
+@@ -77,8 +77,8 @@ static
+ gboolean openvas_ssh_privkey_create(char* pubkey_file, char* privkey_file,
+                                     char* passphrase_pub, char* passphrase_priv)
+ {
+-  gchar* stdout = NULL;
+-  gchar* stderr = NULL;
++  gchar* std_out = NULL;
++  gchar* std_err = NULL;
+   GError* err = NULL;
+   gint exit_status;
+   char* dir;
+@@ -116,14 +116,14 @@ gboolean openvas_ssh_privkey_create(char
+                                     privkey_file, " -passout pass:",
+                                     passphrase_priv, NULL);
+   
+-  if(g_spawn_command_line_sync(command, &stdout, &stderr, &exit_status, &err) == FALSE
++  if(g_spawn_command_line_sync(command, &std_out, &std_err, &exit_status, &err) == FALSE
+           || exit_status != 0 )
+   {
+     show_error(_("Error creating private key file.\nFor further information consult your shell."));
+     printf("Error creating private key file.");
+     printf("\tSpawned openssl process returned with %d.\n", exit_status);
+-    printf("\t\t stdout: %s", stdout);
+-    printf("\t\t stderr: %s", stderr);
++    printf("\t\t stdout: %s", std_out);
++    printf("\t\t stderr: %s", std_err);
+     return FALSE;
+   }
+ 
+@@ -144,8 +144,8 @@ static
+ gboolean openvas_ssh_pubkey_create(char* comment, char* passphrase,
+                                    char* filepath)
+ {
+-  gchar* stdout = NULL;
+-  gchar* stderr = NULL;
++  gchar* std_out = NULL;
++  gchar* std_err = NULL;
+   GError* err = NULL;
+   gint exit_status;
+   char* dir;
+@@ -191,14 +191,14 @@ gboolean openvas_ssh_pubkey_create(char*
+                                     comment, " -P ", passphrase, NULL);
+   efree(&file_pubstripped);
+ 
+-  if(g_spawn_command_line_sync(command, &stdout, &stderr, &exit_status, &err) == FALSE
++  if(g_spawn_command_line_sync(command, &std_out, &std_err, &exit_status, &err) == FALSE
+      || exit_status != 0 )
+   {
+     show_error(_("Error creating public key file.\nFor further information consult your shell."));
+     printf("Error creating public key file.\n");
+     printf("\tSpawned key-gen process returned with %d.\n", exit_status);
+-    printf("\t\t stdout: %s", stdout);
+-    printf("\t\t stderr: %s", stderr);
++    printf("\t\t stdout: %s", std_out);
++    printf("\t\t stderr: %s", std_err);
+     return FALSE;
+   }
+   return TRUE;