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.
 c98304604bfed3b29bb384ab0999596644573f2c
Date: Mon, 26 Mar 2018 19:06:53 +0100
Message-ID: <20180326180654.4141B1081DF2@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2081660330643501531=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2081660330643501531==
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  c98304604bfed3b29bb384ab0999596644573f2c (commit)
       via  be7878d5c92600e7d316a86b18a77819734b62a0 (commit)
       via  dd48a7aac8088ef706d2299bc5b473e9389ba2a2 (commit)
       via  689fed340aab91240b51bf4da1daf0a606290ac1 (commit)
      from  dfdfafc7af57b5088279680098408df823516703 (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 c98304604bfed3b29bb384ab0999596644573f2c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 26 19:04:41 2018 +0100

    core120: Ship updated QoS script and gnupg
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit be7878d5c92600e7d316a86b18a77819734b62a0
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Mon Mar 26 19:50:30 2018 +0200

    Fix typo in 'makeqosscripts.pl'
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit dd48a7aac8088ef706d2299bc5b473e9389ba2a2
Author: Peter M=C3=BCller <peter.mueller(a)link38.eu>
Date:   Sat Mar 24 16:45:02 2018 +0100

    curl: update to 7.59.0
   =20
    Update curl to 7.59.0 which fixes a number of bugs and
    some minor security issues.
   =20
    Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 689fed340aab91240b51bf4da1daf0a606290ac1
Author: Peter M=C3=BCller <peter.mueller(a)link38.eu>
Date:   Sat Mar 24 16:32:53 2018 +0100

    gnupg: update to 1.4.22
   =20
    Update GnuPG to 1.4.22, which fixes some security vulnerabilities,
    such as the memory side channel attack CVE-2017-7526.
   =20
    Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/qos/makeqosscripts.pl                               | 2 +-
 config/rootfiles/core/120/filelists/files                  | 1 +
 config/rootfiles/{oldcore/106 =3D> core/120}/filelists/gnupg | 0
 lfs/curl                                                   | 8 ++++----
 lfs/gnupg                                                  | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)
 copy config/rootfiles/{oldcore/106 =3D> core/120}/filelists/gnupg (100%)

Difference in files:
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 19809615a..824a9937f 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -726,7 +726,7 @@ print <<END
 	echo "Quality of Service was successfully cleared!"
   ;;
   gen|generate)
-	echo -n "Generateing the QoS-Scripts..."
+	echo -n "Generating the QoS-Scripts..."
 	/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/q=
os.sh
 	echo ".Done!"
 	exit 0
diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/cor=
e/120/filelists/files
index 679f627de..88f7d047f 100644
--- a/config/rootfiles/core/120/filelists/files
+++ b/config/rootfiles/core/120/filelists/files
@@ -16,3 +16,4 @@ usr/lib/python2.7/lib-dynload/_hashlib.so
 usr/lib/python2.7/lib-dynload/_ssl.so
 var/ipfire/langs
 var/ipfire/ovpn/openssl/ovpn.cnf
+var/ipfire/qos/bin/makeqosscripts.pl
diff --git a/config/rootfiles/core/120/filelists/gnupg b/config/rootfiles/cor=
e/120/filelists/gnupg
new file mode 120000
index 000000000..a1a156447
--- /dev/null
+++ b/config/rootfiles/core/120/filelists/gnupg
@@ -0,0 +1 @@
+../../../common/gnupg
\ No newline at end of file
diff --git a/lfs/curl b/lfs/curl
index eb2354485..ebb093f56 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,10 +24,10 @@
=20
 include Config
=20
-VER        =3D 7.49.1
+VER        =3D 7.59.0
=20
 THISAPP    =3D curl-$(VER)
-DL_FILE    =3D $(THISAPP).tar.lzma
+DL_FILE    =3D $(THISAPP).tar.gz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D ae5e5e395da413d1fa0864e1d0a3fa57
+$(DL_FILE)_MD5 =3D a44f98c25c7506e7103039b542aa5ad8
=20
 install : $(TARGET)
=20
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
 		--disable-ipv6 \
diff --git a/lfs/gnupg b/lfs/gnupg
index aa76042e3..f131d2b08 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.4.21
+VER        =3D 1.4.22
=20
 THISAPP    =3D gnupg-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 9bdeabf3c0f87ff21cb3f9216efdd01d
+$(DL_FILE)_MD5 =3D 082bda3951a94743e76b83fcf3627547
=20
 install : $(TARGET)
=20


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

--===============2081660330643501531==--