From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 cbc492f516c0dc8077b2e41f336776aca552e256
Date: Sun, 02 Mar 2014 19:53:52 +0100
Message-ID: <20140302185353.2197121060@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0219602203327466897=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0219602203327466897==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  cbc492f516c0dc8077b2e41f336776aca552e256 (commit)
      from  239f8188e22bec5ea0820dd0e566fc8dcbd3e3c1 (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 cbc492f516c0dc8077b2e41f336776aca552e256
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Mar 2 19:44:26 2014 +0100

    apache2: update to 2.2.26.

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

Summary of changes:
 config/rootfiles/common/apache2 | 5 +++--
 lfs/apache2                     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 2076fc3..092a16f 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -606,6 +606,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_host.html
 #srv/web/ipfire/manual/mod/mod_authz_host.html.en
+#srv/web/ipfire/manual/mod/mod_authz_host.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_host.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_host.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_owner.html
@@ -1330,12 +1331,12 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.4.6
+usr/lib/libapr-1.so.0.4.8
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.4.1
+usr/lib/libaprutil-1.so.0.5.2
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
 #usr/sbin/ab
diff --git a/lfs/apache2 b/lfs/apache2
index 50c94a6..697fab6 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2012   IPFire Team  <info(a)ipfire.org>                =
    #
+# Copyright (C) 2007-2014   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      =
  #
@@ -25,7 +25,7 @@
=20
 include Config
=20
-VER        =3D 2.2.23
+VER        =3D 2.2.26
=20
 THISAPP    =3D httpd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects =3D $(DL_FILE) \
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch =3D $(DL_FROM)/httpd-2.2.2-config-1.patch
=20
-$(DL_FILE)_MD5 =3D ca133de0e4b4b15316990a97186b9993
+$(DL_FILE)_MD5 =3D 254eda547f8d624604e4bf403241e617
 httpd-2.2.2-config-1.patch_MD5 =3D e02a3ec5925eb9e111400b9aa229f822
=20
 install : $(TARGET)


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

--===============0219602203327466897==--