IPFire-SCM October 2010

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fa527c3a549acaf820a534bbb234a570c4891673
by git＠ipfire.org 21 Oct '10

21 Oct '10

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(a)ipfire.org> Date: Fri Oct 22 01:14:14 2010 +0200 Merge branch 'next' commit aa3b09af5738c5922034febe89cb0004ad3841ec Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 20 23:29:22 2010 +0200 pyQt: Update to 4.8-snapshot. commit 6b829aab9873eeac57f0ddd00859a9fbb0cc247b Author: Michael Tremer <michael.tremer(a)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(a)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(a)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(a)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(a)ipfire.org> Date: Sun Oct 17 21:11:52 2010 +0200 pyQt: Update to 4.7.7. commit 5c0aa76e18ad4ee26279ba7b643dd8b02f926aa2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:11:21 2010 +0200 sip: Update to 4.11.1. commit c6dfe5f3ac8152e14c372cadbfe4521c188de4c0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:09:58 2010 +0200 qt: Update to 4.7.0. commit 19390374d3ca2699933119a6c0d9249f59385a66 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Oct 17 20:59:46 2010 +0200 python-qtermwidget: New package. commit 0f0a1c89a05738cdab11c04cf29b958bf27ecd93 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Oct 17 20:59:20 2010 +0200 qtermwidget: New package. commit 83a1c641c253c11fac63299d134198a9b21b4ec5 Merge: b50180c 21ad1a3 Author: Michael Tremer <michael.tremer(a)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(a)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(a)ipfire.org> Date: Sat Oct 16 21:54:38 2010 +0200 wpa_supplicant: Add logrotate file. commit ea3450d635a0437cf2f37c8b19727374df7ce6dc Author: Schantl Stefan <Stevee(a)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(a)ipfire.org> Date: Sat Oct 16 21:36:36 2010 +0200 wpa_supplicant: New package. commit 21ad1a3a4d9326bf8c7f43f0e7750c9d21e0bc63 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Oct 17 12:05:10 2010 +0200 python-piksemel: New package. commit b0a5e021e558d62c21376bdba7083682a037a71d Author: Michael Tremer <michael.tremer(a)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(a)ipfire.org> Date: Sat Oct 16 23:19:39 2010 +0200 Merge branch 'next' into installer commit 1cf40216e9451859f0a66faf9a4753c462500622 Author: Michael Tremer <michael.tremer(a)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(a)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(a)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

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f
by git＠ipfire.org 21 Oct '10

21 Oct '10

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, master has been updated via bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f (commit) via b8efe40c89cb7fc95941b3054e1e6d56437185ad (commit) from 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 (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 bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f Merge: b8efe40 38a76ff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 22:06:10 2010 +0200 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit b8efe40c89cb7fc95941b3054e1e6d56437185ad Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 22:04:42 2010 +0200 core41: remove old bzip2 files from /usr/local... ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/41/update.sh | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/41/update.sh b/config/rootfiles/core/41/update.sh index 84bd432..72b334b 100644 --- a/config/rootfiles/core/41/update.sh +++ b/config/rootfiles/core/41/update.sh @@ -28,6 +28,13 @@ #Stop services /etc/init.d/ipsec stop +#Remove old bzip2 files +rm -f /usr/local/bin/bunzip2 +rm -f /usr/local/bin/bzcat +rm -f /usr/local/bin/bzip2 +rm -f /usr/local/include/bzlib.h +rm -f /usr/local/lib/libbz2.a + # #Extract files extract_files hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 38a76ff405f8b1358181c7dfa2e4b23aca1d9985
by git＠ipfire.org 21 Oct '10

21 Oct '10

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, master has been updated via 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 (commit) via 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 (commit) from ad306a7a299badacdd8c31bab3511ab9804af8df (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 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 17:52:25 2010 +0200 Setup: add spanish language file. commit 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 17:45:31 2010 +0200 Add bzip2 update to core41. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/41/filelists/bzip2 | 1 + config/rootfiles/core/41/filelists/files | 1 + src/install+setup/setup/main.c | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/41/filelists/bzip2 Difference in files: diff --git a/config/rootfiles/core/41/filelists/bzip2 b/config/rootfiles/core/41/filelists/bzip2 new file mode 120000 index 0000000..03f4ee5 --- /dev/null +++ b/config/rootfiles/core/41/filelists/bzip2 @@ -0,0 +1 @@ +../../../common/bzip2 \ No newline at end of file diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files index c42902f..21a915b 100644 --- a/config/rootfiles/core/41/filelists/files +++ b/config/rootfiles/core/41/filelists/files @@ -9,3 +9,4 @@ var/ipfire/langs/de.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl var/ipfire/outgoing/bin/outgoingfw.pl +usr/local/sbin/setup diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c index f0d3604..33cae34 100644 --- a/src/install+setup/setup/main.c +++ b/src/install+setup/setup/main.c @@ -23,7 +23,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; extern char *en_tr[]; extern char *de_tr[]; extern char *fr_tr[]; - +extern char *es_tr[]; int main(int argc, char *argv[]) { @@ -31,8 +31,8 @@ int main(int argc, char *argv[]) char *shortlangnames[] = { "en", NULL }; char **langtrs[] = { en_tr, NULL }; #else - char *shortlangnames[] = { "de", "en", "fr", NULL }; - char **langtrs[] = { de_tr, en_tr, fr_tr, NULL }; + char *shortlangnames[] = { "de", "en", "fr", "es", NULL }; + char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL }; #endif int choice; char *sections[11]; /* need to fill this out AFTER knowning lang */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ad306a7a299badacdd8c31bab3511ab9804af8df
by git＠ipfire.org 20 Oct '10

20 Oct '10

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, master has been updated via ad306a7a299badacdd8c31bab3511ab9804af8df (commit) from cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a (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 ad306a7a299badacdd8c31bab3511ab9804af8df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 21 00:24:24 2010 +0200 bzip2: Update 1.0.6. Closes latest security vulnerability. Might require to rebuild toolchain. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bzip2 | 48 +++++++++++++++++++--------------------- lfs/bzip2 | 6 ++-- 2 files changed, 26 insertions(+), 28 deletions(-) Difference in files: diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index 550b9f1..b91b89d 100644 --- a/config/rootfiles/common/bzip2 +++ b/config/rootfiles/common/bzip2 @@ -2,28 +2,26 @@ bin/bunzip2 bin/bzcat bin/bzip2 lib/libbz2.so.1.0 -lib/libbz2.so.1.0.4 -usr/lib/libbz2.so -usr/local/bin/bunzip2 -usr/local/bin/bzcat -#usr/local/bin/bzcmp -#usr/local/bin/bzdiff -#usr/local/bin/bzegrep -#usr/local/bin/bzfgrep -#usr/local/bin/bzgrep -usr/local/bin/bzip2 -#usr/local/bin/bzip2recover -#usr/local/bin/bzless -#usr/local/bin/bzmore -usr/local/include/bzlib.h -usr/local/lib/libbz2.a -#usr/local/man -#usr/local/man/man1 -#usr/local/man/man1/bzcmp.1 -#usr/local/man/man1/bzdiff.1 -#usr/local/man/man1/bzegrep.1 -#usr/local/man/man1/bzfgrep.1 -#usr/local/man/man1/bzgrep.1 -#usr/local/man/man1/bzip2.1 -#usr/local/man/man1/bzless.1 -#usr/local/man/man1/bzmore.1 +lib/libbz2.so.1.0.6 +usr/bin/bunzip2 +usr/bin/bzcat +usr/bin/bzcmp +usr/bin/bzdiff +usr/bin/bzegrep +usr/bin/bzfgrep +usr/bin/bzgrep +usr/bin/bzip2 +usr/bin/bzip2recover +usr/bin/bzless +usr/bin/bzmore +usr/include/bzlib.h +#usr/lib/libbz2.a +#usr/lib/libbz2.so +#usr/man/man1/bzcmp.1 +#usr/man/man1/bzdiff.1 +#usr/man/man1/bzegrep.1 +#usr/man/man1/bzfgrep.1 +#usr/man/man1/bzgrep.1 +#usr/man/man1/bzip2.1 +#usr/man/man1/bzless.1 +#usr/man/man1/bzmore.1 diff --git a/lfs/bzip2 b/lfs/bzip2 index 4712f31..44fa757 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -24,7 +24,7 @@ include Config -VER = 1.0.5 +VER = 1.0.6 THISAPP = bzip2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3c15a0c8d1d3ee1c46a1634d00617b1a +$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b install : $(TARGET) @@ -82,7 +82,7 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make -f Makefile-libbz2_so cd $(DIR_APP) && make clean cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && make install PREFIX=/usr cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2 cd $(DIR_APP) && cp -av libbz2.so* /lib ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2165fbb2de31272c652055adff8a0665957f58e9
by git＠ipfire.org 20 Oct '10

20 Oct '10

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 2165fbb2de31272c652055adff8a0665957f58e9 (commit) via 4aab581eee6ab43a9e4351521bd5f5462d7ad1b4 (commit) from 8070d8e52506e4ce5b93c975d6aab8329841f856 (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 2165fbb2de31272c652055adff8a0665957f58e9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 23:05:37 2010 +0200 Updated syslinux (4.02). commit 4aab581eee6ab43a9e4351521bd5f5462d7ad1b4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 23:05:21 2010 +0200 Fix typo. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/syslinux | 16 +++++++++++++++- langs/de/install/lang_de.c | 4 ++-- lfs/syslinux | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/common/syslinux b/config/rootfiles/common/syslinux index b6c7030..a4a8254 100644 --- a/config/rootfiles/common/syslinux +++ b/config/rootfiles/common/syslinux @@ -1,9 +1,11 @@ #sbin/extlinux #usr/bin/gethostip #usr/bin/isohybrid +#usr/bin/isohybrid.pl #usr/bin/keytab-lilo #usr/bin/lss16toppm #usr/bin/md5pass +#usr/bin/memdiskfind #usr/bin/mkdiskimage #usr/bin/ppmtolss16 #usr/bin/pxelinux-options @@ -20,6 +22,7 @@ #usr/share/syslinux/altmbr.bin #usr/share/syslinux/altmbr_c.bin #usr/share/syslinux/altmbr_f.bin +#usr/share/syslinux/cat.c32 #usr/share/syslinux/chain.c32 #usr/share/syslinux/cmd.c32 #usr/share/syslinux/com32 @@ -45,6 +48,7 @@ #usr/share/syslinux/com32/include/endian.h #usr/share/syslinux/com32/include/errno.h #usr/share/syslinux/com32/include/fcntl.h +#usr/share/syslinux/com32/include/getopt.h #usr/share/syslinux/com32/include/gplinclude #usr/share/syslinux/com32/include/gplinclude/README #usr/share/syslinux/com32/include/gplinclude/cpuid.h @@ -75,6 +79,7 @@ #usr/share/syslinux/com32/include/gplinclude/memory.h #usr/share/syslinux/com32/include/gplinclude/vpd #usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h +#usr/share/syslinux/com32/include/ilog2.h #usr/share/syslinux/com32/include/inttypes.h #usr/share/syslinux/com32/include/klibc #usr/share/syslinux/com32/include/klibc/archsetjmp.h @@ -101,6 +106,7 @@ #usr/share/syslinux/com32/include/string.h #usr/share/syslinux/com32/include/sys #usr/share/syslinux/com32/include/sys/cpu.h +#usr/share/syslinux/com32/include/sys/dirent.h #usr/share/syslinux/com32/include/sys/elf32.h #usr/share/syslinux/com32/include/sys/elf64.h #usr/share/syslinux/com32/include/sys/elfcommon.h @@ -128,7 +134,9 @@ #usr/share/syslinux/com32/include/syslinux/loadfile.h #usr/share/syslinux/com32/include/syslinux/memscan.h #usr/share/syslinux/com32/include/syslinux/movebits.h +#usr/share/syslinux/com32/include/syslinux/pmapi.h #usr/share/syslinux/com32/include/syslinux/pxe.h +#usr/share/syslinux/com32/include/syslinux/pxe_api.h #usr/share/syslinux/com32/include/syslinux/reboot.h #usr/share/syslinux/com32/include/syslinux/resolve.h #usr/share/syslinux/com32/include/syslinux/vesacon.h @@ -155,15 +163,16 @@ #usr/share/syslinux/elf.c32 #usr/share/syslinux/ethersel.c32 #usr/share/syslinux/gfxboot.c32 -#usr/share/syslinux/gfxboot.com #usr/share/syslinux/gptmbr.bin #usr/share/syslinux/gptmbr_c.bin #usr/share/syslinux/gptmbr_f.bin #usr/share/syslinux/gpxecmd.c32 #usr/share/syslinux/gpxelinux.0 #usr/share/syslinux/hdt.c32 +#usr/share/syslinux/host.c32 #usr/share/syslinux/ifcpu.c32 #usr/share/syslinux/ifcpu64.c32 +#usr/share/syslinux/ifplop.c32 #usr/share/syslinux/int18.com #usr/share/syslinux/isohdpfx.bin #usr/share/syslinux/isohdpfx_c.bin @@ -175,6 +184,8 @@ #usr/share/syslinux/isolinux.bin #usr/share/syslinux/kbdmap.c32 #usr/share/syslinux/linux.c32 +#usr/share/syslinux/ls.c32 +#usr/share/syslinux/lua.c32 #usr/share/syslinux/mboot.c32 #usr/share/syslinux/mbr.bin #usr/share/syslinux/mbr_c.bin @@ -186,6 +197,7 @@ #usr/share/syslinux/pcitest.c32 #usr/share/syslinux/pmload.c32 #usr/share/syslinux/poweroff.com +#usr/share/syslinux/pwd.c32 #usr/share/syslinux/pxechain.com #usr/share/syslinux/pxelinux.0 #usr/share/syslinux/reboot.c32 @@ -195,6 +207,8 @@ #usr/share/syslinux/sysdump.c32 #usr/share/syslinux/syslinux.com #usr/share/syslinux/syslinux.exe +#usr/share/syslinux/syslinux64.exe #usr/share/syslinux/vesainfo.c32 #usr/share/syslinux/vesamenu.c32 #usr/share/syslinux/vpdtest.c32 +#usr/share/syslinux/whichsys.c32 diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c index 193e3f5..a62cb8d 100644 --- a/langs/de/install/lang_de.c +++ b/langs/de/install/lang_de.c @@ -572,9 +572,9 @@ char *de_tr[] = { /* TR_DHCP_STOPSERVER */ "Stoppe den DHCP-Server ...", /* TR_LICENSE_ACCEPT */ -"Ich akzeptiere diese Lizens.", +"Ich akzeptiere diese Lizenz.", /* TR_LICENSE_NOT_ACCEPTED */ -"Die Lizens wurde nicht akzeptiert. Abbruch!", +"Die Lizenz wurde nicht akzeptiert. Abbruch!", }; diff --git a/lfs/syslinux b/lfs/syslinux index cae5594..bf68228 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -24,7 +24,7 @@ include Config -VER = 3.86 +VER = 4.02 THISAPP = syslinux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d6fb0231e82190b4932b2aa20274911a +$(DL_FILE)_MD5 = 52912c03f5c275d6c0ac09180ebab81f install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8070d8e52506e4ce5b93c975d6aab8329841f856
by git＠ipfire.org 20 Oct '10

20 Oct '10

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 8070d8e52506e4ce5b93c975d6aab8329841f856 (commit) from df746da1c8017f6f3d8a3afb824baf4f6b8f9b5d (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 8070d8e52506e4ce5b93c975d6aab8329841f856 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:11:55 2010 +0200 Remove "reboot" message at the end of the setup. ----------------------------------------------------------------------- Summary of changes: langs/de/install/lang_de.c | 2 +- langs/en/install/lang_en.c | 2 +- langs/es/install/lang_es.c | 2 +- langs/fr/install/lang_fr.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c index 0a1d275..193e3f5 100644 --- a/langs/de/install/lang_de.c +++ b/langs/de/install/lang_de.c @@ -432,7 +432,7 @@ char *de_tr[] = { /* TR_SETTING_SETUP_PASSWORD */ "Setze 'setup'-Passwort...", /* TR_SETUP_FINISHED */ -"Das Setup ist vollständig beendet. Drücken Sie Ok für den Neustart.", +"Das Setup ist vollständig beendet. Drücken Sie Ok.", /* TR_SETUP_NOT_COMPLETE */ "Das erste Setup wurde nicht vollständig durchgeführt. Sie müssen Setup vollständig beenden; dies können Sie durch Ausführen von Setup in der Shell nachholen.", /* TR_SETUP_PASSWORD */ diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c index 690a586..2977a20 100644 --- a/langs/en/install/lang_en.c +++ b/langs/en/install/lang_en.c @@ -428,7 +428,7 @@ char *en_tr[] = { /* TR_SETTING_SETUP_PASSWORD */ "TO BE REMOVED", /* TR_SETUP_FINISHED */ -"Setup is complete. Press Ok to reboot.", +"Setup is complete. Press Ok.", /* TR_SETUP_NOT_COMPLETE */ "Initial setup was not entirely complete. You must ensure that Setup is properly finished by running setup again at the shell.", /* TR_SETUP_PASSWORD */ diff --git a/langs/es/install/lang_es.c b/langs/es/install/lang_es.c index b960137..9e3d52d 100644 --- a/langs/es/install/lang_es.c +++ b/langs/es/install/lang_es.c @@ -424,7 +424,7 @@ char *es_tr[] = { /* TR_SETTING_SETUP_PASSWORD */ "A REMOVER", /* TR_SETUP_FINISHED */ -"La configuración se ha completado. Presione Ok para reiniciar", +"La configuración se ha completado. Presione Ok.", /* TR_SETUP_NOT_COMPLETE */ "La configuración inicial no se completó totalmente. Asegúrese de configurar todo correctamente ejecutando setup de nuevo desde la línea de comandos.", /* TR_SETUP_PASSWORD */ diff --git a/langs/fr/install/lang_fr.c b/langs/fr/install/lang_fr.c index 25c313c..c6b4e11 100644 --- a/langs/fr/install/lang_fr.c +++ b/langs/fr/install/lang_fr.c @@ -424,7 +424,7 @@ char *fr_tr[] = { /* TR_SETTING_SETUP_PASSWORD */ "A ENLEVER", /* TR_SETUP_FINISHED */ -"Installation terminée. Appuyer sur Ok pour redémarrer.", +"Installation terminée.", /* TR_SETUP_NOT_COMPLETE */ "L'installation initiale n'est pas complètement finie. Vous devez vous assurer que l'installation s'est finie correctement en relançant l'installation depuis le shell.", /* TR_SETUP_PASSWORD */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. df746da1c8017f6f3d8a3afb824baf4f6b8f9b5d
by git＠ipfire.org 20 Oct '10

20 Oct '10

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 df746da1c8017f6f3d8a3afb824baf4f6b8f9b5d (commit) via 19d31f52368a052d328214eda0f6f92b60021eb2 (commit) via 578297dbe5ac5b0d60429fdc2b6df36ad71a6afb (commit) via e0bbaf87779eaf0d53d96bf4bc2efd91a9fde28b (commit) from 59093c5ec474be7eb22c17a8f1cb0c1922f1f93a (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 df746da1c8017f6f3d8a3afb824baf4f6b8f9b5d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:03:02 2010 +0200 Updated Realter 8169 driver. commit 19d31f52368a052d328214eda0f6f92b60021eb2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:02:43 2010 +0200 Updated Realtek 8168 driver. commit 578297dbe5ac5b0d60429fdc2b6df36ad71a6afb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:02:15 2010 +0200 Updated Realtek r8101 driver. commit e0bbaf87779eaf0d53d96bf4bc2efd91a9fde28b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:01:24 2010 +0200 Add license dialog to the installer. ----------------------------------------------------------------------- Summary of changes: langs/de/install/lang_de.c | 11 ++++++- langs/en/install/lang_en.c | 10 +++++- langs/es/install/lang_es.c | 8 ++++- langs/fr/install/lang_fr.c | 10 ++++-- lfs/r8101 | 4 +- lfs/r8168 | 4 +- lfs/r8169 | 4 +- make.sh | 1 + src/install+setup/install/main.c | 22 ++++++++++++- src/install+setup/libsmooth/libsmooth.h | 2 + src/install+setup/libsmooth/main.c | 55 +++++++++++++++++++++++++++++++ 11 files changed, 118 insertions(+), 13 deletions(-) Difference in files: diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c index b59b5d0..0a1d275 100644 --- a/langs/de/install/lang_de.c +++ b/langs/de/install/lang_de.c @@ -1,7 +1,7 @@ /* * German (de) Data File * - * This file is part of the IPCop Firewall. + * This file is part of the IPFire. * * IPCop is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ * along with IPCop; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * (c) IPFire Team <info(a)ipfire.org> + * + * based on work of SmoothWall and IPCop + * * (c) The SmoothWall Team * * IPCop translation @@ -567,5 +571,10 @@ char *de_tr[] = { "Starte den DHCP-Server ...", /* TR_DHCP_STOPSERVER */ "Stoppe den DHCP-Server ...", +/* TR_LICENSE_ACCEPT */ +"Ich akzeptiere diese Lizens.", +/* TR_LICENSE_NOT_ACCEPTED */ +"Die Lizens wurde nicht akzeptiert. Abbruch!", + }; diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c index 939d627..690a586 100644 --- a/langs/en/install/lang_en.c +++ b/langs/en/install/lang_en.c @@ -1,7 +1,7 @@ /* * English (en) Data File * - * This file is part of the IPCop Firewall. + * This file is part of the IPFire. * * IPCop is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ * along with IPCop; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * (c) IPFire Team <info(a)ipfire.org> + * + * based on work of SmoothWall and IPCop + * * (c) The SmoothWall Team * */ @@ -563,6 +567,10 @@ char *en_tr[] = { "Starting DHCP-Server ...", /* TR_DHCP_STOPSERVER */ "Stopping DHCP-Server ...", +/* TR_LICENSE_ACCEPT */ +"I accept this license.", +/* TR_LICENSE_NOT_ACCEPTED */ +"License not accepted. Exit!", }; diff --git a/langs/es/install/lang_es.c b/langs/es/install/lang_es.c index 2e32de2..b960137 100644 --- a/langs/es/install/lang_es.c +++ b/langs/es/install/lang_es.c @@ -1,7 +1,7 @@ /* * Spanish (es) Data File * - * This file is part of the IPFire Firewall. + * This file is part of the IPFire. * * IPFire is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ * along with IPFire; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * (c) IPFire Team <info(a)ipfire.org> + * */ #include "libsmooth.h" @@ -561,6 +563,10 @@ char *es_tr[] = { "Iniciando Servidor DHCP ...", /* TR_DHCP_STOPSERVER */ "Deteniendo Servidor DHCP ...", +/* TR_LICENSE_ACCEPT */ +"I accept this license.", +/* TR_LICENSE_NOT_ACCEPTED */ +"License not accepted. Exit!", }; diff --git a/langs/fr/install/lang_fr.c b/langs/fr/install/lang_fr.c index 2147284..25c313c 100644 --- a/langs/fr/install/lang_fr.c +++ b/langs/fr/install/lang_fr.c @@ -1,7 +1,7 @@ /* * French (fr) Data File * - * This file is part of the IPCop Firewall. + * This file is part of the IPFire. * * IPCop is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ * along with IPCop; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * (c) The SmoothWall Team - * + * (c) IPFire Team <info(a)ipfire.org> + * */ #include "libsmooth.h" @@ -563,6 +563,10 @@ char *fr_tr[] = { "Démarrage du serveur DHCP ...", /* TR_DHCP_STOPSERVER */ "Arrêt du serveur DHCP ...", +/* TR_LICENSE_ACCEPT */ +"I accept this license.", +/* TR_LICENSE_NOT_ACCEPTED */ +"License not accepted. Exit!", }; diff --git a/lfs/r8101 b/lfs/r8101 index d085324..a523c68 100644 --- a/lfs/r8101 +++ b/lfs/r8101 @@ -34,7 +34,7 @@ else endif endif -VER = 1.016.00 +VER = 1.019.00 THISAPP = r8101-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5885e0f20cf8a87566f1fb99b5113b72 +$(DL_FILE)_MD5 = 2804355badc4cb14f091dd8b32d270c3 install : $(TARGET) diff --git a/lfs/r8168 b/lfs/r8168 index fce2d30..a80d156 100644 --- a/lfs/r8168 +++ b/lfs/r8168 @@ -34,7 +34,7 @@ else endif endif -VER = 8.018.00 +VER = 8.019.00 THISAPP = r8168-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f73f91690ef18e76434cb083b10f3b44 +$(DL_FILE)_MD5 = f6934fc5df1dfb5fea82e4a310568890 install : $(TARGET) diff --git a/lfs/r8169 b/lfs/r8169 index 745fd29..b738385 100644 --- a/lfs/r8169 +++ b/lfs/r8169 @@ -34,7 +34,7 @@ else endif endif -VER = 6.013.00 +VER = 6.014.00 THISAPP = r8169-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5cbf92304fe64345b1838b7664701afa +$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3 install : $(TARGET) diff --git a/make.sh b/make.sh index 1f986bc..cc2d3c5 100755 --- a/make.sh +++ b/make.sh @@ -689,6 +689,7 @@ buildinstaller() { ipfiremake mbr ipfiremake memtest ipfiremake installer + cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/ installmake strip ipfiremake initrd } diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index a46de92..dc3ac19 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -35,6 +35,9 @@ extern char *fr_tr[]; int main(int argc, char *argv[]) { + + char discl_msg[40000] = "Disclaimer\n"; + char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL }; char *shortlangnames[] = { "de", "en", "fr", "es", NULL }; char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL }; @@ -57,7 +60,7 @@ int main(int argc, char *argv[]) int allok_fastexit=0; int raid_disk = 0; struct keyvalue *ethernetkv = initkeyvalues(); - FILE *handle, *cmdfile; + FILE *handle, *cmdfile, *copying; char line[STRING_SIZE]; char string[STRING_SIZE]; long memory = 0, disk = 0, free; @@ -108,6 +111,16 @@ int main(int argc, char *argv[]) } } + // Read gpl ... + if (! (copying = fopen("/COPYING", "r"))) + { + fprintf(flog, "Couldn't open gpl (/COPYING)\n"); + sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n"); + } else { + fread(discl_msg, 1, 40000, copying); + fclose(copying); + } + // Load common modules mysystem("/sbin/modprobe iso9660"); // CDROM mysystem("/sbin/modprobe ext2"); // Boot patition @@ -135,6 +148,13 @@ int main(int argc, char *argv[]) sprintf(message, ctr[TR_WELCOME], NAME); newtWinMessage(title, ctr[TR_OK], message); + if (!unattended) { + if (disclaimerbox(discl_msg)==0) { + errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); + goto EXIT; + } + } + switch (mysystem("/bin/mountsource.sh")) { case 0: break; diff --git a/src/install+setup/libsmooth/libsmooth.h b/src/install+setup/libsmooth/libsmooth.h index 54d7029..fb38193 100644 --- a/src/install+setup/libsmooth/libsmooth.h +++ b/src/install+setup/libsmooth/libsmooth.h @@ -79,6 +79,8 @@ void reboot(void); void stripnl(char *s); int mysystem(char *command); void errorbox(char *message); +int statuswindowscroll(int width, int height, char *title, char *text, ...); +int disclaimerbox(char *message); void statuswindow(int width, int height, char *title, char *text, ...); int runcommandwithprogress(int width, int height, char *title, char *command, int lines, char *text, ...); diff --git a/src/install+setup/libsmooth/main.c b/src/install+setup/libsmooth/main.c index 710183a..8de8c23 100644 --- a/src/install+setup/libsmooth/main.c +++ b/src/install+setup/libsmooth/main.c @@ -45,6 +45,61 @@ void errorbox(char *message) newtWinMessage(ctr[TR_ERROR], ctr[TR_OK], message); } +int scrollmsgbox(int width, int height, char *title, char *text, ...) +{ + int rc = 0; + newtComponent t, f, b, c; + char *buf = NULL; + char checkbox; + int size = 0; + int i = 0; + va_list args; + + va_start(args, text); + + do { + size += 40000; + if (buf) free(buf); + buf = malloc(size); + i = vsnprintf(buf, size, text, args); + } while (i == size); + + va_end(args); + + newtCenteredWindow(width, height, title); + + b = newtCompactButton(width - 15 ,height - 2, ctr[TR_OK]); + c = newtCheckbox(3, height - 2, ctr[TR_LICENSE_ACCEPT], ' ', " *", &checkbox); + + t = newtTextbox(1, 1, width - 2, height - 4, NEWT_TEXTBOX_WRAP+NEWT_TEXTBOX_SCROLL); + newtTextboxSetText(t, buf); + + f = newtForm(NULL, NULL, 0); + free(buf); + + newtFormAddComponent(f, c); + newtFormAddComponent(f, b); + newtFormAddComponent(f, t); + + newtRunForm(f); + if (checkbox=='*') rc=1; + newtFormDestroy(f); + return rc; +} + +int disclaimerbox(char *message) +{ + int rc; + char title[STRING_SIZE]; + + sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); + rc = scrollmsgbox(75, 20, title, message); + newtPopWindow(); + + return rc; +} + + void statuswindow(int width, int height, char *title, char *text, ...) { newtComponent t, f; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 59093c5ec474be7eb22c17a8f1cb0c1922f1f93a
by git＠ipfire.org 20 Oct '10

20 Oct '10

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 59093c5ec474be7eb22c17a8f1cb0c1922f1f93a (commit) via 82a8499a6a05652886ab5ddbd82e536b6d8ed144 (commit) via 13ff7d0bfb5b886aa0a1a11cca8045d4e9ed3409 (commit) via 66d54d5bc104924f88f3a36e836ec50594b0476e (commit) via b8f45245a0c2c1c8e4b5ca3cda2f1023c3eb2e37 (commit) via 5d2075e2b080b49e72f38a4974342e3d2fd7d100 (commit) from 9d4e63229159a9e982774b04f1b3a5d651d62ab4 (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 59093c5ec474be7eb22c17a8f1cb0c1922f1f93a Merge: 9d4e632 82a8499 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 18:18:34 2010 +0200 Merge commit 'origin/master' into next Conflicts: config/rootfiles/core/41/exclude config/rootfiles/core/41/filelists/files ----------------------------------------------------------------------- Summary of changes: lfs/glibc | 2 + ...libc-2.3.6-dont_use_origin_on_privil_exec.patch | 67 ++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch Difference in files: diff --git a/lfs/glibc b/lfs/glibc index 82394a2..c540b98 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -95,6 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @mkdir $(DIR_SRC)/glibc-build + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch + ifeq "$(ROOT)" "" cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch diff --git a/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch b/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch new file mode 100644 index 0000000..26c8ac8 --- /dev/null +++ b/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch @@ -0,0 +1,67 @@ +diff -Naur glibc-2.3.6.org/elf/dl-load.c glibc-2.3.6/elf/dl-load.c +--- glibc-2.3.6.org/elf/dl-load.c 2005-04-06 04:50:10.000000000 +0200 ++++ glibc-2.3.6/elf/dl-load.c 2010-10-19 17:41:09.000000000 +0200 +@@ -176,8 +176,7 @@ + + + static size_t +-is_dst (const char *start, const char *name, const char *str, +- int is_path, int secure) ++is_dst (const char *start, const char *name, const char *str, int is_path) + { + size_t len; + bool is_curly = false; +@@ -206,11 +205,6 @@ + && (!is_path || name[len] != ':')) + return 0; + +- if (__builtin_expect (secure, 0) +- && ((name[len] != '\0' && (!is_path || name[len] != ':')) +- || (name != start + 1 && (!is_path || name[-2] != ':')))) +- return 0; +- + return len; + } + +@@ -225,13 +219,12 @@ + { + size_t len; + +- /* $ORIGIN is not expanded for SUID/GUID programs (except if it +- is $ORIGIN alone) and it must always appear first in path. */ ++ /* $ORIGIN is not expanded for SUID/GUID programs. */ + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0 +- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 +- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0 ++ && !INTUSE(__libc_enable_secure)) ++ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 ++ || (len = is_dst (start, name, "LIB", is_path)) != 0) + ++cnt; + + name = strchr (name + len, '$'); +@@ -263,12 +256,17 @@ + size_t len; + + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0) +- repl = l->l_origin; +- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) ++ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) ++ { ++ // Ignore this path at SUID/GUID ++ if (INTUSE(__libc_enable_secure)) ++ repl = (const char *) -1; ++ else ++ repl = l->l_origin; ++ } ++ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) + repl = GLRO(dl_platform); +- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ else if ((len = is_dst (start, name, "LIB", is_path)) != 0) + repl = DL_DST_LIB; + + if (repl != NULL && repl != (const char *) -1) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a
by git＠ipfire.org 19 Oct '10

19 Oct '10

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, master has been updated via cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a (commit) via 81e02ac0b284171e3388eac8eb420a725f2baab1 (commit) via 3c6ab3d121387d53e3cb02273c38968922d4a272 (commit) from 82a8499a6a05652886ab5ddbd82e536b6d8ed144 (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 cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 19 22:57:12 2010 +0200 Stop/start strongswan at core41 update. commit 81e02ac0b284171e3388eac8eb420a725f2baab1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 19 22:55:49 2010 +0200 Rebuild language cache at core41 update. commit 3c6ab3d121387d53e3cb02273c38968922d4a272 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 19 22:54:05 2010 +0200 Add glibc to core41 updater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/41/filelists/glibc | 1 + config/rootfiles/core/41/update.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) create mode 120000 config/rootfiles/core/41/filelists/glibc Difference in files: diff --git a/config/rootfiles/core/41/filelists/glibc b/config/rootfiles/core/41/filelists/glibc new file mode 120000 index 0000000..fbb4a52 --- /dev/null +++ b/config/rootfiles/core/41/filelists/glibc @@ -0,0 +1 @@ +../../../common/glibc \ No newline at end of file diff --git a/config/rootfiles/core/41/update.sh b/config/rootfiles/core/41/update.sh index 6b54995..84bd432 100644 --- a/config/rootfiles/core/41/update.sh +++ b/config/rootfiles/core/41/update.sh @@ -26,6 +26,7 @@ # #Stop services +/etc/init.d/ipsec stop # #Extract files @@ -33,10 +34,11 @@ extract_files # #Start services +/etc/init.d/ipsec start # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's #depmod 2.6.32.15-ipfire hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 82a8499a6a05652886ab5ddbd82e536b6d8ed144
by git＠ipfire.org 19 Oct '10

19 Oct '10

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, master has been updated via 82a8499a6a05652886ab5ddbd82e536b6d8ed144 (commit) from 13ff7d0bfb5b886aa0a1a11cca8045d4e9ed3409 (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 82a8499a6a05652886ab5ddbd82e536b6d8ed144 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 19 18:12:09 2010 +0200 glibc: close privil. escalation hole ($origin libpath) with S/GUID. ----------------------------------------------------------------------- Summary of changes: lfs/glibc | 2 + ...libc-2.3.6-dont_use_origin_on_privil_exec.patch | 67 ++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch Difference in files: diff --git a/lfs/glibc b/lfs/glibc index 82394a2..c540b98 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -95,6 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @mkdir $(DIR_SRC)/glibc-build + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch + ifeq "$(ROOT)" "" cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch diff --git a/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch b/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch new file mode 100644 index 0000000..26c8ac8 --- /dev/null +++ b/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch @@ -0,0 +1,67 @@ +diff -Naur glibc-2.3.6.org/elf/dl-load.c glibc-2.3.6/elf/dl-load.c +--- glibc-2.3.6.org/elf/dl-load.c 2005-04-06 04:50:10.000000000 +0200 ++++ glibc-2.3.6/elf/dl-load.c 2010-10-19 17:41:09.000000000 +0200 +@@ -176,8 +176,7 @@ + + + static size_t +-is_dst (const char *start, const char *name, const char *str, +- int is_path, int secure) ++is_dst (const char *start, const char *name, const char *str, int is_path) + { + size_t len; + bool is_curly = false; +@@ -206,11 +205,6 @@ + && (!is_path || name[len] != ':')) + return 0; + +- if (__builtin_expect (secure, 0) +- && ((name[len] != '\0' && (!is_path || name[len] != ':')) +- || (name != start + 1 && (!is_path || name[-2] != ':')))) +- return 0; +- + return len; + } + +@@ -225,13 +219,12 @@ + { + size_t len; + +- /* $ORIGIN is not expanded for SUID/GUID programs (except if it +- is $ORIGIN alone) and it must always appear first in path. */ ++ /* $ORIGIN is not expanded for SUID/GUID programs. */ + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0 +- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 +- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0 ++ && !INTUSE(__libc_enable_secure)) ++ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 ++ || (len = is_dst (start, name, "LIB", is_path)) != 0) + ++cnt; + + name = strchr (name + len, '$'); +@@ -263,12 +256,17 @@ + size_t len; + + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0) +- repl = l->l_origin; +- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) ++ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) ++ { ++ // Ignore this path at SUID/GUID ++ if (INTUSE(__libc_enable_secure)) ++ repl = (const char *) -1; ++ else ++ repl = l->l_origin; ++ } ++ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) + repl = GLRO(dl_platform); +- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ else if ((len = is_dst (start, name, "LIB", is_path)) != 0) + repl = DL_DST_LIB; + + if (repl != NULL && repl != (const char *) -1) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2010