[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 458a706340ccd6bdc8b571e9b02281f760599396
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 458a706340ccd6bdc8b571e9b02281f760599396 (commit) via 13ce5cfc0e307cb6be80eae55b0d0c391caa70c8 (commit) via 5322e875cd5f453f4d9a5d2e80341768c318f749 (commit) via 8b258cfbc720f15140d7df5185b7b46bdcec6148 (commit) via a2cb5fbdd90bc719fcedbe46da2bbc488f0e8da6 (commit) via e90947759f5aa8cfa55ca1a46569a9084a20cad9 (commit) via b355316be4388398acd4e521bf791c137cb5dce0 (commit) via 8424cbc1f797e4307e7bac5317a9924ca0d0e5f9 (commit) via bd632667151bc46b152ec3595082f4838388b8e4 (commit) via 540d1b2b875c437ba6114267b89e1af1de4bd616 (commit) via 13a27c6057470e980828ebbe771b39f1073b5d5e (commit) via 358d0a7db1bbfad9c1c1eca516d6752c1507dce5 (commit) via bfd6768c717aef07b655e69b7869d69a86c31837 (commit) via 589a34540edc1cdb0268649f0497512f6ebebefa (commit) via 2d1f6320c68d24dd467f35c69686ae1e0f14e7df (commit) via 39b3f25c835d553fc2fb6fe59f7b7de6b2887d4f (commit) from e59ed132285782c4edb40a55ca67a32e72df5bd7 (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 458a706340ccd6bdc8b571e9b02281f760599396 Merge: 13ce5cfc0e307cb6be80eae55b0d0c391caa70c8 a2cb5fbdd90bc719fcedbe46da2bbc488f0e8da6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 6 14:57:00 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 13ce5cfc0e307cb6be80eae55b0d0c391caa70c8 Merge: e90947759f5aa8cfa55ca1a46569a9084a20cad9 5322e875cd5f453f4d9a5d2e80341768c318f749 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 6 14:52:07 2010 +0200
Merge commit 'stevee/initscripts' into next
commit 5322e875cd5f453f4d9a5d2e80341768c318f749 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Jun 6 11:28:21 2010 +0200
vsftpd: Upstart jobfile - Disable run in background.
Add path for configfile to upstart jobfile and allways overwrite the background switch to NO -> So we allways have full control that the job will run in forderground whatever is set inside the configfile. Upstart has problems to stop the process if running in background.
commit 8b258cfbc720f15140d7df5185b7b46bdcec6148 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Jun 6 11:20:43 2010 +0200
vsftpd: Fix binary path in vsftpd upstart jobfile.
commit a2cb5fbdd90bc719fcedbe46da2bbc488f0e8da6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 6 11:18:03 2010 +0200
upstart: Run libtoolize to fix build error.
Upstart doesn't like to get built with the recent version of libtool.
commit e90947759f5aa8cfa55ca1a46569a9084a20cad9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 6 00:09:00 2010 +0200
libtool: Update to 2.2.8.
commit b355316be4388398acd4e521bf791c137cb5dce0 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jun 5 18:25:40 2010 +0200
ntp: Disable forking in upstart jobile.
The ntpd can't stopped correctly from upstart if the process is allowed to fork itself.
commit 8424cbc1f797e4307e7bac5317a9924ca0d0e5f9 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jun 5 17:43:29 2010 +0200
initscripts: Fix syntax of udev-retry jobfile.
The syntax of udev-retry jobfile has to be fixed to fit with new udev version.
commit bd632667151bc46b152ec3595082f4838388b8e4 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 4 23:57:59 2010 +0200
initscripts: Reflect changes on latest udev and upstart versions.
Squashed commit of the following:
commit 540d1b2b875c437ba6114267b89e1af1de4bd616 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:53:37 2010 +0200
initscripts: Add commit to udev jobfile.
commit 13a27c6057470e980828ebbe771b39f1073b5d5e Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:45:18 2010 +0200
initscripts: Udev start on startup and clean up jobfile to use new udev functions.
commit 358d0a7db1bbfad9c1c1eca516d6752c1507dce5 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:43:52 2010 +0200
initscripts: Swith stating goals of load-modules and sysctl.
commit bfd6768c717aef07b655e69b7869d69a86c31837 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:40:32 2010 +0200
initscripts: Remove unneeded file mount-kernel-filesystems.
commit 540d1b2b875c437ba6114267b89e1af1de4bd616 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:53:37 2010 +0200
initscripts: Add commit to udev jobfile.
commit 13a27c6057470e980828ebbe771b39f1073b5d5e Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:45:18 2010 +0200
initscripts: Udev start on startup and clean up jobfile to use new udev functions.
commit 358d0a7db1bbfad9c1c1eca516d6752c1507dce5 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:43:52 2010 +0200
initscripts: Swith stating goals of load-modules and sysctl.
commit bfd6768c717aef07b655e69b7869d69a86c31837 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Jun 4 23:40:32 2010 +0200
initscripts: Remove unneeded file mount-kernel-filesystems.
commit 589a34540edc1cdb0268649f0497512f6ebebefa Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 4 23:36:46 2010 +0200
openl2tp: New package.
commit 2d1f6320c68d24dd467f35c69686ae1e0f14e7df Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 4 23:29:56 2010 +0200
ppp: Fix installation of pppol2tp plugin.
commit 39b3f25c835d553fc2fb6fe59f7b7de6b2887d4f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 4 23:25:58 2010 +0200
naoki: Always install /lib/cpp in environments.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/initscripts/init/load-modules.conf | 2 +- .../initscripts/init/mount-kernel-filesystems.conf | 16 ------- pkgs/core/initscripts/init/sysctl.conf | 2 +- pkgs/core/initscripts/init/udev-retry.conf | 2 +- pkgs/core/initscripts/init/udev.conf | 13 +++--- pkgs/core/libtool/libtool.nm | 2 +- pkgs/core/ntp/ntp.init | 3 +- .../{sqlite/sqlite.nm => openl2tp/openl2tp.nm} | 46 +++++++++++--------- pkgs/core/ppp/ppp.nm | 3 + pkgs/core/upstart/upstart.nm | 5 ++ pkgs/core/vsftpd/vsftpd.init | 2 +- tools/toolchain | 9 ++++ 12 files changed, 54 insertions(+), 51 deletions(-) delete mode 100644 pkgs/core/initscripts/init/mount-kernel-filesystems.conf copy pkgs/core/{sqlite/sqlite.nm => openl2tp/openl2tp.nm} (66%)
Difference in files: diff --git a/pkgs/core/initscripts/init/load-modules.conf b/pkgs/core/initscripts/init/load-modules.conf index b64658c..d9cc718 100644 --- a/pkgs/core/initscripts/init/load-modules.conf +++ b/pkgs/core/initscripts/init/load-modules.conf @@ -1,7 +1,7 @@ description "Trigger coldplug events" author "IPFire Team"
-start on stopped mount-kernel-filesystems +start on startup
script # Exit if there's no modules file or there are no diff --git a/pkgs/core/initscripts/init/mount-kernel-filesystems.conf b/pkgs/core/initscripts/init/mount-kernel-filesystems.conf deleted file mode 100644 index cef79e5..0000000 --- a/pkgs/core/initscripts/init/mount-kernel-filesystems.conf +++ /dev/null @@ -1,16 +0,0 @@ -description "Mount kernel virtual systems" -author "IPFire Team" - -start on stopped welcome - -script - if ! mountpoint /proc > /dev/null; then - mount -n /proc || failed=1 - fi - - if ! mountpoint /sys > /dev/null; then - mount -n /sys || failed=1 - fi - - exit ${failed} -end script diff --git a/pkgs/core/initscripts/init/sysctl.conf b/pkgs/core/initscripts/init/sysctl.conf index 2289a9a..7293c3b 100644 --- a/pkgs/core/initscripts/init/sysctl.conf +++ b/pkgs/core/initscripts/init/sysctl.conf @@ -1,7 +1,7 @@ description "Set sysctl settings" author "IPFire Team"
-start on stopped mount-kernel-filesystems +start on startup
script if [ -f "/etc/sysctl.conf" ]; then diff --git a/pkgs/core/initscripts/init/udev-retry.conf b/pkgs/core/initscripts/init/udev-retry.conf index e3070d4..47c74ad 100644 --- a/pkgs/core/initscripts/init/udev-retry.conf +++ b/pkgs/core/initscripts/init/udev-retry.conf @@ -16,7 +16,7 @@ script done
# Re-trigger the failed uevents in hope they will succeed now - /sbin/udevadm trigger --action=add --retry-failed + /sbin/udevadm trigger --action=add --type=failed
# Now wait for udevd to process the uevents we triggered /sbin/udevadm settle diff --git a/pkgs/core/initscripts/init/udev.conf b/pkgs/core/initscripts/init/udev.conf index 421b8d0..469f46a 100644 --- a/pkgs/core/initscripts/init/udev.conf +++ b/pkgs/core/initscripts/init/udev.conf @@ -1,21 +1,20 @@ description "Start Udev Daemon" author "IPFire Team"
-start on stopped mount-kernel-filesystems -stop on starting shutdown or starting reboot +start on startup +stop on shutdown or reboot
console output
-pre-start script +# xxx should be a pre-start script but it only works as script - +# I don't know why... + +script # Mount a temporary file system over /dev, so that any devices # made or removed during this boot don't affect the next one. # The reason we don't write to mtab is because we don't ever # want /dev to be unavailable (such as by `umount -a'). mount -n -t tmpfs tmpfs /dev -o mode=755 - - # Udev handles uevents itself, so we don't need to have - # the kernel call out to any binary in response to them - echo > /proc/sys/kernel/hotplug end script
expect fork diff --git a/pkgs/core/libtool/libtool.nm b/pkgs/core/libtool/libtool.nm index 9718b3a..dbf3c1b 100644 --- a/pkgs/core/libtool/libtool.nm +++ b/pkgs/core/libtool/libtool.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = libtool -PKG_VER = 2.2.6b +PKG_VER = 2.2.8 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/ntp/ntp.init b/pkgs/core/ntp/ntp.init index 7484749..d47a5c6 100644 --- a/pkgs/core/ntp/ntp.init +++ b/pkgs/core/ntp/ntp.init @@ -4,6 +4,5 @@ author "IPFire Team" start on started network stop on stopping network
-exec /usr/sbin/ntpd -4 -c /etc/ntp.conf -expect daemon +exec /usr/sbin/ntpd -4 -n -c /etc/ntp.conf respawn diff --git a/pkgs/core/openl2tp/openl2tp.nm b/pkgs/core/openl2tp/openl2tp.nm new file mode 100644 index 0000000..fa0349a --- /dev/null +++ b/pkgs/core/openl2tp/openl2tp.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 = openl2tp +PKG_VER = 1.7 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Networking/PPP +PKG_URL = http://www.openl2tp.org/ +PKG_LICENSE = GPL +PKG_SUMMARY = A Linux L2TP solution for enterprise VPN and ISPs. + +PKG_BUILD_DEPS+= bison flex tcl +PKG_DEPS += readline + +define PKG_DESCRIPTION + OpenL2TP is an open source L2TP client / server, written specifically \ + for Linux. It has been designed for use as an enterprise L2TP VPN \ + server or in commercial, Linux-based, embedded networking products and \ + is able to support hundreds of sessions, each with different \ + configuration. It is used by several ISPs to provide L2TP services and \ + by corporations to implement L2TP VPNs. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CFLAGS += -fno-strict-aliasing + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -e "s/-lfl/&_pic/g" -i Makefile +endef + +define STAGE_BUILD + cd $(DIR_APP) && make OPT_CFLAGS="$(CFLAGS)" \ + KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5" +endef + +# This doesn't really a good testing +#define STAGE_TEST +# cd $(DIR_APP) && make test +#endef + +define STAGE_INSTALL + cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ + KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5" +endef diff --git a/pkgs/core/ppp/ppp.nm b/pkgs/core/ppp/ppp.nm index a5ff6db..f9cb367 100644 --- a/pkgs/core/ppp/ppp.nm +++ b/pkgs/core/ppp/ppp.nm @@ -52,6 +52,9 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -e "s@^RUNDIR .*@RUNDIR = /var/run/ppp@" \ -e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \ -i linux/Makefile.top + + cd $(DIR_APP) && sed -e "s@^DESTDIR.*@DESTDIR=$$(INSTROOT)/usr@" \ + -i pppd/plugins/pppol2tp/Makefile.linux endef
define STAGE_BUILD diff --git a/pkgs/core/upstart/upstart.nm b/pkgs/core/upstart/upstart.nm index fb60a55..57e7870 100644 --- a/pkgs/core/upstart/upstart.nm +++ b/pkgs/core/upstart/upstart.nm @@ -51,6 +51,11 @@ CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ --libdir=/lib
+define STAGE_PREPARE_CMDS + cd $(DIR_APP) && libtoolize + cd $(DIR_APP) && autoreconf --force +endef + # Testsuite fails #define STAGE_TEST # cd $(DIR_APP) && make check diff --git a/pkgs/core/vsftpd/vsftpd.init b/pkgs/core/vsftpd/vsftpd.init index e21e27f..5a6bda2 100644 --- a/pkgs/core/vsftpd/vsftpd.init +++ b/pkgs/core/vsftpd/vsftpd.init @@ -4,6 +4,6 @@ author "IPFire Team" start on started network stop on stopping network
-exec /usr/sbin/vsftpd +exec /usr/bin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO expect daemon respawn diff --git a/tools/toolchain b/tools/toolchain index a144912..30a24e3 100755 --- a/tools/toolchain +++ b/tools/toolchain @@ -48,6 +48,15 @@ case "${1}" in mkdir -p ${TARGET_PATH}/usr/lib 2>/dev/null ln -sf ../../$(basename ${TOOLS_DIR})/lib/${i} ${TARGET_PATH}/usr/lib/${i} done + + if ! [ -e "${TARGET_PATH}/lib/cpp" ]; then + for path in /usr/bin/cpp $(basename ${TOOLS_DIR})/bin/cpp; do + if [ -e "${TARGET_PATH}/${path}" ]; then + ln -sf /${path} ${TARGET_PATH}/lib/cpp + break + fi + done + fi ;;
compress)
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org