updated to 1.2.9, added --with-ld-opt=-Wl,-E to configure

This commit is contained in:
root 2013-06-25 18:24:47 +04:00
parent e3d830c6e2
commit 3853dd0738
6 changed files with 64 additions and 19 deletions

View file

@ -1,2 +1,7 @@
removed_sources:
nginx-1.2.4.tar.gz: e3de0b2b82095f26e96bdb461ba36472d3e7cdda
sources: sources:
"nginx-1.2.4.tar.gz": e3de0b2b82095f26e96bdb461ba36472d3e7cdda nginx-1.2.9.tar.gz: 9f31266c0088561b0bdaa9238af8adf1a2fd0ba4
nginx-1.2.9.tar.gz.asc: a3cd4edc4b5d8858b5215bc986ea096d7710f771
nginx-logo.png: a609ff4e27b6236233ea576739a6fb040da4d550
poweredby.png: 3257422eacf1c510239da81c1d683af63e42e129

53
default.conf Normal file
View file

@ -0,0 +1,53 @@
#
# The default server
#
server {
listen 80;
server_name _;
#charset koi8-r;
#access_log logs/host.access.log main;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
}
error_page 404 /404.html;
location = /404.html {
root /usr/share/nginx/html;
}
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}

View file

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)
iQEcBAABAgAGBQJQYbXdAAoJEFIKmZOhwFL4viYIAMf/MSpMNq0yESiL+DvG5NqQ
j9vgcEHLh1D/X+aiGRsD2BX50w/j+uxxxwmUaa8Ya3XhoXf6J2K4qhUMQ84DHCqy
xh6+WlWDOUCuaT+TUJuFTp/jFRyRPDG9g6W/hrsbYph1FXMJepkTgDFiVWqCqdFH
X4l+0F5/kv1XwyMgPEz6i9m9lp+i1raQ0oYnmV6W7hDqMBYQouXKNmgswuD0312c
7Kw7nMgTQQTASckZ5zfOIkiefgEJ8PU2i0KDiHudav/Fxa2YOMWJJR9YeTynEQ4I
t46tuKC1buwxjOvnJBIeibVS7NBWFTOwB7i73O+LR6JpzJwuZulvPeKkk3Uw19w=
=oCm0
-----END PGP SIGNATURE-----

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

View file

@ -9,8 +9,8 @@
Summary: Robust, small and high performance HTTP and reverse proxy server Summary: Robust, small and high performance HTTP and reverse proxy server
Name: nginx Name: nginx
Version: 1.2.4 Version: 1.2.9
Release: 2 Release: 3
Group: System/Servers Group: System/Servers
# BSD License (two clause) # BSD License (two clause)
# http://www.freebsd.org/copyright/freebsd-license.html # http://www.freebsd.org/copyright/freebsd-license.html
@ -22,6 +22,7 @@ Source2: nginx.service
Source3: nginx.logrotate Source3: nginx.logrotate
Source4: virtual.conf Source4: virtual.conf
Source5: ssl.conf Source5: ssl.conf
Source6: default.conf
Source100: index.html Source100: index.html
Source101: poweredby.png Source101: poweredby.png
Source102: nginx-logo.png Source102: nginx-logo.png
@ -84,11 +85,8 @@ proxy server written by Igor Sysoev.
--with-http_perl_module \ --with-http_perl_module \
--with-mail \ --with-mail \
--with-mail_ssl_module \ --with-mail_ssl_module \
--with-ld-opt=-Wl,-E \
--with-cc-opt="$CFLAGS $(pcre-config --cflags)" --with-cc-opt="$CFLAGS $(pcre-config --cflags)"
# this is only passed to perl module being built and only overrides the
# default '-O' flag which anyways lowers optimizations (which we don't
# want)
%make OPTIMIZE="-fno-PIE"
%install %install
@ -104,7 +102,7 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx
%{__install} -p -D -m 0755 %{SOURCE2} %{buildroot}/lib/systemd/system/nginx.service %{__install} -p -D -m 0755 %{SOURCE2} %{buildroot}/lib/systemd/system/nginx.service
%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d %{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
%{__install} -p -m 0644 %{SOURCE4} %{SOURCE5} %{buildroot}%{nginx_confdir}/conf.d %{__install} -p -m 0644 %{SOURCE4} %{SOURCE5} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp} %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir} %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot} %{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB