IPFire-SCM December 2010

ipfire-scm@lists.ipfire.org

1 participants
119 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a62b3ae20d759995ae3a37b2ecd4c1ac99c3d9c4
by git＠ipfire.org 26 Dec '10

26 Dec '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f179d25f982b5a8c8bfc878263a115409b003d6d
by git＠ipfire.org 26 Dec '10

26 Dec '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9256a1dfdfc73433d1e50b0584b5cb0fd6014c58
by git＠ipfire.org 25 Dec '10

25 Dec '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 9256a1dfdfc73433d1e50b0584b5cb0fd6014c58 (commit) from 20fa8ccd19e9fbbfc7f2f6c6613d210d98563353 (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 9256a1dfdfc73433d1e50b0584b5cb0fd6014c58 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 25 13:11:33 2010 +0100 Fix Sundance IPG uevent modulname entry. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 3 +++ .../linux-2.6.32.27_ipg-fix-driver-name.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch Difference in files: diff --git a/lfs/linux b/lfs/linux index 85d0a09..c62001c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -145,6 +145,9 @@ endif # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch + # Fix Sundance/IC Plus IPG driver/modulname + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch + # Install ipfire logo cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \ drivers/video/logo/logo_linux_clut224.ppm diff --git a/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch b/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch new file mode 100644 index 0000000..2da9301 --- /dev/null +++ b/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch @@ -0,0 +1,15 @@ +Patch by Arne Fitzenreiter <arne_f(a)ipfire.org> +Fix PHYSDEVDRIVER from "Sundance IPG ..." to the modulname (ipg) + +diff -Naur linux-2.6.32.27.org/drivers/net/ipg.c linux-2.6.32.27/drivers/net/ipg.c +--- linux-2.6.32.27.org/drivers/net/ipg.c 2010-12-09 22:29:45.000000000 +0100 ++++ linux-2.6.32.27/drivers/net/ipg.c 2010-12-25 00:24:29.291637731 +0100 +@@ -2320,7 +2320,7 @@ + } + + static struct pci_driver ipg_pci_driver = { +- .name = IPG_DRIVER_NAME, ++ .name = DRV_NAME, + .id_table = ipg_pci_tbl, + .probe = ipg_probe, + .remove = __devexit_p(ipg_remove), hooks/post-receive -- IPFire 2.x development tree

1 0

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

24 Dec '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 19947356c852c5dd92460cf115e448a0cb14f3bc
by git＠ipfire.org 24 Dec '10

24 Dec '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e238e4c25bed0fd876d12671518957d13d1a0426
by git＠ipfire.org 24 Dec '10

24 Dec '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 e238e4c25bed0fd876d12671518957d13d1a0426 (commit) from ceb5098e575cd68a133e238c1ec8f67867bf41a7 (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 e238e4c25bed0fd876d12671518957d13d1a0426 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Dec 24 01:02:57 2010 +0100 firstsetup: add reboot if setup was not finnished. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/firstsetup | 4 ++++ src/install+setup/setup/main.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/initscripts/init.d/openvmtools Difference in files: diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup index b03b729..8ea1b5e 100644 --- a/src/initscripts/init.d/firstsetup +++ b/src/initscripts/init.d/firstsetup @@ -2,6 +2,10 @@ /etc/init.d/sysklogd start export LANG=en_US.utf8 /usr/local/sbin/setup /dev/tty2 INSTALL +if [ "${?}" == "1" ]; then + echo Setup not finished. Rebooting ... + reboot -f +fi echo Restarting udev... killall udevd /sbin/udevd --daemon diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools old mode 100755 new mode 100644 diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c index 33cae34..a14930d 100644 --- a/src/install+setup/setup/main.c +++ b/src/install+setup/setup/main.c @@ -199,7 +199,17 @@ EXIT: if (autook) newtWinMessage(title, ctr[TR_OK], ctr[TR_SETUP_FINISHED]); else + { newtWinMessage(ctr[TR_WARNING], ctr[TR_OK], ctr[TR_SETUP_NOT_COMPLETE]); + + fprintf(flog, "Setup program not finnished.\n"); + fflush(flog); + fclose(flog); + + newtFinished(); + + return 1; + } } fprintf(flog, "Setup program ended.\n"); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ceb5098e575cd68a133e238c1ec8f67867bf41a7
by git＠ipfire.org 23 Dec '10

23 Dec '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-beta2, created. 2120ed47e93d52d96bbc3715fc7649f1086141dd
by git＠ipfire.org 21 Dec '10

21 Dec '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 tag, v2.9-beta2 has been created at 2120ed47e93d52d96bbc3715fc7649f1086141dd (commit) - Log ----------------------------------------------------------------- commit 2120ed47e93d52d96bbc3715fc7649f1086141dd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 21 22:11:39 2010 +0100 updater: fix ipsec.conf and squid.conf permissions. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

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

21 Dec '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 2120ed47e93d52d96bbc3715fc7649f1086141dd (commit) from 88f8491945dcb15e1fdc4dba231375736101d00a (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 2120ed47e93d52d96bbc3715fc7649f1086141dd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 21 22:11:39 2010 +0100 updater: fix ipsec.conf and squid.conf permissions. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/44/update.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 97416ce..40a0895 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -170,6 +170,7 @@ fi mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf +chown nobody:nobody /var/ipfire/vpn/ipsec.conf #new squid has some changed options. Build a basic config to be able start squid. mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org @@ -178,6 +179,7 @@ grep -v "error_directory " | \ grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf echo >> /var/ipfire/proxy/squid.conf echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf +chown nobody:nobody /var/ipfire/proxy/squid.conf #Convert extrahd entries to UUID cp -f /var/ipfire/extrahd/devices /var/ipfire/extrahd/devices.org hooks/post-receive -- IPFire 2.x development tree

1 0

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

21 Dec '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 88f8491945dcb15e1fdc4dba231375736101d00a (commit) from 7019ca5809f03b15c4f6aeeb8b03f71acc2cacf9 (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 88f8491945dcb15e1fdc4dba231375736101d00a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Dec 21 20:38:36 2010 +0100 udev: remove old lfs rule that let lsusb shows devices twice. ----------------------------------------------------------------------- Summary of changes: lfs/udev | 3 ++- .../udev-config-6.2_remove-lfs-usb-rule.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) create mode 100644 src/patches/udev-config-6.2_remove-lfs-usb-rule.patch Difference in files: diff --git a/lfs/udev b/lfs/udev index 2b091bb..c7cba71 100644 --- a/lfs/udev +++ b/lfs/udev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2005-2010 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -107,6 +107,7 @@ else rm -rf /lib/udev/devices cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2 cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch install -dv /lib/{firmware,udev/devices/{pts,shm}} echo "Put device firmwares here ..." > /lib/firmware/dirinfo mknod -m0666 /lib/udev/devices/null c 1 3 diff --git a/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch b/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch new file mode 100644 index 0000000..ef02bf7 --- /dev/null +++ b/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch @@ -0,0 +1,11 @@ +diff -Naur udev-config-6.2.org/25-lfs.rules udev-config-6.2/25-lfs.rules +--- udev-config-6.2.org/25-lfs.rules 2006-07-14 23:29:28.000000000 +0200 ++++ udev-config-6.2/25-lfs.rules 2010-12-21 18:55:40.375602794 +0100 +@@ -84,7 +84,6 @@ + + # USB devices go in their own subdirectory + +-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", NAME="%c" + KERNEL=="hiddev*", NAME="usb/%k" + KERNEL=="auer*", NAME="usb/%k" + KERNEL=="legousbtower*", NAME="usb/%k" 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 December 2010