| 1 |
vapier 10/08/31 17:10:30 |
| 2 |
|
| 3 |
Added: iputils-20100418-openssl.patch |
| 4 |
iputils-20100418-so_mark.patch |
| 5 |
Log: |
| 6 |
Make openssl support optional #335436 by Jorge Manuel B. S. Vicetto. Fix building with older linux headers #335347 by Mark Wagner. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/iputils/files/iputils-20100418-openssl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/files/iputils-20100418-openssl.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/files/iputils-20100418-openssl.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: iputils-20100418-openssl.patch |
| 16 |
=================================================================== |
| 17 |
make openssl optional |
| 18 |
|
| 19 |
https://bugs.gentoo.org/335436 |
| 20 |
|
| 21 |
--- ping6.c |
| 22 |
+++ ping6.c |
| 23 |
@@ -161,7 +161,9 @@ |
| 24 |
|
| 25 |
static int icmp_sock; |
| 26 |
|
| 27 |
+#ifdef HAVE_OPENSSL |
| 28 |
#include <openssl/md5.h> |
| 29 |
+#endif |
| 30 |
|
| 31 |
/* Node Information query */ |
| 32 |
int ni_query = -1; |
| 33 |
@@ -478,6 +480,7 @@ |
| 34 |
|
| 35 |
char *ni_groupaddr(const char *name) |
| 36 |
{ |
| 37 |
+#ifdef HAVE_OPENSSL |
| 38 |
MD5_CTX ctxt; |
| 39 |
__u8 digest[16]; |
| 40 |
static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; |
| 41 |
@@ -518,6 +521,10 @@ |
| 42 |
if (q) |
| 43 |
strcat(nigroup_buf, q); |
| 44 |
return nigroup_buf; |
| 45 |
+#else |
| 46 |
+ fprintf(stderr, "ping6: function not available; openssl disabled\n"); |
| 47 |
+ exit(1); |
| 48 |
+#endif |
| 49 |
} |
| 50 |
|
| 51 |
int main(int argc, char *argv[]) |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 net-misc/iputils/files/iputils-20100418-so_mark.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/files/iputils-20100418-so_mark.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/files/iputils-20100418-so_mark.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: iputils-20100418-so_mark.patch |
| 61 |
=================================================================== |
| 62 |
https://bugs.gentoo.org/335347 |
| 63 |
|
| 64 |
fix building with older linux headers that don't define SO_MARK |
| 65 |
|
| 66 |
--- ping_common.c |
| 67 |
+++ ping_common.c |
| 68 |
@@ -485,6 +485,7 @@ |
| 69 |
fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n"); |
| 70 |
} |
| 71 |
#endif |
| 72 |
+#ifdef SO_MARK |
| 73 |
if (options & F_MARK) { |
| 74 |
if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK, |
| 75 |
&mark, sizeof(mark)) == -1) { |
| 76 |
@@ -494,6 +495,7 @@ |
| 77 |
fprintf(stderr, "Warning: Failed to set mark %d\n", mark); |
| 78 |
} |
| 79 |
} |
| 80 |
+#endif |
| 81 |
|
| 82 |
/* Set some SNDTIMEO to prevent blocking forever |
| 83 |
* on sends, when device is too slow or stalls. Just put limit |
Archives