Permalink
Browse files

Fix audit warnings

  • Loading branch information...
1 parent e9f9642 commit ca2611f4f1cfd7fbc62b26b4504ebf733335b2be @jacknagel jacknagel committed May 20, 2014
Showing with 43 additions and 47 deletions.
  1. +1 −1 maven30.rb
  2. +1 −1 maven31.rb
  3. +4 −4 mysql51.rb
  4. +5 −5 mysql55.rb
  5. +4 −4 node08.rb
  6. +1 −1 openjpeg20.rb
  7. +3 −3 percona-server55.rb
  8. +2 −2 postgis20.rb
  9. +3 −3 redis1310.rb
  10. +2 −2 ruby182.rb
  11. +2 −2 ruby186.rb
  12. +2 −2 ruby192.rb
  13. +5 −9 ruby193.rb
  14. +2 −2 ruby20.rb
  15. +2 −2 zeromq22.rb
  16. +2 −2 zeromq3.rb
  17. +2 −2 zeromq32.rb
View
2 maven30.rb
@@ -10,7 +10,7 @@ def install
rm_f Dir["bin/*.bat"]
# Fix the permissions on the global settings file.
- chmod 0644, Dir["conf/settings.xml"]
+ chmod 0644, "conf/settings.xml"
prefix.install_metafiles
libexec.install Dir['*']
View
2 maven31.rb
@@ -10,7 +10,7 @@ def install
rm_f Dir["bin/*.bat"]
# Fix the permissions on the global settings file.
- chmod 0644, Dir["conf/settings.xml"]
+ chmod 0644, "conf/settings.xml"
prefix.install_metafiles
libexec.install Dir['*']
View
8 mysql51.rb
@@ -44,17 +44,17 @@ def install
"--with-partition"]
configure_args << "--without-server" if build.include? 'client-only'
- configure_args << "--with-embedded-server" if build.include? 'with-embedded'
- configure_args << "--with-charset=utf8" if build.include? 'with-utf8-default'
+ configure_args << "--with-embedded-server" if build.with? 'embedded'
+ configure_args << "--with-charset=utf8" if build.with? 'utf8-default'
system "./configure", *configure_args
system "make install"
ln_s "#{libexec}/mysqld", bin
ln_s "#{share}/mysql/mysql.server", bin
- (prefix+'mysql-test').rmtree unless build.include? 'with-tests' # save 66MB!
- (prefix+'sql-bench').rmtree unless build.include? 'with-bench'
+ (prefix+'mysql-test').rmtree if build.without? 'tests' # save 66MB!
+ (prefix+'sql-bench').rmtree if build.without? 'bench'
end
def caveats; <<-EOS.undent
View
10 mysql55.rb
@@ -48,23 +48,23 @@ def install
"-DSYSCONFDIR=#{etc}"]
# To enable unit testing at build, we need to download the unit testing suite
- if build.include? 'with-tests'
+ if build.with? 'tests'
args << "-DENABLE_DOWNLOADS=ON"
else
args << "-DWITH_UNIT_TESTS=OFF"
end
# Build the embedded server
- args << "-DWITH_EMBEDDED_SERVER=ON" if build.include? 'with-embedded'
+ args << "-DWITH_EMBEDDED_SERVER=ON" if build.with? 'embedded'
# Compile with readline unless libedit is explicitly chosen
- args << "-DWITH_READLINE=yes" unless build.include? 'with-libedit'
+ args << "-DWITH_READLINE=yes" if build.without? 'libedit'
# Compile with ARCHIVE engine enabled if chosen
- args << "-DWITH_ARCHIVE_STORAGE_ENGINE=1" if build.include? 'with-archive-storage-engine'
+ args << "-DWITH_ARCHIVE_STORAGE_ENGINE=1" if build.with? 'archive-storage-engine'
# Compile with BLACKHOLE engine enabled if chosen
- args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.include? 'with-blackhole-storage-engine'
+ args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.with? 'blackhole-storage-engine'
# Make universal for binding to universal applications
if build.universal?
View
8 node08.rb
@@ -49,7 +49,7 @@ class Node08 < Formula
option 'without-npm', 'npm will not be installed'
option 'with-shared-libs', 'Use Homebrew V8 and system OpenSSL, zlib'
- depends_on NpmNotInstalled unless build.without? 'npm'
+ depends_on NpmNotInstalled if build.with? 'npm'
depends_on PythonVersion
depends_on 'v8' if build.with? 'shared-libs'
@@ -78,12 +78,12 @@ def install
end
args << "--debug" if build.include? 'enable-debug'
- args << "--without-npm" if build.include? 'without-npm'
+ args << "--without-npm" if build.without? 'npm'
system "./configure", *args
system "make install"
- unless build.include? 'without-npm'
+ if build.with? 'npm'
(lib/"node_modules/npm/npmrc").write(npmrc)
end
end
@@ -107,7 +107,7 @@ def npmrc
end
def caveats
- if build.include? 'without-npm'
+ if build.without? 'npm'
<<-EOS.undent
Homebrew has NOT installed npm. We recommend the following method of
installation:
View
2 openjpeg20.rb
@@ -2,7 +2,7 @@
class Openjpeg20 < Formula
homepage "http://www.openjpeg.org/"
- url "http://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz"
+ url "https://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz"
sha1 "0af78ab2283b43421458f80373422d8029a9f7a7"
depends_on "cmake" => :build
View
6 percona-server55.rb
@@ -69,17 +69,17 @@ def install
]
# To enable unit testing at build, we need to download the unit testing suite
- if build.include? 'with-tests'
+ if build.with? 'tests'
args << "-DENABLE_DOWNLOADS=ON"
else
args << "-DWITH_UNIT_TESTS=OFF"
end
# Build the embedded server
- args << "-DWITH_EMBEDDED_SERVER=ON" if build.include? 'with-embedded'
+ args << "-DWITH_EMBEDDED_SERVER=ON" if build.with? 'embedded'
# Compile with readline unless libedit is explicitly chosen
- args << "-DWITH_READLINE=yes" unless build.include? 'with-libedit'
+ args << "-DWITH_READLINE=yes" if build.without? 'libedit'
# Make universal for binding to universal applications
if build.universal?
View
4 postgis20.rb
@@ -18,7 +18,7 @@ class Postgis20 < Formula
depends_on 'proj'
depends_on 'geos'
- depends_on 'gtk+' if build.include? 'with-gui'
+ depends_on 'gtk+' if build.with? 'gui'
# For GeoJSON and raster handling
depends_on 'json-c'
@@ -53,7 +53,7 @@ def install
# gettext installations are.
"--disable-nls"
]
- args << '--with-gui' if build.include? 'with-gui'
+ args << '--with-gui' if build.with? 'gui'
system './autogen.sh'
system './configure', *args
View
6 redis1310.rb
@@ -2,8 +2,8 @@
class Redis1310 < Formula
homepage 'http://redis.io/'
- url 'https://github.com/antirez/redis/tarball/v1.3.10'
- sha1 'e4d22d8b0df0e9d686069a40bff4b91219c68676'
+ url 'https://github.com/antirez/redis/archive/v1.3.10.tar.gz'
+ sha1 '5fff0785362faa3e21691a442d262734abc85c3f'
fails_with :llvm do
build 2334
@@ -61,4 +61,4 @@ def plist; <<-EOS.undent
</plist>
EOS
end
-end
+end
View
4 ruby182.rb
@@ -38,8 +38,8 @@ def install
args = %W[--prefix=#{prefix} --mandir=#{man} --enable-shared]
args << "--program-suffix=20" if build.with? "suffix"
args << "--with-arch=#{Hardware::CPU.universal_archs.join(',')}" if build.universal?
- args << "--with-out-ext=tk" unless build.with? "tcltk"
- args << "--disable-install-doc" unless build.with? "doc"
+ args << "--with-out-ext=tk" if build.without? "tcltk"
+ args << "--disable-install-doc" if build.without? "doc"
args << "--disable-dtrace" unless MacOS::CLT.installed?
# OpenSSL is deprecated on OS X 10.8 and Ruby can't find the outdated
View
4 ruby186.rb
@@ -36,8 +36,8 @@ def install
args = %W[--prefix=#{prefix} --enable-shared]
args << "--program-suffix=20" if build.with? "suffix"
args << "--with-arch=#{Hardware::CPU.universal_archs.join(',')}" if build.universal?
- args << "--with-out-ext=tk" unless build.with? "tcltk"
- args << "--disable-install-doc" unless build.with? "doc"
+ args << "--with-out-ext=tk" if build.without? "tcltk"
+ args << "--disable-install-doc" if build.without? "doc"
args << "--disable-dtrace" unless MacOS::CLT.installed?
# OpenSSL is deprecated on OS X 10.8 and Ruby can't find the outdated
View
4 ruby192.rb
@@ -22,7 +22,7 @@ def install
args = %W[--prefix=#{prefix}
--enable-shared]
- args << "--program-suffix=192" if build.include? 'with-suffix'
+ args << "--program-suffix=192" if build.with? 'suffix'
args << "--with-arch=x86_64,i386" if build.universal?
# Put gem, site and vendor folders in the HOMEBREW_PREFIX
@@ -38,7 +38,7 @@ def install
system "./configure", *args
system "make"
system "make install"
- system "make install-doc" if build.include? 'with-doc'
+ system "make install-doc" if build.with? 'doc'
end
View
14 ruby193.rb
@@ -10,15 +10,11 @@ class Ruby193 < Formula
option 'with-doc', 'Install documentation'
option 'with-tcltk', 'Install with Tcl/Tk support'
- if build.universal?
- depends_on 'autoconf' => :build
- end
-
depends_on 'pkg-config' => :build
depends_on 'readline'
depends_on 'gdbm'
depends_on 'libyaml'
- depends_on :x11 if build.include? 'with-tcltk'
+ depends_on :x11 if build.with? 'tcltk'
fails_with :llvm do
build 2326
@@ -28,10 +24,10 @@ def install
args = ["--prefix=#{prefix}",
"--enable-shared"]
- args << "--program-suffix=193" if build.include? "with-suffix"
+ args << "--program-suffix=193" if build.with? "suffix"
args << "--with-arch=x86_64,i386" if build.universal?
- args << "--disable-tcltk-framework" << "--with-out-ext=tcl" << "--with-out-ext=tk" unless build.include? "with-tcltk"
- args << "--disable-install-doc" unless build.include? "with-doc"
+ args << "--disable-tcltk-framework" << "--with-out-ext=tcl" << "--with-out-ext=tk" if build.without? "tcltk"
+ args << "--disable-install-doc" if build.without? "doc"
# Put gem, site and vendor folders in the HOMEBREW_PREFIX
ruby_lib = HOMEBREW_PREFIX/"lib/ruby"
@@ -46,7 +42,7 @@ def install
system "./configure", *args
system "make"
system "make install"
- system "make install-doc" if build.include? "with-doc"
+ system "make install-doc" if build.with? "doc"
end
View
4 ruby20.rb
@@ -26,8 +26,8 @@ def install
args = %W[--prefix=#{prefix} --enable-shared]
args << "--program-suffix=20" if build.with? "suffix"
args << "--with-arch=#{Hardware::CPU.universal_archs.join(',')}" if build.universal?
- args << "--with-out-ext=tk" unless build.with? "tcltk"
- args << "--disable-install-doc" unless build.with? "doc"
+ args << "--with-out-ext=tk" if build.without? "tcltk"
+ args << "--disable-install-doc" if build.without? "doc"
args << "--disable-dtrace" unless MacOS::CLT.installed?
paths = []
View
4 zeromq22.rb
@@ -8,7 +8,7 @@ class Zeromq22 < Formula
keg_only 'Conflicts with zeromq in main repository.'
depends_on 'pkg-config' => :build
- depends_on 'libpgm' if build.include? 'with-pgm'
+ depends_on 'libpgm' if build.with? 'pgm'
fails_with :llvm do
build 2326
@@ -42,7 +42,7 @@ def build_fat
def do_config
args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
- if build.include? 'with-pgm'
+ if build.with? 'pgm'
# Use HB libpgm-5.2 because their internal 5.1 is b0rked.
ENV['OpenPGM_CFLAGS'] = %x[pkg-config --cflags openpgm-5.2].chomp
ENV['OpenPGM_LIBS'] = %x[pkg-config --libs openpgm-5.2].chomp
View
4 zeromq3.rb
@@ -11,13 +11,13 @@ class Zeromq3 < Formula
option 'with-pgm', 'Build with PGM extension'
depends_on 'pkg-config' => :build
- depends_on 'libpgm' if build.include? 'with-pgm'
+ depends_on 'libpgm' if build.with? 'pgm'
def install
ENV.universal_binary if build.universal?
args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
- if build.include? 'with-pgm'
+ if build.with? 'pgm'
# Use HB libpgm-5.2 because their internal 5.1 is b0rked.
ENV['OpenPGM_CFLAGS'] = %x[pkg-config --cflags openpgm-5.2].chomp
ENV['OpenPGM_LIBS'] = %x[pkg-config --libs openpgm-5.2].chomp
View
4 zeromq32.rb
@@ -9,13 +9,13 @@ class Zeromq32 < Formula
option 'with-pgm', 'Build with PGM extension'
depends_on 'pkg-config' => :build
- depends_on 'libpgm' if build.include? 'with-pgm'
+ depends_on 'libpgm' if build.with? 'pgm'
def install
ENV.universal_binary if build.universal?
args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
- if build.include? 'with-pgm'
+ if build.with? 'pgm'
# Use HB libpgm-5.2 because their internal 5.1 is b0rked.
ENV['OpenPGM_CFLAGS'] = %x[pkg-config --cflags openpgm-5.2].chomp
ENV['OpenPGM_LIBS'] = %x[pkg-config --libs openpgm-5.2].chomp

0 comments on commit ca2611f

Please sign in to comment.