diff -Nru nginx-1.4.6/debian/changelog nginx-1.4.6/debian/changelog --- nginx-1.4.6/debian/changelog 2014-03-09 17:49:58.000000000 +0000 +++ nginx-1.4.6/debian/changelog 2014-03-13 01:12:07.000000000 +0000 @@ -1,3 +1,18 @@ +nginx (1.4.6-1ubuntu3) trusty; urgency=medium + + * Add new binary package for main, nginx-core, which contains only + source-tarball-included modules and no third-party modules. + * Changes to debian/ directory: + - control: + + Add entry for nginx-core and nginx-core-dbg. + - rules: + + Add nginx-core flavor to the build rules. + - nginx-core.*: Add new packaging files for nginx-core based on + the packaging files for nginx-full. + * The above changes satisfy the requirements for main (LP: #1262710) + + -- Thomas Ward Mon, 10 Mar 2014 18:23:36 -0400 + nginx (1.4.6-1ubuntu2) trusty; urgency=medium * debian/rules: Drop from -O3 to -O2 to work around a build failure. diff -Nru nginx-1.4.6/debian/control nginx-1.4.6/debian/control --- nginx-1.4.6/debian/control 2014-03-04 22:25:28.000000000 +0000 +++ nginx-1.4.6/debian/control 2014-03-13 00:24:53.000000000 +0000 @@ -32,10 +32,12 @@ Package: nginx Architecture: all -Depends: nginx-full (>= ${source:Version}) | +Depends: nginx-core (>= ${source:Version}) | + nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}) | nginx-naxsi (>= ${source:Version}) , + nginx-core (<< ${source:Version}.1~) | nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~) | @@ -46,8 +48,8 @@ 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 is a dependency package to install either nginx-full (by default) or - nginx-light. + This is a dependency package to install either nginx-core (by default), + nginx-full, nginx-light, nginx-extras, or nginx-naxsi. Package: nginx-doc Architecture: all @@ -80,12 +82,56 @@ This package contains base configuration files used by all versions of nginx. +Package: nginx-core +Architecture: any +Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Breaks: nginx (<< 1.4.5-1) +Provides: httpd, httpd-cgi, nginx +Conflicts: nginx-extras, nginx-light, nginx-naxsi, nginx-full +Suggests: nginx-doc (= ${source:Version}) +Description: nginx web/proxy server (core 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 complete set of + standard modules included (but omitting some of those included in + nginx-extras). + . + STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, + Charset, Empty GIF, FastCGI, Geo, Gzip, Headers, Index, Limit Requests, + Limit Zone, Log, Map, Memcached, Proxy, Referer, Rewrite, SCGI, + Split Clients, SSI, Upstream, User ID, UWSGI. + . + OPTIONAL HTTP MODULES: Addition, Debug, GeoIP, Gzip Precompression, HTTP Sub, + Image Filter, IPv6, Real IP, Spdy, SSL, Stub Status, Substitution, WebDAV, + XSLT. + . + MAIL MODULES: Mail Core, IMAP, POP3, SMTP, SSL. + . + NOTE: This is identical to the -full build, but without any third party + modules built in. + +Package: nginx-core-dbg +Architecture: any +Section: debug +Priority: extra +Depends: nginx-core (= ${binary:Version}), ${misc:Depends} +Conflicts: nginx-extras-dbg, nginx-light-dbg, nginx-naxsi-dbg, nginx-full-dbg +Description: nginx web/proxy server (core version) - debugging symbols + 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 debugging symbols for nginx-core, to assist in debugging + issues that you may find. It should not be required for normal operation. + Package: nginx-full Architecture: any Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: nginx (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-light, nginx-naxsi +Conflicts: nginx-extras, nginx-light, nginx-naxsi, nginx-core Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (standard version) Nginx ("engine X") is a high-performance web and reverse proxy server @@ -115,7 +161,7 @@ Section: debug Priority: extra Depends: nginx-full (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-extras-dbg, nginx-light-dbg, nginx-naxsi-dbg +Conflicts: nginx-extras-dbg, nginx-light-dbg, nginx-naxsi-dbg, nginx-core-dbg Description: nginx web/proxy server (standard version) - debugging symbols 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 @@ -130,7 +176,7 @@ Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: nginx (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-full, nginx-naxsi +Conflicts: nginx-extras, nginx-full, nginx-naxsi, 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 @@ -153,7 +199,7 @@ Section: debug Priority: extra Depends: nginx-light (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-extras-dbg, nginx-full-dbg, nginx-naxsi-dbg +Conflicts: nginx-extras-dbg, nginx-full-dbg, nginx-naxsi-dbg, nginx-core-dbg Description: nginx web/proxy server (basic version) - debugging symbols 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 @@ -172,7 +218,7 @@ ${shlibs:Depends} Breaks: nginx (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-full, nginx-light, nginx-naxsi +Conflicts: nginx-full, nginx-light, nginx-naxsi, nginx-core Suggests: nginx-doc (= ${source:Version}) Description: nginx web/proxy server (extended version) Nginx ("engine X") is a high-performance web and reverse proxy server @@ -203,7 +249,7 @@ Section: debug Priority: extra Depends: nginx-extras (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-full-dbg, nginx-light-dbg, nginx-naxsi-dbg +Conflicts: nginx-full-dbg, nginx-light-dbg, nginx-naxsi-dbg, nginx-core-dbg Description: nginx web/proxy server (extended version) - debugging symbols 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 @@ -220,7 +266,7 @@ Breaks: nginx (<< 1.4.5-1), nginx-naxsi-ui (<< 1.4.5-1) Provides: httpd, httpd-cgi, nginx -Conflicts: nginx-extras, nginx-full, nginx-light +Conflicts: nginx-extras, nginx-full, nginx-light, nginx-core Description: nginx web/proxy server (version with naxsi) 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 @@ -243,7 +289,7 @@ Section: debug Priority: extra Depends: nginx-naxsi (= ${binary:Version}), ${misc:Depends} -Conflicts: nginx-extras-dbg, nginx-full-dbg, nginx-light-dbg +Conflicts: nginx-extras-dbg, nginx-full-dbg, nginx-light-dbg, nginx-core-dbg Description: nginx web/proxy server (version with naxsi) - debugging symbols 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 diff -Nru nginx-1.4.6/debian/nginx-core.dirs nginx-1.4.6/debian/nginx-core.dirs --- nginx-1.4.6/debian/nginx-core.dirs 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.4.6/debian/nginx-core.dirs 2014-03-13 00:22:42.000000000 +0000 @@ -0,0 +1 @@ +usr/sbin diff -Nru nginx-1.4.6/debian/nginx-core.install nginx-1.4.6/debian/nginx-core.install --- nginx-1.4.6/debian/nginx-core.install 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.4.6/debian/nginx-core.install 2014-03-13 00:30:35.000000000 +0000 @@ -0,0 +1 @@ +debian/build-core/objs/nginx usr/sbin diff -Nru nginx-1.4.6/debian/nginx-core.lintian-overrides nginx-1.4.6/debian/nginx-core.lintian-overrides --- nginx-1.4.6/debian/nginx-core.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.4.6/debian/nginx-core.lintian-overrides 2014-03-13 00:30:58.000000000 +0000 @@ -0,0 +1 @@ +nginx-core: spelling-error-in-binary usr/sbin/nginx tEH the diff -Nru nginx-1.4.6/debian/nginx-core.postinst nginx-1.4.6/debian/nginx-core.postinst --- nginx-1.4.6/debian/nginx-core.postinst 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.4.6/debian/nginx-core.postinst 2014-03-13 00:22:42.000000000 +0000 @@ -0,0 +1,37 @@ +#!/bin/sh +set -e + +case "$1" in + abort-upgrade|abort-remove|abort-deconfigure|configure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ -x /etc/init.d/nginx ]; then + if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then + NGX_PID=`cat /run/nginx.pid` + if kill -s USR2 $NGX_PID 2>/dev/null; then + while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do + cnt=`expr $cnt + 1` + if [ $cnt -gt 10 ]; then + kill -s KILL $NGX_PID + invoke-rc.d nginx start + exit 0 + fi + sleep 1 + done + NGX_OLD_PID=`cat /run/nginx.pid.oldbin` + kill -s QUIT $NGX_OLD_PID + fi + else + invoke-rc.d nginx start || exit $? + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru nginx-1.4.6/debian/nginx-core.prerm nginx-1.4.6/debian/nginx-core.prerm --- nginx-1.4.6/debian/nginx-core.prerm 1970-01-01 00:00:00.000000000 +0000 +++ nginx-1.4.6/debian/nginx-core.prerm 2014-03-13 00:22:42.000000000 +0000 @@ -0,0 +1,22 @@ +#!/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 -Nru nginx-1.4.6/debian/rules nginx-1.4.6/debian/rules --- nginx-1.4.6/debian/rules 2014-03-09 17:49:23.000000000 +0000 +++ nginx-1.4.6/debian/rules 2014-03-13 00:28:49.000000000 +0000 @@ -8,8 +8,9 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(debian_ldflags) export DEBIAN_NGINX_PERL_LDFLAGS -FLAVOURS:=full light extras naxsi +FLAVOURS:=core full light extras naxsi +BUILDDIR_core = $(CURDIR)/debian/build-core BUILDDIR_full = $(CURDIR)/debian/build-full BUILDDIR_light = $(CURDIR)/debian/build-light BUILDDIR_extras = $(CURDIR)/debian/build-extras @@ -63,6 +64,22 @@ cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/man $(BUILDDIR_$*)/ +config.status.core: config.env.core + cd $(BUILDDIR_core) && ./configure \ + $(common_configure_flags) \ + --with-http_addition_module \ + --with-http_dav_module \ + --with-http_geoip_module \ + --with-http_gzip_static_module \ + --with-http_image_filter_module \ + --with-http_spdy_module \ + --with-http_sub_module \ + --with-http_xslt_module \ + --with-mail \ + --with-mail_ssl_module \ + >$@ + touch $@ + config.status.full: config.env.full cd $(BUILDDIR_full) && ./configure \ $(common_configure_flags) \