* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2ee8dcc4d67be07934e5ee8a697f7a55d4203d93
@ 2013-08-23 11:25 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-08-23 11:25 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7570 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 2ee8dcc4d67be07934e5ee8a697f7a55d4203d93 (commit)
via 416e53bd778955c5d9bc4f609badf8fb76aa5b6b (commit)
via fb4497100afa387f26c28db2a05d46da4bf09808 (commit)
via ae2e54ab3e9104bb7c07a70b7f29171f0c91e330 (commit)
from 9e91f03ff298d2e6a2b632daa7a02de7179f9a4d (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 2ee8dcc4d67be07934e5ee8a697f7a55d4203d93
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Aug 23 13:25:30 2013 +0200
hostapd: Update to 2.0.
commit 416e53bd778955c5d9bc4f609badf8fb76aa5b6b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Aug 23 13:25:20 2013 +0200
iw: Update to 3.10.
commit fb4497100afa387f26c28db2a05d46da4bf09808
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Aug 23 13:25:01 2013 +0200
wireless-regdb: Drop package.
The content is now delivered with crda.
commit ae2e54ab3e9104bb7c07a70b7f29171f0c91e330
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Aug 23 13:23:36 2013 +0200
crda: Update to 1.1.1.
This package also replaced wireless-regdb, which must be built
together with crda. The reason is that crda keeps an internal
copy of the key the wireless regdb has been signed with in order
to validate the wireless regdb blob before using any data that
is inside that.
-----------------------------------------------------------------------
Summary of changes:
crda/crda.nm | 40 +++++++++++++++++++++++++++++++---------
hostapd/hostapd.nm | 11 +++++++----
iw/iw.nm | 15 ++++-----------
wireless-regdb/wireless-regdb.nm | 37 -------------------------------------
4 files changed, 42 insertions(+), 61 deletions(-)
delete mode 100644 wireless-regdb/wireless-regdb.nm
Difference in files:
diff --git a/crda/crda.nm b/crda/crda.nm
index 16af943..64e775c 100644
--- a/crda/crda.nm
+++ b/crda/crda.nm
@@ -4,7 +4,9 @@
###############################################################################
name = crda
-version = 1.1.1
+version = %{ver_crda}-%{ver_regdb}
+ver_crda = 1.1.3
+ver_regdb = 2013.02.13
release = 1
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -20,27 +22,47 @@ description
communication from the kernel.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = \
+ http://wireless.kernel.org/download/crda/ \
+ https://www.kernel.org/pub/software/network/wireless-regdb/
+sources = crda-%{ver_crda}.tar.bz2 wireless-regdb-%{ver_regdb}.tar.xz
build
requires
libgcrypt-devel
libnl-devel
+ openssl
python-m2crypto
- wireless-regdb
end
- prepare_cmds
- cp -vf /usr/lib/crda/pubkeys/root.key.pub.pem %{DIR_APP}/pubkeys/
+ build
+ pushd %{DIR_SRC}/wireless-regdb-%{ver_regdb}
+ make ${PARALLELISMFLAGS} maintainer-clean
+ make ${PARALLELISMFLAGS} REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
+ popd
+
+ pushd %{DIR_SRC}/crda-%{ver_crda}
+ cp ../wireless-regdb-%{ver_regdb}/key.pub.pem pubkeys
+
+ make ${PARALLELISMFLAGS} REG_BIN=../wireless-regdb-%{ver_regdb}/regulatory.bin
+ popd
+ end
+
+ install
+ pushd %{DIR_SRC}/wireless-regdb-%{ver_regdb}
+ make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir}
+ popd
+
+ pushd %{DIR_SRC}/crda-%{ver_crda}
+ make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir}
+ popd
end
end
packages
package %{name}
- requires
- wireless-regdb
- end
+ provides = wireless-regdb = %{ver_regdb}
+ obsoletes = wireless-regdb < %{ver_regdb}
end
package %{name}-debuginfo
diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 5e7351b..216fe63 100644
--- a/hostapd/hostapd.nm
+++ b/hostapd/hostapd.nm
@@ -4,8 +4,8 @@
###############################################################################
name = hostapd
-version = 1.0
-release = 2
+version = 2.0
+release = 1
groups = Networking/Tools
url = http://hostap.epitest.fi/hostapd/
@@ -33,8 +33,11 @@ build
# Create our custom configuration.
cat defconfig > .config
sed -i .config \
- -e "/^#CONFIG_IEEE80211N=y/s/^#//" \
- -e "/^#CONFIG_RADIUS_SERVER=y/s/^#//"
+ -e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
+ -e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
+ -e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
+ -e '/^#CONFIG_IEEE80211N=y/s/^#//' \
+ -e '/^#CONFIG_RADIUS_SERVER=y/s/^#//'
end
build
diff --git a/iw/iw.nm b/iw/iw.nm
index 55e5ffd..53d2b73 100644
--- a/iw/iw.nm
+++ b/iw/iw.nm
@@ -4,7 +4,7 @@
###############################################################################
name = iw
-version = 3.0
+version = 3.10
release = 1
groups = System/Base
@@ -13,29 +13,22 @@ license = BSD
summary = A nl80211 based wireless configuration tool.
description
- iw is a new nl80211 based CLI configuration utility for wireless \
- devices. It supports almost all new drivers that have been added \
+ iw is a new nl80211 based CLI configuration utility for wireless
+ devices. It supports almost all new drivers that have been added
to the kernel recently.
end
-source_dl =
+source_dl = https://www.kernel.org/pub/software/network/iw/
sources = %{thisapp}.tar.bz2
build
requires
libnl-devel
- pkg-config
- end
-
- install_cmds
- mkdir -pv %{BUILDROOT}/sbin
- mv -v %{BUILDROOT}/usr/sbin/iw %{BUILDROOT}/sbin/iw
end
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/wireless-regdb/wireless-regdb.nm b/wireless-regdb/wireless-regdb.nm
deleted file mode 100644
index 9f6d78d..0000000
--- a/wireless-regdb/wireless-regdb.nm
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = wireless-regdb
-version = 2011.04.28
-release = 2
-arch = noarch
-
-maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
-groups = Network/Wireless
-url = http://wireless.kernel.org/en/developers/Regulatory/
-license = ISC
-summary = Linux wireless regulatory database.
-
-description
- This package contains the wireless regulatory database used by all
- cfg80211 based Linux wireless drivers. The wireless database being
- used is maintained by John Linville, the Linux wireless kernel maintainer
- http://wireless.kernel.org/en/develop.
-end
-
-source_dl = http://wireless.kernel.org/download/wireless-regdb/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- python
- python-m2crypto
- end
-end
-
-packages
- package %{name}
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-23 11:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-23 11:25 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2ee8dcc4d67be07934e5ee8a697f7a55d4203d93 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox