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 3834d135ecb9383995f305cfe4fa18e9c7511495 (commit) via 4527e3eb7dce9104cffa99fb4c67dce0368a39a2 (commit) via b7515822bda83729a79acf3693179d048d21ad95 (commit) via 88d701e278ae3aa9fa4d101d192628056380bad7 (commit) via 2ab07f7ef331663a44757e82d6d16c325da6e092 (commit) via 7f5b009ad57926e217df66988513a81f05fb539b (commit) via 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd (commit) via aa8245cbd54e3ba68903580381de4d60816606c5 (commit) via bdc84c9f9221a31d11e364bdf28013ffc30d31a6 (commit) via 51dcdbc3b94ea73fddd77c73f1a54dded06db7c0 (commit) via f2d2ce590242a64baff8343c6707944fef4dd7bb (commit) via 4262c16b36f8d13a80cddff9b4c49a6bf0ab153f (commit) from 925038e35d5f8a5f9dd5874deb22184d6d56fe1e (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 3834d135ecb9383995f305cfe4fa18e9c7511495 Merge: 925038e 4527e3e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 13 15:57:05 2010 +0200
Merge branch 'master' into next
Conflicts: config/rootfiles/core/40/update.sh
-----------------------------------------------------------------------
Summary of changes: config/etc/fstab | 2 +- config/rootfiles/common/openvpn | 1 + lfs/openvpn | 2 ++ src/initscripts/init.d/ntp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-)
Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index c0f98b3..4860d6f 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -10,5 +10,5 @@ sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 #none /tmp tmpfs defaults 0 0 none /var/log/rrd tmpfs defaults,size=64M 0 0 -none /var/lock tmpfs defaults,size=2M 0 0 +none /var/lock tmpfs defaults,size=8M 0 0 none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 47b42f9..23742b3 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -1,3 +1,4 @@ +lib/openvpn-auth-pam.so usr/sbin/openvpn #usr/share/doc/openvpn #usr/share/man/man8/openvpn.8 diff --git a/lfs/openvpn b/lfs/openvpn index 8c8ad71..792de60 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -75,6 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire + cd $(DIR_APP)/plugin/auth-pam && make + cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/ -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/crls touch /var/ipfire/ovpn/ovpn-leases.db diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp index ef94de1..92f174d 100644 --- a/src/initscripts/init.d/ntp +++ b/src/initscripts/init.d/ntp @@ -9,7 +9,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings) case "$1" in start) if [ "$ENABLESETONBOOT" == "on" ]; then - boot_mesg "Setting time on booot..." + boot_mesg "Setting time on boot..." loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf) fi
hooks/post-receive -- IPFire 2.x development tree