aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/libmagic.rb
diff options
context:
space:
mode:
authorMisty De Meo2014-12-18 12:11:26 -0800
committerMisty De Meo2014-12-18 12:59:30 -0800
commit1a5a9e6030bc302eec1f60572ae44461f68bf6df (patch)
tree214d155c764c72f3922023a02408ca7221a30507 /Library/Formula/libmagic.rb
parentea507c6b3aae1c4687ef600d7ff175e91c70b179 (diff)
downloadhomebrew-1a5a9e6030bc302eec1f60572ae44461f68bf6df.tar.bz2
libmagic: adjust patch comment, use upstream commit
Closes #35102. Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Diffstat (limited to 'Library/Formula/libmagic.rb')
-rw-r--r--Library/Formula/libmagic.rb21
1 files changed, 5 insertions, 16 deletions
diff --git a/Library/Formula/libmagic.rb b/Library/Formula/libmagic.rb
index 2b216e956..50731948c 100644
--- a/Library/Formula/libmagic.rb
+++ b/Library/Formula/libmagic.rb
@@ -16,8 +16,12 @@ class Libmagic < Formula
depends_on :python => :optional
+ # Patch applied upstream, should be in 5.22
# See http://bugs.gw.com/view.php?id=230
- patch :DATA if MacOS.version < :lion
+ patch do
+ url "https://github.com/file/file/commit/f79e16aebe701fdb8e821c3c1f3504568d0c10f5.diff"
+ sha1 "7dcbf309bf013c11a6c5367bab8834050d762bd5"
+ end
def install
ENV.universal_binary if build.universal?
@@ -39,18 +43,3 @@ class Libmagic < Formula
rm man1/"file.1"
end
end
-
-__END__
-diff --git a/src/getline.c b/src/getline.c
-index e3c41c4..74c314e 100644
---- a/src/getline.c
-+++ b/src/getline.c
-@@ -76,7 +76,7 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
- }
- }
-
--ssize_t
-+public ssize_t
- getline(char **buf, size_t *bufsiz, FILE *fp)
- {
- return getdelim(buf, bufsiz, '\n', fp);