[gentoo-commits] gentoo-x86 commit in www-servers/nginx: metadata.xml ChangeLog nginx-0.7.64-r3.ebuild

[Dirkjan Ochtman (djc)]

djc         10/01/03 20:29:40

  Modified:             metadata.xml ChangeLog
  Added:                nginx-0.7.64-r3.ebuild
  Log:
  Fix bug 296168 (logrotate) and 247474 (realip use flag) in www-servers/nginx.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  www-servers/nginx/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	3 Jan 2010 19:51:40 -0000	1.6
+++ metadata.xml	3 Jan 2010 20:29:40 -0000	1.7
@@ -18,6 +18,7 @@
 	<flag name='securelink'>Enable HTTP secure link module</flag>
 	<flag name='status'>Enables stub_status module</flag>
 	<flag name='sub'>Enables sub_filter module</flag>
+	<flag name='realip'>Enables realip module</flag>
 	<flag name='webdav'>Enable webdav support</flag>
   </use>
 </pkgmetadata>



1.239                www-servers/nginx/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.239&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.239&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.238&r2=1.239

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- ChangeLog	3 Jan 2010 20:07:38 -0000	1.238
+++ ChangeLog	3 Jan 2010 20:29:40 -0000	1.239
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.238 2010/01/03 20:07:38 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.239 2010/01/03 20:29:40 djc Exp $
+
+*nginx-0.7.64-r3 (03 Jan 2010)
+
+  03 Jan 2010; Dirkjan Ochtman <djc@g.o> +nginx-0.7.64-r3.ebuild,
+  +files/nginx.logrotate, metadata.xml:
+  Fix bug 296168 (logrotate) and 247474 (realip use flag).
 
   03 Jan 2010; Dirkjan Ochtman <djc@g.o> -nginx-0.7.64-r1.ebuild,
   -nginx-0.8.17.ebuild, -files/nginx, -files/nginx.conf,



1.1                  www-servers/nginx/nginx-0.7.64-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.64-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.64-r3.ebuild?rev=1.1&content-type=text/plain

Index: nginx-0.7.64-r3.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64-r3.ebuild,v 1.1 2010/01/03 20:29:40 djc Exp $

inherit eutils ssl-cert toolchain-funcs perl-module

DESCRIPTION="Robust, small and high performance http and reverse proxy server"

HOMEPAGE="http://nginx.net/"
SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE="addition debug fastcgi flv imap pcre perl pop random-index realip smtp ssl static-gzip status sub webdav zlib"

DEPEND="dev-lang/perl
	dev-libs/openssl
	pcre? ( >=dev-libs/libpcre-4.2 )
	zlib? ( sys-libs/zlib )
	perl? ( >=dev-lang/perl-5.8 )"

pkg_setup() {
	ebegin "Creating nginx user and group"
	enewgroup ${PN}
	enewuser ${PN} -1 -1 -1 ${PN}
	eend ${?}
}

src_unpack() {
	unpack ${A}
	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
}

src_compile() {
	local myconf

	# threads support is broken atm.
	#
	# if use threads; then
	# 	einfo
	# 	ewarn "threads support is experimental at the moment"
	# 	ewarn "do not use it on production systems - you've been warned"
	# 	einfo
	# 	myconf="${myconf} --with-threads"
	# fi

	use addition && myconf="${myconf} --with-http_addition_module"
	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
	use flv		&& myconf="${myconf} --with-http_flv_module"
	use zlib	|| myconf="${myconf} --without-http_gzip_module"
	use pcre	|| {
		myconf="${myconf} --without-pcre --without-http_rewrite_module"
	}
	use debug	&& myconf="${myconf} --with-debug"
	use ssl		&& myconf="${myconf} --with-http_ssl_module"
	use perl	&& myconf="${myconf} --with-http_perl_module"
	use status	&& myconf="${myconf} --with-http_stub_status_module"
	use webdav	&& myconf="${myconf} --with-http_dav_module"
	use sub		&& myconf="${myconf} --with-http_sub_module"
	use realip	&& myconf="${myconf} --with-http_realip_module"
	use static-gzip		&& myconf="${myconf} --with-http_gzip_static_module"
	use random-index	&& myconf="${myconf} --with-http_random_index_module"

	if use smtp || use pop || use imap; then
		myconf="${myconf} --with-mail"
		use ssl && myconf="${myconf} --with-mail_ssl_module"
	fi
	use imap || myconf="${myconf} --without-mail_imap_module"
	use pop || myconf="${myconf} --without-mail_pop3_module"
	use smtp || myconf="${myconf} --without-mail_smtp_module"

	tc-export CC
	./configure \
		--prefix=/usr \
		--with-cc-opt="-I${ROOT}/usr/include" \
		--with-ld-opt="-L${ROOT}/usr/lib" \
		--conf-path=/etc/${PN}/${PN}.conf \
		--http-log-path=/var/log/${PN}/access_log \
		--error-log-path=/var/log/${PN}/error_log \
		--pid-path=/var/run/${PN}.pid \
		--http-client-body-temp-path=/var/tmp/${PN}/client \
		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
		${myconf} || die "configure failed"

	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
}

src_install() {
	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}

	dosbin objs/nginx
	newinitd "${FILESDIR}"/nginx.init-r2 nginx || die

	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf

	dodir /etc/${PN}
	insinto /etc/${PN}
	doins conf/*

	dodoc CHANGES{,.ru} README

	# logrotate
	insinto /etc/logrotate.d
	newins "${FILESDIR}"/nginx.logrotate nginx || die

	use perl && {
		cd "${S}"/objs/src/http/modules/perl/
		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
		fixlocalpod
	}
}

pkg_postinst() {
	use ssl && {
		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
			install_cert /etc/ssl/${PN}/${PN}
			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
		fi
	}
}