admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

version: loosen Debian orig tarball regex

Browse Source 
The regex to match Debian `orig` tarballs uses the standard regex for
versions like `1.2.3` but it won't match versions without a dot. The
`lcrack` formula uses a date-based version in the filename
(`lcrack_20040914.orig.tar.gz`) and `mkcue` uses a single number
(`mkcue_1.orig.tar.gz`), so we have to use a manual `version` in
these formulae.

This updates the regex to use the looser `NUMERIC_WITH_OPTIONAL_DOTS`
pattern, which will also match the aforementioned versions. I tested
this by checking versions of formulae before/after this change and
confirming that they remain the same after removing the `version`
calls from related formulae.
This commit is contained in:
Sam Ford 2024-07-24 11:34:09 -04:00
parent cfb4bf7670
commit 2cd95d482d
No known key found for this signature in database
GPG Key ID: 7AF5CBEE1DD6F76D
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/test/version_spec.rb
View File

@ -625,16 +625,23 @@ RSpec.describe Version do
.to be_detected_from("https://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz") .to be_detected_from("https://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz")
end end
specify "debian style 1" do specify "debian style" do
expect(described_class.new("3.03")) expect(described_class.new("3.03"))
.to be_detected_from("https://ftp.de.debian.org/debian/pool/main/s/sl/sl_3.03.orig.tar.gz") .to be_detected_from("https://ftp.de.debian.org/debian/pool/main/s/sl/sl_3.03.orig.tar.gz")
end end
specify "debian style 2" do specify "debian style with letter suffix" do
expect(described_class.new("1.01b")) expect(described_class.new("1.01b"))
.to be_detected_from("https://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz") .to be_detected_from("https://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz")
end end
specify "debian style dotless" do
expect(described_class.new("1"))
.to be_detected_from("https://deb.debian.org/debian/pool/main/e/example/example_1.orig.tar.gz")
expect(described_class.new("20040914"))
.to be_detected_from("https://deb.debian.org/debian/pool/main/e/example/example_20040914.orig.tar.gz")
end
specify "bottle style" do specify "bottle style" do
expect(described_class.new("4.8.0")) expect(described_class.new("4.8.0"))
.to be_detected_from("https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz") .to be_detected_from("https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz")

7
Library/Homebrew/version.rb
View File

@ -462,8 +462,11 @@ class Version
# e.g. `https://search.maven.org/remotecontent?filepath=org/apache/orc/orc-tools/1.2.3/orc-tools-1.2.3-uber.jar` # e.g. `https://search.maven.org/remotecontent?filepath=org/apache/orc/orc-tools/1.2.3/orc-tools-1.2.3-uber.jar`
StemParser.new(/-(#{NUMERIC_WITH_DOTS})-/), StemParser.new(/-(#{NUMERIC_WITH_DOTS})-/),
# e.g. `dash_0.5.5.1.orig.tar.gz (Debian style)` # Debian style
StemParser.new(/_(#{NUMERIC_WITH_DOTS}[abc]?)\.orig$/), # e.g. `dash_0.5.5.1.orig.tar.gz`
# e.g. `lcrack_20040914.orig.tar.gz`
# e.g. `mkcue_1.orig.tar.gz`
StemParser.new(/_(#{NUMERIC_WITH_OPTIONAL_DOTS}[abc]?)\.orig$/),
# e.g. `https://www.openssl.org/source/openssl-0.9.8s.tar.gz` # e.g. `https://www.openssl.org/source/openssl-0.9.8s.tar.gz`
StemParser.new(/-v?(\d[^-]+)/), StemParser.new(/-v?(\d[^-]+)/),