Merge pull request #545 from TheBigBear/travis-ci_cron_daily

merge Merge pull request #468 from TheBigBear/TheBigBear-fix-travis-ci-bad-URLs back to Travis-ci_cron-daily branch
saltstack · Jul 11, 2016 · b0014c8 · b0014c8
2 parents ee46da9 + 9b425d7
commit b0014c8
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 127 deletions.
diff --git a/cdex.sls b/cdex.sls
diff --git a/cyberduck-cli.sls b/cyberduck-cli.sls
@@ -1,9 +1,9 @@
 cyberduck-cli:
   '1.0.0.0':
     full_name: 'Cyberduck CLI'
-    installer: 'http://dist.duck.sh/duck-4.8.0.18560.exe'
+    installer: 'http://dist.duck.sh/duck-5.0.3.20504.exe'
     install_flags: '/quiet /norestart'
-    uninstaller: '%ALLUSERSPROFILE%\Package Cache\{546f46a5-c136-46d7-9698-8bd02eea4402}\duck-4.8.0.18560.exe'
+    uninstaller: '%ALLUSERSPROFILE%\Package Cache\{d7e97b39-df55-4b65-84b3-c24d1041948b}\duck-5.0.3.20504.exe'
     uninstall_flags: '/uninstall /quiet /norestart'
     msiexec: False
     locale: en_US

diff --git a/gimp.sls b/gimp.sls
@@ -1,7 +1,7 @@
 # just 32-bit x86 installer available
 # Gimp installs into %ProgramFiles anyway
 gimp:
-  {% for version, dl_version in (('2.8.14','-1'), ('2.8.10', ''), ('2.8.8', ''), ('2.8.4', ''), ('2.8.2', '-1'), ('2.8.0','')) %}
+  {% for version, dl_version in (('2.8.14','-1')) %}
   {{ version }}:
     full_name: 'GIMP {{ version }}'
     installer: 'http://download.gimp.org/mirror/pub/gimp/v2.8/windows/gimp-{{ version }}-setup{{ dl_version }}.exe'

diff --git a/ice.sls b/ice.sls
@@ -10,21 +10,3 @@ ice:
     msiexec: True
     locale: en_US
     reboot: False
-  '3.6.0':
-    full_name: 'Ice 3.6.0'
-    installer: 'https://zeroc.com/download/Ice/3.6/Ice-3.6.0.msi'
-    uninstaller: '{5F9FE03C-9696-406D-B747-76598903B018}'
-    install_flags: '/qn /norestart'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '3.4.0':
-    full_name: 'Ice 3.4.0'
-    installer: 'https://zeroc.com/download/Ice/3.4/Ice-3.4.0.msi'
-    uninstaller: '{C69C5CD7-2C53-4223-A228-EF40DCF90AE7}'
-    install_flags: '/qn /norestart'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
diff --git a/miktex-basic.sls b/miktex-basic.sls
@@ -2,9 +2,9 @@ miktex-basic:
   '2.9':
     full_name: 'MiKTeX 2.9'
     {% if grains['cpuarch'] == 'AMD64' %}
-    installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.5997-x64.exe'
+    installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.6022-x64.exe'
     {% elif grains['cpuarch'] == 'x86' %}
-    installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.5997.exe'
+    installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.6022.exe'
     {% endif %}
     install_flags: '--auto-install=yes --paper-size=A4 --shared --unattended --package-set=basic --program-folder="%ProgramFiles%\MiKTeX 2.9\"'
     uninstaller: 'cmd'

diff --git a/nxlog.sls b/nxlog.sls
@@ -1,9 +1,9 @@
 nxlog:
-  '2.9.1504':
+  '2.9.1716':
     full_name:  'NXLog-CE'
-    installer: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1504.msi'
+    installer: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1716.msi'
     install_flags: '/quiet /norestart'
-    uninstaller: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1504.msi'
+    uninstaller: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1716.msi'
     uninstall_flags: '/quiet /norestart'
     msiexec: True
     locale: en_US

diff --git a/skype-msi.sls b/skype-msi.sls
@@ -1,72 +1,18 @@
 skype-msi:
-  '7.23.105':
-    full_name: 'Skype™ 7.23'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
-    install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '7.18.112':
-    full_name: 'Skype™ 7.18'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.18.0.112.msi'
-    install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.18.0.112.msi'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '7.18.111':
-    full_name: 'Skype™ 7.18'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.18.0.111.msi'
-    install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.18.0.111.msi'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '7.18.103':
-    full_name: 'Skype™ 7.18'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.18.0.103.msi'
+  '7.25.106':
+    full_name: 'Skype™ 7.25'
+    installer: 'http://download.skype.com/msi/SkypeSetup_7.25.0.106.msi'
     install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.18.0.103.msi'
+    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.25.0.106.msi'
     uninstall_flags: '/qn /norestart'
     msiexec: True
     locale: en_US
     reboot: False
-  '7.17.106':
-    full_name: 'Skype™ 7.17'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.17.0.106.msi'
-    install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.17.0.106.msi'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '7.8.102':
-    full_name: 'Skype™ 7.8'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.8.0.102.msi'
-    install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.8.0.102.msi'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '7.7.102':
-    full_name: 'Skype™ 7.7'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.7.0.102.msi'
-    install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.7.0.102.msi'
-    uninstall_flags: '/qn /norestart'
-    msiexec: True
-    locale: en_US
-    reboot: False
-  '7.1.0.105':
-    full_name: 'Skype™ 7.1'
-    installer: 'http://download.skype.com/msi/SkypeSetup_7.1.0.105.msi'
+  '7.23.105':
+    full_name: 'Skype™ 7.23'
+    installer: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
     install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
-    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.1.0.105.msi'
+    uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
     uninstall_flags: '/qn /norestart'
     msiexec: True
     locale: en_US

diff --git a/wamp-server-3.sls b/wamp-server-3.sls
@@ -1,13 +1,13 @@
 wamp-server-3:
-  '3.0.0':
+  '3.0.4':
     {% if grains['cpuarch'] == 'AMD64' %}
-    full_name: 'Wampserver64 3.0.0'
-    installer: 'http://skylink.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3_x64_apache2.4.17_mysql5.7.9_php5.6.16_php7.0.0.exe'
+    full_name: 'Wampserver64 3.0.4'
+    installer: 'http://tenet.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3_x64_apache2.4.18_mysql5.7.11_php5.6.19-7.0.4.exe'
     uninstaller: 'c:\wamp64\uninstall_services.bat'
     uninstall_flags: '& c:\wamp64\unins000.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
     {% elif grains['cpuarch'] == 'x86' %}
-    full_name: 'Wampserver 3.0.0'
-    installer: 'http://heanet.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3_x86_apache2.4.17_mysql5.7.9_php5.6.15.exe'
+    full_name: 'Wampserver 3.0.4'
+    installer: 'http://tenet.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3.0.4_x86_apache2.4.18_mysql5.7.11_php5.6.19-7.0.4.exe'
     uninstaller: 'c:\wamp\uninstall_services.bat'
     uninstall_flags: '& c:\wamp\unins000.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
     {% endif %}

diff --git a/winscp.sls b/winscp.sls
@@ -4,7 +4,7 @@
     {% set PROGRAM_FILES = "%ProgramFiles%" %}
 {% endif %}
 winscp:
-  {% for version, file_version in (('5.7.6', '576'), ('5.7.5', '575'), ('5.7.4', '574')) %}
+  {% for version, file_version in (('5.7.7', '577'), ('5.7.6', '576'), ('5.7.5', '575'), ('5.7.4', '574')) %}
   '{{ version }}':
     full_name: 'WinSCP {{ version }}'
     installer: 'http://heanet.dl.sourceforge.net/project/winscp/WinSCP/{{ version }}/winscp{{ file_version }}setup.exe'

diff --git a/wireshark-devel.sls b/wireshark-devel.sls