Skip to content

Commit

Permalink
AU: 3 updated - apache-httpd gnucash mixxx
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Apr 9, 2018
1 parent ec73495 commit ab60a59
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 26 deletions.
5 changes: 3 additions & 2 deletions automatic/apache-httpd/apache-httpd.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata>
<id>apache-httpd</id>
<version>2.4.33</version>
<version>2.4.33.20180409</version>
<title>Apache HTTP Server Project</title>
<authors>Apache Software Foundation</authors>
<owners>chocolatey</owners>
Expand All @@ -30,14 +30,15 @@ The Apache HTTP Server is a project of The Apache Software Foundation.
* `/installLocation` - Intstall to a different destination folder. Default: `$Env:AppData\Apache*`
* `/serviceName` - The name of the windows service which will be create. Default: `Apache`
* `/port` - The port Apache will listen to. Default: `80`
* `/noService` - Don't install the apache httpd windows service
Example: `choco install apache-httpd --params '"/installLocation:C:\HTTPD /port:433"'`
## Notes
* This package will install the latest Apache binaries provided at Apache Haus (http://www.apachehaus.com/) with OpenSSL on Visual Studio 2012 (VC11): with OpenSSL 1.0.2g, nghttp 1.9.2, Zlib 1.2.8 (mod_deflate), PCRE 8.38, APR 1.5.2, APR-Util 1.5.4, IPv6 and TLS SNI enabled.
* The complete path of the package will be `$Env:AppData\Apache*`
* Apache will be installed as a service under the default name 'Apache'
* Apache will be installed as a service under the default name 'Apache' (can be disabled with the `/noService` install parameter)
]]></description>
<tags>apache httpd webserver admin</tags>
Expand Down
8 changes: 4 additions & 4 deletions automatic/apache-httpd/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ The installer have been downloaded from their official download link listed on <
and can be verified like this:

1. Download the following installers:
32-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.33-o102n-x86-vc14.zip>
64-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.33-o102n-x64-vc14.zip>
32-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.33-o102o-x86-vc14-r2.zip>
64-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.33-o102o-x64-vc14-r2.zip>
2. You can use one of the following methods to obtain the checksum
- Use powershell function 'Get-Filehash'
- Use chocolatey utility 'checksum.exe'

checksum type: sha256
checksum32: 4C2A31F93D3288DD367594F3A593FAAFC50B9C5484E42E5FB3BC16226F832B10
checksum64: A18A92E816EB2DAA0A9E0E4808A719B6C2EAD86B9A4F4D09B9278884E991CBAA
checksum32: 376AEFDFDA8D65FC359DAA7417119A5D1397D21E820DA8594DF8DD797F14423B
checksum64: E46F99F8B085799A1C03495F084946DF99D27FDDB9BBBE17A65EBE9637366D44

File 'LICENSE.txt' is obtained from <https://www.apache.org/licenses/LICENSE-2.0.txt>
4 changes: 2 additions & 2 deletions automatic/apache-httpd/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ $pp = Get-PackageParameters

$arguments = @{
packageName = $env:chocolateyPackageName
file = "$toolsDir\httpd-2.4.33-o102n-x86-vc14.zip"
file64 = "$toolsDir\httpd-2.4.33-o102n-x64-vc14.zip"
file = "$toolsDir\httpd-2.4.33-o102o-x86-vc14-r2.zip"
file64 = "$toolsDir\httpd-2.4.33-o102o-x64-vc14-r2.zip"
destination = if ($pp.installLocation) { $pp.installLocation } else { $env:APPDATA }
port = if ($pp.Port) { $pp.Port } else { 8080 }
serviceName = if ($pp.NoService) { $null } elseif ($pp.serviceName) { $pp.serviceName } else { 'Apache' }
Expand Down
6 changes: 3 additions & 3 deletions automatic/gnucash/gnucash.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"2.6": "2.6.20",
"3.0": "0.0"
{
"2.6": "2.6.20",
"3.0": "3.0"
}
2 changes: 1 addition & 1 deletion automatic/gnucash/gnucash.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>gnucash</id>
<version>2.6.20</version>
<version>3.0</version>
<packageSourceUrl>https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/gnucash</packageSourceUrl>
<owners>chocolatey</owners>
<title>GnuCash</title>
Expand Down
6 changes: 3 additions & 3 deletions automatic/gnucash/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ Verification is intended to assist the Chocolatey moderators and community
in verifying that this package's contents are trustworthy.

The embedded software have been downloaded from the listed download
location on <https://sourceforge.net/projects/gnucash/files/gnucash%20%28stable%29/>
location on <https://sourceforge.net/projects/gnucash/files/gnucash%20%28stable%29/3.0/>
and can be verified by doing the following:

1. Download the following <https://sourceforge.net/projects/gnucash/files/gnucash%20%28stable%29/2.6.20/gnucash-2.6.20-setup.exe/download>
1. Download the following <https://sourceforge.net/projects/gnucash/files/gnucash%20%28stable%29/3.0/gnucash-3.0.setup.exe/download>
2. Get the checksum using one of the following methods:
- Using powershell function 'Get-FileHash'
- Use chocolatey utility 'checksum.exe'
3. The checksums should match the following:

checksum type: sha256
checksum: D985CB4147D3A347AB10090ED12583C65293324D821A45DB4F6C0BC5A3718637
checksum: 220FDF329F2BDB6B792B049B1D9CA8F07E4BA906E6E882AC689921CD56A14E23

The file 'LICENSE.txt' has been obtained from <https://github.com/Gnucash/gnucash/blob/7a0f0d57c809a2177d015ad4a961e2b1d34dfee6/LICENSE>
4 changes: 2 additions & 2 deletions automatic/gnucash/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $toolsPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$packageArgs = @{
packageName = $env:ChocolateyPackageName
fileType = 'exe'
file = "$toolsPath\gnucash-2.6.20-setup.exe"
file = "$toolsPath\gnucash-3.0.setup.exe"

softwareName = 'GnuCash*'

Expand All @@ -15,4 +15,4 @@ $packageArgs = @{

Install-ChocolateyInstallPackage @packageArgs

ls $toolsPath\*.exe | % { rm $_ -ea 0; if (Test-Path $_) { sc "$_.ignore" } }
Get-ChildItem $toolsPath\*.exe | ForEach-Object { Remove-Item $_ -ea 0; if (Test-Path $_) { Set-Content "$_.ignore" } }
8 changes: 4 additions & 4 deletions automatic/mixxx/legal/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ Package can be verified like this:

1. Go to

x32: https://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-win32.exe
x64: https://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-win64.exe
x32: http://downloads.mixxx.org/builds/2.1/release/mixxx-2.1.0-rc1-2.1-release-x86-latest.exe
x64: http://downloads.mixxx.org/builds/2.1/release/mixxx-2.1.0-rc1-2.1-release-x64-latest.exe

to download the installer.

2. You can use one of the following methods to obtain the SHA256 checksum:
- Use powershell function 'Get-FileHash'
- Use Chocolatey utility 'checksum.exe'

checksum32: 3B7AD8078391B502341648F6FA4C7D094FD5EECB804F6F2789DA6017BD766665
checksum64: 200A1588CB59D5CB464E056166F4E79BBECFBCD133E6A2D11A974D4BF4A92628
checksum32: D7A5E0743C76A949776DF5A4C1503E3F036E2BCC4A6C1FDBE5C99FE813156753
checksum64: C02081E6196CAA4665F82176F9D8D47D057B7A059336312D857CD6E5B8F8A761

File 'license.txt' is obtained from:
https://www.gnu.org/licenses/gpl-2.0.html
2 changes: 1 addition & 1 deletion automatic/mixxx/mixxx.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>mixxx</id>
<version>2.0.0.20180111</version>
<version>2.1.0-rc1</version>
<title>Mixxx</title>
<owners>chocolatey</owners>
<authors>Mixxx Development Team</authors>
Expand Down
8 changes: 4 additions & 4 deletions automatic/mixxx/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
$ErrorActionPreference = 'Stop'
$ErrorActionPreference = 'Stop'

$toolsPath = Split-Path $MyInvocation.MyCommand.Definition

$packageArgs = @{
packageName = 'mixxx'
fileType = 'exe'
file = gi $toolsPath\*-win32.exe
file64 = gi $toolsPath\*-win64.exe
file = Get-Item $toolsPath\*-win32.exe
file64 = Get-Item $toolsPath\*-win64.exe
silentArgs = '/S'
validExitCodes = @(0)
softwareName = 'Mixxx *'
}
Install-ChocolateyInstallPackage @packageArgs
ls $toolsPath\*.exe | % { rm $_ -ea 0; if (Test-Path $_) { sc "$_.ignore" }}
Get-ChildItem $toolsPath\*.exe | ForEach-Object { Remove-Item $_ -ea 0; if (Test-Path $_) { Set-Content "$_.ignore" }}


$installLocation = Get-AppInstallLocation $packageArgs.softwareName
Expand Down

0 comments on commit ab60a59

Please sign in to comment.