public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7d7d5092d3a17ec38f3a8baa5a214075dc269ed3
Date: Sun, 09 Feb 2014 15:40:11 +0100	[thread overview]
Message-ID: <20140209144023.962AD21007@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2494 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7d7d5092d3a17ec38f3a8baa5a214075dc269ed3 (commit)
      from  41e2c149a52c602ca1e5a7c9439e4e0d630620c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7d7d5092d3a17ec38f3a8baa5a214075dc269ed3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 9 15:39:22 2014 +0100

    nginx: remove tcp_proxy_module patch.

-----------------------------------------------------------------------

Summary of changes:
 lfs/nginx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/nginx b/lfs/nginx
index e2f3c4f..e4e80ab 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-14  IPFire Team  <info(a)ipfire.org>                       #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = nginx
-PAK_VER	   = 1
+PAK_VER	   = 2
 
 ###############################################################################
 # Top-level Rules
@@ -76,7 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && tar xvf $(DIR_SRC)/cache/nginx_tcp_proxy_module.tar.bz2 -C $(DIR_APP)	
-	cd $(DIR_APP) && patch -p1 < nginx_tcp_proxy_module/tcp.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr/share/nginx/ \
 		--conf-path=/etc/nginx/nginx.conf \


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2014-02-09 14:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140209144023.962AD21007@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox