[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 84fce430a3d5ee7dc7693f995143437d20f52742 - IPFire-SCM

22 Mar 2016

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  84fce430a3d5ee7dc7693f995143437d20f52742 (commit)
       via  677fa734b8c0505744d19afba56d1717d7c66616 (commit)
       via  bda83227aa0ea509e5b78c11ce607fa8c4e34aa8 (commit)
       via  d5f7b3aad9c260ce633d16d5a130ca21967d6717 (commit)
       via  52c277d917188a860ab050012e5df8685320fa56 (commit)
       via  b336f14656d9979d059284d9bc827c499230596d (commit)
       via  a82348347b2f7622f97f171f2ed67a96129300c6 (commit)
       via  4d137b36f1c669eddb938b95597f22ce168d7374 (commit)
      from  d5ef73a3953bfc828adfd2c0a73d5e5be3617bfc (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 84fce430a3d5ee7dc7693f995143437d20f52742
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 22 22:21:25 2016 +0000
e2fsprogs: Fix indentation of makefile
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 677fa734b8c0505744d19afba56d1717d7c66616
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 22 22:19:25 2016 +0000
e2fsprogs: Only build in own directory
This makes it easier to clean up after the build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bda83227aa0ea509e5b78c11ce607fa8c4e34aa8
Author: Marcel Lorenz marcel.lorenz@ipfire.org
Date:   Wed Mar 9 07:32:21 2016 +0100
e2fsprogs: update to 1.42.13
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d5f7b3aad9c260ce633d16d5a130ca21967d6717
Author: Marcel Lorenz marcel.lorenz@ipfire.org
Date:   Thu Mar 10 17:47:55 2016 +0100
pkg-config: update to 0.29
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 52c277d917188a860ab050012e5df8685320fa56
Author: Marcel Lorenz marcel.lorenz@ipfire.org
Date:   Thu Mar 10 18:00:17 2016 +0100
grep: update to 2.23
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b336f14656d9979d059284d9bc827c499230596d
Author: Dirk Wagner dirk.wagner@ipfire.org
Date:   Sat Feb 20 21:11:03 2016 +0100
asterisk addon: update to 11.21.1
Signed-off-by: Dirk Wagner dirk.wagner@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a82348347b2f7622f97f171f2ed67a96129300c6
Author: Dirk Wagner dirk.wagner@ipfire.org
Date:   Fri Feb 19 23:58:16 2016 +0100
libsrtp: upgrade to 1.5.4
Signed-off-by: Dirk Wagner dirk.wagner@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4d137b36f1c669eddb938b95597f22ce168d7374
Author: Marcel Lorenz marcel.lorenz@ipfire.org
Date:   Tue Mar 22 18:43:01 2016 +0100
git: update to 2.7.1
Fixes CVE-2016-2324 and CVE-2016‑2315
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/e2fsprogs |  4 ++++
 config/rootfiles/packages/git     | 44 +++++++++++++++++++++------------------
 lfs/asterisk                      |  8 +++----
 lfs/e2fsprogs                     | 28 +++++++++++++++----------
 lfs/git                           |  7 +++----
 lfs/grep                          | 15 ++++++-------
 lfs/libsrtp                       |  8 +++----
 lfs/pkg-config                    | 10 ++++-----
 8 files changed, 67 insertions(+), 57 deletions(-)
Difference in files:

diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index 9622e6c..ba4f00a 100644
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -1,4 +1,5 @@
 #etc/mke2fs.conf
+#etc/mke2fs.conf.e2fsprogs-new
 lib/libblkid.so.1
 lib/libblkid.so.1.0
 lib/libcom_err.so.2
@@ -114,6 +115,9 @@ usr/sbin/uuidd
 #usr/share/man/man3/uuid_unparse.3
 #usr/share/man/man5/e2fsck.conf.5
 #usr/share/man/man5/mke2fs.conf.5
+#usr/share/man/man5/ext2.5
+#usr/share/man/man5/ext3.5
+#usr/share/man/man5/ext4.5
 #usr/share/man/man8/badblocks.8
 #usr/share/man/man8/blkid.8
 #usr/share/man/man8/debugfs.8
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index e168483..ea31b20 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -6,26 +6,26 @@ usr/bin/git-upload-archive
 usr/bin/git-upload-pack
 #usr/bin/gitk
 usr/lib/perl5/site_perl/5.12.3/Error.pm
-usr/lib/perl5/site_perl/5.12.3/Git
+#usr/lib/perl5/site_perl/5.12.3/Git
 usr/lib/perl5/site_perl/5.12.3/Git.pm
 usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm
+usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm
 #usr/lib/perl5/site_perl/5.12.3/Git/SVN
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
-usr/libexec/git-core
-usr/libexec/git-core/git
+#usr/libexec/git-core
+#usr/libexec/git-core/git
 usr/libexec/git-core/git-add
 usr/libexec/git-core/git-add--interactive
 usr/libexec/git-core/git-am
@@ -172,6 +172,7 @@ usr/libexec/git-core/git-stash
 usr/libexec/git-core/git-status
 usr/libexec/git-core/git-stripspace
 usr/libexec/git-core/git-submodule
+usr/libexec/git-core/git-submodule--helper
 usr/libexec/git-core/git-svn
 usr/libexec/git-core/git-symbolic-ref
 usr/libexec/git-core/git-tag
@@ -188,8 +189,9 @@ usr/libexec/git-core/git-verify-pack
 usr/libexec/git-core/git-verify-tag
 usr/libexec/git-core/git-web--browse
 usr/libexec/git-core/git-whatchanged
+usr/libexec/git-core/git-worktree
 usr/libexec/git-core/git-write-tree
-usr/libexec/git-core/mergetools
+#usr/libexec/git-core/mergetools
 usr/libexec/git-core/mergetools/araxis
 usr/libexec/git-core/mergetools/bc
 usr/libexec/git-core/mergetools/bc3
@@ -212,12 +214,13 @@ usr/libexec/git-core/mergetools/tortoisemerge
 usr/libexec/git-core/mergetools/vimdiff
 usr/libexec/git-core/mergetools/vimdiff2
 usr/libexec/git-core/mergetools/vimdiff3
+usr/libexec/git-core/mergetools/winmerge
 usr/libexec/git-core/mergetools/xxdiff
-usr/share/git-core
-usr/share/git-core/templates
+#usr/share/git-core
+#usr/share/git-core/templates
 usr/share/git-core/templates/branches
 usr/share/git-core/templates/description
-usr/share/git-core/templates/hooks
+#usr/share/git-core/templates/hooks
 usr/share/git-core/templates/hooks/applypatch-msg.sample
 usr/share/git-core/templates/hooks/commit-msg.sample
 usr/share/git-core/templates/hooks/post-update.sample
@@ -227,7 +230,7 @@ usr/share/git-core/templates/hooks/pre-push.sample
 usr/share/git-core/templates/hooks/pre-rebase.sample
 usr/share/git-core/templates/hooks/prepare-commit-msg.sample
 usr/share/git-core/templates/hooks/update.sample
-usr/share/git-core/templates/info
+#usr/share/git-core/templates/info
 usr/share/git-core/templates/info/exclude
 #usr/share/git-gui
 #usr/share/git-gui/lib
@@ -315,6 +318,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/locale/fr/LC_MESSAGES/git.mo
 #usr/share/locale/is/LC_MESSAGES/git.mo
 #usr/share/locale/it/LC_MESSAGES/git.mo
+#usr/share/locale/ko/LC_MESSAGES/git.mo
 #usr/share/locale/pt_PT/LC_MESSAGES/git.mo
 #usr/share/locale/ru/LC_MESSAGES/git.mo
 #usr/share/locale/sv/LC_MESSAGES/git.mo
diff --git a/lfs/asterisk b/lfs/asterisk
index 91dc4fd..9fc90ea 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2016  IPFire Team  info@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        #
@@ -20,7 +20,7 @@
include Config
-VER        = 11.20.0
+VER        = 11.21.1
THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -28,7 +28,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 18
+PAK_VER    = 19
DEPS       = "libsrtp"
@@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds
 asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
 asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
-$(DL_FILE)_MD5 = d15759b05862250073e2708394ad2f4c
+$(DL_FILE)_MD5 = 9594c3cdcf6dc16c719b5abb00dbdd8f
 asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index dff6393..90e28ac 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  info@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      = 1.42.6
+VER      = 1.42.13
THISAPP    = e2fsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c
+$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265
install : $(TARGET)
@@ -69,12 +69,18 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC) && mkdir build
-	cd $(DIR_SRC)/build && $(DIR_APP)/configure --prefix=/usr --with-root-prefix="" \
-						--enable-elf-shlibs --disable-evms --disable-nls
-	cd $(DIR_SRC)/build && make $(MAKETUNING)
-	cd $(DIR_SRC)/build && make install
-	cd $(DIR_SRC)/build && make install-libs
-	@rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	-mkdir -pv $(DIR_APP)/build
+	cd $(DIR_APP)/build && \
+		$(DIR_APP)/configure \
+			--prefix=/usr \
+			--with-root-prefix="" \
+			--enable-elf-shlibs \
+			--disable-evms \
+			--disable-nls
+	cd $(DIR_APP)/build && make $(MAKETUNING)
+	cd $(DIR_APP)/build && make install
+	cd $(DIR_APP)/build && make install-libs
+	chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
+	@rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/git b/lfs/git
index bbec140..032907b 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
include Config
-VER        = 2.4.4
+VER        = 2.7.1
THISAPP    = git-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31
+$(DL_FILE)_MD5 = eece7b1e87983271621a0cb6aab37a25
install : $(TARGET)
@@ -78,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && ./configure \
+		--with-gitconfig=/etc/gitconfig \
    	--prefix=/usr \
    	--with-libpcre \
    	--with-curl \
    	--with-expat
-
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
-
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/grep b/lfs/grep
index d22b359..9f3a38e 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2016  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  IPFire Team  info@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        = 2.22
+VER        = 2.23
THISAPP    = grep-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -36,14 +36,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --bindir=/bin --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=/tools --disable-nls \
     --disable-perl-regexp --without-included-regex
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+
 endif
###############################################################################
@@ -54,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e1015e951a49a82b02e38891026ef5df
+$(DL_FILE)_MD5 = f46aa9d0d2577b9212a104348a286787
install : $(TARGET)
@@ -85,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/libsrtp b/lfs/libsrtp
index 47c0cad..cc1eef3 100644
--- a/lfs/libsrtp
+++ b/lfs/libsrtp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  info@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,14 +24,14 @@
include Config
-VER        = 1.5.2
+VER        = 1.5.4
 THISAPP    = libsrtp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libsrtp
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       = ""
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2309aa6027992810a4285b042c71e644
+$(DL_FILE)_MD5 = 64a9580f86a9c3e1c4986e944e6a5a84
install : $(TARGET)
diff --git a/lfs/pkg-config b/lfs/pkg-config
index b3db91f..3da8556 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  IPFire Team  info@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        = 0.20
+VER        = 0.29
THISAPP    = pkg-config-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fb42402593e4198bc252ab248dd4158b
+$(DL_FILE)_MD5 = 77f27dce7ef88d0634d0d6f90e03a77f
install : $(TARGET)
@@ -70,8 +70,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
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib
+	cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree

    