← Back to branch summary

~britco/nginx/nginx

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Cyril Lavier, Cyril Lavier, Kartik Mistry
  • Date: 2012-04-13 16:58:59 UTC
  • mfrom: (4.2.48 sid)
  • Revision ID: package-import@ubuntu.com-20120413165859-ef6fkd11mudyaspr
Tags: 1.1.19-1
http://bugs.debian.org/667894
[Cyril Lavier]
* New upstream release.
  + Fixed a buffer overflow in the ngx_http_mp4_module. See: CVE-2012-2089
    for more details.
* debian/copyright:
  + Updated licenses.
* debian/nginx-extras.postinst, debian/nginx-full.postinst,
  debian/nginx-light.postinst, debian/nginx-naxsi.postinst:
  + Removing the debug markers. (Closes: #667894)
* debian/control, debian/rules, debian/copyright,
  debian/modules/nginx-dav-ext-module:
  + Added nginx-dav-ext-module in full and extras.
* debian/modules/naxsi:
  + Updated naxsi to the SVN snapshot (r280) to fix the licence issue with
    OpenSSL.

[Kartik Mistry]
* Misc cleanups in debian/control, debian/copyright.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
7
7
# export necessary for (hardening) flags for perl
8
8
# (src/http/modules/perl/Makefile.PL).
9
9
export CFLAGS LDFLAGS
10
 
     
11
 
FLAVOURS:=full light extras
 
10
 
 
11
FLAVOURS:=full light extras naxsi
12
12
 
13
13
BUILDDIR_full = $(CURDIR)/debian/build-full
14
14
BUILDDIR_light = $(CURDIR)/debian/build-light
15
15
BUILDDIR_extras = $(CURDIR)/debian/build-extras
 
16
BUILDDIR_naxsi = $(CURDIR)/debian/build-naxsi
16
17
MODULESDIR = $(CURDIR)/debian/modules
17
18
BASEDIR = $(CURDIR)
18
19
 
85
86
            --add-module=$(MODULESDIR)/nginx-auth-pam \
86
87
            --add-module=$(MODULESDIR)/nginx-echo \
87
88
            --add-module=$(MODULESDIR)/nginx-upstream-fair \
 
89
            --add-module=$(MODULESDIR)/nginx-dav-ext-module \
88
90
            $(CONFIGURE_OPTS) >$@
89
91
        touch $@
90
92
 
162
164
            --add-module=$(MODULESDIR)/nginx-upload-module \
163
165
            --add-module=$(MODULESDIR)/nginx-upload-progress \
164
166
            --add-module=$(MODULESDIR)/nginx-upstream-fair \
 
167
            --add-module=$(MODULESDIR)/nginx-dav-ext-module \
165
168
            $(CONFIGURE_OPTS) >$@
166
169
        touch $@
167
170
 
 
171
config.status.naxsi: config.env.naxsi config.sub config.guess
 
172
        cd $(BUILDDIR_naxsi) && CFLAGS="$(CFLAGS)" CORE_LINK="$(LDFLAGS)" ./configure  \
 
173
            --prefix=/etc/nginx \
 
174
            --conf-path=/etc/nginx/nginx.conf \
 
175
            --error-log-path=/var/log/nginx/error.log \
 
176
            --http-client-body-temp-path=/var/lib/nginx/body \
 
177
            --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
 
178
            --http-log-path=/var/log/nginx/access.log \
 
179
            --http-proxy-temp-path=/var/lib/nginx/proxy \
 
180
            --http-scgi-temp-path=/var/lib/nginx/scgi \
 
181
            --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
 
182
            --lock-path=/var/lock/nginx.lock \
 
183
            --pid-path=/var/run/nginx.pid \
 
184
            --with-http_ssl_module \
 
185
            --without-mail_pop3_module \
 
186
            --without-mail_smtp_module \
 
187
            --without-mail_imap_module \
 
188
            --without-http_uwsgi_module \
 
189
            --without-http_scgi_module \
 
190
            --with-ipv6 \
 
191
            --add-module=$(MODULESDIR)/nginx-upstream-fair \
 
192
            --add-module=$(MODULESDIR)/nginx-cache-purge \
 
193
            --add-module=$(MODULESDIR)/naxsi/naxsi_src \
 
194
            $(CONFIGURE_OPTS) >$@
 
195
        touch $@
 
196
 
168
197
config.status.%:
169
198
        echo "configuration for flavour $* not yet defined."
170
199