aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorDominyk Tiller2015-01-30 17:25:56 +0000
committerMike McQuaid2015-02-01 17:31:05 +0100
commit01b8fd53a7ff815f589d5bea360fc5ff496201bc (patch)
treecc5dcb380970b7b725dbfc79eb3f67f565bf1278 /Library/Homebrew
parent22e10f50430c5e9319d90312de83913d7c555105 (diff)
downloadhomebrew-01b8fd53a7ff815f589d5bea360fc5ff496201bc.tar.bz2
ngircd: system openssl fix
Fix for linking into the system OpenSSL, strict audit fixes, and the plist. Closes #36386. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/bottle_version.rb4
-rw-r--r--Library/Homebrew/test/test_bottle_versions.rb5
2 files changed, 9 insertions, 0 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb
index 120eac636..9cba7fbfc 100644
--- a/Library/Homebrew/bottle_version.rb
+++ b/Library/Homebrew/bottle_version.rb
@@ -41,6 +41,10 @@ class BottleVersion < Version
m = /-(\d+[a-z])/.match(stem)
return m.captures.first unless m.nil?
+ # e.g. 22 from ngircd-22.mavericks.bottle.tar.gz
+ m = /-(\d{2})/.match(stem)
+ return m.captures.first unless m.nil?
+
super
end
end
diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb
index 08333020d..05316ec5f 100644
--- a/Library/Homebrew/test/test_bottle_versions.rb
+++ b/Library/Homebrew/test/test_bottle_versions.rb
@@ -65,4 +65,9 @@ class BottleVersionParsingTests < Homebrew::TestCase
assert_version_detected '2007f',
'imap-uw-2007f.yosemite.bottle.tar.gz'
end
+
+ def test_ngircd_style
+ assert_version_detected '22',
+ 'ngircd-22.mavericks.bottle.tar.gz'
+ end
end