Skip to content

Commit

Permalink
AU: 1 updated - nginx-service
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Apr 22, 2020
1 parent 62af1c8 commit 0c38502
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 25 deletions.
8 changes: 3 additions & 5 deletions nginx-service/nginx-service.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<metadata>
<!-- == PACKAGE SPECIFIC SECTION == -->
<id>nginx-service</id>
<version>1.16.1</version>
<version>1.18.0</version>
<packageSourceUrl>https://github.com/Pilskalns/choco-au-packages/tree/master/nginx-service</packageSourceUrl>
<owners>Andzs Pilskalns</owners>
<!-- == SOFTWARE SPECIFIC SECTION == -->
<title>nginx service</title>
<authors>Igor Sysoev</authors>
<projectUrl>http://nginx.org/</projectUrl>
<iconUrl>http://cdn.rawgit.com/Pilskalns/choco-au-packages/master/nginx-service/nginx-service.png</iconUrl>
<copyright>2019 &#169; Nginx, Inc.</copyright>
<copyright>2020 &#169; Nginx, Inc.</copyright>
<licenseUrl>http://nginx.org/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://trac.nginx.org/nginx/browser</projectSourceUrl>
Expand Down Expand Up @@ -57,9 +57,7 @@ On default, the service will autostart with Windows. To disable this use Service
See the [nginx.org](https://nginx.org) for more detailed documentation.
]]></description>
<releaseNotes><![CDATA[*) Security: when using HTTP/2 a client might cause excessive memory
consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
CVE-2019-9516).]]></releaseNotes>
<releaseNotes><![CDATA[*) 1.18.x stable branch.]]></releaseNotes>
<dependencies>
<dependency id="nssm" version="2.24.0" />
</dependencies>
Expand Down
14 changes: 3 additions & 11 deletions nginx-service/nginx-service.nuspec.mainline
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<metadata>
<!-- == PACKAGE SPECIFIC SECTION == -->
<id>nginx-service</id>
<version>1.17.3-mainline</version>
<version>1.17.10-mainline</version>
<packageSourceUrl>https://github.com/Pilskalns/choco-au-packages/tree/master/nginx-service</packageSourceUrl>
<owners>Andzs Pilskalns</owners>
<!-- == SOFTWARE SPECIFIC SECTION == -->
<title>nginx service</title>
<authors>Igor Sysoev</authors>
<projectUrl>http://nginx.org/</projectUrl>
<iconUrl>http://cdn.rawgit.com/Pilskalns/choco-au-packages/master/nginx-service/nginx-service.png</iconUrl>
<copyright>2019 &#169; Nginx, Inc.</copyright>
<copyright>2020 &#169; Nginx, Inc.</copyright>
<licenseUrl>http://nginx.org/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://trac.nginx.org/nginx/browser</projectSourceUrl>
Expand Down Expand Up @@ -57,15 +57,7 @@ On default, the service will autostart with Windows. To disable this use Service
See the [nginx.org](https://nginx.org) for more detailed documentation.
]]></description>
<releaseNotes><![CDATA[*) Security: when using HTTP/2 a client might cause excessive memory
consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
CVE-2019-9516).
*) Bugfix: "zero size buf" alerts might appear in logs when using
gzipping; the bug had appeared in 1.17.2.
*) Bugfix: a segmentation fault might occur in a worker process if the
"resolver" directive was used in SMTP proxy.]]></releaseNotes>
<releaseNotes><![CDATA[*) Feature: the "auth_delay" directive.]]></releaseNotes>
<dependencies>
<dependency id="nssm" version="2.24.0" />
</dependencies>
Expand Down
8 changes: 3 additions & 5 deletions nginx-service/nginx-service.nuspec.stable
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<metadata>
<!-- == PACKAGE SPECIFIC SECTION == -->
<id>nginx-service</id>
<version>1.16.1</version>
<version>1.18.0</version>
<packageSourceUrl>https://github.com/Pilskalns/choco-au-packages/tree/master/nginx-service</packageSourceUrl>
<owners>Andzs Pilskalns</owners>
<!-- == SOFTWARE SPECIFIC SECTION == -->
<title>nginx service</title>
<authors>Igor Sysoev</authors>
<projectUrl>http://nginx.org/</projectUrl>
<iconUrl>http://cdn.rawgit.com/Pilskalns/choco-au-packages/master/nginx-service/nginx-service.png</iconUrl>
<copyright>2019 &#169; Nginx, Inc.</copyright>
<copyright>2020 &#169; Nginx, Inc.</copyright>
<licenseUrl>http://nginx.org/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://trac.nginx.org/nginx/browser</projectSourceUrl>
Expand Down Expand Up @@ -57,9 +57,7 @@ On default, the service will autostart with Windows. To disable this use Service
See the [nginx.org](https://nginx.org) for more detailed documentation.
]]></description>
<releaseNotes><![CDATA[*) Security: when using HTTP/2 a client might cause excessive memory
consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
CVE-2019-9516).]]></releaseNotes>
<releaseNotes><![CDATA[*) 1.18.x stable branch.]]></releaseNotes>
<dependencies>
<dependency id="nssm" version="2.24.0" />
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions nginx-service/tools/VERIFICATION.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Invoke-WebRequest "https://nginx.org/keys/mdounin.key" -UseBasicParsing -OutFile

# Get original signature from
# https://nginx.org/en/download.html
Invoke-WebRequest "https://nginx.org/download/nginx-1.16.1.zip.asc" -UseBasicParsing -OutFile "$toolsDir\..\bin\nginx-1.16.1.zip.asc"
Invoke-WebRequest "https://nginx.org/download/nginx-1.18.0.zip.asc" -UseBasicParsing -OutFile "$toolsDir\..\bin\nginx-1.18.0.zip.asc"

### Preperation
# Check that we have GPG
Expand All @@ -27,4 +27,4 @@ choco install gpg4win -y | out-null
### Verify
# Import keys and verify ZIP file against the signature
gpg --import "$toolsDir\..\bin\mdounin.key"
gpg --verify "$toolsDir\..\bin\nginx-1.16.1.zip.asc" "$toolsDir\..\bin\nginx.zip"
gpg --verify "$toolsDir\..\bin\nginx-1.18.0.zip.asc" "$toolsDir\..\bin\nginx.zip"
4 changes: 2 additions & 2 deletions nginx-service/tools/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ VERIFICATION
Nginx for each release provide a ZIP file and .asc signature file.
Files are listed on the official page http://nginx.org/en/download.html

This package bin\ content includes the release ZIP file, obtained from https://nginx.org/download/nginx-1.16.1.zip
This package bin\ content includes the release ZIP file, obtained from https://nginx.org/download/nginx-1.18.0.zip

Package also includes VERIFICATION.ps1, which essentially does the following:

1. Downloads Maxim Dounin’s publick key from https://nginx.org/en/pgp_keys.html
2. Downloads signature for this release: https://nginx.org/download/nginx-1.16.1.zip.asc
2. Downloads signature for this release: https://nginx.org/download/nginx-1.18.0.zip.asc
3. Verifies signature authenticity against bin\nginx.zip

File 'LICENSE.txt' is obtained from <https://nginx.org/LICENSE>
Expand Down

0 comments on commit 0c38502

Please sign in to comment.