Commit 272b5579 authored by Ed Reel's avatar Ed Reel Committed by GitHub

Merge pull request #5470 from saltedcoffii/remove-wget

Remove need for wget
parents 716b8ae8 7d20a68b
...@@ -3,7 +3,7 @@ require 'package' ...@@ -3,7 +3,7 @@ require 'package'
class Buildessential < Package class Buildessential < Package
description 'A collection of tools essential to compile and build software.' description 'A collection of tools essential to compile and build software.'
homepage '' homepage ''
version '1.9' version '1.10'
license 'GPL-3+' license 'GPL-3+'
compatibility 'all' compatibility 'all'
...@@ -45,7 +45,7 @@ class Buildessential < Package ...@@ -45,7 +45,7 @@ class Buildessential < Package
depends_on 'flex' depends_on 'flex'
depends_on 'util_macros' depends_on 'util_macros'
depends_on 'gettext' depends_on 'gettext'
depends_on 'wget' # in some cases, patches might be required and can be downloaded using wget # depends_on 'wget' # use 'curl -#LO' instead
depends_on 'mawk' depends_on 'mawk'
# compression utilities # compression utilities
......
...@@ -14,7 +14,7 @@ class Dr < Package ...@@ -14,7 +14,7 @@ class Dr < Package
depends_on 'setuptools' depends_on 'setuptools'
def self.install def self.install
system 'wget -O dr/dr https://github.com/Ewpratten/dr/releases/download/2.0-cros/dr' system 'curl -#Lo dr/dr https://github.com/Ewpratten/dr/releases/download/2.0-cros/dr'
abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('dr/dr') ) == '4e39a28f947ac044e28349fb10ffb423100fb00acb0ab819e931d931e3f0b02f' abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('dr/dr') ) == '4e39a28f947ac044e28349fb10ffb423100fb00acb0ab819e931d931e3f0b02f'
system "install -Dm755 dr/dr #{CREW_DEST_PREFIX}/bin/dr" system "install -Dm755 dr/dr #{CREW_DEST_PREFIX}/bin/dr"
system "pip3 install . --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} --upgrade --no-cache-dir -r requirements.txt" system "pip3 install . --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} --upgrade --no-cache-dir -r requirements.txt"
......
...@@ -24,7 +24,7 @@ class Iniparser < Package ...@@ -24,7 +24,7 @@ class Iniparser < Package
def self.patch def self.patch
# Fix buffer overflow vulnerabilities # Fix buffer overflow vulnerabilities
system 'wget', 'https://github.com/ndevilla/iniparser/commit/a249509544972d60f5077bfde554af480bd82594.patch' system 'curl -#LO https://github.com/ndevilla/iniparser/commit/a249509544972d60f5077bfde554af480bd82594.patch'
abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('a249509544972d60f5077bfde554af480bd82594.patch') ) == '1b1fe5d2faf6eb5bed51b80b046d4699c09b14b3e5e5277aed790a8741fcad8b' abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('a249509544972d60f5077bfde554af480bd82594.patch') ) == '1b1fe5d2faf6eb5bed51b80b046d4699c09b14b3e5e5277aed790a8741fcad8b'
system 'patch', '-Np1', '-i', 'a249509544972d60f5077bfde554af480bd82594.patch' system 'patch', '-Np1', '-i', 'a249509544972d60f5077bfde554af480bd82594.patch'
# Fix libdir # Fix libdir
......
...@@ -40,7 +40,7 @@ class Js78 < Package ...@@ -40,7 +40,7 @@ class Js78 < Package
patch_url = 'http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs78/mozjs78_78.4.0-2.debian.tar.xz' patch_url = 'http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs78/mozjs78_78.4.0-2.debian.tar.xz'
patch_sha256 = 'dcf2eec86c275448656cf18b3c142c3a2067dc8fdeff029211b66182b9179d21' patch_sha256 = 'dcf2eec86c275448656cf18b3c142c3a2067dc8fdeff029211b66182b9179d21'
system('wget', '--continue', '--no-check-certificate', patch_url, '-O', 'unzippatches.tar.xz') system('curl -#L', patch_url, '-o', 'unzippatches.tar.xz')
unless Digest::SHA256.hexdigest(File.read('./unzippatches.tar.xz')) == patch_sha256 unless Digest::SHA256.hexdigest(File.read('./unzippatches.tar.xz')) == patch_sha256
abort 'Checksum mismatch :/ try again' abort 'Checksum mismatch :/ try again'
end end
......
...@@ -25,7 +25,7 @@ class Nmon < Package ...@@ -25,7 +25,7 @@ class Nmon < Package
depends_on 'ncurses' depends_on 'ncurses'
def self.build def self.build
system 'wget http://downloads.sourceforge.net/project/nmon/lmon16g.c' system 'curl -#LO http://downloads.sourceforge.net/project/nmon/lmon16g.c'
abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('lmon16g.c') ) == 'da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688' abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('lmon16g.c') ) == 'da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688'
system "sed -i 's,<ncurses.h>,<#{CREW_PREFIX}/include/ncurses/ncurses.h>,' lmon16g.c" system "sed -i 's,<ncurses.h>,<#{CREW_PREFIX}/include/ncurses/ncurses.h>,' lmon16g.c"
system 'cc -o nmon lmon16g.c -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM -lncurses -lm -g -D POWER' system 'cc -o nmon lmon16g.c -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM -lncurses -lm -g -D POWER'
......
...@@ -12,7 +12,7 @@ class Wp_cli < Package ...@@ -12,7 +12,7 @@ class Wp_cli < Package
depends_on 'php74' unless File.exists? "#{CREW_PREFIX}/bin/php" depends_on 'php74' unless File.exists? "#{CREW_PREFIX}/bin/php"
def self.build def self.build
system "wget https://github.com/wp-cli/wp-cli/releases/download/v#{version}/wp-cli-#{version}.phar" system "curl -#LO https://github.com/wp-cli/wp-cli/releases/download/v#{version}/wp-cli-#{version}.phar"
abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("wp-cli-#{version}.phar") ) == '139dcc86ed39ef751679efbdaf57a53528f1afda972c4e3622667cc27397b540' abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read("wp-cli-#{version}.phar") ) == '139dcc86ed39ef751679efbdaf57a53528f1afda972c4e3622667cc27397b540'
end end
......
...@@ -85,7 +85,6 @@ trousers ...@@ -85,7 +85,6 @@ trousers
uchardet uchardet
unzip unzip
util_macros util_macros
wget
xorg_proto xorg_proto
xzutils xzutils
zip zip
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment