From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 07a67eed52944e377d4346c6941c9106c83ab291
Date: Sun, 25 Aug 2019 16:15:00 +0100
Message-ID: <20190825151501.0569D60A89@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6794793322208095743=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6794793322208095743==
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  07a67eed52944e377d4346c6941c9106c83ab291 (commit)
       via  51a7871a35718843ef3d0529efa2e805582885ab (commit)
       via  ffb5a1535e978deec5c716b5ad09321bd8c7d661 (commit)
       via  18ec6097c3ccae855fddfafce8cf67627aac3d5d (commit)
      from  b0a8548bdabf1aa78b5754fb0af3dc60064b5d9f (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 07a67eed52944e377d4346c6941c9106c83ab291
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 25 17:11:29 2019 +0200

    core136: touch "need reboot" flag
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 51a7871a35718843ef3d0529efa2e805582885ab
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 25 17:10:44 2019 +0200

    core136: run xt_geoip_update
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit ffb5a1535e978deec5c716b5ad09321bd8c7d661
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 25 17:09:03 2019 +0200

    core136: restart apache2
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 18ec6097c3ccae855fddfafce8cf67627aac3d5d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 25 17:05:55 2019 +0200

    core136: remove old perl files
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/136/update.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/136/update.sh b/config/rootfiles/core/136/=
update.sh
index 7dcf87b62..3c5d4bd86 100644
--- a/config/rootfiles/core/136/update.sh
+++ b/config/rootfiles/core/136/update.sh
@@ -49,6 +49,11 @@ done
 # Extract files
 extract_files
=20
+# Remove old perl files
+rm -rf /usr/bin/perl5.12.3
+rm -rf /usr/lib/perl5/5.12.3
+rm -rf /usr/lib/perl5/site_perl/5.12.3
+
 # update linker config
 ldconfig
=20
@@ -60,9 +65,13 @@ mv /etc/rc.d/rc0.d/K79unbound /etc/rc.d/rc0.d/K86unbound
 mv /etc/rc.d/rc6.d/K79unbound /etc/rc.d/rc6.d/K86unbound
=20
 # Start services
+/etc/init.d/apache restart
+
+# Update GeoIP
+/usr/local/bin/xt_geoup_update
=20
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
=20
 # Finish
 /etc/init.d/fireinfo start


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

--===============6794793322208095743==--