From 63fedb24de185174f24b8a85e8858b8729817ce8 Mon Sep 17 00:00:00 2001 From: farnsworth Date: Mon, 4 Apr 2011 19:12:24 -0400 Subject: [PATCH] changes to add modules and make things a little more "secure" (obscure) --- bin/evalserver | 4 ++++ deps/build_deps.sh | 5 ++--- lib/EvalServer.pm | 3 +++ lib/eval.pl | 16 ++++++++++++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/bin/evalserver b/bin/evalserver index f061926..93114cc 100755 --- a/bin/evalserver +++ b/bin/evalserver @@ -1,5 +1,7 @@ #!/usr/bin/perl +use lib '/home/farnsworth/perl5/lib/perl5'; +use local::lib; # Guess we're being activated inside bin/, so go up a directory. BEGIN { if( not -e 'lib' and not -e 'etc' and -e 'bb3' ) { chdir ".."; } } @@ -7,6 +9,8 @@ use lib 'lib'; use EvalServer; use POSIX qw/setsid/; +$ENV{PATH}="/usr/bin/:/bin/"; + # Only daemonize if we're asked to. if( $ARGV[0] eq '-d' ) { # Crude daemonization diff --git a/deps/build_deps.sh b/deps/build_deps.sh index 5519b28..536eb9e 100755 --- a/deps/build_deps.sh +++ b/deps/build_deps.sh @@ -16,9 +16,8 @@ cd ../.. cd JavaScript-SpiderMonkey-0.19-patched perl Makefile.PL make -make test -sudo make install +make test && make install cd .. -sudo cpan Log::Log4perl +#sudo cpan Log::Log4perl diff --git a/lib/EvalServer.pm b/lib/EvalServer.pm index deb930c..0a5b9d2 100644 --- a/lib/EvalServer.pm +++ b/lib/EvalServer.pm @@ -1,4 +1,7 @@ package EvalServer; + +use lib '/home/farnsworth/perl5/lib/perl5/'; +$ENV{PERL5LIB}="/home/farnsworth/perl5/lib/perl5/x86_64-linux-gnu-thread-multi:/home/farnsworth/perl5/lib/perl5"; use POE; use POE::Wheel::SocketFactory; use POE::Wheel::ReadWrite; diff --git a/lib/eval.pl b/lib/eval.pl index ffe3061..c6535bd 100755 --- a/lib/eval.pl +++ b/lib/eval.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl -use lib '/home/ryan/perl5/lib/perl5'; +use lib '/home/farnsworth/perl5/lib/perl5/x86_64-linux-gnu-thread-multi'; +use lib '/home/farnsworth/perl5/lib/perl5'; use strict; use Data::Dumper; @@ -9,6 +10,16 @@ use BSD::Resource; use File::Glob; use POSIX; +use List::Util; +use List::MoreUtils; +use List::UtilsBy; +use Data::Munge; +use Scalar::MoreUtils; + +require Moose; +require MooseX::Declare; +no warnings; + # This sub is defined here so that it is defined before the 'use charnames' # command. This causes extremely strange interactions that result in the # deparse output being much longer than it should be. @@ -129,7 +140,7 @@ use Storable qw/nfreeze/; nfreeze([]); #Preload Nfreeze since it's loaded on dem my $kilo = 1024; my $meg = $kilo * $kilo; - my $limit = 50 * $meg; + my $limit = 150 * $meg; ( setrlimit(RLIMIT_DATA, $limit, $limit ) @@ -156,6 +167,7 @@ use Storable qw/nfreeze/; nfreeze([]); #Preload Nfreeze since it's loaded on dem ) or die "Failed to set rlimit: $!"; + %ENV=(); #setrlimit(RLIMIT_MSGQUEUE,100,100); die "Failed to drop root: $<" if $< == 0;