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 3ced8695afbc62b95b52d53be4ca64086a700e39 (commit) via 39d4fe16c51fc484058626cbb57a34f1a68f179d (commit) via 53803a28683e68cc2f59d676ad4ff733a9483e53 (commit) via d823e491307129c91edb2857c5368de4eaf08d15 (commit) from 35f4e9668ec7c043f04b8167380eebde0a913e8e (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 3ced8695afbc62b95b52d53be4ca64086a700e39 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 1 14:13:39 2011 +0200
crda: move wireless-regdb to own package. update crda to 1.1.1. update wireless-regdb to 2011.04.28.
commit 39d4fe16c51fc484058626cbb57a34f1a68f179d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 1 14:12:18 2011 +0200
next-core: add iw to update.
commit 53803a28683e68cc2f59d676ad4ff733a9483e53 Merge: d823e49 35f4e96 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 1 14:11:18 2011 +0200
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
commit d823e491307129c91edb2857c5368de4eaf08d15 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 1 10:13:49 2011 +0200
iw: update to 0.9.22.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/crda | 2 -- config/rootfiles/common/wireless-regdb | 5 +++++ .../{oldcore/46 => core/next}/filelists/crda | 0 .../{oldcore/28 => core/next}/filelists/iw | 0 .../rootfiles/core/next/filelists/wireless-regdb | 1 + lfs/crda | 16 +++++----------- lfs/iw | 4 ++-- lfs/{syslinux => wireless-regdb} | 11 ++++++----- make.sh | 1 + 9 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 config/rootfiles/common/wireless-regdb copy config/rootfiles/{oldcore/46 => core/next}/filelists/crda (100%) copy config/rootfiles/{oldcore/28 => core/next}/filelists/iw (100%) create mode 120000 config/rootfiles/core/next/filelists/wireless-regdb copy lfs/{syslinux => wireless-regdb} (93%)
Difference in files: diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda index abda701..3c932a1 100644 --- a/config/rootfiles/common/crda +++ b/config/rootfiles/common/crda @@ -5,7 +5,5 @@ lib/udev/rules.d/85-regulatory.rules #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto/__m2crypto.so sbin/crda sbin/regdbdump -#usr/lib/crda -usr/lib/crda/regulatory.bin #usr/share/man/man8/crda.8.gz #usr/share/man/man8/regdbdump.8.gz diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common/wireless-regdb new file mode 100644 index 0000000..2dcdbca --- /dev/null +++ b/config/rootfiles/common/wireless-regdb @@ -0,0 +1,5 @@ +#usr/lib/crda +#usr/lib/crda/pubkeys +usr/lib/crda/pubkeys/linville.key.pub.pem +usr/lib/crda/regulatory.bin +#usr/share/man/man5/regulatory.bin.5.gz diff --git a/config/rootfiles/core/next/filelists/crda b/config/rootfiles/core/next/filelists/crda new file mode 120000 index 0000000..d68c46e --- /dev/null +++ b/config/rootfiles/core/next/filelists/crda @@ -0,0 +1 @@ +../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/iw b/config/rootfiles/core/next/filelists/iw new file mode 120000 index 0000000..7c58a20 --- /dev/null +++ b/config/rootfiles/core/next/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/wireless-regdb b/config/rootfiles/core/next/filelists/wireless-regdb new file mode 120000 index 0000000..c9205b3 --- /dev/null +++ b/config/rootfiles/core/next/filelists/wireless-regdb @@ -0,0 +1 @@ +../../../common/wireless-regdb \ No newline at end of file diff --git a/lfs/crda b/lfs/crda index f97fdcb..521eb93 100644 --- a/lfs/crda +++ b/lfs/crda @@ -24,12 +24,10 @@
include Config
-VER = 20110202-git - -REGDB = regulatory-20110202 +VER = 1.1.1
THISAPP = crda-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -39,13 +37,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ###############################################################################
-objects = $(DL_FILE) $(REGDB).tar.xz +objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(REGDB).tar.xz = $(DL_FROM)/$(REGDB).tar.xz
-$(DL_FILE)_MD5 = 1da048b854cca1f1087c1250df335ca8 -$(REGDB).tar.xz_MD5 = 620621172d18d6f8cdc2db423dcb6381 +$(DL_FILE)_MD5 = 5fc77af68b3e21736b8ef2f8b061c810
install : $(TARGET)
@@ -74,9 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir /usr/lib/crda - tar Jxf $(DIR_DL)/$(REGDB).tar.xz -C /usr/lib/crda/ - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && USE_OPENSSL=1 make $(MAKETUNING) cd $(DIR_APP) && USE_OPENSSL=1 make install @rm -rf $(DIR_APP) diff --git a/lfs/iw b/lfs/iw index c330420..ec59f23 100644 --- a/lfs/iw +++ b/lfs/iw @@ -24,7 +24,7 @@
include Config
-VER = 0.9.20 +VER = 0.9.22
THISAPP = iw-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1055799b544b3e08169d155bb6c21bb0 +$(DL_FILE)_MD5 = 561c2602c5ce7c65a590118286c0892a
install : $(TARGET)
diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb new file mode 100644 index 0000000..2228c22 --- /dev/null +++ b/lfs/wireless-regdb @@ -0,0 +1,76 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 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 Config + +VER = 2011.04.28 + +THISAPP = wireless-regdb-$(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 = 16b7fabd4d7761ccf206702a3f18cce9 + +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) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4a7e374..ba25ec3 100755 --- a/make.sh +++ b/make.sh @@ -690,6 +690,7 @@ buildipfire() { ipfiremake parted ipfiremake swig ipfiremake python-m2crypto + ipfiremake wireless-regdb ipfiremake crda ipfiremake libsatsolver ipfiremake python-satsolver
hooks/post-receive -- IPFire 2.x development tree