[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8243eeaced82bc53ef87eb9951830ba0842bbcdd

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8243eeaced82bc53ef87eb9951830ba0842bbcdd

[git]

[-- Attachment #1: Type: text/plain, Size: 4448 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 3.x development tree".

The branch, master has been updated
       via  8243eeaced82bc53ef87eb9951830ba0842bbcdd (commit)
       via  ec31d8f4b6949c26b74040c6f07a1130aa2c7d10 (commit)
      from  c414ebd58adcea238591577cb6a50eecb69e449a (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 8243eeaced82bc53ef87eb9951830ba0842bbcdd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 26 23:15:07 2016 +0100

    curl: Update to 7.48.0
    
    Explicitely depend on openssl.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ec31d8f4b6949c26b74040c6f07a1130aa2c7d10
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Apr 22 22:37:46 2016 +0100

    Remove support for ReiserFS
    
    This filesystem is very much outdated and not too much
    developed any more. Usage is very small if even existent.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 curl/curl.nm                   |  3 ++-
 kernel/config-generic          |  7 +------
 kernel/kernel.nm               |  2 +-
 reiserfsprogs/reiserfsprogs.nm | 40 ----------------------------------------
 4 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 reiserfsprogs/reiserfsprogs.nm

Difference in files:
diff --git a/curl/curl.nm b/curl/curl.nm
index 4bebbff..ae59162 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = curl
-version    = 7.41.0
+version    = 7.48.0
 release    = 1
 
 groups     = Application/Internet
@@ -32,6 +32,7 @@ build
 		libtool-devel
 		net-tools
 		openldap-devel
+		openssl-devel
 		zlib-devel
 	end
 
diff --git a/kernel/config-generic b/kernel/config-generic
index a850914..bba9abe 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -4378,12 +4378,7 @@ CONFIG_EXT4_FS_ENCRYPTION=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
+# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index f408d71..dc4884b 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.1.3
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
diff --git a/reiserfsprogs/reiserfsprogs.nm b/reiserfsprogs/reiserfsprogs.nm
deleted file mode 100644
index bd3bee0..0000000
--- a/reiserfsprogs/reiserfsprogs.nm
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
-###############################################################################
-
-name       = reiserfsprogs
-version    = 3.6.21
-release    = 1
-
-groups     = System/Filesystems
-url        = http://www.kernel.org/pub/linux/utils/fs/reiserfs/
-license    = GPL
-summary    = Tools for ReiserFS filesystems.
-
-description
-	This package contains utilities to create, check, resize, and
-	debug ReiserFS filesystems.
-end
-
-source_dl  = http://www.kernel.org/pub/linux/utils/fs/reiserfs/
-sources    = %{thisapp}.tar.bz2
-
-build
-	configure_options += \
-		--sbindir=/sbin
-
-	install_cmds
-		ln -svf reiserfsck %{BUILDROOT}/sbin/fsck.reiserfs
-		ln -svf mkreiserfs %{BUILDROOT}/sbin/mkfs.reiserfs
-	end
-end
-
-packages
-	package %{name}
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end


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