public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc2e0320d3bfdaf0f2c51f6ed7297c3140806482
Date: Mon, 27 Jun 2016 23:21:16 +0100	[thread overview]
Message-ID: <20160627222117.9144A1078E81@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 5038 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  dc2e0320d3bfdaf0f2c51f6ed7297c3140806482 (commit)
       via  a3cab8134a87712723a5a4a76e0e5deee4b02864 (commit)
      from  f7029f205713edc6f523c58685e2f420b5d2852e (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 dc2e0320d3bfdaf0f2c51f6ed7297c3140806482
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 27 23:18:39 2016 +0100

    core104: Ship updated libarchive
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a3cab8134a87712723a5a4a76e0e5deee4b02864
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date:   Sun Jun 26 09:27:58 2016 +0200

    libarchive: update to 3.2.1
    
    Fixes CVE-2016-4301
    Libarchive mtree parse_device Code Execution Vulnerability
    
    Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/libarchive             |  6 +++++-
 config/rootfiles/core/104/filelists/libarchive |  1 +
 lfs/libarchive                                 | 12 ++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 120000 config/rootfiles/core/104/filelists/libarchive

Difference in files:
diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive
index 735bf37..80daa2d 100644
--- a/config/rootfiles/common/libarchive
+++ b/config/rootfiles/common/libarchive
@@ -1,13 +1,15 @@
 #usr/bin/bsdcpio
+#usr/bin/bsdcat
 #usr/bin/bsdtar
 #usr/include/archive.h
 #usr/include/archive_entry.h
 #usr/lib/libarchive.la
 #usr/lib/libarchive.so
 #usr/lib/libarchive.so.13
-#usr/lib/libarchive.so.13.1.2
+#usr/lib/libarchive.so.13.2.1
 #usr/lib/pkgconfig/libarchive.pc
 #usr/share/man/man1/bsdcpio.1
+#usr/share/man/man1/bsdcat.1
 #usr/share/man/man1/bsdtar.1
 #usr/share/man/man3/archive_entry.3
 #usr/share/man/man3/archive_entry_acl.3
@@ -17,6 +19,7 @@
 #usr/share/man/man3/archive_entry_stat.3
 #usr/share/man/man3/archive_entry_time.3
 #usr/share/man/man3/archive_read.3
+#usr/share/man/man3/archive_read_add_passphrase.3
 #usr/share/man/man3/archive_read_data.3
 #usr/share/man/man3/archive_read_disk.3
 #usr/share/man/man3/archive_read_extract.3
@@ -40,6 +43,7 @@
 #usr/share/man/man3/archive_write_new.3
 #usr/share/man/man3/archive_write_open.3
 #usr/share/man/man3/archive_write_set_options.3
+#usr/share/man/man3/archive_write_set_passphrase.3
 #usr/share/man/man3/libarchive.3
 #usr/share/man/man3/libarchive_changes.3
 #usr/share/man/man3/libarchive_internals.3
diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive
new file mode 120000
index 0000000..551f1f7
--- /dev/null
+++ b/config/rootfiles/core/104/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/lfs/libarchive b/lfs/libarchive
index 43365ee..58b4b6e 100644
--- a/lfs/libarchive
+++ b/lfs/libarchive
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  IPFire Team  <info(a)ipfire.org>                          #
+# Copyright (C) 2016  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.2
+VER        = 3.2.1
 
 THISAPP    = libarchive-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = efad5a503f66329bb9d2f4308b5de98a
+$(DL_FILE)_MD5 = afa257047d1941a565216edbf0171e72
 
 install : $(TARGET)
 
@@ -74,12 +74,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure \
-		--prefix=/usr \
-		--disable-static
-
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


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

                 reply	other threads:[~2016-06-27 22:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160627222117.9144A1078E81@git01.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox