From f7eab091642b641df1c2e49b63d0fc065afefda4 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Thu, 8 Jun 2017 14:15:49 +0200 Subject: [PATCH 1/3] guardian: Bump package version During commit d68ead3decfdcc4ca4a1413e33f3c47270799836 the guardian.cgi has been changed, and therefore the package version of guardian needs to be bumped to ship the changed files. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer --- lfs/guardian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/guardian b/lfs/guardian index 2120a08a4..f3001c821 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" From 3de55e1b0e89cc48b579fc510f43b28bf9e9f7bc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 9 Jun 2017 21:36:02 +0200 Subject: [PATCH 2/3] gzip: remove wrong zcat and gunzip symlinks new gzip version use zcat and gunzip shell scripts that add the needed parameter to gzip. fixes: #11399 Signed-off-by: Arne Fitzenreiter --- lfs/gzip | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lfs/gzip b/lfs/gzip index 537662c33..e61d78a8c 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team # +# Copyright (C) 2007-2017 IPFire Team # # # # 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 From 369a04a49d17bd642e14d91cc22f846361169390 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 10 Jun 2017 12:22:36 +0200 Subject: [PATCH 3/3] samba: remove winbind tevent poll patch this not work without matching libtevent fixes #11390 Signed-off-by: Arne Fitzenreiter --- lfs/samba | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/samba b/lfs/samba index 815a8ece1..d54d507af 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