From: | "Justin Lecher (jlec)" <jlec@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-analyzer/openvas-libraries/files: openvas-libraries-7.0.4-libssh.patch openvas-libraries-7.0.4-bsdsource.patch |
Date: | Sun, 28 Sep 2014 16:49:07 |
Message-Id: | 20140928164859.D471813A8@oystercatcher.gentoo.org |
1 | jlec 14/09/28 16:48:59 |
2 | |
3 | Added: openvas-libraries-7.0.4-libssh.patch |
4 | openvas-libraries-7.0.4-bsdsource.patch |
5 | Log: |
6 | net-analyzer/openvas-libraries: Import fedora patches, make ldap support optional |
7 | |
8 | (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
9 | |
10 | Revision Changes Path |
11 | 1.1 net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch?rev=1.1&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch?rev=1.1&content-type=text/plain |
15 | |
16 | Index: openvas-libraries-7.0.4-libssh.patch |
17 | =================================================================== |
18 | https://www.mail-archive.com/openvas-discuss@×××××××××××××××.org/msg05828.html |
19 | Fixes build issue with the newer version of libssh |
20 | |
21 | diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c openvas-libraries-7.0.1.new/nasl/nasl_ssh.c |
22 | --- openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c 2014-04-14 19:15:40.000000000 +0200 |
23 | +++ openvas-libraries-7.0.1.new/nasl/nasl_ssh.c 2014-05-23 00:13:56.791111974 +0200 |
24 | @@ -1861,7 +1861,8 @@ |
25 | return NULL; |
26 | session = session_table[tbl_slot].session; |
27 | |
28 | - banner = ssh_get_serverbanner (session); |
29 | + //banner = ssh_get_serverbanner (session); |
30 | + banner = (char*) ssh_get_serverbanner (session); |
31 | if (!banner) |
32 | return NULL; |
33 | |
34 | |
35 | |
36 | |
37 | 1.1 net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch |
38 | |
39 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch?rev=1.1&view=markup |
40 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch?rev=1.1&content-type=text/plain |
41 | |
42 | Index: openvas-libraries-7.0.4-bsdsource.patch |
43 | =================================================================== |
44 | diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c |
45 | --- openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c 2014-05-24 01:11:33.049417462 +0200 |
46 | +++ openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c 2014-05-24 17:01:25.409361461 +0200 |
47 | @@ -24,7 +24,7 @@ |
48 | * |
49 | */ |
50 | |
51 | -#define _BSD_SOURCE 1 |
52 | +#define _DEFAULT_SOURCE 1 |
53 | |
54 | #include <unistd.h> /* for close() */ |
55 | #include <stdlib.h> /* for rand() */ |
56 | diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_raw.h openvas-libraries-7.0.1.new/nasl/nasl_raw.h |
57 | --- openvas-libraries-7.0.1.orig/nasl/nasl_raw.h 2014-05-24 01:11:33.287412716 +0200 |
58 | +++ openvas-libraries-7.0.1.new/nasl/nasl_raw.h 2014-05-24 17:02:33.829967589 +0200 |
59 | @@ -20,12 +20,12 @@ |
60 | #ifndef OPENVAS_RAW_H |
61 | #define OPENVAS_RAW_H |
62 | #ifdef __linux__ |
63 | -#ifndef __BSD_SOURCE |
64 | -#define __BSD_SOURCE |
65 | +#ifndef __DEFAULT_SOURCE |
66 | +#define __DEFAULT_SOURCE |
67 | #endif |
68 | |
69 | -#ifndef _BSD_SOURCE |
70 | -#define _BSD_SOURCE |
71 | +#ifndef _DEFAULT_SOURCE |
72 | +#define _DEFAULT_SOURCE |
73 | #endif |
74 | |
75 | #ifndef __FAVOR_BSD |