tag 429922 + patch thanks Hi,
I've prepared a patch for the new upstream release and it closes all the
open bugs for the nginx debian package. I'm using the resulting package in
my production environment and everything is working, but feel free to
change and adapt it to your needs.
Also, if you need help, I'm willing to help maintaining the package and/or
acting as a sponsor (if you are not a Debian maintainer, I'm not sure).
Thanks,
--
Fabio Tranchitella <[EMAIL PROTECTED]> .''`.
Proud Debian GNU/Linux developer, admin and user. : :' :
`. `'`
http://people.debian.org/~kobold/ `-
_____________________________________________________________________
1024D/7F961564, fpr 5465 6E69 E559 6466 BF3D 9F01 2BF8 EE2B 7F96 1564
diff -urN nginx-0.5.30/debian/changelog nginx-0.5.33/debian/changelog
--- nginx-0.5.30/debian/changelog 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/changelog 2007-11-07 16:11:31.000000000 +0100
@@ -1,3 +1,14 @@
+nginx (0.5.33-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #429922)
+ * debian/control: provides httpd. (Closes: #430468)
+ * debian/{postinst,prerm}: don't use debconf init stuff;
+ debian/{preinst,postrm}: removed. (Closes: #435965, #445246).
+ * debian/nginx.links: removed; debian/postinst: create the link for the
+ default web server only on new installations: (Closes: #432961)
+
+ -- Fabio Tranchitella <[EMAIL PROTECTED]> Wed, 07 Nov 2007 16:05:24 +0100
+
nginx (0.5.30-1) unstable; urgency=low
* New stable upstream release.
diff -urN nginx-0.5.30/debian/control nginx-0.5.33/debian/control
--- nginx-0.5.30/debian/control 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/control 2007-11-07 18:43:48.000000000 +0100
@@ -2,12 +2,14 @@
Section: web
Priority: optional
Maintainer: Jose Parrella <[EMAIL PROTECTED]>
+Uploaders: Fabio Tranchitella <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), autotools-dev, libpcre3-dev, zlib1g-dev, libssl-dev
Standards-Version: 3.7.2
Package: nginx
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
+Provides: httpd
Description: small, but very powerful and efficient web server
Nginx (engine x) is a web server created by Igor Sysoev and kindly provided
to the open-source community. This server can be used as standalone HTTP
diff -urN nginx-0.5.30/debian/nginx.links nginx-0.5.33/debian/nginx.links
--- nginx-0.5.30/debian/nginx.links 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/nginx.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-etc/nginx/sites-available/default etc/nginx/sites-enabled/default
diff -urN nginx-0.5.30/debian/postinst nginx-0.5.33/debian/postinst
--- nginx-0.5.30/debian/postinst 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/postinst 2007-11-07 18:58:53.000000000 +0100
@@ -19,13 +19,12 @@
case "$1" in
configure)
-
+ if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] ; then
+ ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+ fi
;;
-
abort-upgrade|abort-remove|abort-deconfigure)
-
;;
-
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
@@ -33,30 +32,33 @@
esac
if [ -x "/etc/init.d/nginx" ]; then
- if [ -f /var/run/nginx.pid ]; then
- /bin/kill -USR2 `cat /var/run/nginx.pid`
- while [ ! -f /var/run/nginx.pid.oldbin ]
- do
- cnt=`expr $cnt + 1`
- if [ $cnt -gt 10 ]
- then
- echo "Nginx 'soft' update failed, doing restart";
- /bin/kill -9 `cat /var/run/nginx.pid`
- invoke-rc.d nginx start
- exit 0
- fi
- sleep 1
- done
- /bin/kill -QUIT `cat /var/run/nginx.pid.oldbin`
-# else
-# invoke-rc.d nginx start
- fi
+ if [ -f /var/run/nginx.pid ] && /bin/pidof /usr/sbin/nginx >/dev/null; then
+ echo "Trying a soft restart"
+ if /bin/kill -USR2 `cat /var/run/nginx.pid` 2>/dev/null; then
+ echo "PID IS RIGHT"
+ while [ ! -f /var/run/nginx.pid.oldbin ]
+ do
+ echo "WAITING"
+ cnt=`expr $cnt + 1`
+ if [ $cnt -gt 10 ]
+ then
+ echo "Nginx 'soft' update failed, doing restart";
+ /bin/kill -9 `cat /var/run/nginx.pid`
+ invoke-rc.d nginx start
+ exit 0
+ fi
+ sleep 1
+ done
+ echo "QUIT"
+ /bin/kill -QUIT `cat /var/run/nginx.pid.oldbin`
+ fi
+ elif [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d nginx start || exit $?
+ else
+ /etc/init.d/nginx start || exit $?
+ fi
fi
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
diff -urN nginx-0.5.30/debian/postrm nginx-0.5.33/debian/postrm
--- nginx-0.5.30/debian/postrm 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/postrm 2007-11-07 18:23:04.000000000 +0100
@@ -19,15 +19,14 @@
case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
+ purge)
+ rm -fr /var/lib/nginx /var/log/nginx /etc/nginx
+ ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
-
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
-
esac
# dh_installdeb will replace this with shell code automatically
diff -urN nginx-0.5.30/debian/preinst nginx-0.5.33/debian/preinst
--- nginx-0.5.30/debian/preinst 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/preinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-#!/bin/sh
-# preinst script for nginx
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- install|upgrade)
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff -urN nginx-0.5.30/debian/prerm nginx-0.5.33/debian/prerm
--- nginx-0.5.30/debian/prerm 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/prerm 2007-11-07 18:35:22.000000000 +0100
@@ -19,7 +19,13 @@
case "$1" in
remove|remove-in-favour|deconfigure|deconfigure-in-favour)
- invoke-rc.d nginx stop
+ if [ -x /etc/init.d/nginx ]; then
+ if [ -x /usr/sbin/invoke-rc.d ] ; then
+ invoke-rc.d nginx stop
+ else
+ /etc/init.d/nginx stop
+ fi
+ fi
;;
upgrade|failed-upgrade)
;;
@@ -35,5 +41,3 @@
#DEBHELPER#
exit 0
-
-
diff -urN nginx-0.5.30/debian/rules nginx-0.5.33/debian/rules
--- nginx-0.5.30/debian/rules 2007-11-07 15:50:38.000000000 +0100
+++ nginx-0.5.33/debian/rules 2007-11-07 18:28:00.000000000 +0100
@@ -35,7 +35,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) clean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
rm -f config.sub
@@ -59,7 +59,7 @@
dh_testroot
dh_installchangelogs CHANGES
dh_installdocs
- dh_installinit
+ dh_installinit -r --no-start
dh_installman debian/nginx.1
dh_installlogrotate
dh_link
signature.asc
Description: Digital signature
