This repository has been archived by the owner on Oct 27, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into minecraft
- Loading branch information
Showing
7 changed files
with
145 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,17 @@ | ||
| # Last Modified: Tue Mar 10 16:38:14 2020 | ||
| # Last Modified: Fri Oct 30 11:33:31 2020 | ||
| #include <tunables/global> | ||
|
|
||
| /usr/bin/yggdrasil { | ||
| #include <abstractions/base> | ||
| #include <abstractions/nameservice> | ||
|
|
||
| capability net_admin, | ||
| capability net_raw, | ||
|
|
||
| network inet stream, | ||
| network inet dgram, | ||
| network inet6 dgram, | ||
| network inet6 stream, | ||
| network netlink raw, | ||
|
|
||
| /lib/@{multiarch}/ld-*.so mr, | ||
| /proc/sys/net/core/somaxconn r, | ||
| owner /sys/kernel/mm/transparent_hugepage/hpage_pmd_size r, | ||
| /dev/net/tun rw, | ||
| /proc/sys/net/core/somaxconn r, | ||
| /sys/kernel/mm/transparent_hugepage/hpage_pmd_size r, | ||
|
|
||
| /usr/bin/yggdrasil mr, | ||
| /etc/yggdrasil.conf rw, | ||
| /run/yggdrasil.sock rw, | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| #!/bin/sh | ||
| #!/bin/bash | ||
|
|
||
| # This script generates an MSI file for Yggdrasil for a given architecture. It | ||
| # needs to run on Windows within MSYS2 and Go 1.13 or later must be installed on | ||
| # the system and within the PATH. This is ran currently by Appveyor (see | ||
| # appveyor.yml in the repository root) for both x86 and x64. | ||
| # needs to run on Linux or macOS with Go 1.16, wixl and msitools installed. | ||
| # | ||
| # Author: Neil Alexander <[email protected]> | ||
|
|
||
| # Get arch from command line if given | ||
| PKGARCH=$1 | ||
| if [ "${PKGARCH}" == "" ]; | ||
| then | ||
| echo "tell me the architecture: x86 or x64" | ||
| echo "tell me the architecture: x86, x64 or arm" | ||
| exit 1 | ||
| fi | ||
|
|
||
|
|
@@ -28,28 +26,11 @@ then | |
| git checkout ${APPVEYOR_REPO_BRANCH} | ||
| fi | ||
|
|
||
| # Install prerequisites within MSYS2 | ||
| pacman -S --needed --noconfirm unzip git curl | ||
|
|
||
| # Download the wix tools! | ||
| if [ ! -d wixbin ]; | ||
| then | ||
| curl -LO https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip | ||
| if [ `md5sum wix311-binaries.zip | cut -f 1 -d " "` != "47a506f8ab6666ee3cc502fb07d0ee2a" ]; | ||
| then | ||
| echo "wix package didn't match expected checksum" | ||
| exit 1 | ||
| fi | ||
| mkdir -p wixbin | ||
| unzip -o wix311-binaries.zip -d wixbin || ( | ||
| echo "failed to unzip WiX" | ||
| exit 1 | ||
| ) | ||
| fi | ||
|
|
||
| # Build Yggdrasil! | ||
| [ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build | ||
| [ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build | ||
| [ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build -p -l "-aslr" | ||
| [ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build -p -l "-aslr" | ||
| [ "${PKGARCH}" == "arm" ] && GOOS=windows GOARCH=arm CGO_ENABLED=0 ./build -p -l "-aslr" | ||
| #[ "${PKGARCH}" == "arm64" ] && GOOS=windows GOARCH=arm64 CGO_ENABLED=0 ./build | ||
|
|
||
| # Create the postinstall script | ||
| cat > updateconfig.bat << EOF | ||
|
|
@@ -58,7 +39,9 @@ if not exist %ALLUSERSPROFILE%\\Yggdrasil ( | |
| ) | ||
| if not exist %ALLUSERSPROFILE%\\Yggdrasil\\yggdrasil.conf ( | ||
| if exist yggdrasil.exe ( | ||
| yggdrasil.exe -genconf > %ALLUSERSPROFILE%\\Yggdrasil\\yggdrasil.conf | ||
| if not exist %ALLUSERSPROFILE%\\Yggdrasil\\yggdrasil.conf ( | ||
| yggdrasil.exe -genconf > %ALLUSERSPROFILE%\\Yggdrasil\\yggdrasil.conf | ||
| ) | ||
| ) | ||
| ) | ||
| EOF | ||
|
|
@@ -72,12 +55,16 @@ PKGVERSIONMS=$(echo $PKGVERSION | tr - .) | |
| PKGGUID="54a3294e-a441-4322-aefb-3bb40dd022bb" PKGINSTFOLDER="ProgramFilesFolder" | ||
|
|
||
| # Download the Wintun driver | ||
| curl -o wintun.zip https://www.wintun.net/builds/wintun-0.10.2.zip | ||
| unzip wintun.zip | ||
| if [ $PKGARCH = "x64" ]; then | ||
| PKGMSMNAME=wintun-x64.msm | ||
| curl -o ${PKGMSMNAME} https://www.wintun.net/builds/wintun-amd64-0.7.msm || (echo "couldn't get wintun"; exit 1) | ||
| PKGWINTUNDLL=wintun/bin/amd64/wintun.dll | ||
| elif [ $PKGARCH = "x86" ]; then | ||
| PKGMSMNAME=wintun-x86.msm | ||
| curl -o ${PKGMSMNAME} https://www.wintun.net/builds/wintun-x86-0.7.msm || (echo "couldn't get wintun"; exit 1) | ||
| PKGWINTUNDLL=wintun/bin/x86/wintun.dll | ||
| elif [ $PKGARCH = "arm" ]; then | ||
| PKGWINTUNDLL=wintun/bin/arm/wintun.dll | ||
| #elif [ $PKGARCH = "arm64" ]; then | ||
| # PKGWINTUNDLL=wintun/bin/arm64/wintun.dll | ||
| else | ||
| echo "wasn't sure which architecture to get wintun for" | ||
| exit 1 | ||
|
|
@@ -100,6 +87,7 @@ cat > wix.xml << EOF | |
| Language="1033" | ||
| Codepage="1252" | ||
| Version="${PKGVERSIONMS}" | ||
| Platform="${PKGARCH}" | ||
| Manufacturer="github.com/yggdrasil-network"> | ||
| <Package | ||
|
|
@@ -136,6 +124,12 @@ cat > wix.xml << EOF | |
| Source="yggdrasil.exe" | ||
| KeyPath="yes" /> | ||
| <File | ||
| Id="Wintun" | ||
| Name="wintun.dll" | ||
| DiskId="1" | ||
| Source="${PKGWINTUNDLL}" /> | ||
| <ServiceInstall | ||
| Id="ServiceInstaller" | ||
| Account="LocalSystem" | ||
|
|
@@ -176,12 +170,6 @@ cat > wix.xml << EOF | |
| </Component> | ||
| </Directory> | ||
| </Directory> | ||
| <Merge | ||
| Id="Wintun" | ||
| Language="0" | ||
| DiskId="1" | ||
| SourceFile="${PKGMSMNAME}" /> | ||
| </Directory> | ||
| <Feature Id="YggdrasilFeature" Title="Yggdrasil" Level="1"> | ||
|
|
@@ -190,13 +178,6 @@ cat > wix.xml << EOF | |
| <ComponentRef Id="ConfigScript" /> | ||
| </Feature> | ||
| <Feature Id="WintunFeature" Title="Wintun" Level="1"> | ||
| <Condition Level="0"> | ||
| UPGRADINGPRODUCTCODE | ||
| </Condition> | ||
| <MergeRef Id="Wintun" /> | ||
| </Feature> | ||
| <CustomAction | ||
| Id="UpdateGenerateConfig" | ||
| Directory="YggdrasilInstallFolder" | ||
|
|
@@ -208,17 +189,12 @@ cat > wix.xml << EOF | |
| <InstallExecuteSequence> | ||
| <Custom | ||
| Action="UpdateGenerateConfig" | ||
| Before="StartServices"> | ||
| NOT Installed AND NOT REMOVE | ||
| </Custom> | ||
| Before="StartServices" /> | ||
| </InstallExecuteSequence> | ||
| </Product> | ||
| </Wix> | ||
| EOF | ||
|
|
||
| # Generate the MSI | ||
| CANDLEFLAGS="-nologo" | ||
| LIGHTFLAGS="-nologo -spdb -sice:ICE71 -sice:ICE61" | ||
| wixbin/candle $CANDLEFLAGS -out ${PKGNAME}-${PKGVERSION}-${PKGARCH}.wixobj -arch ${PKGARCH} wix.xml && \ | ||
| wixbin/light $LIGHTFLAGS -ext WixUtilExtension.dll -out ${PKGNAME}-${PKGVERSION}-${PKGARCH}.msi ${PKGNAME}-${PKGVERSION}-${PKGARCH}.wixobj | ||
| wixl -v wix.xml -a ${PKGARCH} -o ${PKGNAME}-${PKGVERSION}-${PKGARCH}.msi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,21 @@ | ||
| module github.com/popura-network/Popura | ||
|
|
||
| go 1.13 | ||
| go 1.16 | ||
|
|
||
| require ( | ||
| github.com/cheggaaa/pb/v3 v3.0.4 | ||
| github.com/fatih/color v1.9.0 // indirect | ||
| github.com/cheggaaa/pb/v3 v3.0.6 | ||
| github.com/gologme/log v1.2.0 | ||
| github.com/hashicorp/go-syslog v1.0.0 | ||
| github.com/hjson/hjson-go v3.0.2-0.20200316202735-d5d0e8b0617d+incompatible | ||
| github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0 | ||
| github.com/mattn/go-colorable v0.1.6 // indirect | ||
| github.com/mattn/go-runewidth v0.0.9 // indirect | ||
| github.com/hjson/hjson-go v3.1.0+incompatible | ||
| github.com/kardianos/minwinsvc v1.0.0 | ||
| github.com/mdlayher/ndp v0.0.0-20200602162440-17ab9e3e5567 | ||
| github.com/miekg/dns v1.1.29 // indirect | ||
| github.com/mitchellh/mapstructure v1.3.0 | ||
| github.com/miekg/dns v1.1.41 // indirect | ||
| github.com/mitchellh/mapstructure v1.4.1 | ||
| github.com/vishvananda/netlink v1.1.0 | ||
| github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe // indirect | ||
| github.com/yggdrasil-network/yggdrasil-go v0.3.15 | ||
| github.com/yggdrasil-network/yggdrasil-go v0.3.16 | ||
| github.com/zhoreeq/meshname v0.1.0 | ||
| golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect | ||
| golang.org/x/net v0.0.0-20200602114024-627f9648deb9 | ||
| golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de | ||
| golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 // indirect | ||
| golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 | ||
| golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d // indirect | ||
| golang.org/x/text v0.3.6-0.20210220033129-8f690f22cf1c | ||
| ) |
Oops, something went wrong.