[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8adaa8e1a04dab1749011e0cb92bd3a192beca4a - IPFire-SCM

20 Mar 2011

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  8adaa8e1a04dab1749011e0cb92bd3a192beca4a (commit)
       via  4b351b64080535581c688d699e1ea00930cd0915 (commit)
       via  56fd809a4846bf1ac76eeb668209be7843406efc (commit)
       via  24c9c217c0334dc868b4b82e7f562aa52687ffc1 (commit)
       via  9549f3dfe1d5e8a1b6afef718e9d823dc6a89cf5 (commit)
       via  c95e26c8a96af714e4eb12990366c9edc015566c (commit)
       via  fc3440f6b161686c42f41442e3f47417af4e187c (commit)
       via  d13664445bfcef1494e11de1241c23c596f6add9 (commit)
       via  d65c7a92af26c6cef943c65b393a75b0765c0ef0 (commit)
       via  8987f278868d879397adfc8ce9dc01e467725e89 (commit)
       via  89649c09160fffc78efd05a59b564d4a39c9a253 (commit)
       via  a5a76995272e10a9035243f0c972e2578c3286f5 (commit)
      from  d84a4f261da492d5ad2db151e06acd90e37f13e4 (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 8adaa8e1a04dab1749011e0cb92bd3a192beca4a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 20 15:54:00 2011 +0100
linux-firmware: There is no STAGE_CONFIGURE.
commit 4b351b64080535581c688d699e1ea00930cd0915
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 20 15:53:33 2011 +0100
linux-firmware: Fix spelling of Arne's email address.
commit 56fd809a4846bf1ac76eeb668209be7843406efc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 20 15:52:23 2011 +0100
kernel: Let only the kernel itself depend on the firmware.
kernel-headers for example does not need it.
commit 24c9c217c0334dc868b4b82e7f562aa52687ffc1
Merge: 9549f3d fc3440f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 20 15:51:15 2011 +0100
Merge remote-tracking branch 'arne_f/linux-firmware'
commit 9549f3dfe1d5e8a1b6afef718e9d823dc6a89cf5
Merge: c95e26c d65c7a9
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 20 15:35:26 2011 +0100
Merge remote-tracking branch 'arne_f/openssh'
commit c95e26c8a96af714e4eb12990366c9edc015566c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 20 15:34:49 2011 +0100
build-essentials: Export missing SUMMARY.
commit fc3440f6b161686c42f41442e3f47417af4e187c
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Mar 20 11:35:40 2011 +0100
kernel: add package depency: linux-firmware.
commit d13664445bfcef1494e11de1241c23c596f6add9
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Mar 20 11:34:58 2011 +0100
linux-firmware: new package that provide firmware for common devices.
commit d65c7a92af26c6cef943c65b393a75b0765c0ef0
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Mar 19 20:50:03 2011 +0100
openssh: needs openssl-1.0.0d-2 or higher.
commit 8987f278868d879397adfc8ce9dc01e467725e89
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Mar 19 20:40:36 2011 +0100
openssl: enable ecdsa for openssh.
commit 89649c09160fffc78efd05a59b564d4a39c9a253
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 18 17:18:55 2011 +0100
build-essentials: Remove a debugging line.
commit a5a76995272e10a9035243f0c972e2578c3286f5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 18 15:27:11 2011 +0100
build-essentials: Make dependency resolution faster.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/build-essentials/build-essentials.nm          |    2 +-
 .../buildsystem-tools/dependency-tracker           |   26 ++++++++--------
 .../buildsystem-tools/functions-packager-find      |    6 +---
 pkgs/build-essentials/buildsystem/Targets          |    1 +
 pkgs/kernel/kernel.nm                              |    4 +-
 .../linux-firmware.nm}                             |   31 ++++++++++---------
 pkgs/openssh/openssh.nm                            |    6 ++--
 pkgs/openssl/openssl.nm                            |    5 +--
 8 files changed, 38 insertions(+), 43 deletions(-)
 copy pkgs/{python-distutils-extra/python-distutils-extra.nm => linux-firmware/linux-firmware.nm} (73%)
Difference in files:

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 4bd680a..8bec9f3 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 8
+PKG_REL        = 10
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
diff --git a/pkgs/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker
index 5fb9718..bbfb8e9 100755
--- a/pkgs/build-essentials/buildsystem-tools/dependency-tracker
+++ b/pkgs/build-essentials/buildsystem-tools/dependency-tracker
@@ -4,19 +4,19 @@ dirname=$(dirname ${0})
. ${dirname}/common-functions
-action=${1}
-shift
+args=${1}
-case "${action}" in
-	requires)
-		find_requires $@
-		exit $?
-		;;
+if [ -n "${2}" ]; then
+	args=${2}
+fi
-	provides)
-		find_provides $@
-		exit $?
-		;;
-esac
+provides=$(find_provides ${args})
+requires=""
+for require in $(find_requires ${args}); do
+	listmatch ${require} ${provides} || requires="${requires} ${require}"
+done
-exit 1
+echo "provides="${provides}""
+echo "requires="${requires}""
+
+exit 0
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-packager-find b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
index f78eddb..1b488d9 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-packager-find
+++ b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
@@ -40,10 +40,6 @@ function find_requires() {
    others="${others} $(find_perl_requires ${dirs})"
    others="${others} $(find_pkgconfig_requires ${dirs})"
-	# Get provides, because packages should not depend on features they provide
-	# by themselves.
-	local provides=$(find_provides ${dirs})
-
    # Return a sorted and unique(!) list
    local require
    local requires
@@ -54,7 +50,7 @@ function find_requires() {
    		grep -qE "${PKG_REQUIRES_FILTER}" <<< "${require}" && continue
    	fi
-		listmatch ${require} ${provides} || requires="${requires} ${require}"
+		requires="${requires} ${require}"
    done
echo ${requires}
diff --git a/pkgs/build-essentials/buildsystem/Targets b/pkgs/build-essentials/buildsystem/Targets
index 8c02cb7..24cbec7 100644
--- a/pkgs/build-essentials/buildsystem/Targets
+++ b/pkgs/build-essentials/buildsystem/Targets
@@ -23,6 +23,7 @@ buildinfo:
    @echo "PKG_GROUP="$(PKG_GROUP)""
    @echo "PKG_LICENSE="$(PKG_LICENSE)""
    @echo "PKG_MAINTAINER="$(PKG_MAINTAINER)""
+	@echo "PKG_SUMMARY="$(strip $(PKG_SUMMARY))""
    @echo "PKG_URL="$(PKG_URL)""
@echo "PKG_FILES="$(PKG_OBJECTS)""
diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm
index 15a95bc..0ca32bb 100644
--- a/pkgs/kernel/kernel.nm
+++ b/pkgs/kernel/kernel.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = linux
 PKG_VER        = 2.6.37.2
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org
 PKG_GROUP      = System/Kernels
@@ -35,7 +35,7 @@ PKG_LICENSE    = GPLv2
 PKG_SUMMARY    = The Linux kernel.
PKG_BUILD_DEPS+= module-init-tools ncurses-devel perl
-PKG_DEPS-kernel= dracut
+PKG_DEPS-kernel= dracut linux-firmware
define PKG_DESCRIPTION
    The kernel package contains the Linux kernel (vmlinuz), the core of any \
diff --git a/pkgs/linux-firmware/linux-firmware.nm b/pkgs/linux-firmware/linux-firmware.nm
new file mode 100644
index 0000000..70b8f7a
--- /dev/null
+++ b/pkgs/linux-firmware/linux-firmware.nm
@@ -0,0 +1,54 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# 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 $(PKGROOT)/Include
+
+PKG_NAME       = linux-firmware
+PKG_VER        = 20110311
+PKG_REL        = 0
+
+PKG_MAINTAINER = Arne Fitzenreiter arne.fitzenreiter@ipfire.org
+PKG_GROUP      = System/Libraries
+PKG_URL        = http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
+PKG_LICENSE    = Non-GPL
+PKG_SUMMARY    = Firmware Binaries for some Devices.
+
+define PKG_DESCRIPTION
+	linux-firmware provides some firmware binaries that \
+	are loaded into the devices at startup. \
+	For detailed license info check the WHENCE and LICENSE.* texts \
+	for the specific firmware.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+
+PKG_BUILD_DEPS =
+
+define STAGE_BUILD
+endef
+
+define STAGE_INSTALL
+	-mkdir -pv $(BUILDROOT)/lib/firmware
+	cd $(DIR_APP) && cp -prv * $(BUILDROOT)/lib/firmware
+endef
diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm
index ac5c2dd..1f3b0db 100644
--- a/pkgs/openssh/openssh.nm
+++ b/pkgs/openssh/openssh.nm
@@ -34,15 +34,15 @@ PKG_URL        = http://www.openssh.com/portable.html
 PKG_LICENSE    = MIT
 PKG_SUMMARY    = An open source implementation of SSH protocol versions 1 and 2.
-PKG_BUILD_DEPS+= audit-devel libselinux-devel nss-devel openssl-devel pam-devel \
-	zlib-devel
+PKG_BUILD_DEPS+= audit-devel libselinux-devel nss-devel openssl-devel>=1.0.0d-2 \
+	pam-devel zlib-devel
 PKG_DEPS-openssh = openssh-clients=$(THISVER) openssh-server=$(THISVER)
# /usr/bin/ssh-keygen is needed to generate keys for the ssh server.
 PKG_DEPS-openssh-server += /usr/bin/ssh-keygen
define PKG_DESCRIPTION
-	SH (Secure SHell) is a program for logging into and executing \
+	SSH (Secure SHell) is a program for logging into and executing \
    commands on a remote machine. SSH is intended to replace rlogin and \
    rsh, and to provide secure encrypted communications between two \
    untrusted hosts over an insecure network.
diff --git a/pkgs/openssl/openssl.nm b/pkgs/openssl/openssl.nm
index 3f2a2fe..494df30 100644
--- a/pkgs/openssl/openssl.nm
+++ b/pkgs/openssl/openssl.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = openssl
 PKG_VER        = 1.0.0d
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org
 PKG_GROUP      = System/Libraries
@@ -88,9 +88,6 @@ define STAGE_BUILD
    		no-idea \
    		no-mdc2 \
    		no-rc5 \
-			no-ec \
-			no-ecdh \
-			no-ecdsa \
    		-DSSL_FORBID_ENULL
# Build.
hooks/post-receive
--
IPFire 3.x development tree

    