diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-12-07 16:24:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-12-07 16:24:34 +0000 |
| commit | e166a2c7ac84c2f419a9a14de5777e5d905c9b1b (patch) | |
| tree | bb75db44baf57086f7af924c8ce766c561a1d47a | |
| parent | Stable for amd64 wrt bug #491046 (diff) | |
| download | gentoo-2-e166a2c7ac84c2f419a9a14de5777e5d905c9b1b.tar.gz gentoo-2-e166a2c7ac84c2f419a9a14de5777e5d905c9b1b.tar.bz2 gentoo-2-e166a2c7ac84c2f419a9a14de5777e5d905c9b1b.zip | |
Fix building with USE=sasl. Add zlib dep.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
| -rw-r--r-- | net-analyzer/argus-clients/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild | 6 | ||||
| -rw-r--r-- | net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch | 20 |
3 files changed, 29 insertions, 3 deletions
diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog index ab0daca29439..b30e232be969 100644 --- a/net-analyzer/argus-clients/ChangeLog +++ b/net-analyzer/argus-clients/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/argus-clients # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.59 2013/12/06 16:35:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.60 2013/12/07 16:24:34 jer Exp $ + + 07 Dec 2013; Jeroen Roovers <jer@gentoo.org> argus-clients-3.0.7.18.ebuild, + +files/argus-clients-3.0.7.18-sasl.patch: + Fix building with USE=sasl. Add zlib dep. *argus-clients-3.0.7.18 (06 Dec 2013) diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild index de66ac3009d2..f93ce5311630 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild,v 1.1 2013/12/06 16:35:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild,v 1.2 2013/12/07 16:24:34 jer Exp $ EAPI=5 inherit autotools eutils toolchain-funcs @@ -19,6 +19,7 @@ MY_CDEPEND=" net-libs/libpcap sys-libs/ncurses sys-libs/readline + sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) @@ -37,7 +38,8 @@ DEPEND=" src_prepare() { epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ + "${FILESDIR}"/${PN}-3.0.7.18-sasl.patch sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die tc-export AR RANLIB diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch new file mode 100644 index 000000000000..955c773f0107 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch @@ -0,0 +1,20 @@ +--- a/common/argus_auth.c ++++ b/common/argus_auth.c +@@ -127,7 +127,7 @@ + static int RaSimple(void *context, int, const char **, unsigned *); + static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **); + +-int ArgusInitializeAuthentication (struct ArgusInput *input, sasl_conn_t *) ++int RaSaslNegotiate (struct ArgusInput *input); + int RaGetSaslString (int, char *, int); + int RaSendSaslString (int, const char *, int, int); + +@@ -433,7 +433,7 @@ + int in, out, retn = 0; + sasl_conn_t *conn; + +- conn = input->conn; ++ conn = input->sasl_conn; + in = input->in; + out = input->out; + |