From ef6ec67d6e42d4912c499cd80f6d54d765103690 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 15 Mar 2015 09:38:13 +0100 Subject: [PATCH] ettercap: update to 0.8.2. --- srcpkgs/ettercap/patches/libressl.patch | 44 ------------------------- srcpkgs/ettercap/template | 14 +++----- 2 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/ettercap/patches/libressl.patch diff --git a/srcpkgs/ettercap/patches/libressl.patch b/srcpkgs/ettercap/patches/libressl.patch deleted file mode 100644 index bb77020e9bc..00000000000 --- a/srcpkgs/ettercap/patches/libressl.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- src/dissectors/ec_ssh.c.orig 2014-07-15 20:49:09.223335992 +0200 -+++ src/dissectors/ec_ssh.c 2014-07-15 20:52:27.927984161 +0200 -@@ -89,8 +89,8 @@ typedef struct { - - struct des3_state - { -- des_key_schedule k1, k2, k3; -- des_cblock iv1, iv2, iv3; -+ DES_key_schedule k1, k2, k3; -+ DES_cblock iv1, iv2, iv3; - }; - - struct blowfish_state -@@ -603,13 +603,13 @@ static void *des3_init(u_char *sesskey, - - state = malloc(sizeof(*state)); - -- des_set_key((void *)sesskey, (state->k1)); -- des_set_key((void *)(sesskey + 8), (state->k2)); -+ DES_set_key((void *)sesskey, (&state->k1)); -+ DES_set_key((void *)(sesskey + 8), (&state->k2)); - - if (len <= 16) -- des_set_key((void *)sesskey, (state->k3)); -+ DES_set_key((void *)sesskey, (&state->k3)); - else -- des_set_key((void *)(sesskey + 16), (state->k3)); -+ DES_set_key((void *)(sesskey + 16), (&state->k3)); - - memset(state->iv1, 0, 8); - memset(state->iv2, 0, 8); -@@ -625,9 +625,9 @@ static void des3_decrypt(u_char *src, u_ - dstate = (struct des3_state *)state; - memcpy(dstate->iv1, dstate->iv2, 8); - -- des_ncbc_encrypt(src, dst, len, (dstate->k3), &dstate->iv3, DES_DECRYPT); -- des_ncbc_encrypt(dst, dst, len, (dstate->k2), &dstate->iv2, DES_ENCRYPT); -- des_ncbc_encrypt(dst, dst, len, (dstate->k1), &dstate->iv1, DES_DECRYPT); -+ DES_ncbc_encrypt(src, dst, len, (&dstate->k3), &dstate->iv3, DES_DECRYPT); -+ DES_ncbc_encrypt(dst, dst, len, (&dstate->k2), &dstate->iv2, DES_ENCRYPT); -+ DES_ncbc_encrypt(dst, dst, len, (&dstate->k1), &dstate->iv1, DES_DECRYPT); - } - - static void swap_bytes(const u_char *src, u_char *dst, int n) diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template index daffcfba2ae..0d4ec2e7716 100644 --- a/srcpkgs/ettercap/template +++ b/srcpkgs/ettercap/template @@ -1,20 +1,16 @@ # Template file for 'ettercap' pkgname=ettercap -version=0.8.1 -revision=4 +version=0.8.2 +revision=1 lib32disabled=yes build_style=cmake configure_args="-DENABLE_GTK=OFF" -hostmakedepends="cmake flex git" +hostmakedepends="cmake flex" makedepends="ncurses-devel libressl-devel>=2.1.4 libcurl-devel libltdl-devel libnet-devel libpcap-devel pcre-devel" conf_files="/etc/${pkgname}/etter.conf" short_desc="A network sniffer/interceptor/logger for ethernet LANs" maintainer="Juan RP " license="GPL-2" homepage="http://ettercap.github.com/ettercap/" - -LDFLAGS="-Wl,--no-as-needed -ldl" - -do_fetch() { - git clone -b v${version} git://github.com/Ettercap/ettercap.git ${pkgname}-${version} -} +distfiles="https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz" +checksum=f38514f35bea58bfe6ef1902bfd4761de0379942a9aa3e175fc9348f4eef2c81