From b0a6e0c3df112d7e561184e642847b4b70b3d8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Sat, 26 Nov 2022 22:22:17 +0100 Subject: [PATCH 1/6] release nginx 1.22.1-2~exp1, upload to experimental --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4735a81..a056cd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nginx (1.22.1-2) UNRELEASED; urgency=medium +nginx (1.22.1-2~exp1) experimental; urgency=medium * d/control: fixed spelling-error-in-description * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of @@ -7,11 +7,10 @@ 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žíš Fri, 11 Nov 2022 06:15:39 +0100 + -- Jan Mojžíš Sat, 26 Nov 2022 22:27:46 +0100 nginx (1.22.1-1) unstable; urgency=medium From 6bbadee3e09fd33e4130f52eaf9b9339820707bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Sun, 27 Nov 2022 12:53:46 +0100 Subject: [PATCH 2/6] Add buildsystem nginx_mod to dh-sequence nginx --- debian/debhelper/nginx.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debhelper/nginx.pm b/debian/debhelper/nginx.pm index 0473815..0e41120 100644 --- a/debian/debhelper/nginx.pm +++ b/debian/debhelper/nginx.pm @@ -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; From e341b7b335ca87a283be48d6913239bf5b1d21ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Sun, 27 Nov 2022 12:55:48 +0100 Subject: [PATCH 3/6] nginx-dev provides dh-sequence-nginx --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 769452a..f464dd8 100644 --- a/debian/control +++ b/debian/control @@ -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 From ed59f45f38eb084dbff90a37b1d34ee72c0812bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Sun, 27 Nov 2022 12:57:51 +0100 Subject: [PATCH 4/6] Update changelog --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index a056cd7..b471c99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ nginx (1.22.1-2~exp1) experimental; 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 @@ -10,6 +11,10 @@ nginx (1.22.1-2~exp1) experimental; urgency=medium * d/control: updated implicit dependencies of third-party modules for easier transition to third-party modules in separate packages. + [ Jérémy Lal ] + * d/debhelper: set nginx_mod buildsystem by default + * d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879) + -- Jan Mojžíš Sat, 26 Nov 2022 22:27:46 +0100 nginx (1.22.1-1) unstable; urgency=medium From 491a9c5e34589fa7a26345bcee6d6159c0e4dcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Sun, 27 Nov 2022 16:12:28 +0100 Subject: [PATCH 5/6] d/changelog version 1.22.1-2~exp2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b471c99..3bcf095 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nginx (1.22.1-2~exp1) experimental; urgency=medium +nginx (1.22.1-2~exp2) UNRELEASED; urgency=medium [ Jan Mojžíš ] * d/control: fixed spelling-error-in-description @@ -15,7 +15,7 @@ nginx (1.22.1-2~exp1) experimental; urgency=medium * d/debhelper: set nginx_mod buildsystem by default * d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879) - -- Jan Mojžíš Sat, 26 Nov 2022 22:27:46 +0100 + -- Jan Mojžíš Sun, 27 Nov 2022 16:12:17 +0100 nginx (1.22.1-1) unstable; urgency=medium From 63ff7389bbc28537ff3ca58bebe67c620cad9478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Sun, 27 Nov 2022 17:10:19 +0100 Subject: [PATCH 6/6] Set LUAJIT_LIB, LUAJIT_INC in mod_nginx configure --- debian/debhelper/nginx_mod.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm index af37fda..d771cef 100644 --- a/debian/debhelper/nginx_mod.pm +++ b/debian/debhelper/nginx_mod.pm @@ -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 \\