From 1d255a2e6464b23b04f01f104383b13853c792b2 Mon Sep 17 00:00:00 2001 From: Max Miorim Date: Sat, 14 Aug 2010 13:36:12 -0500 Subject: network/nginx: Updated for version 0.7.67. Signed-off-by: Erik Hanson --- network/nginx/0.7.65-fix_perl_man_path.patch | 12 ------------ network/nginx/0.7.67-fix_perl_man_path.patch | 12 ++++++++++++ network/nginx/nginx.SlackBuild | 19 +++++++++++++------ network/nginx/nginx.info | 6 +++--- 4 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 network/nginx/0.7.65-fix_perl_man_path.patch create mode 100644 network/nginx/0.7.67-fix_perl_man_path.patch diff --git a/network/nginx/0.7.65-fix_perl_man_path.patch b/network/nginx/0.7.65-fix_perl_man_path.patch deleted file mode 100644 index de54627363..0000000000 --- a/network/nginx/0.7.65-fix_perl_man_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru nginx-0.7.65.orig//auto/lib/perl/conf nginx-0.7.65/auto/lib/perl/conf ---- nginx-0.7.65.orig//auto/lib/perl/conf 2006-12-24 16:23:11.000000000 -0200 -+++ nginx-0.7.65/auto/lib/perl/conf 2010-06-07 00:42:23.398070172 -0300 -@@ -47,7 +47,7 @@ - if test -n "$NGX_PERL_MODULES"; then - have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" - . auto/define -- NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3 -+ NGX_PERL_MODULES_MAN=/usr/man/man3 - fi - - else diff --git a/network/nginx/0.7.67-fix_perl_man_path.patch b/network/nginx/0.7.67-fix_perl_man_path.patch new file mode 100644 index 0000000000..de54627363 --- /dev/null +++ b/network/nginx/0.7.67-fix_perl_man_path.patch @@ -0,0 +1,12 @@ +diff -Nru nginx-0.7.65.orig//auto/lib/perl/conf nginx-0.7.65/auto/lib/perl/conf +--- nginx-0.7.65.orig//auto/lib/perl/conf 2006-12-24 16:23:11.000000000 -0200 ++++ nginx-0.7.65/auto/lib/perl/conf 2010-06-07 00:42:23.398070172 -0300 +@@ -47,7 +47,7 @@ + if test -n "$NGX_PERL_MODULES"; then + have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" + . auto/define +- NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3 ++ NGX_PERL_MODULES_MAN=/usr/man/man3 + fi + + else diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild index 397a0d2bc2..3b0a99250f 100644 --- a/network/nginx/nginx.SlackBuild +++ b/network/nginx/nginx.SlackBuild @@ -25,16 +25,14 @@ # Modified by Max Miorim PRGNAM=nginx -VERSION=${VERSION:-0.7.65} +VERSION=${VERSION:-0.7.67} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; -# Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -76,7 +74,7 @@ find . \ -exec chmod 644 {} \; # patch to install the perl man pages in /usr/man/man3 -patch -p1 --verbose < $CWD/0.7.65-fix_perl_man_path.patch +patch -p1 --verbose < $CWD/0.7.67-fix_perl_man_path.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -111,9 +109,9 @@ CXXFLAGS="$SLKCFLAGS" \ --http-fastcgi-temp-path=/dev/shm \ --without-mail_pop3_module \ --without-mail_imap_module \ - --without-mail_smtp_module + --without-mail_smtp_module -make +make make install DESTDIR=$PKG find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ @@ -145,6 +143,15 @@ cat $CWD/nginx.SlackBuild > $PKG/usr/doc/nginx-$VERSION/nginx.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat << EOF >> $PKG/install/doinst.sh + +# Create the log dir and set the permissions +if [ ! -d /var/log/nginx ]; then + mkdir -p /var/log/nginx + chown $NGINXUSER:$NGINXGROUP /var/log/nginx + chmod 750 /var/log/nginx +fi +EOF # Let's not clobber config files on upgrade ( cd $PKG/etc/nginx diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info index 5e3175ac5e..0795f21eef 100644 --- a/network/nginx/nginx.info +++ b/network/nginx/nginx.info @@ -1,10 +1,10 @@ PRGNAM="nginx" -VERSION="0.7.65" +VERSION="0.7.67" HOMEPAGE="http://nginx.org/" -DOWNLOAD="http://nginx.org/download/nginx-0.7.65.tar.gz" +DOWNLOAD="http://nginx.org/download/nginx-0.7.67.tar.gz" MD5SUM="abc4f76af450eedeb063158bd963feaa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Max Miorim" EMAIL="miorimmax@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" -- cgit v1.2.3