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, core111,
 updated. fa9ae828aba49064b79a1c7d657afd48faa951c8
Date: Sat, 10 Jun 2017 11:18:26 +0100
Message-ID: <20170610101827.440061078E83@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8985252762996571678=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============8985252762996571678==
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, core111 has been updated
       via  fa9ae828aba49064b79a1c7d657afd48faa951c8 (commit)
       via  3de55e1b0e89cc48b579fc510f43b28bf9e9f7bc (commit)
       via  f7eab091642b641df1c2e49b63d0fc065afefda4 (commit)
      from  3b1c776259eba53514c6fa4c120d919b7f3f365e (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 fa9ae828aba49064b79a1c7d657afd48faa951c8
Merge: 3de55e1 f7eab09
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jun 9 21:41:19 2017 +0200

    Merge remote-tracking branch 'origin/master' into core111

commit 3de55e1b0e89cc48b579fc510f43b28bf9e9f7bc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jun 9 21:36:02 2017 +0200

    gzip: remove wrong zcat and gunzip symlinks
   =20
    new gzip version use zcat and gunzip shell scripts that
    add the needed parameter to gzip.
   =20
    fixes: #11399
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 lfs/guardian | 2 +-
 lfs/gzip     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/lfs/guardian b/lfs/guardian
index 2120a08..f3001c8 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -33,7 +33,7 @@ DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
 PROG       =3D guardian
-PAK_VER    =3D 13
+PAK_VER    =3D 14
=20
 DEPS       =3D "perl-inotify2 perl-Net-IP"
=20
diff --git a/lfs/gzip b/lfs/gzip
index 537662c..e61d78a 100644
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2017  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      =
  #
@@ -83,8 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
-	ln -sfv gzip /bin/gunzip
-	ln -sfv gzip /bin/zcat
 	mv -v /bin/{gzexe,zcmp,zdiff,zegrep} /usr/bin
 	mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin
 endif


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

--===============8985252762996571678==--