Compare commits

...
Sign in to create a new pull request.

6 commits
main ... luajit

Author SHA1 Message Date
Jérémy Lal
63ff7389bb Set LUAJIT_LIB, LUAJIT_INC in mod_nginx configure 2022-11-27 17:10:19 +01:00
Jan Mojžíš
491a9c5e34
d/changelog version 1.22.1-2~exp2 2022-11-27 16:12:28 +01:00
Jérémy Lal
ed59f45f38
Update changelog 2022-11-27 16:09:44 +01:00
Jérémy Lal
e341b7b335
nginx-dev provides dh-sequence-nginx 2022-11-27 16:07:07 +01:00
Jérémy Lal
6bbadee3e0
Add buildsystem nginx_mod to dh-sequence nginx 2022-11-27 16:06:19 +01:00
Jan Mojžíš
b0a6e0c3df
release nginx 1.22.1-2~exp1, upload to experimental 2022-11-26 22:27:58 +01:00
4 changed files with 24 additions and 3 deletions

10
debian/changelog vendored
View file

@ -1,5 +1,6 @@
nginx (1.22.1-2) UNRELEASED; urgency=medium
nginx (1.22.1-2~exp2) UNRELEASED; urgency=medium
[ Jan Mojžíš ]
* d/control: fixed spelling-error-in-description
* d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
pidof and ad-hoc tests, tnx Gioele Barabucci
@ -7,11 +8,14 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
* d/p/bug-1024605.patch added: fixes problem when a subrequest has SSI
enabled but its main request does not, the SSI module may crash the worker
due to NULL-pointer dereference. The patch is backported from the upstream
(Closes: 1024605)
* d/control: updated implicit dependencies of third-party modules
for easier transition to third-party modules in separate packages.
-- Jan Mojžíš <jan.mojzis@gmail.com> Fri, 11 Nov 2022 06:15:39 +0100
[ Jérémy Lal ]
* d/debhelper: set nginx_mod buildsystem by default
* d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879)
-- Jan Mojžíš <jan.mojzis@gmail.com> Sun, 27 Nov 2022 16:12:17 +0100
nginx (1.22.1-1) unstable; urgency=medium

1
debian/control vendored
View file

@ -81,6 +81,7 @@ Depends: ${misc:Depends},
zlib1g-dev,
nginx-core (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
nginx-core (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version})
Provides: dh-sequence-nginx
Description: nginx web/proxy server - development headers
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server

View file

@ -3,6 +3,12 @@ use warnings;
use strict;
use Debian::Debhelper::Dh_Lib;
add_command_options( "dh_auto_test", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_configure", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_build", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_install", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_clean", "--buildsystem=nginx_mod" );
insert_after("dh_install", "dh_nginx");
1;

View file

@ -26,6 +26,14 @@ sub _NGINX_SRC_DIR {
"/usr/share/nginx/src"
}
sub _LUAJIT_INC {
"/usr/include/luajit-2.1"
}
sub _LUAJIT_LIB {
"/usr/lib/x86_64-linux-gnu/libluajit-5.1.so"
}
sub new {
my $class=shift;
my $this= $class->SUPER::new(@_);
@ -42,6 +50,8 @@ sub configure {
"src_dir" => $this->get_sourcedir,
"bld_dir" => $this->get_builddir,
"pwd_dir" => $this->{cwd},
"LUAJIT_INC" => $this->_LUAJIT_INC,
"LUAJIT_LIB" => $this->_LUAJIT_LIB
},
}, "bash", "-c", '. ./conf_flags
./configure \\