Merge branch 'master' into next

lfs/ca-certificates

@@ -0,0 +1,61 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.de>                           #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 20150710
+
+THISAPP    = ca-certificates
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+install : $(TARGET)
+
+check : 
+
+download : 
+
+md5 : 
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cp -av $(DIR_CONF)/$(THISAPP) $(DIR_APP)
+
+	cd $(DIR_APP) && sh ./build.sh
+
+	-mkdir -pv /etc/ssl/certs
+	cd $(DIR_APP) && install -p -m 644 ca-bundle.crt ca-bundle.trust.crt \
+		/etc/ssl/certs
+	ln -svf certs/ca-bundle.crt /etc/ssl/cert.pem
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)

lfs/openssl

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2c
+VER        = 1.0.2d
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c8d81a9ae7005276e486702edbcd4b6
+$(DL_FILE)_MD5 = 38dd619b2e77cbac69b99f52a053d25a
 
 install : $(TARGET)
 

lfs/python-optional-src

@@ -24,12 +24,12 @@
 
 include Config
 
-VER	   = 2.7.9
+VER	   = 2.7.10
 
 include python
 
 PROG	   = python-optional-src
-PAK_VER    = 3
+PAK_VER    = 4
 DEPS       =
 
 dist: