Skip to content

Commit

Permalink
DO NOT MERGE: Remove sub-modules
Browse files Browse the repository at this point in the history
WARNING: This branch SHOULD NOT BE MERGED

Launchpad cannot clone submodules for some reason,
so I am including the contents of each here to get
it working. Further investigation is needed on
compiling deb packages via git using submodules.

Bug: #4
  • Loading branch information
Jnchi committed Aug 15, 2019
1 parent 709374d commit 95d629c
Show file tree
Hide file tree
Showing 481 changed files with 155,205 additions and 23 deletions.
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

17 changes: 2 additions & 15 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,11 @@

DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

OPENVPN_VERSION = bebd25a0e3a2aba0b1f98463a87b24db6c419a66

%:
dh $@

override_dh_auto_configure: clean-submodules openvpn pam_aad
echo "skipping configure ..."

openvpn:
git clone https://github.com/openvpn/openvpn.git
cd openvpn && git checkout ${OPENVPN_VERSION} && autoreconf -fiv && ./configure

pam_aad:
git clone https://github.com/cyberninjas/pam_aad.git
cd pam_aad && git checkout tags/0.0.3 && ./bootstrap.sh && ./configure

clean-submodules:
rm -rf openvpn pam_aad
override_dh_auto_configure:
echo "skipping configure..."

override_dh_auto_install:
mkdir -p $$(pwd)/usr/lib/openvpn/plugins
Expand Down
1 change: 0 additions & 1 deletion openvpn
Submodule openvpn deleted from bebd25
7 changes: 7 additions & 0 deletions openvpn/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*.c eol=lf
*.h eol=lf
*.rc eol=lf
*.txt eol=lf
*.bat eol=lf
*.vc*proj* eol=crlf
*.sln eol=crlf
15 changes: 15 additions & 0 deletions openvpn/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Thank you for your contribution

You are welcome to open PR, but they are used for discussion only. All
patches must eventually go to the openvpn-devel mailing list for review:

* https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Please send your patch using [git-send-email](https://git-scm.com/docs/git-send-email). For example to send your latest commit to the list:

$ git send-email [email protected] HEAD~1

For details, see these Wiki articles:

* https://community.openvpn.net/openvpn/wiki/DeveloperDocumentation
* https://community.openvpn.net/openvpn/wiki/Contributing
74 changes: 74 additions & 0 deletions openvpn/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
*.[oa]
*.l[oa]
*.dll
*.exe
*.exe.*
*.obj
*.pyc
*.so
*~
*.idb
*.suo
*.ncb
*.vcproj.*
*.vcxproj.user
*.sln.cache
*.log
Release
Debug
Win32-Output
.vs
.deps
.libs
Makefile
Makefile.in
aclocal.m4
autodefs.h
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.h
depcomp
stamp-h1
install-sh
missing
ltmain.sh
libtool
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4

version.sh
msvc-env-local.bat
config-msvc-local.h
config-msvc-version.h
doc/openvpn.8.html
/doc/doxygen/html/
/doc/doxygen/latex/
/doc/doxygen/openvpn.doxyfile
distro/systemd/*.service
sample/sample-keys/sample-ca/
vendor/cmocka_build
vendor/dist
build/msvc/msvc-generate/version.m4

tests/t_client.sh
tests/t_client-*-20??????-??????/
t_client.rc
t_client_ips.rc
tests/unit_tests/**/*_testdriver

src/openvpn/openvpn
include/openvpn-plugin.h
config-version.h
nbproject
test-driver
compile
stamp-h2
4 changes: 4 additions & 0 deletions openvpn/.gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "vendor/cmocka"]
path = vendor/cmocka
url = https://git.cryptomilk.org/projects/cmocka.git
branch = master
13 changes: 13 additions & 0 deletions openvpn/.mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Adriaan de Jong <[email protected]> <adriaan@adriaan-VirtualBox.(none)>
David Sommerseth <[email protected]> <[email protected]>
Gert Doering <[email protected]> <[email protected]>
Gert Doering <[email protected]> <[email protected]>
Gert Doering <[email protected]> <[email protected]>
Gert Doering <[email protected]> <[email protected]>
James Yonan <[email protected]> <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Jan Just Keijser <[email protected]> <[email protected]>
JuanJo Ciarlante <[email protected]> <[email protected]>
Karl O. Pinc <[email protected]> <[email protected]>
Robert Fischer <[email protected]> <[email protected]>
Samuli Seppänen <[email protected]> <[email protected]>
Seth Mos <[email protected]> <[email protected]>
1 change: 1 addition & 0 deletions openvpn/.svncommitters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
james = James Yonan <[email protected]>
97 changes: 97 additions & 0 deletions openvpn/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
sudo: required
dist: xenial

os: linux

language: c

env:
global:
- JOBS=3
- PREFIX="${HOME}/opt"
- TAP_WINDOWS_VERSION=9.21.2
- LZO_VERSION=2.10
- PKCS11_HELPER_VERSION=1.22
- MBEDTLS_VERSION="2.8.0"
- MBEDTLS_CFLAGS="-I${PREFIX}/include"
- MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
- OPENSSL_VERSION="1.0.2o"
- OPENSSL_CFLAGS="-I${PREFIX}/include"
- OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
# via the "travis encrypt" command using the project repo's public key
- secure: "l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U="

matrix:
include:
- env: SSLLIB="openssl" RUN_COVERITY="1"
os: linux
compiler: gcc
- env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
os: linux
compiler: gcc
- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
os: linux
compiler: gcc
- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le"
os: linux-ppc64le
compiler: gcc
- env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
os: linux
compiler: gcc
- env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
os: linux
compiler: clang
- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
os: linux
compiler: clang
- env: SSLLIB="mbedtls"
os: linux
compiler: gcc
- env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address"
os: linux
compiler: clang
- env: SSLLIB="openssl"
os: osx
compiler: clang
- env: SSLLIB="mbedtls"
os: osx
compiler: clang
- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
os: linux
compiler: ": Win64 build only"
- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.0h"
os: linux
compiler: ": Win64 build only"
- env: SSLLIB="openssl" CHOST=i686-w64-mingw32
os: linux
compiler: ": Win32 build only"
- env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck"
os: linux
compiler: clang
- env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"
os: linux
compiler: clang

addons:
apt:
update: true
packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64]
homebrew:
packages: [ lzo ]

cache:
directories:
- download-cache
- ${HOME}/opt
- ${HOME}/Library/Caches/Homebrew

install:
- if [ ! -z "${CHOST}" ]; then unset CC; fi
- .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)

before_script:
- .travis/coverity.sh

script:
- .travis/build-check.sh
30 changes: 30 additions & 0 deletions openvpn/.travis/build-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/sh
set -eux

if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}"
fi

if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH:-}"
fi

autoreconf -vi

if [ -z ${CHOST+x} ]; then
./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1)
make -j$JOBS
src/openvpn/openvpn --version || true
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd src/openvpn/openvpn; fi
if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L src/openvpn/openvpn; fi
make check
${EXTRA_SCRIPT:-}
else
export TAP_CFLAGS="-I${PWD}/tap-windows-${TAP_WINDOWS_VERSION}/include"
export LZO_CFLAGS="-I${PREFIX}/include"
export LZO_LIBS="-L${PREFIX}/lib -llzo2"
export PKCS11_HELPER_LIBS="-L${PREFIX}/lib -lpkcs11-helper"
export PKCS11_HELPER_CFLAGS="-I${PREFIX}/include"
./configure --with-crypto-library="${SSLLIB}" --host=${CHOST} --build=x86_64-pc-linux-gnu --enable-pkcs11 --disable-plugins || (cat config.log && exit 1)
make -j${JOBS}
fi
Loading

0 comments on commit 95d629c

Please sign in to comment.