Reduce more of the python2 dependency (#10422)

* Remove q package as it is no longer suitable for packaging (see Homebrew/homebrew-core#90174)

* smem 1.4 -> 1.5

* sqlmap 1.4.2 -> 1.8.8

* weechat 2.1 -> 4.4.1
This commit is contained in:
Maximilian Downey Twiss
2024-09-05 17:22:14 +10:00
committed by GitHub
parent 5557dafde7
commit 1ee091587d
14 changed files with 79 additions and 109 deletions

View File

@@ -173,6 +173,7 @@ pkg_update_arr = [
{ pkg_name: 'postgres', pkg_rename: 'postgresql', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'postgres', pkg_rename: 'postgresql', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' },
{ pkg_name: 'proj4', pkg_rename: 'proj', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'proj4', pkg_rename: 'proj', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' },
{ pkg_name: 'pygobject', pkg_rename: 'py3_pygobject', pkg_deprecated: nil, comments: 'Renamed to use pip packaging.' }, { pkg_name: 'pygobject', pkg_rename: 'py3_pygobject', pkg_deprecated: nil, comments: 'Renamed to use pip packaging.' },
{ pkg_name: 'q', pkg_rename: nil, pkg_deprecated: true, comments: 'No longer suitable for packaging.' },
{ pkg_name: 'qtbase', pkg_rename: 'qt5_base', pkg_deprecated: nil, comments: 'Qt packages renamed to qt5_*' }, { pkg_name: 'qtbase', pkg_rename: 'qt5_base', pkg_deprecated: nil, comments: 'Qt packages renamed to qt5_*' },
{ pkg_name: 'qtcharts', pkg_rename: 'qt5_charts', pkg_deprecated: nil, comments: nil }, { pkg_name: 'qtcharts', pkg_rename: 'qt5_charts', pkg_deprecated: nil, comments: nil },
{ pkg_name: 'qtchooser', pkg_rename: nil, pkg_deprecated: true, comments: "Doesn't work for newer Qt versions." }, { pkg_name: 'qtchooser', pkg_rename: nil, pkg_deprecated: true, comments: "Doesn't work for newer Qt versions." },

View File

@@ -1 +0,0 @@
/usr/local/bin/q

View File

@@ -1,3 +1,3 @@
/usr/local/bin/smem /usr/local/bin/smem
/usr/local/bin/smemcap /usr/local/bin/smemcap
/usr/local/man/man8/smem.8 /usr/local/share/man/man8/smem.8.zst

View File

@@ -4,23 +4,32 @@
/usr/local/include/weechat/weechat-plugin.h /usr/local/include/weechat/weechat-plugin.h
/usr/local/lib/pkgconfig/weechat.pc /usr/local/lib/pkgconfig/weechat.pc
/usr/local/lib/weechat/plugins/alias.so /usr/local/lib/weechat/plugins/alias.so
/usr/local/lib/weechat/plugins/aspell.so
/usr/local/lib/weechat/plugins/buflist.so /usr/local/lib/weechat/plugins/buflist.so
/usr/local/lib/weechat/plugins/charset.so /usr/local/lib/weechat/plugins/charset.so
/usr/local/lib/weechat/plugins/exec.so /usr/local/lib/weechat/plugins/exec.so
/usr/local/lib/weechat/plugins/fifo.so /usr/local/lib/weechat/plugins/fifo.so
/usr/local/lib/weechat/plugins/fset.so /usr/local/lib/weechat/plugins/fset.so
/usr/local/lib/weechat/plugins/guile.so
/usr/local/lib/weechat/plugins/irc.so /usr/local/lib/weechat/plugins/irc.so
/usr/local/lib/weechat/plugins/logger.so /usr/local/lib/weechat/plugins/logger.so
/usr/local/lib/weechat/plugins/lua.so
/usr/local/lib/weechat/plugins/perl.so /usr/local/lib/weechat/plugins/perl.so
/usr/local/lib/weechat/plugins/python.so /usr/local/lib/weechat/plugins/python.so
/usr/local/lib/weechat/plugins/relay.so /usr/local/lib/weechat/plugins/relay.so
/usr/local/lib/weechat/plugins/ruby.so /usr/local/lib/weechat/plugins/ruby.so
/usr/local/lib/weechat/plugins/script.so /usr/local/lib/weechat/plugins/script.so
/usr/local/lib/weechat/plugins/spell.so
/usr/local/lib/weechat/plugins/tcl.so /usr/local/lib/weechat/plugins/tcl.so
/usr/local/lib/weechat/plugins/trigger.so /usr/local/lib/weechat/plugins/trigger.so
/usr/local/lib/weechat/plugins/typing.so
/usr/local/lib/weechat/plugins/xfer.so /usr/local/lib/weechat/plugins/xfer.so
/usr/local/share/applications/weechat.desktop
/usr/local/share/icons/hicolor/128x128/apps/weechat.png
/usr/local/share/icons/hicolor/16x16/apps/weechat.png
/usr/local/share/icons/hicolor/256x256/apps/weechat.png
/usr/local/share/icons/hicolor/32x32/apps/weechat.png /usr/local/share/icons/hicolor/32x32/apps/weechat.png
/usr/local/share/icons/hicolor/512x512/apps/weechat.png
/usr/local/share/icons/hicolor/64x64/apps/weechat.png
/usr/local/share/locale/cs/LC_MESSAGES/weechat.mo /usr/local/share/locale/cs/LC_MESSAGES/weechat.mo
/usr/local/share/locale/de/LC_MESSAGES/weechat.mo /usr/local/share/locale/de/LC_MESSAGES/weechat.mo
/usr/local/share/locale/es/LC_MESSAGES/weechat.mo /usr/local/share/locale/es/LC_MESSAGES/weechat.mo
@@ -32,4 +41,5 @@
/usr/local/share/locale/pt/LC_MESSAGES/weechat.mo /usr/local/share/locale/pt/LC_MESSAGES/weechat.mo
/usr/local/share/locale/pt_BR/LC_MESSAGES/weechat.mo /usr/local/share/locale/pt_BR/LC_MESSAGES/weechat.mo
/usr/local/share/locale/ru/LC_MESSAGES/weechat.mo /usr/local/share/locale/ru/LC_MESSAGES/weechat.mo
/usr/local/share/locale/sr/LC_MESSAGES/weechat.mo
/usr/local/share/locale/tr/LC_MESSAGES/weechat.mo /usr/local/share/locale/tr/LC_MESSAGES/weechat.mo

View File

@@ -1 +0,0 @@
/usr/local/bin/q

View File

@@ -1,3 +1,3 @@
/usr/local/bin/smem /usr/local/bin/smem
/usr/local/bin/smemcap /usr/local/bin/smemcap
/usr/local/man/man8/smem.8 /usr/local/share/man/man8/smem.8.zst

View File

@@ -4,23 +4,32 @@
/usr/local/include/weechat/weechat-plugin.h /usr/local/include/weechat/weechat-plugin.h
/usr/local/lib/pkgconfig/weechat.pc /usr/local/lib/pkgconfig/weechat.pc
/usr/local/lib/weechat/plugins/alias.so /usr/local/lib/weechat/plugins/alias.so
/usr/local/lib/weechat/plugins/aspell.so
/usr/local/lib/weechat/plugins/buflist.so /usr/local/lib/weechat/plugins/buflist.so
/usr/local/lib/weechat/plugins/charset.so /usr/local/lib/weechat/plugins/charset.so
/usr/local/lib/weechat/plugins/exec.so /usr/local/lib/weechat/plugins/exec.so
/usr/local/lib/weechat/plugins/fifo.so /usr/local/lib/weechat/plugins/fifo.so
/usr/local/lib/weechat/plugins/fset.so /usr/local/lib/weechat/plugins/fset.so
/usr/local/lib/weechat/plugins/guile.so
/usr/local/lib/weechat/plugins/irc.so /usr/local/lib/weechat/plugins/irc.so
/usr/local/lib/weechat/plugins/logger.so /usr/local/lib/weechat/plugins/logger.so
/usr/local/lib/weechat/plugins/lua.so
/usr/local/lib/weechat/plugins/perl.so /usr/local/lib/weechat/plugins/perl.so
/usr/local/lib/weechat/plugins/python.so /usr/local/lib/weechat/plugins/python.so
/usr/local/lib/weechat/plugins/relay.so /usr/local/lib/weechat/plugins/relay.so
/usr/local/lib/weechat/plugins/ruby.so /usr/local/lib/weechat/plugins/ruby.so
/usr/local/lib/weechat/plugins/script.so /usr/local/lib/weechat/plugins/script.so
/usr/local/lib/weechat/plugins/spell.so
/usr/local/lib/weechat/plugins/tcl.so /usr/local/lib/weechat/plugins/tcl.so
/usr/local/lib/weechat/plugins/trigger.so /usr/local/lib/weechat/plugins/trigger.so
/usr/local/lib/weechat/plugins/typing.so
/usr/local/lib/weechat/plugins/xfer.so /usr/local/lib/weechat/plugins/xfer.so
/usr/local/share/applications/weechat.desktop
/usr/local/share/icons/hicolor/128x128/apps/weechat.png
/usr/local/share/icons/hicolor/16x16/apps/weechat.png
/usr/local/share/icons/hicolor/256x256/apps/weechat.png
/usr/local/share/icons/hicolor/32x32/apps/weechat.png /usr/local/share/icons/hicolor/32x32/apps/weechat.png
/usr/local/share/icons/hicolor/512x512/apps/weechat.png
/usr/local/share/icons/hicolor/64x64/apps/weechat.png
/usr/local/share/locale/cs/LC_MESSAGES/weechat.mo /usr/local/share/locale/cs/LC_MESSAGES/weechat.mo
/usr/local/share/locale/de/LC_MESSAGES/weechat.mo /usr/local/share/locale/de/LC_MESSAGES/weechat.mo
/usr/local/share/locale/es/LC_MESSAGES/weechat.mo /usr/local/share/locale/es/LC_MESSAGES/weechat.mo
@@ -32,4 +41,5 @@
/usr/local/share/locale/pt/LC_MESSAGES/weechat.mo /usr/local/share/locale/pt/LC_MESSAGES/weechat.mo
/usr/local/share/locale/pt_BR/LC_MESSAGES/weechat.mo /usr/local/share/locale/pt_BR/LC_MESSAGES/weechat.mo
/usr/local/share/locale/ru/LC_MESSAGES/weechat.mo /usr/local/share/locale/ru/LC_MESSAGES/weechat.mo
/usr/local/share/locale/sr/LC_MESSAGES/weechat.mo
/usr/local/share/locale/tr/LC_MESSAGES/weechat.mo /usr/local/share/locale/tr/LC_MESSAGES/weechat.mo

View File

@@ -1 +0,0 @@
/usr/local/bin/q

View File

@@ -1,3 +1,3 @@
/usr/local/bin/smem /usr/local/bin/smem
/usr/local/bin/smemcap /usr/local/bin/smemcap
/usr/local/man/man8/smem.8.gz /usr/local/share/man/man8/smem.8.zst

View File

@@ -4,23 +4,32 @@
/usr/local/include/weechat/weechat-plugin.h /usr/local/include/weechat/weechat-plugin.h
/usr/local/lib/pkgconfig/weechat.pc /usr/local/lib/pkgconfig/weechat.pc
/usr/local/lib/weechat/plugins/alias.so /usr/local/lib/weechat/plugins/alias.so
/usr/local/lib/weechat/plugins/aspell.so
/usr/local/lib/weechat/plugins/buflist.so /usr/local/lib/weechat/plugins/buflist.so
/usr/local/lib/weechat/plugins/charset.so /usr/local/lib/weechat/plugins/charset.so
/usr/local/lib/weechat/plugins/exec.so /usr/local/lib/weechat/plugins/exec.so
/usr/local/lib/weechat/plugins/fifo.so /usr/local/lib/weechat/plugins/fifo.so
/usr/local/lib/weechat/plugins/fset.so /usr/local/lib/weechat/plugins/fset.so
/usr/local/lib/weechat/plugins/guile.so
/usr/local/lib/weechat/plugins/irc.so /usr/local/lib/weechat/plugins/irc.so
/usr/local/lib/weechat/plugins/logger.so /usr/local/lib/weechat/plugins/logger.so
/usr/local/lib/weechat/plugins/lua.so
/usr/local/lib/weechat/plugins/perl.so /usr/local/lib/weechat/plugins/perl.so
/usr/local/lib/weechat/plugins/python.so /usr/local/lib/weechat/plugins/python.so
/usr/local/lib/weechat/plugins/relay.so /usr/local/lib/weechat/plugins/relay.so
/usr/local/lib/weechat/plugins/ruby.so /usr/local/lib/weechat/plugins/ruby.so
/usr/local/lib/weechat/plugins/script.so /usr/local/lib/weechat/plugins/script.so
/usr/local/lib/weechat/plugins/spell.so
/usr/local/lib/weechat/plugins/tcl.so /usr/local/lib/weechat/plugins/tcl.so
/usr/local/lib/weechat/plugins/trigger.so /usr/local/lib/weechat/plugins/trigger.so
/usr/local/lib/weechat/plugins/typing.so
/usr/local/lib/weechat/plugins/xfer.so /usr/local/lib/weechat/plugins/xfer.so
/usr/local/share/applications/weechat.desktop
/usr/local/share/icons/hicolor/128x128/apps/weechat.png
/usr/local/share/icons/hicolor/16x16/apps/weechat.png
/usr/local/share/icons/hicolor/256x256/apps/weechat.png
/usr/local/share/icons/hicolor/32x32/apps/weechat.png /usr/local/share/icons/hicolor/32x32/apps/weechat.png
/usr/local/share/icons/hicolor/512x512/apps/weechat.png
/usr/local/share/icons/hicolor/64x64/apps/weechat.png
/usr/local/share/locale/cs/LC_MESSAGES/weechat.mo /usr/local/share/locale/cs/LC_MESSAGES/weechat.mo
/usr/local/share/locale/de/LC_MESSAGES/weechat.mo /usr/local/share/locale/de/LC_MESSAGES/weechat.mo
/usr/local/share/locale/es/LC_MESSAGES/weechat.mo /usr/local/share/locale/es/LC_MESSAGES/weechat.mo
@@ -32,4 +41,5 @@
/usr/local/share/locale/pt/LC_MESSAGES/weechat.mo /usr/local/share/locale/pt/LC_MESSAGES/weechat.mo
/usr/local/share/locale/pt_BR/LC_MESSAGES/weechat.mo /usr/local/share/locale/pt_BR/LC_MESSAGES/weechat.mo
/usr/local/share/locale/ru/LC_MESSAGES/weechat.mo /usr/local/share/locale/ru/LC_MESSAGES/weechat.mo
/usr/local/share/locale/sr/LC_MESSAGES/weechat.mo
/usr/local/share/locale/tr/LC_MESSAGES/weechat.mo /usr/local/share/locale/tr/LC_MESSAGES/weechat.mo

View File

@@ -1,26 +0,0 @@
require 'package'
class Q < Package
description 'q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).'
homepage 'http://harelba.github.io/q/'
version '1.7.1'
license 'GPL-3'
compatibility 'all'
source_url 'https://github.com/harelba/q/archive/1.7.1.tar.gz'
source_sha256 'cf0f2ca3ecb88fedf6232d5ce5931afc90eae1db8fdef78b17933d46e9f9f678'
binary_compression 'tar.xz'
binary_sha256({
aarch64: '04016db78b39035e66a0e6a3ed12e7bec1b7e497b2dff89dbb9a02d8b74a6bfa',
armv7l: '04016db78b39035e66a0e6a3ed12e7bec1b7e497b2dff89dbb9a02d8b74a6bfa',
i686: '3be0918a64369228dd23881368bd8e091f5008cdabd14541af5c4f8820293926',
x86_64: 'd1c9c44e976208687c4f0a52e631cce825fefa737b5aedf19c252db9bd99019c'
})
depends_on 'python2'
depends_on 'sqlite'
def self.install
system "install -Dm755 bin/q #{CREW_DEST_PREFIX}/bin/q"
end
end

View File

@@ -3,30 +3,29 @@ require 'package'
class Smem < Package class Smem < Package
description 'A Linux memory reporting tool that uses proportional set size.' description 'A Linux memory reporting tool that uses proportional set size.'
homepage 'https://www.selenic.com/smem/' homepage 'https://www.selenic.com/smem/'
version '1.4' version '1.5'
license 'GPL-2+' license 'GPL-2+'
compatibility 'all' compatibility 'all'
source_url 'https://www.selenic.com/smem/download/smem-1.4.tar.gz' source_url "https://selenic.com/repo/smem/archive/#{version}.tar.bz2"
source_sha256 '2ea9f878f4cf3c276774c3f7e2a41977a1f2d64f98d2dcb6a15f1f3d84df61ec' source_sha256 '950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6'
binary_compression 'tar.xz' binary_compression 'tar.zst'
binary_sha256({ binary_sha256({
aarch64: '914a30f98944155240bfefd8b4181b06a5b868f2e5949d86c806fe02fecf7c49', aarch64: '9b525a1287322f8a3d152031b34963d471e74f30101af27c1bc2cee5ffff7e42',
armv7l: '914a30f98944155240bfefd8b4181b06a5b868f2e5949d86c806fe02fecf7c49', armv7l: '9b525a1287322f8a3d152031b34963d471e74f30101af27c1bc2cee5ffff7e42',
i686: 'a971c2ea408330aa01ab3ad1740057d480f6dcbc64f1507e45d33a4f9d82d695', i686: 'f63a138b571fd6f391bc823007f2649b6ac2f6cb75c2495e1540cf30adb048b2',
x86_64: 'aff43254df620f1dcd080a5071a0f58b223d57b6f48d8545ed453062c115ada6' x86_64: '28884e546d36071a800018570f84c95847332d66f592743acb553ccc0f2e2509'
}) })
depends_on 'buildessential' => :build depends_on 'python3'
depends_on 'python2'
def self.build def self.build
system 'make smemcap' system 'make smemcap'
end end
def self.install def self.install
system "install -Dm755 smem #{CREW_DEST_PREFIX}/bin/smem" FileUtils.install 'smem', "#{CREW_DEST_PREFIX}/bin/smem", mode: 0o755
system "install -Dm755 smemcap #{CREW_DEST_PREFIX}/bin/smemcap" FileUtils.install 'smemcap', "#{CREW_DEST_PREFIX}/bin/smemcap", mode: 0o755
system "install -Dm644 smem.8 #{CREW_DEST_PREFIX}/man/man8/smem.8" FileUtils.install 'smem.8', "#{CREW_DEST_MAN_PREFIX}/man8/smem.8", mode: 0o644
end end
end end

View File

@@ -1,41 +1,12 @@
require 'package' require 'buildsystems/pip'
class Sqlmap < Package class Sqlmap < Pip
description 'sqlmap is an open source penetration testing tool that automates the process of detecting and exploiting SQL injection flaws and taking over of database servers.' description 'sqlmap is an open source penetration testing tool that automates the process of detecting and exploiting SQL injection flaws and taking over of database servers.'
homepage 'https://sqlmap.org/' homepage 'https://sqlmap.org/'
version '1.4.2' version '1.8.8'
license 'GPL-2' license 'GPL-2'
compatibility 'all' compatibility 'all'
source_url 'https://github.com/sqlmapproject/sqlmap/archive/1.4.2.tar.gz' source_url 'SKIP'
source_sha256 '77faf85164eb17dce769ec830cbd146768644315bc1024613ad13155e09c2d11'
binary_compression 'tar.xz'
binary_sha256({ depends_on 'python3', '>= 3.12.0'
aarch64: '02a1b56739af28c5c2dbd920f69c630e7e1ffafc043387b06534c9586886f5f7',
armv7l: '02a1b56739af28c5c2dbd920f69c630e7e1ffafc043387b06534c9586886f5f7',
i686: '0fbff386670b5ef09f12d3b3e3478d203f4f1140d529b039be36d7123399497e',
x86_64: '886d073baae73b24d03dfdc8c7d09dff3de47eda9229794caed5a1915b25c588'
})
depends_on 'python27' unless File.exist? "#{CREW_PREFIX}/bin/python"
def self.build
system "echo '#!/bin/bash' > sqlmap"
system "echo 'cd #{CREW_PREFIX}/share/sqlmap' >> sqlmap"
system "echo 'python sqlmap.py -c sqlmap.conf \"\$@\"' >> sqlmap"
end
def self.install
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/sqlmap"
system "cp -r . #{CREW_DEST_PREFIX}/share/sqlmap"
system "install -Dm755 sqlmap #{CREW_DEST_PREFIX}/bin/sqlmap"
end
def self.postinstall
puts
puts "To get extended help, run 'sqlmap -hh | most'".lightblue
puts
puts "To configure, edit #{CREW_PREFIX}/share/sqlmap/sqlmap.conf".lightblue
puts
end
end end

View File

@@ -1,39 +1,37 @@
require 'package' require 'buildsystems/cmake'
class Weechat < Package class Weechat < CMake
description 'WeeChat is a fast, light and extensible chat client.' description 'WeeChat is a fast, light and extensible chat client.'
homepage 'https://weechat.org/' homepage 'https://weechat.org/'
version '2.1' version '4.4.1'
license 'GPL-3' license 'GPL-3'
compatibility 'all' compatibility 'all'
source_url 'https://weechat.org/files/src/weechat-2.1.tar.xz' source_url 'https://github.com/weechat/weechat.git'
source_sha256 'cda0f81ff8243fd25cca76c8e490e2fdb5b8fbb2554d7aa87cb3b0beda16ed38' git_hashtag "v#{version}"
binary_compression 'tar.xz' binary_compression 'tar.zst'
binary_sha256({ binary_sha256({
aarch64: '9b00d99af938abc66093f1b64287d71502a3d4967530d4d5f7e55756ba6fc00e', aarch64: '3755d6351a04f3afd99377e117608113c952a353be98aa9b1ac1c2cbfbe8a565',
armv7l: '9b00d99af938abc66093f1b64287d71502a3d4967530d4d5f7e55756ba6fc00e', armv7l: '3755d6351a04f3afd99377e117608113c952a353be98aa9b1ac1c2cbfbe8a565',
i686: '31ef7d36a76b8b41bcd2f1a352adcd20456deccc4ed2e452e882223c32b67ba3', i686: '02a64442c7bf8c421c7f947e76020a35fdea9bb04ae3efbc41dae1ea500c04fb',
x86_64: '4ab72526832466b8d2166ab093951fe87cf2e4faba1e29361c95c6bc966210bd' x86_64: 'f9018d6a3bd471185516d7a7d2fc70ab37f442458eedd27441d4f6a80d3923fd'
}) })
depends_on 'aspell'
depends_on 'bdwgc' # R
depends_on 'cjson'
depends_on 'curl'
depends_on 'gnutls'
depends_on 'guile'
depends_on 'libgcrypt' depends_on 'libgcrypt'
depends_on 'aspell' => :build depends_on 'lua'
depends_on 'curl' => :build depends_on 'ncurses'
depends_on 'lua' => :build depends_on 'perl'
depends_on 'python2' depends_on 'python3'
depends_on 'tcl' => :build depends_on 'ruby'
depends_on 'tcl'
depends_on 'zlib'
depends_on 'zstd'
def self.build cmake_options '-DENABLE_PHP=OFF'
system 'cmake',
"-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX}",
'-DCMAKE_BUILD_TYPE=Release',
'-DENABLE_MAN=ON',
"-DPYTHON_EXECUTABLE=#{CREW_PREFIX}/bin/python2"
system 'make'
end
def self.install
system 'make', "LIBDIR=#{CREW_LIB_PREFIX}", "DESTDIR=#{CREW_DEST_DIR}", 'install'
end
end end