-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patches for Ubuntu16. Update manual
- Loading branch information
Showing
8 changed files
with
335 additions
and
325 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
--- /usr/share/perl5/Class/DBI.pm 2007-10-04 21:27:07.000000000 +0000 | ||
+++ /usr/share/perl5/Class/DBI.pm.orig 2018-11-06 21:08:32.364069274 +0000 | ||
@@ -597,6 +597,7 @@ | ||
|
||
sub _auto_increment_value { | ||
my $self = shift; | ||
+ my $sth = shift; | ||
my $dbh = $self->db_Main; | ||
|
||
# Try to do this in a standard method. Fall back to MySQL/SQLite | ||
@@ -607,6 +608,7 @@ | ||
my $id = $dbh->last_insert_id(undef, undef, $self->table, undef) # std | ||
|| $dbh->{mysql_insertid} # mysql | ||
|| eval { $dbh->func('last_insert_rowid') } | ||
+ || $sth->{'mysql_insertid'} # Added for MySQL 5.7 | ||
or $self->_croak("Can't get last insert id"); | ||
return $id; | ||
} | ||
@@ -623,7 +625,7 @@ | ||
$self->_bind_param($sth, \@columns); | ||
$sth->execute(values %$data); | ||
my @primary_columns = $self->primary_columns; | ||
- $data->{ $primary_columns[0] } = $self->_auto_increment_value | ||
+ $data->{ $primary_columns[0] } = $self->_auto_increment_value($sth) | ||
if @primary_columns == 1 | ||
&& !defined $data->{ $primary_columns[0] }; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- /etc/init.d/apache2.orig 2018-11-06 20:30:52.478691277 +0000 | ||
+++ /etc/init.d/apache2 2018-11-06 20:32:00.800835274 +0000 | ||
@@ -159,8 +159,11 @@ | ||
fi | ||
|
||
if apache_conftest ; then | ||
+ a2disconf netdot | ||
$APACHE2CTL start | ||
apache_wait_start $? | ||
+ a2enconf netdot | ||
+ $APACHE2CTL graceful | ||
return $? | ||
else | ||
APACHE2_INIT_MESSAGE="The apache2$DIR_SUFFIX configtest failed." |