[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65ca3f05075a11e2bce7daef5980f9bb4715ae84

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65ca3f05075a11e2bce7daef5980f9bb4715ae84

[git]

[-- Attachment #1: Type: text/plain, Size: 3666 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  65ca3f05075a11e2bce7daef5980f9bb4715ae84 (commit)
       via  369a04a49d17bd642e14d91cc22f846361169390 (commit)
       via  fa9ae828aba49064b79a1c7d657afd48faa951c8 (commit)
       via  3de55e1b0e89cc48b579fc510f43b28bf9e9f7bc (commit)
       via  f7eab091642b641df1c2e49b63d0fc065afefda4 (commit)
      from  357b8c14111373a8d4e02b9e9b9506e6d83c40be (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 65ca3f05075a11e2bce7daef5980f9bb4715ae84
Merge: 357b8c1 369a04a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 10 22:38:32 2017 +0200

    Merge branch 'master' into next

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

Summary of changes:
 lfs/guardian | 2 +-
 lfs/gzip     | 4 +---
 lfs/samba    | 4 ++--
 3 files changed, 4 insertions(+), 6 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    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = guardian
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       = "perl-inotify2 perl-Net-IP"
 
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
diff --git a/lfs/samba b/lfs/samba
index 815a8ec..d54d507 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 66
+PAK_VER    = 67
 
 DEPS       = "cups krb5"
 
@@ -153,7 +153,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.99-fix_dirsort_ea-support.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-7494-v3-6.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/doc-update.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.x-winbind_tevent_poll.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.x-winbind_tevent_poll.patch
 
 
 	cd $(DIR_APP)/source3 && ./autogen.sh


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