Fix a quoting problem which caused errors with pie on amd64

vaeth · May 12, 2017 · 3feae1b · 3feae1b
1 parent c4463ac
commit 3feae1b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for schedule
 
+*schedule-v7.5.3:
+	Martin Väth <martin at mvath.de>:
+	- Fix a quoting problem which caused with pie on amd64 the error:
+	  Hexadecimal number > 0xffffffff non-portable at (eval 1) line 1
+
 *schedule-v7.5.2:
 	Martin Väth <martin at mvath.de>:
 	- schedule-tmux --remain: Avoid set-remain-on-exit (for >=tmux-2.4)

diff --git a/bin/schedule b/bin/schedule
@@ -3,7 +3,7 @@
 # This is part of the schedule project.
 
 BEGIN { require 5.012 }
-package Schedule v7.5.0;
+package Schedule v7.5.3;
 
 use strict;
 use warnings;
@@ -147,7 +147,7 @@ if(exists($ENV{'SCHEDULE_OPTS'})) {
 	unshift(@ARGV, &env_to_array('SCHEDULE_OPTS'))
 }
 
-eval "END { $s->did_alpha() || $s->exec_alpha() }";
+eval 'END { $s->did_alpha() || $s->exec_alpha() }';
 
 # Parse Options:
 

diff --git a/bin/schedule-server b/bin/schedule-server
@@ -3,7 +3,7 @@
 # This is part of the schedule project.
 
 BEGIN { require 5.012 }
-package ScheduleServer v7.5.0;
+package ScheduleServer v7.5.3;
 
 use strict;
 use warnings;
@@ -87,7 +87,7 @@ if(exists($ENV{'SCHEDULE_SERVER_OPTS'})) {
 	unshift(@ARGV, &env_to_array('SCHEDULE_OPTS'))
 }
 
-eval "END { $s->did_alpha() || $s->exec_alpha() }";
+eval 'END { $s->did_alpha() || $s->exec_alpha() }';
 
 # Parse Options:
 

diff --git a/share/schedule/Schedule/Connect.pm b/share/schedule/Schedule/Connect.pm
@@ -7,7 +7,7 @@
 # common parts of schedule and schedule-server which are always needed
 
 BEGIN { require 5.012 }
-package Schedule::Connect v7.5.2;
+package Schedule::Connect v7.5.3;
 
 use strict;
 use warnings;
@@ -48,8 +48,11 @@ my $serversupallowed = '';
 # For modules not appearing here, the above defaults apply.
 # If "undefined", no corresponding restriction is required.
 
+my $version753 = $VERSION; #  version->declare('v7.5.3')
 my %minversion = (
 # temporary:
+	'Schedule' => $version753,
+	'ScheduleServer' => $version753,
 
 # Keep the following always:
 	'Schedule::Connect' => undef
@@ -322,6 +325,8 @@ sub get_options {
 	my $s = shift();
 	my @passfile = ();
 	my $quiet = 0;
+	$s->check_version((($s->name()) =~ m{serv}i) ?
+		'ScheduleServer' : 'Schedule');
 	Getopt::Long::Configure(qw(
 		bundling
 		gnu_compat