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 fa527c3a549acaf820a534bbb234a570c4891673 (commit) via aa3b09af5738c5922034febe89cb0004ad3841ec (commit) via 6b829aab9873eeac57f0ddd00859a9fbb0cc247b (commit) via 216ce26296ca9c32df2e1313b843589b1fb81180 (commit) via 3f7d42d5b4ff72866eccd6ce4a4c8d351e2657ce (commit) via b549ea2adcd994a723144443d3d1d29fe10eba0b (commit) via fd44e3b213c97ec93a0c6e1df2b96c7fd5727f3f (commit) via 5c0aa76e18ad4ee26279ba7b643dd8b02f926aa2 (commit) via c6dfe5f3ac8152e14c372cadbfe4521c188de4c0 (commit) via 19390374d3ca2699933119a6c0d9249f59385a66 (commit) via 0f0a1c89a05738cdab11c04cf29b958bf27ecd93 (commit) via 83a1c641c253c11fac63299d134198a9b21b4ec5 (commit) via 75e3819571e794966250fe11c42680f5158ba577 (commit) via 21ad1a3a4d9326bf8c7f43f0e7750c9d21e0bc63 (commit) via b0a5e021e558d62c21376bdba7083682a037a71d (commit) via b50180cc6932c562a5da46d9a202c6ccce63efc1 (commit) via 1cf40216e9451859f0a66faf9a4753c462500622 (commit) via ed269f50648132f414d7ef2d01bb3252130692d7 (commit) from cdd964e9f8907999c9a54b4d15271902d0666064 (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 fa527c3a549acaf820a534bbb234a570c4891673 Merge: b0a5e02 aa3b09a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 22 01:14:14 2010 +0200
Merge branch 'next'
commit aa3b09af5738c5922034febe89cb0004ad3841ec Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 20 23:29:22 2010 +0200
pyQt: Update to 4.8-snapshot.
commit 6b829aab9873eeac57f0ddd00859a9fbb0cc247b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 20 23:28:33 2010 +0200
sip: Update to 4.11.2-snapshot.
commit 216ce26296ca9c32df2e1313b843589b1fb81180 Merge: 75e3819 3f7d42d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 22:01:21 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 3f7d42d5b4ff72866eccd6ce4a4c8d351e2657ce Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 21:59:24 2010 +0200
pyQt: Forgot to add patch.
commit b549ea2adcd994a723144443d3d1d29fe10eba0b Merge: fd44e3b 1939037 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 21:12:28 2010 +0200
Merge remote branch 'stevee/qtermwidget' into installer
commit fd44e3b213c97ec93a0c6e1df2b96c7fd5727f3f Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 21:11:52 2010 +0200
pyQt: Update to 4.7.7.
commit 5c0aa76e18ad4ee26279ba7b643dd8b02f926aa2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 21:11:21 2010 +0200
sip: Update to 4.11.1.
commit c6dfe5f3ac8152e14c372cadbfe4521c188de4c0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 21:09:58 2010 +0200
qt: Update to 4.7.0.
commit 19390374d3ca2699933119a6c0d9249f59385a66 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Oct 17 20:59:46 2010 +0200
python-qtermwidget: New package.
commit 0f0a1c89a05738cdab11c04cf29b958bf27ecd93 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Oct 17 20:59:20 2010 +0200
qtermwidget: New package.
commit 83a1c641c253c11fac63299d134198a9b21b4ec5 Merge: b50180c 21ad1a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 15:17:32 2010 +0200
Merge remote branch 'stevee/piksemel' into installer
commit 75e3819571e794966250fe11c42680f5158ba577 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 13:59:10 2010 +0200
wpa_supplicant: New package.
Squashed commit of the following:
commit e47e489cd63f5e39cc73fc5e62caf22430fa50f6 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 16 21:54:38 2010 +0200
wpa_supplicant: Add logrotate file.
commit ea3450d635a0437cf2f37c8b19727374df7ce6dc Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 16 21:50:26 2010 +0200
wpa_supplicant: Improve build, add system config file.
commit 30ce34bdc0cabf1231e482fc30f149b41e60b9d0 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 16 21:36:36 2010 +0200
wpa_supplicant: New package.
commit 21ad1a3a4d9326bf8c7f43f0e7750c9d21e0bc63 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Oct 17 12:05:10 2010 +0200
python-piksemel: New package.
commit b0a5e021e558d62c21376bdba7083682a037a71d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 17 00:47:43 2010 +0200
network: Depends on rstp on runtime.
commit b50180cc6932c562a5da46d9a202c6ccce63efc1 Merge: 1cf4021 cdd964e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 16 23:19:39 2010 +0200
Merge branch 'next' into installer
commit 1cf40216e9451859f0a66faf9a4753c462500622 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 20:26:39 2010 +0200
naoki: Add installer to ISO image.
commit ed269f50648132f414d7ef2d01bb3252130692d7 Merge: 3b381d1 9ad440f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 14:17:43 2010 +0200
Merge remote branch 'stevee/x-fixes' into installer
-----------------------------------------------------------------------
Summary of changes: naoki/generators.py | 12 ++++- pkgs/core/network/network.nm | 6 +- .../patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch | 9 ---- pkgs/core/pyQt/pyQt.nm | 7 ++- .../python-piksemel.nm} | 18 +++++-- .../python-qtermwidget.nm} | 24 ++++----- pkgs/core/qt/qt.nm | 2 +- pkgs/core/qtermwidget/patches/shared.patch | 46 ++++++++++++++++++ .../libcap.nm => qtermwidget/qtermwidget.nm} | 42 ++++++++++------ pkgs/core/sip/patches/disable-rpaths.patch | 10 ++++ pkgs/core/sip/sip.nm | 4 +- pkgs/core/wpa_supplicant/wpa_supplicant.conf | 3 + pkgs/core/wpa_supplicant/wpa_supplicant.config | 33 +++++++++++++ pkgs/core/wpa_supplicant/wpa_supplicant.logrotate | 6 ++ .../wpa_supplicant.nm} | 50 ++++++++++++------- 15 files changed, 201 insertions(+), 71 deletions(-) delete mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch copy pkgs/core/{python-pyaspects/python-pyaspects.nm => python-piksemel/python-piksemel.nm} (83%) copy pkgs/core/{python-pyaspects/python-pyaspects.nm => python-qtermwidget/python-qtermwidget.nm} (80%) create mode 100644 pkgs/core/qtermwidget/patches/shared.patch copy pkgs/core/{libcap/libcap.nm => qtermwidget/qtermwidget.nm} (68%) create mode 100644 pkgs/core/sip/patches/disable-rpaths.patch create mode 100644 pkgs/core/wpa_supplicant/wpa_supplicant.conf create mode 100644 pkgs/core/wpa_supplicant/wpa_supplicant.config create mode 100644 pkgs/core/wpa_supplicant/wpa_supplicant.logrotate copy pkgs/core/{iproute2/iproute2.nm => wpa_supplicant/wpa_supplicant.nm} (58%)
Difference in files: diff --git a/naoki/generators.py b/naoki/generators.py index b3f2f01..99b385d 100644 --- a/naoki/generators.py +++ b/naoki/generators.py @@ -42,7 +42,17 @@ class Generator(_Environment): self.installer_deps = dependencies.DependencySet(arch=self.arch) deps = [ "basesystem", - #"installer", + "installer", + # TODO needs to be replaced + "xorg-x11-drv-ati", + "xorg-x11-drv-evdev", + "xorg-x11-drv-intel", + "xorg-x11-drv-keyboard", + "xorg-x11-drv-mouse", + "xorg-x11-drv-nv", + "xorg-x11-drv-synaptics", + "xorg-x11-drv-vesa", + "xorg-x11-drv-vmware", ] for dep in deps: dep = dependencies.Dependency(dep) diff --git a/pkgs/core/network/network.nm b/pkgs/core/network/network.nm index 30cf750..f4c6be5 100644 --- a/pkgs/core/network/network.nm +++ b/pkgs/core/network/network.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = network PKG_VER = 0.99.0 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Networking/Tools @@ -35,8 +35,8 @@ PKG_LICENSE = GPLv3+ PKG_SUMMARY = The IPFire Networking Scripts.
PKG_BUILD_DEPS = # Need no gcc -PKG_DEPS += bash bridge-utils coreutils dhcp grep iproute2 ppp sqlite \ - upstart vlan +PKG_DEPS += bash bridge-utils coreutils dhcp grep iproute2 ppp rstp \ + sqlite upstart vlan
define PKG_DESCRIPTION This script installs the IPFire Networking Scripts. diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch deleted file mode 100644 index bafa4ec..0000000 --- a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py ---- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang 2009-06-16 03:37:46.000000000 -0500 -+++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py 2009-07-02 14:01:44.218147410 -0500 -@@ -1,3 +1,5 @@ -+#!/usr/bin/python -tt -+ - import sys - import optparse - diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm index 6a85c02..7e85ead 100644 --- a/pkgs/core/pyQt/pyQt.nm +++ b/pkgs/core/pyQt/pyQt.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = pyQt -PKG_VER = 4.7.4 +PKG_VER = snapshot-4.8-3011e73e866d PKG_REL = 0
PKG_MAINTAINER = @@ -63,3 +63,8 @@ define STAGE_BUILD endef
STAGE_INSTALLTARGET += INSTALL_ROOT=$(BUILDROOT) + +define STAGE_INSTALL_CMDS + # Remove python3 port + rm -rfv $(BUILDROOT)/usr/lib/python*/site-packages/PyQt4/uic/port_v3 +endef diff --git a/pkgs/core/python-piksemel/python-piksemel.nm b/pkgs/core/python-piksemel/python-piksemel.nm new file mode 100644 index 0000000..9353af2 --- /dev/null +++ b/pkgs/core/python-piksemel/python-piksemel.nm @@ -0,0 +1,58 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = piksemel +PKG_VER = 1.3.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://cekirdek.pardus.org.tr/~bahadir/piksemel/ +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = A python XML parser. + +PKG_BUILD_DEPS+= python-devel + +define PKG_DESCRIPTION + Piksemel is a easy to use python XML parser, based on iksemel. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && python setup.py build +endef + +define STAGE_TEST + # Create symlink for testsuite to find the compiled module. + cd $(DIR_APP)/tests && ln -s ../build/lib.*/piksemel.so piksemel.so + cd $(DIR_APP) && python setup.py test +endef + +define STAGE_INSTALL + cd $(DIR_APP) && python setup.py install --root=$(BUILDROOT) +endef + diff --git a/pkgs/core/python-qtermwidget/python-qtermwidget.nm b/pkgs/core/python-qtermwidget/python-qtermwidget.nm new file mode 100644 index 0000000..2e80268 --- /dev/null +++ b/pkgs/core/python-qtermwidget/python-qtermwidget.nm @@ -0,0 +1,50 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = python-qtermwidget +PKG_VER = 0.1.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://code.google.com/p/pyqt4-extrawidgets/downloads/list +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = PyQt4 Bindings for QTermWidget. + +PKG_BUILD_DEPS+= gcc-c++ pyQt pyQt-devel python-devel qt qtermwidget-devel sip-devel + +define PKG_DESCRIPTION + PyQt4 Bindings for QTermWidget. +endef + +PKG_TARBALL = qtermwidget-$(PKG_VER).tar.gz + +DIR_APP = $(DIR_SRC)/qtermwidget + +define STAGE_BUILD + cd $(DIR_APP) && python config.py + cd $(DIR_APP) && make +endef diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm index d65ea4c..22ad408 100644 --- a/pkgs/core/qt/qt.nm +++ b/pkgs/core/qt/qt.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = qt -PKG_VER = 4.7.0-beta2 +PKG_VER = 4.7.0 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/qtermwidget/patches/shared.patch b/pkgs/core/qtermwidget/patches/shared.patch new file mode 100644 index 0000000..cdef77d --- /dev/null +++ b/pkgs/core/qtermwidget/patches/shared.patch @@ -0,0 +1,46 @@ +Index: qtermwidget/lib/lib.pro +=================================================================== +--- qtermwidget.orig/lib/lib.pro ++++ qtermwidget/lib/lib.pro +@@ -4,7 +4,7 @@ DESTDIR = .. + + TARGET = qtermwidget + +-CONFIG += qt debug_and_release warn_on build_all staticlib #dll ++CONFIG += qt debug_and_release warn_on build_all #dll + + QT += core gui + +@@ -42,7 +42,3 @@ SOURCES = TerminalCharacterDecoder.cpp + Session.cpp ShellCommand.cpp \ + qtermwidget.cpp + +- +- +- +- +\ Dosya sonunda yenisatır yok. +Index: qtermwidget/src/src.pro +=================================================================== +--- qtermwidget.orig/src/src.pro ++++ qtermwidget/src/src.pro +@@ -10,11 +10,11 @@ MOC_DIR = ../.moc + CONFIG(debug, debug|release) { + OBJECTS_DIR = ../.objs_d + TARGET = consoleq_d +- LIBS += -L.. ../libqtermwidget_d.a ++ LIBS += -L.. ../libqtermwidget_d.so + } else { + OBJECTS_DIR = ../.objs + TARGET = consoleq +- LIBS += -L.. ../libqtermwidget.a ++ LIBS += -L.. ../libqtermwidget.so + } + + SOURCES = main.cpp +@@ -24,4 +24,3 @@ INCLUDEPATH = ../lib + #LIBS += -L.. -lqtermwidget + + +- +\ Dosya sonunda yenisatır yok. diff --git a/pkgs/core/qtermwidget/qtermwidget.nm b/pkgs/core/qtermwidget/qtermwidget.nm new file mode 100644 index 0000000..b60718b --- /dev/null +++ b/pkgs/core/qtermwidget/qtermwidget.nm @@ -0,0 +1,70 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = qtermwidget +PKG_VER = 0.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = /Tools +PKG_URL = http://qtermwidget.sourceforge.net/ +PKG_LICENSE = GPLv2 +PKG_SUMMARY = A QT4 terminal emulation widget. + +PKG_BUILD_DEPS+= gcc-c++ python-devel qt +PKG_DEPS += + +define PKG_DESCRIPTION + QTermWidget is an opensource project based on KDE4 Konsole \ + application. The main goal of this project is to provide \ + unicode-enabled, embeddable QT4 widget for using as a built-in \ + console (or terminal emulation widget). +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +DIR_APP = $(DIR_SRC)/$(PKG_NAME) + +define STAGE_BUILD + cd $(DIR_APP) && qmake + + cd $(DIR_APP) && make #$(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + # Install headers + -mkdir -pv $(BUILDROOT)/usr/include/$(PKG_NAME) + cd $(DIR_APP) && cp -vf lib/*.h $(BUILDROOT)/usr/include/$(PKG_NAME) + + # Install lib + -mkdir -pv $(BUILDROOT)/usr/lib + cd $(DIR_APP) && cp -vf libqtermwidget.so.0 $(BUILDROOT)/usr/lib + ln -svf libqtermwidget.so.0 $(BUILDROOT)/usr/lib/libqtermwidget.so + + # Do not install binaries +endef diff --git a/pkgs/core/sip/patches/disable-rpaths.patch b/pkgs/core/sip/patches/disable-rpaths.patch new file mode 100644 index 0000000..6f15c54 --- /dev/null +++ b/pkgs/core/sip/patches/disable-rpaths.patch @@ -0,0 +1,10 @@ +--- a/siputils.py ++++ b/siputils.py +@@ -737,6 +737,7 @@ class Makefile: + rpaths is the cannonical list of rpaths. + """ + flags = [] ++ return flags + prefix = self.optional_string("RPATH") + + if prefix: diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm index ca3ad4e..96a70fb 100644 --- a/pkgs/core/sip/sip.nm +++ b/pkgs/core/sip/sip.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = sip -PKG_VER = 4.10.5 -PKG_REL = 1 +PKG_VER = 4.11.2-snapshot-5167b98767e2 +PKG_REL = 0
PKG_MAINTAINER = PKG_GROUP = Development/Tools diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.conf b/pkgs/core/wpa_supplicant/wpa_supplicant.conf new file mode 100644 index 0000000..65ad645 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,3 @@ +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=wheel + diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.config b/pkgs/core/wpa_supplicant/wpa_supplicant.config new file mode 100644 index 0000000..7b83012 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.config @@ -0,0 +1,33 @@ +CONFIG_CTRL_IFACE=y +CONFIG_CTRL_IFACE_DBUS=y +//CONFIG_DRIVER_HOSTAP=y +//CONFIG_DRIVER_HERMES=y +//CONFIG_DRIVER_MADWIFI=y +CONFIG_DRIVER_ATMEL=y +CONFIG_DRIVER_WEXT=y +CONFIG_DRIVER_NDISWRAPPER=y +//CONFIG_DRIVER_PRISM54=y +CONFIG_DRIVER_WIRED=y +//CONFIG_DRIVER_BROADCOM=y +//CONFIG_DRIVER_IPW=y +//CONFIG_DRIVER_BSD=y +//CONFIG_DRIVER_NDIS=y +CONFIG_WIRELESS_EXTENSION=y +CONFIG_IEEE8021X_EAPOL=y +CONFIG_EAP_MD5=y +CONFIG_EAP_MSCHAPV2=y +CONFIG_EAP_TLS=y +CONFIG_EAP_PEAP=y +CONFIG_EAP_TTLS=y +CONFIG_EAP_GTC=y +CONFIG_EAP_OTP=y +CONFIG_EAP_SIM=y +CONFIG_EAP_AKA=y +CONFIG_EAP_PSK=y +CONFIG_EAP_PAX=y +CONFIG_EAP_LEAP=y +//CONFIG_PCSC=y +CONFIG_PKCS12=y +CONFIG_SMARTCARD=y +CONFIG_DEBUG_FILE=y + diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate b/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate new file mode 100644 index 0000000..bd7ef91 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate @@ -0,0 +1,6 @@ +/var/log/wpa_supplicant.log { + missingok + notifempty + size 30k + create 0600 root root +} diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.nm b/pkgs/core/wpa_supplicant/wpa_supplicant.nm new file mode 100644 index 0000000..28dcac6 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.nm @@ -0,0 +1,72 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = wpa_supplicant +PKG_VER = 0.7.3 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Sytem/Base +PKG_URL = http://hostap.epitest.fi/releases/ +PKG_LICENSE = BSD +PKG_SUMMARY = WPA/WPA2/IEEE 802.1X Supplicant. + +PKG_BUILD_DEPS+= dbus-devel openssl-devel pkg-config + +define PKG_DESCRIPTION + wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support \ + for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA \ + component that is used in the client stations. It implements key negotiation \ + with a WPA Authenticator and it controls the roaming and IEEE 802.11 \ + authentication/association of the wlan driver. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + # Copy our config file for build + cp $(DIR_SOURCE)/wpa_supplicant.config $(DIR_APP)/wpa_supplicant/.config + + # Build wpa_supplicant + cd $(DIR_APP)/wpa_supplicant && make $(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/etc/logrotate.d + -mkdir -pv $(BUILDROOT)/etc/wpa_supplicant + -mkdir -pv $(BUILDROOT)/usr/sbin + + # Install config file + install -D -m 0600 $(DIR_SOURCE)/wpa_supplicant.conf $(BUILDROOT)/etc/wpa_supplicant + + # Install binaries + install -m 0755 $(DIR_APP)/wpa_supplicant/wpa_passphrase $(BUILDROOT)/usr/sbin + install -m 0755 $(DIR_APP)/wpa_supplicant/wpa_cli $(BUILDROOT)/usr/sbin + install -m 0755 $(DIR_APP)/wpa_supplicant/wpa_supplicant $(BUILDROOT)/usr/sbin + + # Install logrotate file + install -D -m 0644 $(DIR_SOURCE)/wpa_supplicant.logrotate $(BUILDROOT)/etc/logrotate.d/wpa_supplicant +endef
hooks/post-receive -- IPFire 3.x development tree