Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump tihmstar related tools and libraries #61

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions Formula/img4tool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class Img4tool < Formula
desc "Tool for manipulating IMG4, IM4M and IM4P files"
homepage "https://github.com/tihmstar/img4tool"
url "https://github.com/tihmstar/img4tool.git",
revision: "aca6cf005c94caf135023263cbb5c61a0081804f"
version "197"
revision: "e1c37d6ce8c629ca9669efc9cb5b5f7d6810ed30"
version "202"
license "LGPL-3.0-or-later"
head "https://github.com/tihmstar/img4tool.git", branch: "master"

Expand All @@ -26,9 +26,9 @@ class Img4tool < Formula
depends_on "libtool" => :build
depends_on "pkg-config" => :build

depends_on "libplist"
depends_on "libtihmstar-general"
depends_on "[email protected]"
depends_on "stek29/idevice/libplist"
depends_on "openssl@3"

def fix_tihmstar
inreplace %w[configure.ac],
Expand All @@ -40,12 +40,7 @@ def fix_tihmstar
def install
fix_tihmstar

system "./autogen.sh",
"--disable-debug",
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"

system "./autogen.sh", *std_configure_args
system "make"
system "make", "install", "PREFIX=#{prefix}"
end
Expand Down
9 changes: 3 additions & 6 deletions Formula/libfragmentzip.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class Libfragmentzip < Formula
desc "Library for downloading single files from a remote zip archive"
homepage "https://github.com/tihmstar/libfragmentzip"
url "https://github.com/tihmstar/libfragmentzip.git",
revision: "aaf6fae83a0aa6f7aae1c94721857076d04a14e8"
version "64"
revision: "2dcd708f838eb2eb7adea1f07a3350a0f9e08faa"
version "70"
license "LGPL-3.0-or-later"
head "https://github.com/tihmstar/libfragmentzip.git", branch: "master"

Expand Down Expand Up @@ -39,10 +39,7 @@ def fix_tihmstar
def install
fix_tihmstar

system "./autogen.sh", "--disable-debug",
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"
system "./autogen.sh", *std_configure_args
system "make"
system "make", "install"
end
Expand Down
9 changes: 3 additions & 6 deletions Formula/libinsn.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class Libinsn < Formula
desc "Instruction decoder/encoder for 64bit ARM"
homepage "https://github.com/tihmstar/libinsn"
url "https://github.com/tihmstar/libinsn.git",
revision: "e795956b0c0e0c2fcbb074ee1f1cfd84e98f0918"
version "37"
revision: "c2ed667df12e185b0964cf32850f8e42839ccaa9"
version "49"
license "LGPL-2.1-or-later"
head "https://github.com/tihmstar/libinsn.git", branch: "master"

Expand Down Expand Up @@ -40,10 +40,7 @@ def fix_tihmstar
def install
fix_tihmstar

system "./autogen.sh", "--disable-debug",
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"
system "./autogen.sh", *std_configure_args
system "make"
system "make", "install", "PREFIX=#{prefix}"
end
Expand Down
12 changes: 4 additions & 8 deletions Formula/libtihmstar-general.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ class LibtihmstarGeneral < Formula
desc "General stuff for tihmstar's projects"
homepage "https://github.com/tihmstar/libgeneral"
url "https://github.com/tihmstar/libgeneral.git",
revision: "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34"
version "63"
revision: "6bca5824f23ab88af0de6568bc7b3213318c27ed"
version "77"
license "LGPL-2.1-or-later"
head "https://github.com/tihmstar/img4tool.git", branch: "master"
head "https://github.com/tihmstar/libgeneral.git", branch: "master"

livecheck do
url :homepage
Expand Down Expand Up @@ -37,11 +37,7 @@ def fix_tihmstar
def install
fix_tihmstar

system "./autogen.sh",
"--disable-debug",
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"
system "./autogen.sh", *std_configure_args
system "make"
system "make", "install", "PREFIX=#{prefix}"
end
Expand Down
11 changes: 4 additions & 7 deletions Formula/tsschecker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
desc "Tool to check TSS signing status of various devices"
homepage "https://github.com/1Conan/tsschecker"
url "https://github.com/1Conan/tsschecker.git",
revision: "ba70a6ad0c818b67028276c430ef221591692d2a"
version "382"
revision: "75f5c11420946c9d2b6ce3bacb35f0b7beddc84a"
version "431"
license "LGPL-3.0-or-later"
head "https://github.com/1Conan/tsschecker.git", branch: "master"

Expand All @@ -27,8 +27,8 @@
depends_on "pkg-config" => :build

depends_on "libfragmentzip"
depends_on "libplist"
depends_on "stek29/idevice/libirecovery"
depends_on "stek29/idevice/libplist"

def fix_tihmstar
inreplace %w[configure.ac],
Expand All @@ -40,10 +40,7 @@
def install
fix_tihmstar

system "./autogen.sh", "--disable-debug",
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"
system "./autogen.sh", *std_configure_args
system "make"

# we dont need libjssy
Expand All @@ -56,7 +53,7 @@
EOS
end

test do

Check warning on line 56 in Formula/tsschecker.rb

View workflow job for this annotation

GitHub Actions / test-bot (macos-13)

`brew test --verbose stek29/idevice/tsschecker` failed on macOS Ventura (13)!

/usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.1.0/bin/bundle clean ==> Testing stek29/idevice/tsschecker ==> /usr/local/Cellar/tsschecker/431/bin/tsschecker Error: stek29/idevice/tsschecker: failed An exception occurred within a child process: NoMethodError: undefined method `captures' for nil:NilClass /usr/local/Homebrew/Library/Taps/stek29/homebrew-idevice/Formula/tsschecker.rb:56:in `block in <class:Tsschecker>' /usr/local/Homebrew/Library/Homebrew/formula.rb:2599:in `block (3 levels) in run_test' /usr/local/Homebrew/Library/Homebrew/extend/kernel.rb:493:in `with_env' /usr/local/Homebrew/Library/Homebrew/formula.rb:2598:in `block (2 levels) in run_test' /usr/local/Homebrew/Library/Homebrew/formula.rb:1064:in `with_logging' /usr/local/Homebrew/Library/Homebrew/formula.rb:2597:in `block in run_test' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `block in run' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `chdir' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `run' /usr/local/Homebrew/Library/Homebrew/formula.rb:2891:in `mktemp' /usr/local/Homebrew/Library/Homebrew/formula.rb:2591:in `run_test' /usr/local/Homebrew/Library/Homebrew/test.rb:46:in `block in <main>' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:107:in `block in timeout' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:36:in `block in catch' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:36:in `catch' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:36:in `catch' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:123:in `timeout' /usr/local/Homebrew/Library/Homebrew/test.rb:50:in `<main>'

Check warning on line 56 in Formula/tsschecker.rb

View workflow job for this annotation

GitHub Actions / test-bot (macos-14)

`brew test --verbose stek29/idevice/tsschecker` failed on macOS Sonoma (14) on Apple Silicon!

/opt/homebrew/Library/Homebrew/vendor/bundle/ruby/3.1.0/bin/bundle clean ==> Testing stek29/idevice/tsschecker ==> /opt/homebrew/Cellar/tsschecker/431/bin/tsschecker Error: stek29/idevice/tsschecker: failed An exception occurred within a child process: NoMethodError: undefined method `captures' for nil:NilClass /opt/homebrew/Library/Taps/stek29/homebrew-idevice/Formula/tsschecker.rb:56:in `block in <class:Tsschecker>' /opt/homebrew/Library/Homebrew/formula.rb:2599:in `block (3 levels) in run_test' /opt/homebrew/Library/Homebrew/extend/kernel.rb:493:in `with_env' /opt/homebrew/Library/Homebrew/formula.rb:2598:in `block (2 levels) in run_test' /opt/homebrew/Library/Homebrew/formula.rb:1064:in `with_logging' /opt/homebrew/Library/Homebrew/formula.rb:2597:in `block in run_test' /opt/homebrew/Library/Homebrew/mktemp.rb:75:in `block in run' /opt/homebrew/Library/Homebrew/mktemp.rb:75:in `chdir' /opt/homebrew/Library/Homebrew/mktemp.rb:75:in `run' /opt/homebrew/Library/Homebrew/formula.rb:2891:in `mktemp' /opt/homebrew/Library/Homebrew/formula.rb:2591:in `run_test' /opt/homebrew/Library/Homebrew/test.rb:46:in `block in <main>' /opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:107:in `block in timeout' /opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:36:in `block in catch' /opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:36:in `catch' /opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:36:in `catch' /opt/homebrew/Library/Homebrew/vendor/portable-ruby/3.1.4/lib/ruby/3.1.0/timeout.rb:123:in `timeout' /opt/homebrew/Library/Homebrew/test.rb:50:in `<main>'
assert_equal version.to_s, shell_output("#{bin}/tsschecker", 255)
.split("\n")
.first.match(/version: 0\.(\d+)-/).captures.first
Expand Down
Loading