Merge pull request Ettercap#637 from LocutusOfBorg/update-mac

Update mac

.travis.yml

@@ -93,7 +93,7 @@ matrix:
 
 before_install:
     - if [ ${TRAVIS_OS_NAME} = "linux" ]; then sudo apt-get update -qq; sudo apt-get install debhelper bison check cmake flex ghostscript libbsd-dev libcurl4-openssl-dev libgtk2.0-dev libltdl-dev libluajit-5.1-dev libncurses5-dev libnet1-dev libpcap-dev libpcre3-dev libssl-dev libgtk-3-dev; fi
-    - if [ ${TRAVIS_OS_NAME} = "osx" ]; then brew update; brew install cmake check curl; brew install ghostscript gtk+ gtk+3; brew install libidn libnet; brew install luajit openssl pcre rtmpdump; fi
+    - if [ ${TRAVIS_OS_NAME} = "osx" ]; then brew update; brew install check curl; brew install ghostscript gtk+ gtk+3; brew install libidn libnet; brew install luajit openssl pcre rtmpdump; fi
 script:
   - mkdir build && cd build && cmake -DENABLE_TESTS=On $BUILD_ARGS .. && make && make test_verbose
 notifications:

INSTALL

@@ -18,7 +18,7 @@ $ make install
 #### Bundled libraries
 Ettercap now bundles the following libraries with the source distribution:
   libnet 1.1.6
-  curl 7.39.0
+  curl 7.40.0
   luajit 2.0.3
   check 0.9.14
 

bundled_deps/curl/CMakeLists.txt

@@ -3,7 +3,7 @@
 # This will build curl using the release that we've included with
 # our distribution of ettercap.
 include(ExternalProject)
-SET(CURL_VERSION 7.39.0)
+SET(CURL_VERSION 7.40.0)
 SET(CURL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 SET(CURL_TARGET bundled-curl-${CURL_VERSION}-${CMAKE_BUILD_TYPE})
 SET(CURL_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${CURL_TARGET})

misc/get-mac.sh

@@ -8,3 +8,5 @@ rm oui.txt
 echo "the maximum line SHOULD be less than 120 bytes (ec_manuf.c manuf_init function)"
 echo "maximum line of the newly generated file"
 wc -L etter.finger.mac
+dos2unix etter.finger.mac
+mv etter.finger.mac share