X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from nienna.jlyo.org (nienna.jlyo.org [173.236.66.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 851CF1DA26CA for ; Thu, 27 Oct 2011 21:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=jlyo.org; s=nienna; h=Message-Id:Date:Subject:Cc:To:From; bh=cvAnSDkpDTG0ayWNsdLZt7e7aLecAhdH8OKpwU/xy60=; b=LFnNsiac6xXFqm4o281fZKGYyF3vJFxg1QgSFj9E1LdQo0lsJ5GoqV/ynT1oqFzIBNqcFK0vRBuweIZSiwQJWeAjcF8mYoks+vXfu2RxVmM5ONAKcx05ri2RujkL1ULgPM74fIo+pezGOYHtImY87xnuTCllvReZJmwSoaqm/hg=; Received: from [10.117.56.1] (helo=telperion.jlyo.org) by nienna.jlyo.org with esmtp (Exim 4.76) (envelope-from ) id 1RJXZk-0002S7-4S; Thu, 27 Oct 2011 21:33:24 +0000 Received: from localhost ([127.0.0.1] helo=telperion.jlyo.org) by telperion.jlyo.org with esmtp (Exim 4.77) (envelope-from ) id 1RJXZR-0002WM-DQ; Thu, 27 Oct 2011 16:33:05 -0500 From: Jesse Young To: Alpine Development Cc: Jesse Young Subject: [alpine-devel] [PATCH 1/4] main/nginx: default listen on :::80 rather than 0.0.0.0:80 Date: Thu, 27 Oct 2011 21:32:53 +0000 Message-Id: <1319751176-9658-1-git-send-email-jlyo@jlyo.org> X-Mailer: git-send-email 1.7.4.5 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Signed-off-by: Jesse Young --- main/nginx/APKBUILD | 6 ++++-- main/nginx/ipv6.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 main/nginx/ipv6.patch diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index d6727fb..c2a9dda 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -16,14 +16,15 @@ source="http://nginx.org/download/$pkgname-$pkgver.tar.gz nginx.initd nginx.logrotate $install + ipv6.patch " - _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" # apply patches here + patch -Np1 -i "$srcdir"/ipv6.patch } build() { @@ -58,4 +59,5 @@ package() { md5sums="d23f6e6b07b57ac061e790b1ed64bb98 nginx-1.0.4.tar.gz b06f6e23753385be0076539ba1806cb6 nginx.initd -8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate" +8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate +39352885998d36ea3415cd50d0d5049b ipv6.patch" diff --git a/main/nginx/ipv6.patch b/main/nginx/ipv6.patch new file mode 100644 index 0000000..9b05f8f --- /dev/null +++ b/main/nginx/ipv6.patch @@ -0,0 +1,42 @@ +--- a/src/http/ngx_http_core_module.c ++++ b/src/http/ngx_http_core_module.c +@@ -2442,7 +2442,11 @@ + ngx_uint_t i; + ngx_conf_t pcf; + ngx_http_module_t *module; ++#if (NGX_HAVE_INET6) ++ struct sockaddr_in6 *sin6; ++#else + struct sockaddr_in *sin; ++#endif + ngx_http_conf_ctx_t *ctx, *http_ctx; + ngx_http_listen_opt_t lsopt; + ngx_http_core_srv_conf_t *cscf, **cscfp; +@@ -2526,6 +2530,19 @@ + if (rv == NGX_CONF_OK && !cscf->listen) { + ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); + ++#if (NGX_HAVE_INET6) ++ sin6 = &lsopt.u.sockaddr_in6; ++ ++ sin6->sin6_family = AF_INET6; ++#if (NGX_WIN32) ++ sin6->sin6_port = htons(80); ++#else ++ sin6->sin6_port = htons((getuid() == 0) ? 80 : 8000); ++#endif ++ sin6->sin6_addr = in6addr_any; ++ ++ lsopt.socklen = sizeof(struct sockaddr_in6); ++#else + sin = &lsopt.u.sockaddr_in; + + sin->sin_family = AF_INET; +@@ -2537,6 +2554,7 @@ + sin->sin_addr.s_addr = INADDR_ANY; + + lsopt.socklen = sizeof(struct sockaddr_in); ++#endif + + lsopt.backlog = NGX_LISTEN_BACKLOG; + lsopt.rcvbuf = -1; -- 1.7.4.5 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---