| 1 |
jer 09/07/29 03:09:58 |
| 2 |
|
| 3 |
Added: echoping-6.0.2-gnutls.patch |
| 4 |
Log: |
| 5 |
Revision bump to apply >net-libs/gnutls-2.7 patch (bug #279525). |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: echoping-6.0.2-gnutls.patch |
| 15 |
=================================================================== |
| 16 |
Date: 2009-06-30 14:26 |
| 17 |
Sender: bortz |
| 18 |
|
| 19 |
The patch by ametzler seems indeed to work (thanks to him). I've committed |
| 20 |
it (r426) and will make a new release soon. |
| 21 |
|
| 22 |
http://sourceforge.net/tracker/index.php?func=detail&aid=2811861&group_id=4581&atid=104581 |
| 23 |
|
| 24 |
|
| 25 |
--- trunk/SRC/configure.ac 2009/06/30 14:18:15 425 |
| 26 |
+++ trunk/SRC/configure.ac 2009/06/30 14:19:07 426 |
| 27 |
@@ -92,14 +92,21 @@ |
| 28 |
AC_ARG_WITH(gnutls, |
| 29 |
[ --with-gnutls[=DIR] SSL/TLS crypt support (needs GNU TLS), the argument DIR should not be necessary],dnl |
| 30 |
[if test "$withval" != "no"; then |
| 31 |
- AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) |
| 32 |
- GNUTLS=1 |
| 33 |
- CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`" |
| 34 |
- LDFLAGS="${LDFLAGS} `libgnutls-config --libs`" |
| 35 |
- if test "$withval" != "yes"; then |
| 36 |
- GNUTLSROOT=$withval |
| 37 |
- LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib" |
| 38 |
- CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include" |
| 39 |
+ if test "$withval" = "yes"; then |
| 40 |
+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], |
| 41 |
+ [ |
| 42 |
+ echo "GnuTLS found" |
| 43 |
+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) |
| 44 |
+ GNUTLS=1 |
| 45 |
+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" |
| 46 |
+ LIBS="$LIBS $LIBGNUTLS_LIBS" |
| 47 |
+ ],) |
| 48 |
+ else |
| 49 |
+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) |
| 50 |
+ GNUTLS=1 |
| 51 |
+ GNUTLSROOT=$withval |
| 52 |
+ LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib -lgnutls" |
| 53 |
+ CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include" |
| 54 |
fi |
| 55 |
fi], |
| 56 |
dnl Default: disable it |
Archives