Permalink
Browse files

Force Ubuntu 12.04 until we can migrate to 14.04 (#1023)

* Force use of Ubuntu 12 builds on Travis CI until we can migrate to 14

* Fix Travis Dockerfile

* Add bash command logging to Travis scripts, since Travis removed its own logging

* curl should follow redirects when grabbing Ubuntu packages

* Update Travis cache directories to newer version of Python, as seen in Travis logs

* Use ::1 instead of ip6-localhost since Travis 12.04 changes broke it
  • Loading branch information...
zachriggle committed Sep 8, 2017
1 parent c438893 commit 267c6cc15a4e12e2c61d7ba03f49ac16f0476813
Showing with 12 additions and 10 deletions.
  1. +3 −4 .travis.yml
  2. +1 −1 pwnlib/shellcraft/templates/i386/linux/connect.asm
  3. +3 −0 travis/docker/Dockerfile
  4. +3 −3 travis/install.sh
  5. +2 −2 travis/ssh_setup.sh
View
@@ -1,10 +1,9 @@
sudo: false
dist: precise
language: python
addons:
apt:
packages:
- gcc-multilib
- gcc-4.6-arm-linux-gnueabihf
- lib32stdc++6
- ash
- bash
@@ -18,8 +17,8 @@ cache:
- pip
- directories:
- usr
- /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages/
- /home/travis/virtualenv/python2.7.9/bin/
- /home/travis/virtualenv/python2.7.13/lib/python2.7/site-packages/
- /home/travis/virtualenv/python2.7.13/bin/
python:
- "2.7"
before_install:
@@ -24,7 +24,7 @@ Examples:
'Hello'
>>> l = listen(fam='ipv6', timeout=5)
>>> assembly = shellcraft.i386.linux.connect('ip6-localhost', l.lport, 'ipv6')
>>> assembly = shellcraft.i386.linux.connect('::1', l.lport, 'ipv6')
>>> p = run_assembly(assembly)
>>> assert l.wait_for_connection()
View
@@ -8,7 +8,10 @@ MAINTAINER Maintainer Gallopsled et al.
USER root
RUN apt-get update
# Use UTF-8
RUN apt-get install -y locales
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
View
@@ -1,5 +1,5 @@
#!/usr/bin/env bash -e
set -e
set -ex
local_deb_extract()
{
@@ -15,7 +15,7 @@ install_deb()
package=$1
echo "Installing $package"
INDEX="http://packages.ubuntu.com/en/$version/amd64/$package/download"
URL=$(curl "$INDEX" | grep -Eo "https?://.*$package.*\.deb" | head -1)
URL=$(curl -L "$INDEX" | grep -Eo "https?://.*$package.*\.deb" | head -1)
local_deb_extract "$URL"
}
@@ -198,4 +198,4 @@ elif [[ "$(uname)" == "Linux" ]]; then
setup_android_emulator
fi
set +e
set +ex
View
@@ -4,7 +4,7 @@
#
# All of the "conditional sudo" is to do container-based builds on
# Travis which are much, much faster.
set -e
set -ex
U=travis
H=/home/$U
@@ -55,4 +55,4 @@ EOF
ssh -o "StrictHostKeyChecking no" -vvvv travis@example.pwnme id
set +e
set +ex

0 comments on commit 267c6cc

Please sign in to comment.