Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force Ubuntu 12.04 until we can migrate to 14.04 #1023

Merged
merged 8 commits into from
Sep 8, 2017
Merged

Force Ubuntu 12.04 until we can migrate to 14.04 #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68243a8
Force use of Ubuntu 12 builds on Travis CI until we can migrate to 14
zachriggle Sep 7, 2017
9e01398
Fix Travis Dockerfile
zachriggle Sep 6, 2017
e35aecb
curl should follow redirects when grabbing Ubuntu packages
zachriggle Sep 6, 2017
3aad898
Add bash command logging to Travis scripts, since Travis removed its …
zachriggle Sep 6, 2017
84d1084
Perhaps i
zachriggle Sep 8, 2017
7965e52
Perhaps if I add another commit, Travis will be nice?
zachriggle Sep 8, 2017
0eaa005
Update Travis cache directories to newer version of Python, as seen i…
zachriggle Sep 8, 2017
2557291
Use ::1 instead of ip6-localhost since Travis 12.04 changes broke it
zachriggle Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pwnlib/shellcraft/templates/i386/linux/connect.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
3 changes: 3 additions & 0 deletions travis/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions travis/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash -e
set -e
set -ex

local_deb_extract()
{
Expand All @@ -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"
}

Expand Down Expand Up @@ -198,4 +198,4 @@ elif [[ "$(uname)" == "Linux" ]]; then
setup_android_emulator
fi

set +e
set +ex
4 changes: 2 additions & 2 deletions travis/ssh_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -55,4 +55,4 @@ EOF

ssh -o "StrictHostKeyChecking no" -vvvv [email protected] id

set +e
set +ex