Djam/angie
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/angie.git synced 2025-02-25 03:42:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

version update 1.2.2 cooker sync

Browse source
This commit is contained in:
Alexander Khryukin 2012-09-24 15:36:16 +04:00
commit 6666a5afde
7 changed files with 120 additions and 296 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"nginx-1.0.5.tar.gz": 34418bb8caade9a1204c6ddafc389edece052617
"nginx-1.2.2.tar.gz": 1893940485e21f8c9bdc8058eb9cc2826d629d04

7
nginx-1.0.5.tar.gz.asc
View file

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)
iEYEABECAAYFAk4liYUACgkQqTdhOaUkxT5+KQCeO0BooJEUKRtOucjrjH5vxdRP
OyIAn0PY38S+mpwe2EvhR4RNqlmokHNW
=J3RZ
-----END PGP SIGNATURE-----

11
nginx-1.2.2.tar.gz.asc Normal file
View file

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)
iQEcBAABAgAGBQJP8s6QAAoJEFIKmZOhwFL4ihYH/1myZC1ZMtAybbpG+5dMCEtX
3flTtfT6e9H0yLDa7S7CNtvcE76HwDlKov8oXtCOsMVjv2QT0772hxJL5nJEopbS
bf9pM8TCMC1gR+gHCfT6tGj6/CmB/SEAEEtg6VMilCuCR+q6i0RhHYTnlEXDN411
UhOLgNfOGlyLGQu4yT1/5rClOieaXlkGUljax4ZEBovmum3M43PWdDoXV5sOwyez
rVCMQzvde8LliJUeUkzf1DxhTf6Bvmkq+UzV6VlbUJsEzo/aQIxQdASqQbgJE4PF
1gdAAJeR9KNrHD98gpM4RfLCCvyKVpf8Z0gp3XkEbvo0d7yCtbE+AnQ1phqyEuY=
=uHRl
-----END PGP SIGNATURE-----

133
nginx.init
View file

@ -1,133 +0,0 @@
#!/bin/sh
#
# nginx - this script starts and stops the nginx daemon
#
# chkconfig: - 85 15
# description: Nginx is an HTTP(S) server, HTTP(S) reverse \
# proxy and IMAP/POP3 proxy server
# processname: nginx
# config: /etc/nginx/nginx.conf
# config: /etc/sysconfig/nginx
# pidfile: /var/run/nginx/nginx.pid
# Source function library.
. /etc/rc.d/init.d/functions
# Source networking configuration.
. /etc/sysconfig/network
# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0
nginx="/usr/sbin/nginx"
prog=$(basename $nginx)
NGINX_CONF_FILE="/etc/nginx/nginx.conf"
[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
lockfile=/var/lock/subsys/nginx
start() {
[ -x $nginx ] || exit 5
[ -f $NGINX_CONF_FILE ] || exit 6
echo -n $"Starting $prog: "
daemon $nginx -c $NGINX_CONF_FILE
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
return $retval
}
stop() {
echo -n $"Stopping $prog: "
killproc $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
return $retval
}
restart() {
configtest_q || configtest || return 6
stop
start
}
reload() {
configtest_q || configtest || return 6
echo -n $"Reloading $prog: "
killproc $nginx -HUP
echo
}
configtest() {
$nginx -t -c $NGINX_CONF_FILE
}
configtest_q() {
configtest >/dev/null 2>&1
}
rh_status() {
status $prog
}
rh_status_q() {
rh_status >/dev/null 2>&1
}
# Upgrade the binary with no downtime.
upgrade() {
local pidfile="/var/run/${prog}/${prog}.pid"
local oldbin_pidfile="${pidfile}.oldbin"
configtest_q || configtest || return 6
echo -n $"Starting 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
$1
;;
stop)
rh_status_q || exit 0
$1
;;
restart|configtest)
$1
;;
force-reload|upgrade)
rh_status_q || exit 7
upgrade
;;
reload)
rh_status_q || exit 7
$1
;;
status|status_q)
rh_$1
;;
condrestart|try-restart)
rh_status_q || exit 7
restart
;;
*)
echo $"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
exit 2
esac

13
nginx.service Normal file
View file

@ -0,0 +1,13 @@
[Unit]
Description=A high performance web server and reverse proxy server
[Service]
Type=forking
PIDFile=/var/run/nginx/nginx.pid
ExecStartPre=/usr/sbin/nginx -t -c /etc/nginx/nginx.conf
ExecStart=/usr/sbin/nginx -c /etc/nginx/nginx.conf
ExecReload=/usr/sbin/nginx -c /etc/nginx/nginx.conf -s reload
ExecStop=/usr/sbin/nginx -s quit
[Install]
WantedBy=multi-user.target

246
nginx.spec
View file

@ -7,10 +7,15 @@
%define nginx_datadir %{_datadir}/nginx
%define nginx_webroot %{nginx_datadir}/html
Summary: Robust, small and high performance http and reverse proxy server
Summary: Robust, small and high performance HTTP and reverse proxy server
Name: nginx
<<<<<<< HEAD
Version: 1.0.5
Release: %mkrel 4
=======
Version: 1.2.2
Release: 1
>>>>>>> 0a10ab9d9772a052390b90d3cb2615dc5a2720ee
Group: System/Servers
# BSD License (two clause)
# http://www.freebsd.org/copyright/freebsd-license.html
@ -18,52 +23,48 @@ License: BSD
URL: http://nginx.net/
Source0: http://nginx.org/download/nginx-%{version}.tar.gz
Source1: http://nginx.org/download/nginx-%{version}.tar.gz.asc
Source2: %{name}.init
Source3: %{name}.logrotate
Source2: nginx.service
Source3: nginx.logrotate
Source4: virtual.conf
Source5: ssl.conf
Source6: %{name}.sysconfig
Source100: index.html
Source101: poweredby.png
Source102: nginx-logo.png
Source103: 50x.html
Source104: 404.html
<<<<<<< HEAD
# http://nginx.org/download/patch.2012.memory.txt
Patch0: nginx-1.0.5-CVE-2012-1180.diff
Requires(post): rpm-helper
Requires(preun): rpm-helper
=======
>>>>>>> 0a10ab9d9772a052390b90d3cb2615dc5a2720ee
Requires(pre): rpm-helper
Requires(postun): rpm-helper
Requires(pre): apache-conf >= 2.2.0
Requires: apache-conf >= 2.2.0
BuildRequires: pcre-devel
BuildRequires: zlib-devel
BuildRequires: gd-devel
BuildRequires: GeoIP-devel
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: perl-devel
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: zlib-devel
Requires: pcre
Requires: geoip
Requires: openssl
Provides: webserver
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
proxy server written by Igor Sysoev.
%prep
%setup -q
%patch0 -p1 -b .CVE-2012-1180
%build
export LDFLAGS="$LDFLAGS -fPIC"
%serverbuild
# nginx does not utilize a standard configure script. It has its own
# and the standard configure options cause the nginx configure script
# to error out. This is is also the reason for the DESTDIR environment
# variable. The configure script(s) have been patched (Patch1 and
# Patch2) in order to support installing into a build environment.
export DESTDIR=%{buildroot}
./configure \
--user=%{nginx_user} \
--group=%{nginx_group} \
@ -77,25 +78,40 @@ export DESTDIR=%{buildroot}
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
--pid-path=/var/run/%{name}/%{name}.pid \
--lock-path=/var/lock/subsys/%{name} \
--with-file-aio \
--with-ipv6 \
--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_mp4_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-ipv6 \
--with-mail \
--with-mail_ssl_module \
<<<<<<< HEAD
--with-ld-opt=" -fPIC" \
--with-cc-opt="$CFLAGS $(pcre-config --cflags)"
%make
=======
--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"
>>>>>>> 0a10ab9d9772a052390b90d3cb2615dc5a2720ee
%install
rm -rf %{buildroot}
%makeinstall_std INSTALLDIRS=vendor
@ -106,9 +122,8 @@ find %{buildroot} -type f -exec chmod 0644 {} \;
find %{buildroot} -type f -name '*.so' -exec chmod 0755 {} \;
chmod 0755 %{buildroot}%{_sbindir}/nginx
%{__install} -p -D -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
%{__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 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
%{__install} -p -m 0644 %{SOURCE4} %{SOURCE5} %{buildroot}%{nginx_confdir}/conf.d
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
@ -134,20 +149,23 @@ install -m0644 man/*.8 %{buildroot}%{_mandir}/man8/
%_pre_useradd %{nginx_user} %{nginx_home} /bin/false
%post
%_post_service %{nginx_user}
if [ -f /var/lock/subsys/%{name} ]; then
%{_initrddir}/%{name} restart 1>&2;
if [ $1 -eq 1 ]; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun
%_preun_service %{nginx_user}
if [ $1 -eq 0 ]; then
/bin/systemctl --no-reload disable nginx.service >/dev/null 2>&1 || :
/bin/systemctl stop nginx.service >/dev/null 2>&1 || :
fi
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -gt 1 ]; then
/bin/systemctl try-restart nginx.service >/dev/null 2>&1 || :
fi
%_postun_userdel %{nginx_user}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc LICENSE CHANGES README
@ -155,7 +173,7 @@ rm -rf %{buildroot}
%{_sbindir}/%{name}
%{_mandir}/man3/%{name}.3pm*
%{_mandir}/man8/*
%{_initrddir}/%{name}
/lib/systemd/system/nginx.service
%dir %{nginx_confdir}
%dir %{nginx_confdir}/conf.d
%config(noreplace) %{nginx_confdir}/conf.d/*.conf
@ -175,7 +193,6 @@ rm -rf %{buildroot}
%config(noreplace) %{nginx_confdir}/uwsgi_params
%config(noreplace) %{nginx_confdir}/uwsgi_params.default
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{perl_vendorarch}/auto/%{name}
%{perl_vendorarch}/%{name}.pm
%{perl_vendorarch}/auto/%{name}/%{name}.so
@ -186,10 +203,59 @@ rm -rf %{buildroot}
%changelog
<<<<<<< HEAD
* Thu Mar 29 2012 Oden Eriksson <oeriksson@mandriva.com> 1.0.5-1.1
- P0: security fix for CVE-2012-1180 (upstream)
* Fri Aug 12 2011 Oden Eriksson <oeriksson@mandriva.com> 1.0.5-1mdv2011.0
=======
* Thu Jul 19 2012 Alexander Khrukin <akhrukin@mandriva.org> 1.2.2-1
+ Revision: 810193
- version update 1.2.2
* Thu Jun 07 2012 Alexander Khrukin <akhrukin@mandriva.org> 1.2.1-1
+ Revision: 803077
- version update 1.2.1
* Wed Apr 25 2012 Dmitry Mikhirev <dmikhirev@mandriva.org> 1.2.0-1
+ Revision: 793321
- update to 1.2.0
* Thu Mar 29 2012 Oden Eriksson <oeriksson@mandriva.com> 1.1.18-1
+ Revision: 788064
- 1.1.18
- sync with fedora a bit
* Sat Mar 03 2012 Lonyai Gergely <aleph@mandriva.org> 1.1.16-1
+ Revision: 782041
- 1.1.16
* Tue Feb 21 2012 Lonyai Gergely <aleph@mandriva.org> 1.1.15-1
+ Revision: 778545
- 1.1.15
* Tue Feb 07 2012 Oden Eriksson <oeriksson@mandriva.com> 1.1.13-2
+ Revision: 771523
- rebuilt for new pcre
* Sun Feb 05 2012 Alexander Khrukin <akhrukin@mandriva.org> 1.1.13-1
+ Revision: 771307
- version update 1.1.13
* Tue Jan 31 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.0.8-2
+ Revision: 770066
- drop some dead DESTDIR hackiness
- drop legacy junk
- fix so that perl module isn't attempted to be compiled with -fPIE which break
built
- mass rebuild of perl extensions against perl 5.14.2
* Tue Oct 04 2011 Leonardo Coelho <leonardoc@mandriva.org> 1.0.8-1
+ Revision: 702740
- bump new version
* Fri Aug 12 2011 Oden Eriksson <oeriksson@mandriva.com> 1.0.5-1
>>>>>>> 0a10ab9d9772a052390b90d3cb2615dc5a2720ee
+ Revision: 694277
- drop the config patch, seems redundant now
- 1.0.5
@ -346,125 +412,3 @@ rm -rf %{buildroot}
+ Revision: 390248
- import nginx
* Sun Jun 28 2009 Oden Eriksson <oeriksson@mandriva.com> 0.8.4-1
- initial Mandriva package (fedora import)
* Sun May 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.36-2
- init script updates from Gena Makhomed
- remove nginx-upstream-fair
* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.36-1
- update to 0.6.36
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.35-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
- rebuild
* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-1
- update to 0.6.35
* Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 0.6.34-2
- rebuild with new openssl
* Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.34-1
- update to 0.6.34
* Thu Dec 4 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.6.33-2
- Fix inclusion of /usr/share/nginx tree => no unowned directories.
* Sun Nov 23 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.33-1
- update to 0.6.33
* Tue Jul 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.32-1
- update to 0.6.32
- nginx now supports DESTDIR so removed the patches that enabled it
* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-3
- init script fixes
- resolve 'listen 80 default' [#447873]
* Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
- update to 0.6.31
* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-2
- upate to new upstream stable branch 0.6
- added 3rd party module nginx-upstream-fair
- added default webpages
* Sun Apr 20 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-2
- update init script to match recommended guidelines
- add /etc/nginx/conf.d support [#443280]
- use /etc/sysconfig/nginx to determine nginx.conf [#442708]
* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.5.35-3
- add Requires for versioned perl (libperl.so)
- drop silly file Requires
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.5.35-2
- Autorebuild for GCC 4.3
* Sat Jan 19 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-1
- update to 0.5.35
* Sat Dec 15 2007 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.34-1
- update to 0.5.34
* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.5.33-2
- Rebuild for deps
* Sun Nov 11 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.33-1
- update to 0.5.33
* Mon Sep 24 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.32-1
- updated to 0.5.32
- fixed rpmlint UTF-8 complaints.
* Sat Aug 18 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.31-2
- added --with-http_stub_status_module build option.
- added --with-http_sub_module build option.
- added use of pcre-config --cflags
* Fri Aug 17 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.31-1
- Update to 0.5.31
- specify license is BSD
* Sat Aug 11 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.30-2
- Add BuildRequires: perl-devel - fixing rawhide build
* Mon Jul 30 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.30-1
- Update to 0.5.30
* Tue Jul 24 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.29-1
- Update to 0.5.29
* Wed Jul 18 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.28-1
- Update to 0.5.28
* Mon Jul 09 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.27-1
- Update to 0.5.27
* Mon Jun 18 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.26-1
- Update to 0.5.26
* Sat Apr 28 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.19-1
- Update to 0.5.19
* Mon Apr 02 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.17-1
- Update to 0.5.17
* Mon Mar 26 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.16-1
- Update to 0.5.16
- add ownership of /usr/share/nginx/html (#233950)
* Fri Mar 23 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.15-3
- fixed package review bugs (#235222) given by ruben@rubenkerkhof.com
* Thu Mar 22 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.15-2
- fixed package review bugs (#233522) given by kevin@tummy.com
* Thu Mar 22 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.15-1
- create patches to assist with building for Fedora
- initial packaging for Fedora

4
nginx.sysconfig
View file

@ -1,4 +0,0 @@
# Configuration file for the nginx service
# set this to the location of the nginx configuration file
NGINX_CONF_FILE=/etc/nginx/nginx.conf