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

19 Jun 2014

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  e0af4231ac7d798b12c79582c6ff22e69102b0f2 (commit)
       via  88f2f61f43cbb1d9fbb8e432377f445cab7e1fd1 (commit)
       via  8e944ec640a39446d5569e2671ef1aadae633d9f (commit)
       via  f577f4bce75b19376d1d986d0197cf210c75b956 (commit)
      from  a57cfc41ad99bfb4ac9ff69a1a4b965fa9a9580d (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 e0af4231ac7d798b12c79582c6ff22e69102b0f2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jun 19 14:24:13 2014 +0200
rng-tools: Update to version 5.
Supports using RDRAND on processors which don't have AES-NI.
commit 88f2f61f43cbb1d9fbb8e432377f445cab7e1fd1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jun 19 14:23:14 2014 +0200
Add new crypto library libgrypt
commit 8e944ec640a39446d5569e2671ef1aadae633d9f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jun 19 14:21:05 2014 +0200
core80: Automatically uninstall libgpg-error.
This is not a package any more.
commit f577f4bce75b19376d1d986d0197cf210c75b956
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jun 19 14:20:13 2014 +0200
libgpg-error: Update to version 1.13.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/libgcrypt                  | 14 +++++++++++
 config/rootfiles/common/libgpg-error               | 29 ++++++++++++++++++++++
 config/rootfiles/core/80/filelists/libgcrypt       |  1 +
 config/rootfiles/core/80/filelists/libgpg-error    |  1 +
 .../{oldcore/77 => core/80}/filelists/rng-tools    |  0
 config/rootfiles/core/80/update.sh                 |  5 ++++
 config/rootfiles/packages/libgpg-error             | 25 -------------------
 lfs/{libupnp => libgcrypt}                         | 11 +++++---
 lfs/libgpg-error                                   | 11 ++------
 lfs/rng-tools                                      |  4 +--
 make.sh                                            |  5 ++--
 11 files changed, 64 insertions(+), 42 deletions(-)
 create mode 100644 config/rootfiles/common/libgcrypt
 create mode 100644 config/rootfiles/common/libgpg-error
 create mode 120000 config/rootfiles/core/80/filelists/libgcrypt
 create mode 120000 config/rootfiles/core/80/filelists/libgpg-error
 copy config/rootfiles/{oldcore/77 => core/80}/filelists/rng-tools (100%)
 delete mode 100644 config/rootfiles/packages/libgpg-error
 copy lfs/{libupnp => libgcrypt} (94%)
Difference in files:

diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt
new file mode 100644
index 0000000..96e48e1
--- /dev/null
+++ b/config/rootfiles/common/libgcrypt
@@ -0,0 +1,14 @@
+#usr/bin/dumpsexp
+#usr/bin/hmac256
+#usr/bin/libgcrypt-config
+#usr/bin/mpicalc
+#usr/include/gcrypt.h
+#usr/lib/libgcrypt.la
+#usr/lib/libgcrypt.so
+usr/lib/libgcrypt.so.20
+usr/lib/libgcrypt.so.20.0.1
+#usr/share/aclocal/libgcrypt.m4
+#usr/share/info/gcrypt.info
+#usr/share/info/gcrypt.info-1
+#usr/share/info/gcrypt.info-2
+#usr/share/man/man1/hmac256.1
diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error
new file mode 100644
index 0000000..dc40398
--- /dev/null
+++ b/config/rootfiles/common/libgpg-error
@@ -0,0 +1,29 @@
+usr/bin/gpg-error
+#usr/bin/gpg-error-config
+#usr/include/gpg-error.h
+#usr/lib/libgpg-error.la
+#usr/lib/libgpg-error.so
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.11.0
+#usr/share/aclocal/gpg-error.m4
+#usr/share/common-lisp
+#usr/share/common-lisp/source
+#usr/share/common-lisp/source/gpg-error
+#usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
+#usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
+#usr/share/common-lisp/source/gpg-error/gpg-error.asd
+#usr/share/common-lisp/source/gpg-error/gpg-error.lisp
+#usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
diff --git a/config/rootfiles/core/80/filelists/libgcrypt b/config/rootfiles/core/80/filelists/libgcrypt
new file mode 120000
index 0000000..2df12a2
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/libgcrypt
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/80/filelists/libgpg-error b/config/rootfiles/core/80/filelists/libgpg-error
new file mode 120000
index 0000000..cad4313
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/libgpg-error
@@ -0,0 +1 @@
+../../../common/libgpg-error
\ No newline at end of file
diff --git a/config/rootfiles/core/80/filelists/rng-tools b/config/rootfiles/core/80/filelists/rng-tools
new file mode 120000
index 0000000..a7853e4
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/rng-tools
@@ -0,0 +1 @@
+../../../common/rng-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index f878cfe..6878fb7 100644
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -41,6 +41,11 @@ extract_files
 # Update Language cache
 #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+# Uninstall the libgpg-error package.
+rm -f \
+	/opt/pakfire/db/installed/meta-libgpg-error \
+	/opt/pakfire/db/rootfiles/libgpg-error
+
 sync
# This update need a reboot...
diff --git a/config/rootfiles/packages/libgpg-error b/config/rootfiles/packages/libgpg-error
deleted file mode 100644
index dad751c..0000000
--- a/config/rootfiles/packages/libgpg-error
+++ /dev/null
@@ -1,25 +0,0 @@
-usr/bin/gpg-error
-usr/bin/gpg-error-config
-#usr/include/gpg-error.h
-#usr/lib/libgpg-error.la
-usr/lib/libgpg-error.so
-usr/lib/libgpg-error.so.0
-usr/lib/libgpg-error.so.0.8.0
-#usr/share/aclocal/gpg-error.m4
-usr/share/common-lisp
-usr/share/common-lisp/source
-usr/share/common-lisp/source/gpg-error
-usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
-usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
-usr/share/common-lisp/source/gpg-error/gpg-error.asd
-usr/share/common-lisp/source/gpg-error/gpg-error.lisp
-#usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
diff --git a/lfs/libgcrypt b/lfs/libgcrypt
new file mode 100644
index 0000000..76ee3d0
--- /dev/null
+++ b/lfs/libgcrypt
@@ -0,0 +1,80 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        = 1.6.1
+
+THISAPP    = libgcrypt-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a5a5060dc2f80bcac700ab0236ea47dc
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--enable-noexecstack
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/libgpg-error b/lfs/libgpg-error
index 59108c1..7faf289 100644
--- a/lfs/libgpg-error
+++ b/lfs/libgpg-error
@@ -24,17 +24,13 @@
include Config
-VER        = 1.10
+VER        = 1.13
THISAPP    = libgpg-error-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libgpg-error
-PAK_VER    = 1
-
-DEPS       = ""
###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 736a03daa9dc5873047d4eb4a9c22a16
+$(DL_FILE)_MD5 = fe0cfa7e15262ef8fdeee366109e9ff6
install : $(TARGET)
@@ -54,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist: 
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
diff --git a/lfs/rng-tools b/lfs/rng-tools
index 8ca95cf..c8ea08d 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -24,7 +24,7 @@
include Config
-VER        = 4
+VER        = 5
THISAPP    = rng-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ae89dbfcf08bdfbea19066cfbf599127
+$(DL_FILE)_MD5 = 6726cdc6fae1f5122463f24ae980dd68
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 162128d..f756033 100755
--- a/make.sh
+++ b/make.sh
@@ -467,6 +467,9 @@ buildipfire() {
   ipfiremake pam
   ipfiremake openssl
   ipfiremake openssl-compat
+  ipfiremake libgpg-error
+  ipfiremake libgcrypt
+  ipfiremake libassuan
   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite
@@ -769,8 +772,6 @@ buildipfire() {
   ipfiremake fping
   ipfiremake telnet
   ipfiremake xinetd
-  ipfiremake libgpg-error
-  ipfiremake libassuan
   ipfiremake gpgme
   ipfiremake pygpgme
   ipfiremake pakfire3
hooks/post-receive
--
IPFire 2.x development tree

    