| 1 |
flameeyes 10/12/01 06:04:17 |
| 2 |
|
| 3 |
Added: ettercap-0.7.3-autotools.patch |
| 4 |
Log: |
| 5 |
Fix build with libtool 2.4 by patching up the build system to work with automake 1.11; dependency tracking is broken though, so make sure to hard-disable it (we don't need it anyway). Also make it more obvious that libtool is a _runtime_ dependency for this package. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/ettercap/files/ettercap-0.7.3-autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ettercap/files/ettercap-0.7.3-autotools.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ettercap/files/ettercap-0.7.3-autotools.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ettercap-0.7.3-autotools.patch |
| 16 |
=================================================================== |
| 17 |
Index: ettercap-NG-0.7.3/configure.in |
| 18 |
=================================================================== |
| 19 |
--- ettercap-NG-0.7.3.orig/configure.in |
| 20 |
+++ ettercap-NG-0.7.3/configure.in |
| 21 |
@@ -20,7 +20,7 @@ dnl |
| 22 |
dnl $Id: ettercap-0.7.3-autotools.patch,v 1.1 2010/12/01 06:04:16 flameeyes Exp $ |
| 23 |
dnl |
| 24 |
|
| 25 |
-AC_INIT |
| 26 |
+AC_INIT(ettercap, 0.7.3) |
| 27 |
AC_CONFIG_SRCDIR([include/ec.h]) |
| 28 |
|
| 29 |
dnl Force autoconf 2.57 |
| 30 |
@@ -32,16 +32,8 @@ dnl AM_INIT_AUTOMAKE(1.7.0) |
| 31 |
dnl Do not recompile configure Makefile et similia |
| 32 |
AM_MAINTAINER_MODE |
| 33 |
|
| 34 |
-VERSION=`grep EC_VERSION\ ./include/ec_version.h | cut -f2 -d"\""` |
| 35 |
-SB=`./shtool echo -n -e %B` |
| 36 |
-EB=`./shtool echo -n -e %b` |
| 37 |
-AC_SUBST(SB) |
| 38 |
-AC_SUBST(EB) |
| 39 |
-AC_SUBST(VERSION) |
| 40 |
-EC_MESSAGE(Configuring ettercap $VERSION) |
| 41 |
- |
| 42 |
AC_CONFIG_SRCDIR(src) |
| 43 |
-AM_INIT_AUTOMAKE(ettercap, $VERSION) |
| 44 |
+AM_INIT_AUTOMAKE([subdir-objects]) |
| 45 |
|
| 46 |
AC_CONFIG_HEADERS([include/config.h]) |
| 47 |
dnl AC_CONFIG_HEADERS(include/config.h) |
| 48 |
@@ -282,29 +274,18 @@ EC_MESSAGE(Checking for missing function |
| 49 |
|
| 50 |
AC_CONFIG_LIBOBJ_DIR(src/missing) |
| 51 |
|
| 52 |
-AM_CONDITIONAL(MISSING_STRLCPY, false) |
| 53 |
-AM_CONDITIONAL(MISSING_STRLCAT, false) |
| 54 |
-AM_CONDITIONAL(MISSING_STRSEP, false) |
| 55 |
-AM_CONDITIONAL(MISSING_MEMMEM, false) |
| 56 |
-AM_CONDITIONAL(MISSING_MEMCMP, false) |
| 57 |
-AM_CONDITIONAL(MISSING_BASENAME, false) |
| 58 |
-AM_CONDITIONAL(MISSING_GETOPT_LONG, false) |
| 59 |
-AM_CONDITIONAL(MISSING_STRCASESTR, false) |
| 60 |
-AM_CONDITIONAL(MISSING_INET_ATON, false) |
| 61 |
-AM_CONDITIONAL(MISSING_SCANDIR, false) |
| 62 |
- |
| 63 |
dnl AC_REPLACE_FUNCS(strlcpy) |
| 64 |
|
| 65 |
-AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(missing/strlcpy) AM_CONDITIONAL(MISSING_STRLCPY, true)]) |
| 66 |
-AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(missing/strlcat) AM_CONDITIONAL(MISSING_STRLCAT, true)]) |
| 67 |
-AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(missing/strsep) AM_CONDITIONAL(MISSING_STRSEP, true)]) |
| 68 |
-AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(missing/memmem) AM_CONDITIONAL(MISSING_MEMMEM, true)]) |
| 69 |
-AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(missing/memcmp) AM_CONDITIONAL(MISSING_MEMCMP, true)]) |
| 70 |
-AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(missing/basename) AM_CONDITIONAL(MISSING_BASENAME, true)]) |
| 71 |
-AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(missing/getopt) AM_CONDITIONAL(MISSING_GETOPT_LONG, true)]) |
| 72 |
-AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(missing/strcasestr) AM_CONDITIONAL(MISSING_STRCASESTR, true)]) |
| 73 |
-AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(missing/scandir) AM_CONDITIONAL(MISSING_SCANDIR, true)]) |
| 74 |
-AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(missing/inet_aton) AM_CONDITIONAL(MISSING_INET_ATON, true)]) |
| 75 |
+AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(strlcpy)]) |
| 76 |
+AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(strlcat)]) |
| 77 |
+AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(strsep)]) |
| 78 |
+AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(memmem)]) |
| 79 |
+AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(memcmp)]) |
| 80 |
+AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(basename)]) |
| 81 |
+AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(getopt)]) |
| 82 |
+AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(strcasestr)]) |
| 83 |
+AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(scandir)]) |
| 84 |
+AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(inet_aton)]) |
| 85 |
|
| 86 |
AC_CHECK_LIB(resolv, inet_aton, |
| 87 |
AM_CONDITIONAL(INET_ATON_WANTS_RESOLV, true), |
| 88 |
Index: ettercap-NG-0.7.3/utils/etterlog/Makefile.am |
| 89 |
=================================================================== |
| 90 |
--- ettercap-NG-0.7.3.orig/utils/etterlog/Makefile.am |
| 91 |
+++ ettercap-NG-0.7.3/utils/etterlog/Makefile.am |
| 92 |
@@ -30,32 +30,10 @@ etterlog_SOURCES = el_analyze.c \ |
| 93 |
$(top_srcdir)/src/ec_passive.c \ |
| 94 |
$(top_srcdir)/src/ec_strings.c \ |
| 95 |
$(top_srcdir)/src/ec_format.c |
| 96 |
- |
| 97 |
-if MISSING_STRSEP |
| 98 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/strsep.c |
| 99 |
-endif |
| 100 |
-if MISSING_STRLCAT |
| 101 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/strlcat.c |
| 102 |
-endif |
| 103 |
-if MISSING_STRCASESTR |
| 104 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/strcasestr.c |
| 105 |
-endif |
| 106 |
-if MISSING_MEMMEM |
| 107 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/memmem.c |
| 108 |
-endif |
| 109 |
-if MISSING_BASENAME |
| 110 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/basename.c |
| 111 |
-endif |
| 112 |
-if MISSING_INET_ATON |
| 113 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/inet_aton.c |
| 114 |
-endif |
| 115 |
-if MISSING_GETOPT_LONG |
| 116 |
- etterlog_SOURCES += $(top_srcdir)/src/missing/getopt.c |
| 117 |
-endif |
| 118 |
|
| 119 |
etterlog_CFLAGS = @EC_CFLAGS@ |
| 120 |
|
| 121 |
-etterlog_LDADD = -lz @ICONVLIB@ |
| 122 |
+etterlog_LDADD = -lz @ICONVLIB@ @LIBOBJS@ |
| 123 |
|
| 124 |
if INET_ATON_WANTS_RESOLV |
| 125 |
etterlog_LDADD += -lresolv |
| 126 |
Index: ettercap-NG-0.7.3/utils/etterfilter/Makefile.am |
| 127 |
=================================================================== |
| 128 |
--- ettercap-NG-0.7.3.orig/utils/etterfilter/Makefile.am |
| 129 |
+++ ettercap-NG-0.7.3/utils/etterfilter/Makefile.am |
| 130 |
@@ -26,22 +26,6 @@ etterfilter_SOURCES = ef_compiler.c \ |
| 131 |
$(top_srcdir)/src/ec_strings.c |
| 132 |
|
| 133 |
noinst_HEADERS = ef_grammar.h |
| 134 |
- |
| 135 |
-if MISSING_STRSEP |
| 136 |
- etterfilter_SOURCES += $(top_srcdir)/src/missing/strsep.c |
| 137 |
-endif |
| 138 |
-if MISSING_STRLCPY |
| 139 |
- etterfilter_SOURCES += $(top_srcdir)/src/missing/strlcpy.c |
| 140 |
-endif |
| 141 |
-if MISSING_MEMMEM |
| 142 |
- etterfilter_SOURCES += $(top_srcdir)/src/missing/memmem.c |
| 143 |
-endif |
| 144 |
-if MISSING_INET_ATON |
| 145 |
- etterfilter_SOURCES += $(top_srcdir)/src/missing/inet_aton.c |
| 146 |
-endif |
| 147 |
-if MISSING_GETOPT_LONG |
| 148 |
- etterfilter_SOURCES += $(top_srcdir)/src/missing/getopt.c |
| 149 |
-endif |
| 150 |
|
| 151 |
etterfilter_CFLAGS = @EC_CFLAGS@ |
| 152 |
|
| 153 |
@@ -49,7 +33,7 @@ if BSD |
| 154 |
etterfilter_CFLAGS += -pthread |
| 155 |
endif |
| 156 |
|
| 157 |
-etterfilter_LDADD = |
| 158 |
+etterfilter_LDADD = @LIBOBJS@ |
| 159 |
|
| 160 |
if INET_ATON_WANTS_RESOLV |
| 161 |
etterfilter_LDADD += -lresolv |
Archives