[nginx/el5/master] testing that all lib requires are found
by jjh
commit 5ec0a887b5199b6149d3bd3953283caf7e8c0141
Author: Jeremy Hinegardner <jeremy(a)hinegardner.org>
Date: Sun Oct 31 16:44:43 2010 -0600
testing that all lib requires are found
nginx.spec | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index 40aae9c..f747ef8 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -21,7 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed)
BuildRequires: libxslt-devel,GeoIP-devel,gd-devel
-Requires: pcre,zlib,openssl,GeoIP,gd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# for /usr/sbin/useradd
Requires(pre): shadow-utils
12Â years, 3Â months
[libX11] - libX11 1.3.99.903 (1.4 RC1)
by Peter Hutterer
commit 7cae5b4951591261fa58a0af0d3425a40c8ce3e3
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Mon Nov 1 08:44:05 2010 +1000
- libX11 1.3.99.903 (1.4 RC1)
.gitignore | 1 +
libX11.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7485044..f6f7c87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libX11-1.3.99.901.tar.bz2
+/libX11-1.3.99.903.tar.bz2
diff --git a/libX11.spec b/libX11.spec
index 08a8437..800690d 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -3,7 +3,7 @@
Summary: Core X11 protocol client library
Name: libX11
-Version: 1.3.99.901
+Version: 1.3.99.903
Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
@@ -16,7 +16,7 @@ Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.t
#Source1: make-git-snapshot.sh
Patch2: dont-forward-keycode-0.patch
-BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-util-macros >= 1.11
BuildRequires: pkgconfig(xproto) >= 7.0.15
BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
BuildRequires: libxcb-devel >= 1.2
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/*.5*
%changelog
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 1.3.99.903-1
+- libX11 1.3.99.903 (1.4 RC1)
+
* Mon Sep 06 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 1.3.99.901-1
- libX11 1.3.99.901 (1.4 RC1)
diff --git a/sources b/sources
index a085381..2d0a5f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5efa130b912350d33ffbe195a66d4684 libX11-1.3.99.901.tar.bz2
+3e8ed7a91f70bb819b5dab9c124a7062 libX11-1.3.99.903.tar.bz2
12Â years, 3Â months
[libXScrnSaver] - libXScrnSaver 1.2.1
by Peter Hutterer
commit f234f932d5821aa7813c88563c3313d652ab6929
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Mon Nov 1 08:41:02 2010 +1000
- libXScrnSaver 1.2.1
.gitignore | 1 +
libXScrnSaver.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 970be96..3085769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libXScrnSaver-1.2.0.tar.bz2
+/libXScrnSaver-1.2.1.tar.bz2
diff --git a/libXScrnSaver.spec b/libXScrnSaver.spec
index dd94250..f2e8cfe 100644
--- a/libXScrnSaver.spec
+++ b/libXScrnSaver.spec
@@ -1,7 +1,7 @@
Summary: X.Org X11 libXss runtime library
Name: libXScrnSaver
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
@@ -54,6 +54,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_includedir}/X11/extensions/scrnsaver.h
%changelog
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 1.2.1-1
+- libXScrnSaver 1.2.1
+
* Wed Sep 29 2010 jkeating - 1.2.0-3
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index 14003f0..c46df06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33e54f64b55f22d8bbe822a5b62568cb libXScrnSaver-1.2.0.tar.bz2
+898794bf6812fc9be9bf1bb7aa4d2b08 libXScrnSaver-1.2.1.tar.bz2
12Â years, 3Â months
[xorg-x11-xkb-utils] - setxkbmap 1.2.0 - xkbcomp 1.2.0 - xkbutils 1.0.3 - xkbevd 1.1.1
by Peter Hutterer
commit 4b961c84c4e93b3e2a051f6ccd6a5123fad919a4
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Mon Nov 1 08:35:07 2010 +1000
- setxkbmap 1.2.0
- xkbcomp 1.2.0
- xkbutils 1.0.3
- xkbevd 1.1.1
.gitignore | 4 +
sources | 8 +-
xkbcomp-hex-parsing.patch | 67 ----
xkbcomp-speed.patch | 755 ---------------------------------------------
xorg-x11-xkb-utils.spec | 32 +-
5 files changed, 22 insertions(+), 844 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d52318..e184c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,7 @@ setxkbmap-1.1.0.tar.bz2
xkbcomp-1.1.1.tar.bz2
xkbevd-1.1.0.tar.bz2
xkbutils-1.0.2.tar.bz2
+/setxkbmap-1.2.0.tar.bz2
+/xkbcomp-1.2.0.tar.bz2
+/xkbevd-1.1.1.tar.bz2
+/xkbutils-1.0.3.tar.bz2
diff --git a/sources b/sources
index a9a2314..7faef77 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
b98ae2d8b21c545b7b322d0b302efefa xkbprint-1.0.1.tar.bz2
-2f902e0a89aaf2b19e06e7f26c6efb3a setxkbmap-1.1.0.tar.bz2
-38c387bacdc01038c8ac280588792bcf xkbcomp-1.1.1.tar.bz2
-8d3c1485c2dd62ea7395a37377958a39 xkbevd-1.1.0.tar.bz2
-369a21641b7ca983d6641298e51d97f8 xkbutils-1.0.2.tar.bz2
+2f6df89201eb9a2cbfb905d6b82a191e setxkbmap-1.2.0.tar.bz2
+0f55995cd8da9b2d88553e1a2e17cd0a xkbcomp-1.2.0.tar.bz2
+699198865d6902c39e3c6a9693a6422d xkbevd-1.1.1.tar.bz2
+52ad6d8d87577a8ac736ab5488bec210 xkbutils-1.0.3.tar.bz2
diff --git a/xorg-x11-xkb-utils.spec b/xorg-x11-xkb-utils.spec
index c7678ba..8660aa4 100644
--- a/xorg-x11-xkb-utils.spec
+++ b/xorg-x11-xkb-utils.spec
@@ -1,25 +1,19 @@
Summary: X.Org X11 xkb utilities
Name: xorg-x11-xkb-utils
-Version: 7.4
-Release: 9%{?dist}
+Version: 7.5
+Release: 1%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# use the macro so the doc dir is changed automagically
-%define xkbutils_version 1.0.2
+%define xkbutils_version 1.0.3
Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.1.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.0.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.2.0.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.1.tar.bz2
Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.1.0.tar.bz2
-
-Patch0: xkbcomp-speed.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=638244
-# Key's defined using unicode hex codes has stopped working in some/all
-# layouts (e.g. ir and af layouts)
-Patch1: xkbcomp-hex-parsing.patch
+Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.2.0.tar.bz2
BuildRequires: pkgconfig
BuildRequires: byacc
@@ -55,10 +49,6 @@ X.Org X11 xkb gadgets
%prep
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-pushd xkbcomp-*
-%patch0 -p1 -b .speeeeeed
-%patch1 -p1 -b .hex-parsing
-popd
%build
export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP -Os"
@@ -90,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
%files -n xorg-x11-xkb-extras
%defattr(-,root,root,-)
-%doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
-%doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README
+%doc xkbutils-%{xkbutils_version}/COPYING
+%doc xkbutils-%{xkbutils_version}/README
%{_bindir}/xkbbell
%{_bindir}/xkbevd
%{_bindir}/xkbprint
@@ -104,6 +94,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xkbwatch.*
%changelog
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 7.5-1
+- setxkbmap 1.2.0
+- xkbcomp 1.2.0
+- xkbutils 1.0.3
+- xkbevd 1.1.1
+
* Mon Oct 11 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 7.4-9
- xkbcomp-hex-parsing.patch: fix up parsing of hex-code symbols (#638244)
12Â years, 3Â months
[nginx/el5/master] perl-devel does not exist on el5
by jjh
commit 357ef81b557058282b3845cf9f0911f7a89670fe
Author: Jeremy Hinegardner <jeremy(a)hinegardner.org>
Date: Sun Oct 31 16:35:19 2010 -0600
perl-devel does not exist on el5
nginx.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index 2d52df8..40aae9c 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -19,7 +19,7 @@ License: BSD
URL: http://nginx.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
+BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed)
BuildRequires: libxslt-devel,GeoIP-devel,gd-devel
Requires: pcre,zlib,openssl,GeoIP,gd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
12Â years, 3Â months
[nginx/el5/master] Update to the new stable branch 0.8.53
by jjh
commit c0814984931d26f05e5aba45d90efaf024adb359
Author: Jeremy Hinegardner <jeremy(a)hinegardner.org>
Date: Sun Oct 31 16:31:41 2010 -0600
Update to the new stable branch 0.8.53
Normally this update would not have take place, but the 0.6.x branch
of code in nginx itself has been deprecated and will no longer be
supported.
.gitignore | 8 ++++-
nginx-cve-2009-3555.patch | 87 ---------------------------------------------
nginx-upstream-fair.tgz | Bin 6824 -> 0 bytes
nginx.conf | 21 +++++------
nginx.init | 56 ++++++++++++++++++++--------
nginx.spec | 71 +++++++++++++++++++++---------------
sources | 2 +-
upstream-fair.conf | 18 ---------
8 files changed, 99 insertions(+), 164 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e9df11..933f040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
-nginx-0.6.39.tar.gz
+nginx-0.8.53.tar.gz
+*~
+nginx*/
+x86_64/
+.*.log
+*swp
+*.rpm
diff --git a/nginx.conf b/nginx.conf
index 078c0a4..f3dc403 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,7 +3,7 @@
# This is the main Nginx configuration file.
#
# More information about the configuration options is available on
-# * the English wiki - http://wiki.codemongers.com/Main
+# * the English wiki - http://wiki.nginx.org/Main
# * the Russian documentation - http://sysoev.ru/nginx/
#
#######################################################################
@@ -11,25 +11,24 @@
#----------------------------------------------------------------------
# Main Module - directives that cover basic functionality
#
-# http://wiki.codemongers.com/NginxMainModule
+# http://wiki.nginx.org/NginxHttpMainModule
#
#----------------------------------------------------------------------
user nginx;
worker_processes 1;
-error_log /var/log/nginx/error.log;
-#error_log /var/log/nginx/error.log notice;
-#error_log /var/log/nginx/error.log info;
-
-pid /var/run/nginx.pid;
+error_log /var/log/nginx/error.log;
+#error_log /var/log/nginx/error.log notice;
+#error_log /var/log/nginx/error.log info;
+pid /var/run/nginx.pid;
#----------------------------------------------------------------------
# Events Module
#
-# http://wiki.codemongers.com/NginxEventsModule
+# http://wiki.nginx.org/NginxHttpEventsModule
#
#----------------------------------------------------------------------
@@ -41,7 +40,7 @@ events {
#----------------------------------------------------------------------
# HTTP Core Module
#
-# http://wiki.codemongers.com/NginxHttpCoreModule
+# http://wiki.nginx.org/NginxHttpCoreModule
#
#----------------------------------------------------------------------
@@ -49,8 +48,8 @@ http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
- log_format main '$remote_addr - $remote_user [$time_local] $request '
- '"$status" $body_bytes_sent "$http_referer" '
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
diff --git a/nginx.init b/nginx.init
index 6ba302d..670fca5 100644
--- a/nginx.init
+++ b/nginx.init
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# nginx - this script starts and stops the nginx daemin
+# nginx - this script starts and stops the nginx daemon
#
-# chkconfig: - 85 15
+# chkconfig: - 85 15
# description: Nginx is an HTTP(S) server, HTTP(S) reverse \
# proxy and IMAP/POP3 proxy server
# processname: nginx
@@ -49,27 +49,26 @@ stop() {
}
restart() {
- configtest || return $?
+ configtest_q || configtest || return 6
stop
start
}
reload() {
- configtest || return $?
+ configtest_q || configtest || return 6
echo -n $"Reloading $prog: "
killproc $nginx -HUP
- RETVAL=$?
echo
}
-force_reload() {
- restart
-}
-
configtest() {
$nginx -t -c $NGINX_CONF_FILE
}
+configtest_q() {
+ configtest >/dev/null 2>&1
+}
+
rh_status() {
status $prog
}
@@ -78,6 +77,29 @@ rh_status_q() {
rh_status >/dev/null 2>&1
}
+# Upgrade the binary with no downtime.
+upgrade() {
+ local pidfile="/var/run/${prog}.pid"
+ local oldbin_pidfile="${pidfile}.oldbin"
+
+ configtest_q || configtest || return 6
+ echo -n $"Staring new master $prog: "
+ killproc $nginx -USR2
+ retval=$?
+ echo
+ sleep 1
+ if [[ -f ${oldbin_pidfile} && -f ${pidfile} ]]; then
+ echo -n $"Graceful shutdown of old $prog: "
+ killproc -p ${oldbin_pidfile} -QUIT
+ retval=$?
+ echo
+ return 0
+ else
+ echo $"Something bad happened, manual intervention required, maybe restart?"
+ return 1
+ fi
+}
+
case "$1" in
start)
rh_status_q && exit 0
@@ -90,20 +112,22 @@ case "$1" in
restart|configtest)
$1
;;
+ force-reload|upgrade)
+ rh_status_q || exit 7
+ upgrade
+ ;;
reload)
rh_status_q || exit 7
$1
;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
+ status|status_q)
+ rh_$1
;;
condrestart|try-restart)
- rh_status_q || exit 0
+ rh_status_q || exit 7
+ restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
+ echo $"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
exit 2
esac
diff --git a/nginx.spec b/nginx.spec
index 103d22d..2d52df8 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -8,9 +8,9 @@
%define nginx_webroot %{nginx_datadir}/html
Name: nginx
-Version: 0.6.39
-Release: 5%{?dist}
-Summary: Robust, small and high performance http and reverse proxy server
+Version: 0.8.53
+Release: 1%{?dist}
+Summary: Robust, small and high performance HTTP and reverse proxy server
Group: System Environment/Daemons
# BSD License (two clause)
@@ -19,8 +19,9 @@ License: BSD
URL: http://nginx.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed)
-Requires: pcre,zlib,openssl
+BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
+BuildRequires: libxslt-devel,GeoIP-devel,gd-devel
+Requires: pcre,zlib,openssl,GeoIP,gd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# for /usr/sbin/useradd
Requires(pre): shadow-utils
@@ -28,16 +29,15 @@ Requires(post): chkconfig
# for /sbin/service
Requires(preun): chkconfig, initscripts
Requires(postun): initscripts
+Provides: webserver
Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: virtual.conf
Source4: ssl.conf
-Source5: nginx-upstream-fair.tgz
-Source6: upstream-fair.conf
-Source7: %{name}.sysconfig
-Source8: %{name}.conf
+Source5: %{name}.sysconfig
+Source6: nginx.conf
Source100: index.html
Source101: poweredby.png
Source102: nginx-logo.png
@@ -48,22 +48,14 @@ Source104: 404.html
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
Patch0: nginx-auto-cc-gcc.patch
-#patch for http://www.kb.cert.org/vuls/id/120541
-Patch1: nginx-cve-2009-3555.patch
-
-
%description
Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
proxy server written by Igor Sysoev.
-One third party module, nginx-upstream-fair, has been added.
-
%prep
%setup -q
%patch0 -p0
-%patch1 -p0
-%{__tar} zxvf %{SOURCE5}
%build
# nginx does not utilize a standard configure script. It has its own
@@ -83,27 +75,33 @@ export DESTDIR=%{buildroot}
--http-client-body-temp-path=%{nginx_home_tmp}/client_body \
--http-proxy-temp-path=%{nginx_home_tmp}/proxy \
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
+ --http-uwsgi-temp-path=%{nginx_home_tmp}/uwsgi \
+ --http-scgi-temp-path=%{nginx_home_tmp}/scgi \
--pid-path=%{_localstatedir}/run/%{name}.pid \
--lock-path=%{_localstatedir}/lock/subsys/%{name} \
--with-http_ssl_module \
--with-http_realip_module \
--with-http_addition_module \
+ --with-http_xslt_module \
+ --with-http_image_filter_module \
+ --with-http_geoip_module \
--with-http_sub_module \
--with-http_dav_module \
--with-http_flv_module \
--with-http_gzip_static_module \
+ --with-http_random_index_module \
+ --with-http_secure_link_module \
+ --with-http_degradation_module \
--with-http_stub_status_module \
--with-http_perl_module \
--with-mail \
+ --with-file-aio \
--with-mail_ssl_module \
+ --with-ipv6 \
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
- --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
+ --with-cc-opt="%{optflags} $(pcre-config --cflags)"
make %{?_smp_mflags}
-# rename the readme for nginx-upstream-fair so it doesn't conflict with the main
-# readme
-mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair
-
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALLDIRS=vendor
@@ -115,10 +113,10 @@ find %{buildroot} -type f -name '*.so' -exec chmod 0755 {} \;
chmod 0755 %{buildroot}%{_sbindir}/nginx
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
-%{__install} -p -m 0644 %{SOURCE8} %{buildroot}%{nginx_confdir}
-%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE6} %{buildroot}%{nginx_confdir}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
@@ -136,10 +134,14 @@ done
rm -rf %{buildroot}
%pre
-%{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+if [ $1 == 1 ]; then
+ %{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+fi
%post
-/sbin/chkconfig --add %{name}
+if [ $1 == 1 ]; then
+ /sbin/chkconfig --add %{name}
+fi
%preun
if [ $1 = 0 ]; then
@@ -148,13 +150,13 @@ if [ $1 = 0 ]; then
fi
%postun
-if [ $1 -ge 1 ]; then
- /sbin/service %{name} condrestart > /dev/null 2>&1 || :
+if [ $1 == 2 ]; then
+ /sbin/service %{name} upgrade || :
fi
%files
%defattr(-,root,root,-)
-%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
+%doc LICENSE CHANGES README
%{nginx_datadir}/
%{_sbindir}/%{name}
%{_mandir}/man3/%{name}.3pm.gz
@@ -166,8 +168,14 @@ fi
%config(noreplace) %{nginx_confdir}/win-utf
%config(noreplace) %{nginx_confdir}/%{name}.conf.default
%config(noreplace) %{nginx_confdir}/mime.types.default
+%config(noreplace) %{nginx_confdir}/fastcgi.conf
+%config(noreplace) %{nginx_confdir}/fastcgi.conf.default
%config(noreplace) %{nginx_confdir}/fastcgi_params
%config(noreplace) %{nginx_confdir}/fastcgi_params.default
+%config(noreplace) %{nginx_confdir}/scgi_params
+%config(noreplace) %{nginx_confdir}/scgi_params.default
+%config(noreplace) %{nginx_confdir}/uwsgi_params
+%config(noreplace) %{nginx_confdir}/uwsgi_params.default
%config(noreplace) %{nginx_confdir}/koi-win
%config(noreplace) %{nginx_confdir}/koi-utf
%config(noreplace) %{nginx_confdir}/%{name}.conf
@@ -182,6 +190,9 @@ fi
%changelog
+* Sun Oct 31 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.8.53-1
+- Update to new stable 0.8.53 since 0.6.x branch is no longer supported
+
* Sun Jun 20 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-5
- fix bug #591543
diff --git a/sources b/sources
index dded03f..8f1cbe0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c22787fe88e37d694e773f1dda52005 nginx-0.6.39.tar.gz
+717eaea1b34e8663849f64b9aa05a9da nginx-0.8.53.tar.gz
12Â years, 3Â months