diff --git a/debian/controlX/control.bionic b/debian/controlX/control.bionic new file mode 100644 index 00000000..33e98a8e --- /dev/null +++ b/debian/controlX/control.bionic @@ -0,0 +1,27 @@ +Source: tor2web +Maintainer: Random GlobaLeaks developers +Section: web +Priority: optional +Build-Depends: + debhelper, + dh-apparmor, + dh-python, + python3 (>= 3.5), + python3-pip, + python3-setuptools, +Vcs-Git: https://github.com/globaleaks/Tor2web.git +Standards-Version: 3.9.8 + +Package: tor2web +Architecture: all +Depends: + apparmor, + apparmor-utils, + python3:any, + python3-cryptography, + python3-openssl, + python3-twisted-core, + tor +Description: Tor2web proxy. + Tor2web is an HTTP proxy software that enables access to + Tor Hidden Services by mean of common web browsers. diff --git a/debian/controlX/control.trusty b/debian/controlX/control.trusty deleted file mode 100644 index e4943f17..00000000 --- a/debian/controlX/control.trusty +++ /dev/null @@ -1,41 +0,0 @@ -Source: tor2web -Maintainer: Random GlobaLeaks developers -Section: web -Priority: optional -Build-Depends: - debhelper, - dh-python, - dh-apparmor, - python (>= 2.7), - python-pip, - python-setuptools -Vcs-Git: git://github.com/globaleaks/Tor2web-3.0.git -Standards-Version: 3.9.1 - -Package: tor2web -Architecture: all -Depends: -# The following substitution variable shall be uncommented once we get -# all globaleaks dependencies into tor2web. -# ${python:Depends} -# XXX. The following packages, instead, are required in order to use pip -# to install tor2web dependencies. - gcc, - python:any (>= 2.7), python:any (<< 2.8), - python-dev, - libffi-dev, - libssl-dev -# End of packages required by pip - ${misc:Depends}, - apparmor, - apparmor-utils, - build-essential, - python-pip, - python-zope.component, - python-zope.event, - python-zope.interface, - tor -Description: Tor2web proxy. - Tor2web is an HTTP proxy software that enables access to - Tor Hidden Services by mean of common web browsers. -Provides: ${python:Provides} diff --git a/debian/tor2web.postinst b/debian/tor2web.postinst index 40bd7070..c58018ac 100755 --- a/debian/tor2web.postinst +++ b/debian/tor2web.postinst @@ -6,12 +6,6 @@ if which pycompile >/dev/null 2>&1; then pycompile -p tor2web fi -CHECK_PIP_VERSION=" -import pip -from pkg_resources import parse_version as v -exit(v(pip.__version__) < v('1.3')) -" - DISTRO="unknown" DISTRO_CODENAME="unknown" if which lsb_release >/dev/null; then @@ -19,22 +13,6 @@ if which lsb_release >/dev/null; then DISTRO_CODENAME="$( lsb_release -cs )" fi -PIP_NEEDED=1 -if echo "$DISTRO_CODENAME" | grep -qE "^xenial$"; then - PIP_NEEDED=0 -fi - -if [ $PIP_NEEDED -eq 1 ]; then - # XXX. Hardcore installation of globaleaks dependencies using pip. - # Please remove the following lines once up-to-date python-storm, - # python-cryptography, and python-pip will be available in debian. - if ! python -c "$CHECK_PIP_VERSION" 2>/dev/null; then - curl https://bootstrap.pypa.io/get-pip.py | python - fi - - pip install -r /usr/share/tor2web/requirements.txt -fi - if ! id -u tor2web >/dev/null 2>&1; then useradd tor2web -b /home/tor2web -s /bin/false fi diff --git a/requirements/requirements-bionic.txt b/requirements/requirements-bionic.txt new file mode 100644 index 00000000..907f38a3 --- /dev/null +++ b/requirements/requirements-bionic.txt @@ -0,0 +1,13 @@ +Parsley==1.2 +Twisted==17.9.0 +cffi==1.11.5 +cryptography==2.1.4 +enum34==1.1.6 +idna==2.6 +pyOpenSSL==17.5.0 +pyasn1==0.4.2 +pycparser==2.18 +service_identity==16.0.0 +six==1.11.0 +transaction==1.4.3 +zope.interface==4.3.2 diff --git a/requirements/requirements-trusty.txt b/requirements/requirements-trusty.txt deleted file mode 100644 index 139f0a67..00000000 --- a/requirements/requirements-trusty.txt +++ /dev/null @@ -1,13 +0,0 @@ -Parsley==1.2 -Twisted==16.0.0 -cffi==1.5.2 -cryptography==1.2.3 -enum34==0.9.23 -idna==2.0 -pyOpenSSL==0.15.1 -pyasn1==0.1.9 -pycparser==2.10 -service_identity==16.0.0 -six==1.5.2 -transaction==1.1.1 -zope.interface==4.0.5 diff --git a/scripts/build.sh b/scripts/build.sh index 94e403c4..da665cc7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -7,13 +7,13 @@ usage() { echo "Valid options:" echo " -h" echo -e " -t tagname (build specific release/branch)" - echo -e " -d distribution (available: trusty, xenial, wheezy, jessie)" + echo -e " -d distribution (available: xenial, bionic)" echo -e " -n (do not sign)" echo -e " -p (push on repository)" } -TARGETS="trusty xenial wheezy jessie" -DISTRIBUTION="trusty" +TARGETS="xenial bionic" +DISTRIBUTION="xenial" TAG="master" NOSIGN=0 PUSH=0 @@ -86,10 +86,6 @@ for TARGET in $TARGETS; do rm debian/control requirements.txt - if [ "$TARGET" != 'xenial' ]; then - TARGET='trusty' - fi - cp debian/controlX/control.$TARGET debian/control cp requirements/requirements-$TARGET.txt requirements.txt diff --git a/scripts/travis.sh b/scripts/travis.sh index 0e7ce87d..f79449b7 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -10,4 +10,4 @@ rm -rf requirements.txt ln -s requirements/requirements-xenial.txt requirements.txt pip install -r requirements.txt -./scripts/build.sh -d trusty -t $TRAVIS_COMMIT -n +./scripts/build.sh -d xenial -t $TRAVIS_COMMIT -n