diff options
Diffstat (limited to 'openvpn3')
25 files changed, 930 insertions, 0 deletions
diff --git a/openvpn3/PKGBUILD b/openvpn3/PKGBUILD new file mode 100644 index 000000000..4761738c6 --- /dev/null +++ b/openvpn3/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Erich Eckner <arch at eckner dot net> +# Contributor: Byeonghoon Yoo <bh322yoo gmail com> + +_pkgname=openvpn3-linux +pkgname=openvpn3 +pkgver=19_beta +pkgrel=2 +pkgdesc='OpenVPN 3 Linux client' +arch=('i686' 'x86_64' 'aarch64' 'armv7h') +url="https://github.com/OpenVPN/$_pkgname" +license=('AGPL3') +depends=( + 'glib2>=2.50' 'jsoncpp>=0.10.5' 'libcap-ng>=0.7.5' 'lz4>=1.7.3' 'util-linux-libs>=2.23.2' 'protobuf>=2.4.0' + 'python-dbus' 'python-gobject' 'python-systemd' 'tinyxml2>=2.1.0' 'libnl>=3.2.29' +) +optdepends=( + 'openssl: OpenSSL version' 'mbedtls: mbed TLS version' 'polkit>=0.105: for systemd-resolved integration' + 'repkg: Automatically rebuild the package on dependency updates' +) +makedepends=( + 'autoconf-archive' 'git' 'python-docutils' 'python-jinja' 'bash' +) +source=( + "git+https://github.com/OpenVPN/$_pkgname.git#tag=v${pkgver}" + 'openvpn3.rule' + 'sysusers-openvpn3.conf' + 'tmpfiles-openvpn3.conf' +) +sha256sums=( + 'SKIP' + 'ec0b8e28ae77b4b074d3eb8a084626e6dcfc587a07bef5d53fe1c6e160c0fc01' + '045e914bb6fff5a082314dfc805bb511c9a80170619fa1e94a07825fa977c90a' + 'addc47b54aa48ff83c1ed782aa9f471f26c5cc5cf11e194e0873e0cfd7f2667b' +) + +build() { + cd "$_pkgname" + ./bootstrap.sh + ./configure \ + --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var \ + --enable-bash-completion --enable-dco + make +} + +check() { + cd "$_pkgname" + + make check +} + +package() { + cd "$_pkgname" + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/$_pkgname/src/shell/bash-completion/openvpn3" "$pkgdir/usr/share/bash-completion/completions/openvpn3" + install -Dm644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule" + install -Dm644 "../sysusers-$pkgname.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -Dm644 "../tmpfiles-$pkgname.conf" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" +} diff --git a/openvpn3/openvpn3-linux/HEAD b/openvpn3/openvpn3-linux/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/openvpn3/openvpn3-linux/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/openvpn3/openvpn3-linux/config b/openvpn3/openvpn3-linux/config new file mode 100644 index 000000000..f6b37cfa8 --- /dev/null +++ b/openvpn3/openvpn3-linux/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = https://github.com/OpenVPN/openvpn3-linux.git + fetch = +refs/*:refs/* + mirror = true diff --git a/openvpn3/openvpn3-linux/description b/openvpn3/openvpn3-linux/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/openvpn3/openvpn3-linux/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/openvpn3/openvpn3-linux/hooks/applypatch-msg.sample b/openvpn3/openvpn3-linux/hooks/applypatch-msg.sample new file mode 100755 index 000000000..a5d7b84a6 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/openvpn3/openvpn3-linux/hooks/commit-msg.sample b/openvpn3/openvpn3-linux/hooks/commit-msg.sample new file mode 100755 index 000000000..b58d1184a --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/openvpn3/openvpn3-linux/hooks/fsmonitor-watchman.sample b/openvpn3/openvpn3-linux/hooks/fsmonitor-watchman.sample new file mode 100755 index 000000000..23e856f5d --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; <CHLD_OUT>}; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/openvpn3/openvpn3-linux/hooks/post-update.sample b/openvpn3/openvpn3-linux/hooks/post-update.sample new file mode 100755 index 000000000..ec17ec193 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/openvpn3/openvpn3-linux/hooks/pre-applypatch.sample b/openvpn3/openvpn3-linux/hooks/pre-applypatch.sample new file mode 100755 index 000000000..4142082bc --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/openvpn3/openvpn3-linux/hooks/pre-commit.sample b/openvpn3/openvpn3-linux/hooks/pre-commit.sample new file mode 100755 index 000000000..e144712c8 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/openvpn3/openvpn3-linux/hooks/pre-merge-commit.sample b/openvpn3/openvpn3-linux/hooks/pre-merge-commit.sample new file mode 100755 index 000000000..399eab192 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/openvpn3/openvpn3-linux/hooks/pre-push.sample b/openvpn3/openvpn3-linux/hooks/pre-push.sample new file mode 100755 index 000000000..4ce688d32 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# <local ref> <local oid> <remote ref> <remote oid> +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') + +while read local_ref local_oid remote_ref remote_oid +do + if test "$local_oid" = "$zero" + then + # Handle delete + : + else + if test "$remote_oid" = "$zero" + then + # New branch, examine all commits + range="$local_oid" + else + # Update to existing branch, examine new commits + range="$remote_oid..$local_oid" + fi + + # Check for WIP commit + commit=$(git rev-list -n 1 --grep '^WIP' "$range") + if test -n "$commit" + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/openvpn3/openvpn3-linux/hooks/pre-rebase.sample b/openvpn3/openvpn3-linux/hooks/pre-rebase.sample new file mode 100755 index 000000000..6cbef5c37 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/openvpn3/openvpn3-linux/hooks/pre-receive.sample b/openvpn3/openvpn3-linux/hooks/pre-receive.sample new file mode 100755 index 000000000..a1fd29ec1 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/openvpn3/openvpn3-linux/hooks/prepare-commit-msg.sample b/openvpn3/openvpn3-linux/hooks/prepare-commit-msg.sample new file mode 100755 index 000000000..10fa14c5a --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/openvpn3/openvpn3-linux/hooks/push-to-checkout.sample b/openvpn3/openvpn3-linux/hooks/push-to-checkout.sample new file mode 100755 index 000000000..af5a0c001 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin </dev/null) +fi + +if ! git diff-index --quiet --cached --ignore-submodules $head -- +then + die "Working directory has staged changes" +fi + +if ! git read-tree -u -m "$commit" +then + die "Could not update working tree to new HEAD" +fi diff --git a/openvpn3/openvpn3-linux/hooks/update.sample b/openvpn3/openvpn3-linux/hooks/update.sample new file mode 100755 index 000000000..c4d426bc6 --- /dev/null +++ b/openvpn3/openvpn3-linux/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 <ref> <oldrev> <newrev>)" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 <ref> <oldrev> <newrev>" >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/openvpn3/openvpn3-linux/info/exclude b/openvpn3/openvpn3-linux/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/openvpn3/openvpn3-linux/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/openvpn3/openvpn3-linux/objects/pack/pack-07baad07a10f1fb111ab1a26ab89291547196d68.idx b/openvpn3/openvpn3-linux/objects/pack/pack-07baad07a10f1fb111ab1a26ab89291547196d68.idx Binary files differnew file mode 100644 index 000000000..e0d730504 --- /dev/null +++ b/openvpn3/openvpn3-linux/objects/pack/pack-07baad07a10f1fb111ab1a26ab89291547196d68.idx diff --git a/openvpn3/openvpn3-linux/objects/pack/pack-07baad07a10f1fb111ab1a26ab89291547196d68.pack b/openvpn3/openvpn3-linux/objects/pack/pack-07baad07a10f1fb111ab1a26ab89291547196d68.pack Binary files differnew file mode 100644 index 000000000..9cb19f8b1 --- /dev/null +++ b/openvpn3/openvpn3-linux/objects/pack/pack-07baad07a10f1fb111ab1a26ab89291547196d68.pack diff --git a/openvpn3/openvpn3-linux/packed-refs b/openvpn3/openvpn3-linux/packed-refs new file mode 100644 index 000000000..1598e6fd9 --- /dev/null +++ b/openvpn3/openvpn3-linux/packed-refs @@ -0,0 +1,59 @@ +# pack-refs with: peeled fully-peeled sorted +3060a2469a0b09e62a795f93e72a081e7bdf0ebc refs/heads/dev/gh-issue-14-asio-include-dir +012ae40e61c091a5a8615c70e419e53cab6e5d5b refs/heads/master +95c860ba242050c4901d8491522d2273974e5abc refs/pull/1/head +6a81d1fe58b7cd8082847e6e2cc6bf342d1a2d60 refs/pull/1/merge +ffa7f86363fd5b13f8921b3fbedb45a58393c205 refs/pull/10/head +95670770b4fc3eb9e64a78b3c65b1e8f685b31f3 refs/pull/114/head +19d20b35d6cb2048622512f071b58cb2a11f1a87 refs/pull/114/merge +776d9069916a1ff4e8d2af46bfefe7f5a80d6583 refs/pull/131/head +cc06af0e38f5f93a51dfd23f3868f81ebe6efc29 refs/pull/145/head +5ba1ee3b26f0a0ac7d946d21325ba34a0a3c2252 refs/pull/4/head +5d86eaa9ca5242e02f7af4c67820a2958c2a3ced refs/pull/4/merge +f272be8268729923d73f88a2e770e51dc7d819b4 refs/pull/81/head +f3f4861af5c61a2fd1a9af2675d8faedc356a81f refs/pull/83/head +7e2fb5cbbe46433463d4145600cdbc570df1486d refs/pull/84/head +ff595891488e079c429298fac8aae13cec299454 refs/pull/96/head +590855ccad4f9b1cb393ec02960788bdf70c23e0 refs/tags/v10_beta +^ff27a9f83b29448797e72ce9f92abc498647202a +50f275243aceacd847568348d83340f790e9b657 refs/tags/v11_beta +^087393e775fb5b58b28147819ffc55a30b1d29ff +c34a5ba2c6699a6528c1e2e2e38518c385ba3029 refs/tags/v12_beta +^be65151677fa854080a563a52d1a96b38ab29544 +e092aa85a17468f649c93a42356cdda145712ad2 refs/tags/v13_beta +^20319752618587500d7d5bc496965d742ce161dc +8217160b583552a417e5c1ce9a4d36eff2d651f5 refs/tags/v14_beta +^6ae8c77ffcfcdbe594dfc5a524a741726d9247d0 +5a989a0dc3618ecedccd5d8e0d7aea9b2e79c671 refs/tags/v15_beta +^6c9bbc9e10d7c499339c1ac774d1614e8df88573 +78c1545f6c920f95bd1be1a38721bdf23b40a526 refs/tags/v16_beta +^713b35e908489579bf5246b577373880923cf6fe +a6f3a25816a13671ccad9ed64e9d727e9d0a99b7 refs/tags/v17_beta +^079e9da7f66f5cca59cf80ba8c548f0dedd433db +4537e05d2831d04e582b8cfd11d9a7a657d86061 refs/tags/v17_betaUb2204 +^67bba720d0378d9c4c6850791eb6ee0ac74c361b +b3ba600753f2ac08417e6c740f5a03692ec4a6be refs/tags/v18_beta +^5c47318f719aa04606219c2f0913f5d63d3ee999 +ff131d898fce40ba67b3d4b942702da50bff4261 refs/tags/v18_betaRC +793bb3ba03ba006ac2129fe6e17001396b7f9ff5 refs/tags/v18_betaRC2 +5c47318f719aa04606219c2f0913f5d63d3ee999 refs/tags/v18_betaRC3 +e3773dac32f5ebdf94da70edf8ed5125b28401ac refs/tags/v19_beta +^33da965fa4151a05f95f385f00f338fa028471a2 +532747a590cb715478846d4f1567a1a6a078e7c3 refs/tags/v1_beta +^3ac12ff9c894771de787537eee50c6d3ef8a2981 +4eb7bef5a05507d576e52902305efd111e1b0a98 refs/tags/v2_beta +^bb2e96a3c713b452dca7afcf75ed97b206c23a04 +49c9a4bb5ed3b710c4e75ff4123aa2e5b99ac389 refs/tags/v3_beta +^bcc8e481aa49d0f126814bca807af760ab02b851 +e67ea3e9e66db0bb76d6ec15bd221b80be3bb4af refs/tags/v4_beta +^d2fef7e83b46da8b4d9c3d417c8e3f7aa7aecae6 +7c6b0fe5a69b9ea73f93fb6a3f462d68bbbd2ae4 refs/tags/v5_beta +^16dd2acdf3343e6180e005a229dbd4bd40c9f644 +b072542fe6e1bd5acc397f08e3a98376b544e7de refs/tags/v6_beta +^e6c66892ba0868206d558ad8b81351140c1195b4 +34bd2559b689f6610703aba53fc4d67a8b764976 refs/tags/v7_beta +^9478329ed017ba252b61b702d16a076b3adab678 +7848cc2049dfc81faba38ef932d5e50ee07bd13b refs/tags/v8_beta +^ee9ae86605b4985fac94e7c534a0012dc8958f67 +65bcca91c36ebdcf580b0baf890bb01839574cf7 refs/tags/v9_beta +^4e251217750ebf1b268e345815f3df3b154f576f diff --git a/openvpn3/openvpn3.conf b/openvpn3/openvpn3.conf new file mode 100644 index 000000000..99c619f72 --- /dev/null +++ b/openvpn3/openvpn3.conf @@ -0,0 +1 @@ +u openvpn - "OpenVPN"
\ No newline at end of file diff --git a/openvpn3/openvpn3.rule b/openvpn3/openvpn3.rule new file mode 100644 index 000000000..3fde26ff5 --- /dev/null +++ b/openvpn3/openvpn3.rule @@ -0,0 +1 @@ +jsoncpp=v protobuf=v tinyxml2=v python=:0:1
\ No newline at end of file diff --git a/openvpn3/sysusers-openvpn3.conf b/openvpn3/sysusers-openvpn3.conf new file mode 100644 index 000000000..ab72fa6be --- /dev/null +++ b/openvpn3/sysusers-openvpn3.conf @@ -0,0 +1,2 @@ +u openvpn - "OpenVPN" +g openvpn - diff --git a/openvpn3/tmpfiles-openvpn3.conf b/openvpn3/tmpfiles-openvpn3.conf new file mode 100644 index 000000000..d58e07ca3 --- /dev/null +++ b/openvpn3/tmpfiles-openvpn3.conf @@ -0,0 +1,2 @@ +d /var/lib/openvpn3 0755 openvpn openvpn +d /var/lib/openvpn3/configs 0755 openvpn openvpn
\ No newline at end of file |