Skip to content

Commit

Permalink
AU: 2 updated - apache-httpd dropbox
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Apr 1, 2020
1 parent 93cba76 commit 2b7ac2f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 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.41</version>
<version>2.4.43</version>
<title>Apache HTTP Server Project</title>
<authors>Apache Software Foundation</authors>
<owners>chocolatey</owners>
Expand All @@ -27,9 +27,9 @@ The Apache HTTP Server is a project of The Apache Software Foundation.
## Package Parameters
* `/installLocation` - Intstall to a different destination folder. Default: `$Env:AppData\Apache*`
* `/installLocation` - Install 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`
* `/port` - The port Apache will listen to. Default: `8080`
* `/noService` - Don't install the apache httpd windows service
Example: `choco install apache-httpd --params '"/installLocation:C:\HTTPD /port:433"'`
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.41-o102s-x86-vc14.zip>
64-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.41-o102s-x64-vc14.zip>
32-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.43-lre302-x86-vc14.zip>
64-Bit: <https://www.apachehaus.com/downloads/httpd-2.4.43-lre302-x64-vc14.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: 2F17A28F4641FB3A3E6D557956C535EC25640E343BBB455FC79B9357D0E43BB9
checksum64: 8D03326F6F0DB4722848483BB8994CDC529CF578673B566B0046635F7DB0A4C4
checksum32: BEA3A2328CBC3FEF049B16722F3DC534314563CBEBE4C34BBD9B04DD18172F99
checksum64: 8BD7CDB8D4BE4254BEF9A146DA793A197007A9947BFBB1D12BCFE861BA73EC02

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.41-o102s-x86-vc14.zip"
file64 = "$toolsDir\httpd-2.4.41-o102s-x64-vc14.zip"
file = "$toolsDir\httpd-2.4.43-lre302-x86-vc14.zip"
file64 = "$toolsDir\httpd-2.4.43-lre302-x64-vc14.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
4 changes: 2 additions & 2 deletions automatic/apache-httpd/tools/helpers.ps1
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@


function Get-TCPConnections {
param(
[int]$portNumber
)
$ListeningPort = @()
$GetPorts = netstat -nao | Select-String ":$portNumber " | Select -First 2
$GetPorts = netstat -nao | Select-String ":$portNumber " | Select-Object -First 2
Foreach ($Port in $GetPorts) {
$a = $Port -split '\s\s*'
if ( $a[2] -match ":$portNumber" ) {
Expand Down
2 changes: 1 addition & 1 deletion automatic/dropbox/dropbox.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"beta": "94.3.379-beta",
"beta": "95.3.425-beta",
"stable": "94.3.371"
}
2 changes: 1 addition & 1 deletion automatic/dropbox/dropbox.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>dropbox</id>
<version>94.3.379-beta</version>
<version>95.3.425-beta</version>
<title>Dropbox</title>
<authors>Dropbox</authors>
<owners>chocolatey,ferventcoder,the-running-dev</owners>
Expand Down
6 changes: 3 additions & 3 deletions automatic/dropbox/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if(!$PSScriptRoot){ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent }
. "$PSScriptRoot\helper.ps1"

$version = '94.3.379'
$version = '95.3.425'

if (!(IsVersionAlreadyInstalled $version)) {
$stop_dropbox = if (Get-Process -Name Dropbox -ErrorAction SilentlyContinue) {$false} else {$true}
Expand All @@ -11,8 +11,8 @@ if (!(IsVersionAlreadyInstalled $version)) {
$packageArgs = @{
packageName = $env:ChocolateyPackageName
softwareName = "Dropbox"
url = 'https://clientupdates.dropboxstatic.com/dbx-releng/client/Dropbox%2094.3.379%20Offline%20Installer.exe'
checksum = 'de8ce7575bbb95fe1fd61586e8bb15a2562e2bb87cf380d90541d6c80f224b36'
url = 'https://clientupdates.dropboxstatic.com/dbx-releng/client/Dropbox%2095.3.425%20Offline%20Installer.exe'
checksum = 'a813ea4f72792e11ebef99ee8a1480c2bb90bf16f4d3053e8263c269f734f932'
fileType = 'exe'
checksumType = 'sha256'
silentArgs = '/s'
Expand Down

0 comments on commit 2b7ac2f

Please sign in to comment.