From 8458df16722d8dcf1c8634b38f7900fc843f9587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Thu, 5 Jan 2023 16:44:10 +0100 Subject: [PATCH 1/5] only 'core' flavour, light/extras replaced by a dependency package --- debian/control | 43 +++++++++--------- debian/libnginx-mod-http-geoip.nginx | 2 +- debian/libnginx-mod-http-image-filter.nginx | 2 +- debian/libnginx-mod-http-perl.install | 4 +- debian/libnginx-mod-http-perl.nginx | 2 +- debian/libnginx-mod-http-xslt-filter.nginx | 2 +- debian/libnginx-mod-mail.nginx | 2 +- debian/libnginx-mod-stream-geoip.nginx | 2 +- debian/libnginx-mod-stream.nginx | 2 +- debian/nginx-extras.NEWS | 6 --- debian/nginx-extras.install | 1 - debian/nginx-extras.manpages | 1 - debian/nginx-extras.postinst | 33 -------------- debian/nginx-extras.prerm | 22 --------- debian/nginx-extras.triggers | 1 - debian/nginx-light.dirs | 1 - debian/nginx-light.install | 1 - debian/nginx-light.manpages | 1 - debian/nginx-light.postinst | 33 -------------- debian/nginx-light.prerm | 22 --------- debian/nginx-light.triggers | 1 - debian/rules | 49 +++++++-------------- 22 files changed, 46 insertions(+), 187 deletions(-) delete mode 100644 debian/nginx-extras.NEWS delete mode 100644 debian/nginx-extras.install delete mode 100644 debian/nginx-extras.manpages delete mode 100644 debian/nginx-extras.postinst delete mode 100644 debian/nginx-extras.prerm delete mode 100644 debian/nginx-extras.triggers delete mode 100644 debian/nginx-light.dirs delete mode 100644 debian/nginx-light.install delete mode 100644 debian/nginx-light.manpages delete mode 100644 debian/nginx-light.postinst delete mode 100644 debian/nginx-light.prerm delete mode 100644 debian/nginx-light.triggers diff --git a/debian/control b/debian/control index ec51b4a..dcfe662 100644 --- a/debian/control +++ b/debian/control @@ -87,10 +87,9 @@ Depends: libnginx-mod-http-geoip (= ${binary:Version}), iproute2, ${misc:Depends}, ${shlibs:Depends} -Breaks: nginx-full (<< 1.18.0-1), -Replaces: nginx-full (<< 1.18.0-1), +Breaks: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~) +Replaces: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-light Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (standard version) Nginx ("engine X") is a high-performance web and reverse proxy server @@ -155,22 +154,20 @@ Description: nginx web/proxy server (standard version with 3rd parties) Upstream Fair Queue. Package: nginx-light -Architecture: any +Architecture: all Depends: libnginx-mod-http-echo (>= 1:0.63-3~), - nginx-common (<< ${source:Version}.1~), - nginx-common (>= ${source:Version}), - iproute2, + nginx-core (>= ${source:Version}), + nginx-core (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-core Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (basic version) 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 and as a proxy to reduce the load on back-end HTTP or mail servers. . - This package provides a very light version of nginx with only the + This metapackage provides a very light version of nginx with only the minimal set of features and modules. . STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Empty GIF, @@ -189,35 +186,39 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~), libnginx-mod-http-dav-ext (>= 1:3.0.0-2~), libnginx-mod-http-echo (>= 1:0.63-3~), libnginx-mod-http-fancyindex (>= 1:0.5.2-2~), - libnginx-mod-http-geoip (= ${binary:Version}), + libnginx-mod-http-geoip (>= ${binary:Version}), + libnginx-mod-http-geoip (<< ${binary:Version}.1~), libnginx-mod-http-geoip2 (>= 1:3.4-2~), libnginx-mod-http-headers-more-filter (>= 1:0.34-2~), - libnginx-mod-http-image-filter (= ${binary:Version}), + libnginx-mod-http-image-filter (>= ${binary:Version}), + libnginx-mod-http-image-filter (<< ${binary:Version}.1~), libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc], - libnginx-mod-http-perl (= ${binary:Version}), + libnginx-mod-http-perl (>= ${binary:Version}), + libnginx-mod-http-perl (<< ${binary:Version}.1~), libnginx-mod-http-subs-filter (>= 1:0.6.4-2~), libnginx-mod-http-uploadprogress (>= 1:0.9.2-2~), libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~), - libnginx-mod-http-xslt-filter (= ${binary:Version}), - libnginx-mod-mail (= ${binary:Version}), + libnginx-mod-http-xslt-filter (>= ${binary:Version}), + libnginx-mod-http-xslt-filter (<< ${binary:Version}.1~), + libnginx-mod-mail (>= ${binary:Version}), + libnginx-mod-mail (<< ${binary:Version}.1~), libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~), - libnginx-mod-stream (= ${binary:Version}), - libnginx-mod-stream-geoip (= ${binary:Version}), + libnginx-mod-stream (>= ${binary:Version}), + libnginx-mod-stream-geoip (>= ${binary:Version}), + libnginx-mod-stream-geoip (<< ${binary:Version}.1~), libnginx-mod-stream-geoip2 (>= 1:3.4-2~), - nginx-common (<< ${source:Version}.1~), - nginx-common (>= ${source:Version}), - iproute2, + nginx-core (>= ${source:Version}), + nginx-core (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-core, nginx-light Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (extended version) 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 and as a proxy to reduce the load on back-end HTTP or mail servers. . - This package provides a version of nginx with the standard modules, plus + This metapackage provides a version of nginx with the standard modules, plus extra features and modules such as the Perl module, which allows the addition of Perl in configuration files. . diff --git a/debian/libnginx-mod-http-geoip.nginx b/debian/libnginx-mod-http-geoip.nginx index 78c206f..c37c6f8 100755 --- a/debian/libnginx-mod-http-geoip.nginx +++ b/debian/libnginx-mod-http-geoip.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-http-image-filter.nginx b/debian/libnginx-mod-http-image-filter.nginx index 78c206f..c37c6f8 100755 --- a/debian/libnginx-mod-http-image-filter.nginx +++ b/debian/libnginx-mod-http-image-filter.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-http-perl.install b/debian/libnginx-mod-http-perl.install index 14ca692..779bedb 100755 --- a/debian/libnginx-mod-http-perl.install +++ b/debian/libnginx-mod-http-perl.install @@ -3,5 +3,5 @@ use Config; my $vendorarch = substr($Config{vendorarch}, 1); -print "debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n"; -print "debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n"; +print "debian/build-core/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n"; +print "debian/build-core/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n"; diff --git a/debian/libnginx-mod-http-perl.nginx b/debian/libnginx-mod-http-perl.nginx index 78c206f..c37c6f8 100755 --- a/debian/libnginx-mod-http-perl.nginx +++ b/debian/libnginx-mod-http-perl.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-http-xslt-filter.nginx b/debian/libnginx-mod-http-xslt-filter.nginx index 78c206f..c37c6f8 100755 --- a/debian/libnginx-mod-http-xslt-filter.nginx +++ b/debian/libnginx-mod-http-xslt-filter.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-mail.nginx b/debian/libnginx-mod-mail.nginx index 78c206f..c37c6f8 100755 --- a/debian/libnginx-mod-mail.nginx +++ b/debian/libnginx-mod-mail.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-stream-geoip.nginx b/debian/libnginx-mod-stream-geoip.nginx index 9acb103..b5603ee 100755 --- a/debian/libnginx-mod-stream-geoip.nginx +++ b/debian/libnginx-mod-stream-geoip.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n"; diff --git a/debian/libnginx-mod-stream.nginx b/debian/libnginx-mod-stream.nginx index 78c206f..c37c6f8 100755 --- a/debian/libnginx-mod-stream.nginx +++ b/debian/libnginx-mod-stream.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/nginx-extras.NEWS b/debian/nginx-extras.NEWS deleted file mode 100644 index d4fff37..0000000 --- a/debian/nginx-extras.NEWS +++ /dev/null @@ -1,6 +0,0 @@ -nginx-extras (1.10.1-2) unstable; urgency=medium - - Starting with this release the HTTP Push module has been replaced by Nchan. - More info for the upgrade can be found at https://nchan.slact.net/upgrade. - - -- Christos Trochalakis Wed, 31 Aug 2016 15:07:20 +0300 diff --git a/debian/nginx-extras.install b/debian/nginx-extras.install deleted file mode 100644 index 833c24b..0000000 --- a/debian/nginx-extras.install +++ /dev/null @@ -1 +0,0 @@ -debian/build-extras/objs/nginx usr/sbin diff --git a/debian/nginx-extras.manpages b/debian/nginx-extras.manpages deleted file mode 100644 index 6dd6a30..0000000 --- a/debian/nginx-extras.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/build-extras/objs/nginx.8 diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst deleted file mode 100644 index 80be4de..0000000 --- a/debian/nginx-extras.postinst +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - abort-upgrade|abort-remove|abort-deconfigure|configure) - ;; - triggered) - if invoke-rc.d --quiet nginx status >/dev/null; then - echo "Triggering nginx reload ..." - invoke-rc.d nginx reload || true - fi - exit 0 - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -if invoke-rc.d --quiet nginx status >/dev/null; then - invoke-rc.d nginx upgrade || invoke-rc.d nginx restart - exit $? -else - if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then - invoke-rc.d nginx start || exit $? - echo "Not attempting to start NGINX, port 80 is already in use." - exit 0 - fi -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/nginx-extras.prerm b/debian/nginx-extras.prerm deleted file mode 100644 index a2e3838..0000000 --- a/debian/nginx-extras.prerm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - remove|remove-in-favour|deconfigure|deconfigure-in-favour) - if [ -x /etc/init.d/nginx ]; then - invoke-rc.d nginx stop || exit $? - fi - ;; - - upgrade|failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/nginx-extras.triggers b/debian/nginx-extras.triggers deleted file mode 100644 index efb0515..0000000 --- a/debian/nginx-extras.triggers +++ /dev/null @@ -1 +0,0 @@ -interest-noawait nginx-reload diff --git a/debian/nginx-light.dirs b/debian/nginx-light.dirs deleted file mode 100644 index 236670a..0000000 --- a/debian/nginx-light.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/debian/nginx-light.install b/debian/nginx-light.install deleted file mode 100644 index 8c2d90f..0000000 --- a/debian/nginx-light.install +++ /dev/null @@ -1 +0,0 @@ -debian/build-light/objs/nginx usr/sbin diff --git a/debian/nginx-light.manpages b/debian/nginx-light.manpages deleted file mode 100644 index 06143d4..0000000 --- a/debian/nginx-light.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/build-light/objs/nginx.8 diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst deleted file mode 100644 index 80be4de..0000000 --- a/debian/nginx-light.postinst +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - abort-upgrade|abort-remove|abort-deconfigure|configure) - ;; - triggered) - if invoke-rc.d --quiet nginx status >/dev/null; then - echo "Triggering nginx reload ..." - invoke-rc.d nginx reload || true - fi - exit 0 - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -if invoke-rc.d --quiet nginx status >/dev/null; then - invoke-rc.d nginx upgrade || invoke-rc.d nginx restart - exit $? -else - if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then - invoke-rc.d nginx start || exit $? - echo "Not attempting to start NGINX, port 80 is already in use." - exit 0 - fi -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/nginx-light.prerm b/debian/nginx-light.prerm deleted file mode 100644 index a2e3838..0000000 --- a/debian/nginx-light.prerm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - remove|remove-in-favour|deconfigure|deconfigure-in-favour) - if [ -x /etc/init.d/nginx ]; then - invoke-rc.d nginx stop || exit $? - fi - ;; - - upgrade|failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/nginx-light.triggers b/debian/nginx-light.triggers deleted file mode 100644 index efb0515..0000000 --- a/debian/nginx-light.triggers +++ /dev/null @@ -1 +0,0 @@ -interest-noawait nginx-reload diff --git a/debian/rules b/debian/rules index c852729..0c2235c 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS) debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC -FLAVOURS := core light extras +FLAVOURS := core DYN_MODS := \ http-geoip \ http-image-filter \ @@ -53,53 +53,34 @@ basic_configure_flags := \ --with-http_v2_module \ --with-http_dav_module \ --with-http_slice_module \ - --with-threads + --with-threads \ + --with-http_addition_module \ + --with-http_flv_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_mp4_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_sub_module \ + --with-mail_ssl_module \ + --with-stream_ssl_module \ + --with-stream_ssl_preread_module \ + --with-stream_realip_module common_configure_flags := \ --with-cc-opt="$(debian_cflags)" \ --with-ld-opt="$(debian_ldflags)" \ $(basic_configure_flags) -light_configure_flags := \ - $(common_configure_flags) \ - --with-http_gzip_static_module \ - --without-http_browser_module \ - --without-http_geo_module \ - --without-http_limit_req_module \ - --without-http_limit_conn_module \ - --without-http_memcached_module \ - --without-http_referer_module \ - --without-http_split_clients_module \ - --without-http_userid_module - core_configure_flags := \ $(common_configure_flags) \ - --with-http_addition_module \ - --with-http_gunzip_module \ - --with-http_gzip_static_module \ - --with-http_sub_module \ - -extras_configure_flags := \ - $(common_configure_flags) \ - --with-http_addition_module \ - --with-http_flv_module \ --with-http_geoip_module=dynamic \ - --with-http_gunzip_module \ - --with-http_gzip_static_module \ --with-http_image_filter_module=dynamic \ - --with-http_mp4_module \ --with-http_perl_module=dynamic \ - --with-http_random_index_module \ - --with-http_secure_link_module \ - --with-http_sub_module \ --with-http_xslt_module=dynamic \ --with-mail=dynamic \ - --with-mail_ssl_module \ --with-stream=dynamic \ - --with-stream_geoip_module=dynamic \ - --with-stream_ssl_module \ - --with-stream_ssl_preread_module \ - --with-stream_realip_module + --with-stream_geoip_module=dynamic %: dh $@ --without autoreconf From 942593c46199edc3893db3afeb2ee2be040d1a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Thu, 5 Jan 2023 17:25:49 +0100 Subject: [PATCH 2/5] add nginx-bin, nginx-{core,light,full,extras} are metapackages --- debian/control | 59 ++++++++++++------- debian/libnginx-mod-http-geoip.nginx | 2 +- debian/libnginx-mod-http-image-filter.nginx | 2 +- debian/libnginx-mod-http-perl.install | 4 +- debian/libnginx-mod-http-perl.nginx | 2 +- debian/libnginx-mod-http-xslt-filter.nginx | 2 +- debian/libnginx-mod-mail.nginx | 2 +- debian/libnginx-mod-stream-geoip.nginx | 2 +- debian/libnginx-mod-stream.nginx | 2 +- debian/{nginx-core.dirs => nginx-bin.dirs} | 0 debian/nginx-bin.install | 1 + debian/nginx-bin.manpages | 1 + ...nginx-core.postinst => nginx-bin.postinst} | 0 debian/{nginx-core.prerm => nginx-bin.prerm} | 0 ...nginx-core.triggers => nginx-bin.triggers} | 0 debian/nginx-core.install | 1 - debian/nginx-core.manpages | 1 - debian/rules | 4 +- 18 files changed, 51 insertions(+), 34 deletions(-) rename debian/{nginx-core.dirs => nginx-bin.dirs} (100%) create mode 100644 debian/nginx-bin.install create mode 100644 debian/nginx-bin.manpages rename debian/{nginx-core.postinst => nginx-bin.postinst} (100%) rename debian/{nginx-core.prerm => nginx-bin.prerm} (100%) rename debian/{nginx-core.triggers => nginx-bin.triggers} (100%) delete mode 100644 debian/nginx-core.install delete mode 100644 debian/nginx-core.manpages diff --git a/debian/control b/debian/control index dcfe662..df2890c 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,8 @@ Rules-Requires-Root: no Package: nginx Architecture: all -Depends: nginx-core (<< ${source:Version}.1~) | nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~), - nginx-core (>= ${source:Version}) | nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}), +Depends: nginx-bin (<< ${source:Version}.1~), + nginx-bin (>= ${source:Version}), ${misc:Depends} Description: small, powerful, scalable web/proxy server Nginx ("engine X") is a high-performance web and reverse proxy server @@ -33,6 +33,24 @@ Description: small, powerful, scalable web/proxy server This is a dependency package to install either nginx-core (by default), nginx-full, nginx-light or nginx-extras. +Package: nginx-bin +Architecture: any +Depends: iproute2, + nginx-common (<< ${source:Version}.1~), + nginx-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~), nginx-core (<< 1.22.1-5~), +Replaces: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~), nginx-core (<< 1.22.1-5~), +Provides: httpd, httpd-cgi, nginx +Suggests: nginx-doc (= ${source:Version}) +Description: nginx web/proxy server (standard version) + 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 + and as a proxy to reduce the load on back-end HTTP or mail servers. + . + This package contains nginx binary. + Package: nginx-doc Architecture: all Multi-Arch: foreign @@ -62,8 +80,8 @@ Package: nginx-dev Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, ${S:Build-Depends}, - 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}) + nginx-bin (<< ${source:Version}.1~), + nginx-bin (>= ${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 @@ -75,20 +93,19 @@ Description: nginx web/proxy server - development headers additions to the Debian nginx web/proxy server packages. Package: nginx-core -Architecture: any -Depends: libnginx-mod-http-geoip (= ${binary:Version}), - libnginx-mod-http-image-filter (= ${binary:Version}), - libnginx-mod-http-xslt-filter (= ${binary:Version}), - libnginx-mod-mail (= ${binary:Version}), - libnginx-mod-stream (= ${binary:Version}), - libnginx-mod-stream-geoip (= ${binary:Version}), +Architecture: all +Depends: libnginx-mod-http-geoip (= ${source:Version}), + libnginx-mod-http-image-filter (= ${source:Version}), + libnginx-mod-http-xslt-filter (= ${source:Version}), + libnginx-mod-mail (= ${source:Version}), + libnginx-mod-stream (= ${source:Version}), + libnginx-mod-stream-geoip (= ${source:Version}), nginx-common (<< ${source:Version}.1~), nginx-common (>= ${source:Version}), - iproute2, + nginx-bin (>= ${source:Version}), + nginx-bin (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} -Breaks: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~) -Replaces: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~) Provides: httpd, httpd-cgi, nginx Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (standard version) @@ -96,7 +113,7 @@ Description: nginx web/proxy server (standard version) created by Igor Sysoev. It can be used both as a standalone web server and as a proxy to reduce the load on back-end HTTP or mail servers. . - This package provides a version of nginx identical to that of nginx-full, + This metapackage provides a version of nginx identical to that of nginx-full, but without any third-party modules, and only modules in the original nginx code base. . @@ -122,8 +139,8 @@ Depends: libnginx-mod-http-auth-pam, libnginx-mod-http-subs-filter, libnginx-mod-http-upstream-fair, libnginx-mod-stream-geoip2, - nginx-core (>= ${source:Version}), - nginx-core (<< ${source:Version}.1~), + nginx-bin (>= ${source:Version}), + nginx-bin (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} Provides: httpd, httpd-cgi, nginx @@ -156,8 +173,8 @@ Description: nginx web/proxy server (standard version with 3rd parties) Package: nginx-light Architecture: all Depends: libnginx-mod-http-echo (>= 1:0.63-3~), - nginx-core (>= ${source:Version}), - nginx-core (<< ${source:Version}.1~), + nginx-bin (>= ${source:Version}), + nginx-bin (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} Provides: httpd, httpd-cgi, nginx @@ -207,8 +224,8 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~), libnginx-mod-stream-geoip (>= ${binary:Version}), libnginx-mod-stream-geoip (<< ${binary:Version}.1~), libnginx-mod-stream-geoip2 (>= 1:3.4-2~), - nginx-core (>= ${source:Version}), - nginx-core (<< ${source:Version}.1~), + nginx-bin (>= ${source:Version}), + nginx-bin (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} Provides: httpd, httpd-cgi, nginx diff --git a/debian/libnginx-mod-http-geoip.nginx b/debian/libnginx-mod-http-geoip.nginx index c37c6f8..0ca730a 100755 --- a/debian/libnginx-mod-http-geoip.nginx +++ b/debian/libnginx-mod-http-geoip.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-http-image-filter.nginx b/debian/libnginx-mod-http-image-filter.nginx index c37c6f8..0ca730a 100755 --- a/debian/libnginx-mod-http-image-filter.nginx +++ b/debian/libnginx-mod-http-image-filter.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-http-perl.install b/debian/libnginx-mod-http-perl.install index 779bedb..7382eca 100755 --- a/debian/libnginx-mod-http-perl.install +++ b/debian/libnginx-mod-http-perl.install @@ -3,5 +3,5 @@ use Config; my $vendorarch = substr($Config{vendorarch}, 1); -print "debian/build-core/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n"; -print "debian/build-core/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n"; +print "debian/build-bin/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n"; +print "debian/build-bin/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n"; diff --git a/debian/libnginx-mod-http-perl.nginx b/debian/libnginx-mod-http-perl.nginx index c37c6f8..0ca730a 100755 --- a/debian/libnginx-mod-http-perl.nginx +++ b/debian/libnginx-mod-http-perl.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-http-xslt-filter.nginx b/debian/libnginx-mod-http-xslt-filter.nginx index c37c6f8..0ca730a 100755 --- a/debian/libnginx-mod-http-xslt-filter.nginx +++ b/debian/libnginx-mod-http-xslt-filter.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-mail.nginx b/debian/libnginx-mod-mail.nginx index c37c6f8..0ca730a 100755 --- a/debian/libnginx-mod-mail.nginx +++ b/debian/libnginx-mod-mail.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/libnginx-mod-stream-geoip.nginx b/debian/libnginx-mod-stream-geoip.nginx index b5603ee..438ee46 100755 --- a/debian/libnginx-mod-stream-geoip.nginx +++ b/debian/libnginx-mod-stream-geoip.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n"; diff --git a/debian/libnginx-mod-stream.nginx b/debian/libnginx-mod-stream.nginx index c37c6f8..0ca730a 100755 --- a/debian/libnginx-mod-stream.nginx +++ b/debian/libnginx-mod-stream.nginx @@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//; $modulepath = $module; $modulepath =~ s/-/_/g; -print "mod debian/build-core/objs/ngx_${modulepath}_module.so\n"; +print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n"; print "mod debian/libnginx-mod.conf/mod-${module}.conf\n"; diff --git a/debian/nginx-core.dirs b/debian/nginx-bin.dirs similarity index 100% rename from debian/nginx-core.dirs rename to debian/nginx-bin.dirs diff --git a/debian/nginx-bin.install b/debian/nginx-bin.install new file mode 100644 index 0000000..f268f7f --- /dev/null +++ b/debian/nginx-bin.install @@ -0,0 +1 @@ +debian/build-bin/objs/nginx usr/sbin diff --git a/debian/nginx-bin.manpages b/debian/nginx-bin.manpages new file mode 100644 index 0000000..b62c815 --- /dev/null +++ b/debian/nginx-bin.manpages @@ -0,0 +1 @@ +debian/build-bin/objs/nginx.8 diff --git a/debian/nginx-core.postinst b/debian/nginx-bin.postinst similarity index 100% rename from debian/nginx-core.postinst rename to debian/nginx-bin.postinst diff --git a/debian/nginx-core.prerm b/debian/nginx-bin.prerm similarity index 100% rename from debian/nginx-core.prerm rename to debian/nginx-bin.prerm diff --git a/debian/nginx-core.triggers b/debian/nginx-bin.triggers similarity index 100% rename from debian/nginx-core.triggers rename to debian/nginx-bin.triggers diff --git a/debian/nginx-core.install b/debian/nginx-core.install deleted file mode 100644 index a82f702..0000000 --- a/debian/nginx-core.install +++ /dev/null @@ -1 +0,0 @@ -debian/build-core/objs/nginx usr/sbin diff --git a/debian/nginx-core.manpages b/debian/nginx-core.manpages deleted file mode 100644 index 3b6d0bd..0000000 --- a/debian/nginx-core.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/build-core/objs/nginx.8 diff --git a/debian/rules b/debian/rules index 0c2235c..6ba6df3 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS) debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC -FLAVOURS := core +FLAVOURS := bin DYN_MODS := \ http-geoip \ http-image-filter \ @@ -72,7 +72,7 @@ common_configure_flags := \ --with-ld-opt="$(debian_ldflags)" \ $(basic_configure_flags) -core_configure_flags := \ +bin_configure_flags := \ $(common_configure_flags) \ --with-http_geoip_module=dynamic \ --with-http_image_filter_module=dynamic \ From 71799cdba4ad53c01e36b681b9d99f95aaeeab8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Thu, 5 Jan 2023 18:56:25 +0100 Subject: [PATCH 3/5] d/control: fix not-binnmuable-all-depends-any nginx-core --- debian/control | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index df2890c..08e805b 100644 --- a/debian/control +++ b/debian/control @@ -94,12 +94,18 @@ Description: nginx web/proxy server - development headers Package: nginx-core Architecture: all -Depends: libnginx-mod-http-geoip (= ${source:Version}), - libnginx-mod-http-image-filter (= ${source:Version}), - libnginx-mod-http-xslt-filter (= ${source:Version}), - libnginx-mod-mail (= ${source:Version}), - libnginx-mod-stream (= ${source:Version}), - libnginx-mod-stream-geoip (= ${source:Version}), +Depends: libnginx-mod-http-geoip (>= ${binary:Version}), + libnginx-mod-http-geoip (<< ${binary:Version}.1~), + libnginx-mod-http-image-filter (>= ${binary:Version}), + libnginx-mod-http-image-filter (<< ${binary:Version}.1~), + libnginx-mod-http-xslt-filter (>= ${binary:Version}), + libnginx-mod-http-xslt-filter (<< ${binary:Version}.1~), + libnginx-mod-mail (>= ${binary:Version}), + libnginx-mod-mail (<< ${binary:Version}.1~), + libnginx-mod-stream (>= ${binary:Version}), + libnginx-mod-stream (<< ${binary:Version}.1~), + libnginx-mod-stream-geoip (>= ${binary:Version}), + libnginx-mod-stream-geoip (<< ${binary:Version}.1~), nginx-common (<< ${source:Version}.1~), nginx-common (>= ${source:Version}), nginx-bin (>= ${source:Version}), From 12378d7240cb98a47ee4798055b188cbe682f8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Thu, 5 Jan 2023 18:58:13 +0100 Subject: [PATCH 4/5] d/control nginx-extras: fix libnginx-mod-stream dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 08e805b..91feaf4 100644 --- a/debian/control +++ b/debian/control @@ -227,6 +227,7 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~), libnginx-mod-mail (<< ${binary:Version}.1~), libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~), libnginx-mod-stream (>= ${binary:Version}), + libnginx-mod-stream (<< ${binary:Version}.1~), libnginx-mod-stream-geoip (>= ${binary:Version}), libnginx-mod-stream-geoip (<< ${binary:Version}.1~), libnginx-mod-stream-geoip2 (>= 1:3.4-2~), From 0283849daedc6079f578e4efd0a3314502d8dbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= Date: Thu, 5 Jan 2023 19:35:36 +0100 Subject: [PATCH 5/5] d/changelog: bump version to 1.22.1-6 d/control: fix breaks/replaces --- debian/changelog | 7 +++++++ debian/control | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ef0298..57eaa18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nginx (1.22.1-6) UNRELEASED; urgency=medium + + * Added new package nginx-bin, and nginx-{light,core,extras} replaced by + dependency package. + + -- Jan Mojžíš Thu, 05 Jan 2023 19:10:50 +0100 + nginx (1.22.1-5) unstable; urgency=medium [ Jan Mojžíš ] diff --git a/debian/control b/debian/control index 91feaf4..88c7099 100644 --- a/debian/control +++ b/debian/control @@ -40,8 +40,8 @@ Depends: iproute2, nginx-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~), nginx-core (<< 1.22.1-5~), -Replaces: nginx-full (<< 1.18.0-1), nginx-light (<< 1.22.1-5~), nginx-extras (<< 1.22.1-5~), nginx-core (<< 1.22.1-5~), +Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), +Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), Provides: httpd, httpd-cgi, nginx Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (standard version) @@ -112,6 +112,8 @@ Depends: libnginx-mod-http-geoip (>= ${binary:Version}), nginx-bin (<< ${source:Version}.1~), ${misc:Depends}, ${shlibs:Depends} +Breaks: nginx-full (<< 1.18.0-1), +Replaces: nginx-full (<< 1.18.0-1), Provides: httpd, httpd-cgi, nginx Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (standard version)