diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/nginx/README | 2 | ||||
| -rw-r--r-- | network/nginx/fix_perl_man_path.patch | 12 | ||||
| -rw-r--r-- | network/nginx/nginx.SlackBuild | 19 | ||||
| -rw-r--r-- | network/nginx/nginx.info | 8 |
4 files changed, 11 insertions, 30 deletions
diff --git a/network/nginx/README b/network/nginx/README index e148206644..2110d38844 100644 --- a/network/nginx/README +++ b/network/nginx/README @@ -3,7 +3,7 @@ as well as an IMAP/POP3 proxy server. By default, nginx will use the "nobody" user and group accounts. You may specify alternate values on the command line if desired; for example: - + NGINXUSER=backup NGINXGROUP=backup ./nginx.SlackBuild Regardless of which user and group you decide to use, you will need to make diff --git a/network/nginx/fix_perl_man_path.patch b/network/nginx/fix_perl_man_path.patch deleted file mode 100644 index 437f3953a6..0000000000 --- a/network/nginx/fix_perl_man_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur nginx-0.8.53.orig//auto/lib/perl/conf nginx-0.8.53//auto/lib/perl/conf ---- nginx-0.8.53.orig//auto/lib/perl/conf 2006-12-24 12:23:11.000000000 -0600 -+++ nginx-0.8.53//auto/lib/perl/conf 2010-12-11 17:01:03.152535901 -0600 -@@ -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 330a700d6d..c9e77dd0f5 100644 --- a/network/nginx/nginx.SlackBuild +++ b/network/nginx/nginx.SlackBuild @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Max Miorim <miorimmax@gmail.com> +# Modified by Diogo Leal <diogo@diogoleal.com> PRGNAM=nginx -VERSION=${VERSION:-0.8.54} +VERSION=${VERSION:-1.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,9 +73,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# patch to install the perl man pages in /usr/man/man3 -patch -p1 --verbose < $CWD/fix_perl_man_path.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -123,8 +120,6 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | \ find $PKG -perm 444 -exec chmod 0644 {} \; find $PKG -perm 555 -exec chmod 0755 {} \; -find $PKG/usr/man -type f -exec gzip -9 {} \; - # Remove some other empty and/or unnecessary directories from the package eval $(perl '-V:archlib') rm -rf $PKG/$archlib $PKG/usr/html $PKG/var @@ -155,13 +150,11 @@ EOF # Let's not clobber config files on upgrade ( cd $PKG/etc/nginx - for i in * ; do - if ! echo "$i" | grep -q '.default' ; then - mv $i $i.new; - echo "config etc/nginx/$i.new" >> $PKG/install/doinst.sh; - fi + for i in fastcgi_params mime.types nginx.conf koi-utf koi-win win-utf; do + mv $i $i.new; + echo "config etc/nginx/$i.new" >> $PKG/install/doinst.sh; done ) cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info index ba018a1b8b..ae36e4dd43 100644 --- a/network/nginx/nginx.info +++ b/network/nginx/nginx.info @@ -1,10 +1,10 @@ PRGNAM="nginx" -VERSION="0.8.54" +VERSION="1.0.4" HOMEPAGE="http://nginx.org/" -DOWNLOAD="http://nginx.org/download/nginx-0.8.54.tar.gz" -MD5SUM="44df4eb6a22d725021288c570789046f" +DOWNLOAD="http://nginx.org/download/nginx-1.0.4.tar.gz" +MD5SUM="d23f6e6b07b57ac061e790b1ed64bb98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Diogo Leal" EMAIL="diogo@diogoleal.com" -APPROVED="rworkman" +APPROVED="dsomero" |