IPFire-SCM September 2012

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 4bd6b58393a136f17afc1fb823ed551c9c097d33
by git＠ipfire.org 23 Sep '12

23 Sep '12

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, thirteen has been updated via 4bd6b58393a136f17afc1fb823ed551c9c097d33 (commit) from 22a3f77293cf469932811130f4ce73143065b741 (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 4bd6b58393a136f17afc1fb823ed551c9c097d33 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 23 09:54:09 2012 -0400 v4l-dvb: disable RADIO_SHARK (missing tuner symbols). ----------------------------------------------------------------------- Summary of changes: lfs/v4l-dvb | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index 7b0b335..cde3efc 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -88,6 +88,10 @@ ifeq "$(KCFG)" "-omap" "s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \ v4l/.config endif + # Disable Radio Shark (missing tuner module) + cd $(DIR_APP) && sed -i -e \ + "s|^CONFIG_RADIO_SHARK=m|# CONFIG_RADIO_SHARK is not set|g" \ + v4l/.config cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) ln -sf $(DIR_APP)/ /usr/src/v4l-dvb hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 22a3f77293cf469932811130f4ce73143065b741
by git＠ipfire.org 23 Sep '12

23 Sep '12

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, thirteen has been updated via 22a3f77293cf469932811130f4ce73143065b741 (commit) from 5e0a1a503b90c5c80016399308bb2585edba219b (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 22a3f77293cf469932811130f4ce73143065b741 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 23 07:06:50 2012 -0400 v4ldvb: fix and enable build for omap. ----------------------------------------------------------------------- Summary of changes: lfs/v4l-dvb | 9 +++++++++ make.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index 5f2751a..7b0b335 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -79,6 +79,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) +ifeq "$(KCFG)" "-omap" + # Disable failing OMAP2 Video Out and IR RX51 driver + cd $(DIR_APP) && sed -i -e \ + "s|^CONFIG_VIDEO_OMAP2_VOUT=m|# CONFIG_VIDEO_OMAP2_VOUT is not set|g" \ + v4l/.config + cd $(DIR_APP) && sed -i -e \ + "s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \ + v4l/.config +endif cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER) ln -sf $(DIR_APP)/ /usr/src/v4l-dvb diff --git a/make.sh b/make.sh index c139bf5..92e5762 100755 --- a/make.sh +++ b/make.sh @@ -435,7 +435,7 @@ buildipfire() { # ipfiremake igb KCFG="-rpi" ipfiremake linux KCFG="-omap" -# ipfiremake v4l-dvb KCFG="-omap" + ipfiremake v4l-dvb KCFG="-omap" # ipfiremake kvm-kmod KCFG="-omap" # ipfiremake mISDN KCFG="-omap" ipfiremake cryptodev KCFG="-omap" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 5e0a1a503b90c5c80016399308bb2585edba219b
by git＠ipfire.org 23 Sep '12

23 Sep '12

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, thirteen has been updated via 5e0a1a503b90c5c80016399308bb2585edba219b (commit) via b96220a4274284723db83a2b73dbda1ff4adfd37 (commit) via c7d6609dc0196d9cc87b2013c0bee039574b0bea (commit) via 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (commit) via 1cded5eefd1516f5e35f16086b4fde737907e20f (commit) via 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc (commit) via e851b1c35c1a7962a9087b7e0c78fb1410c42037 (commit) via e5d406ab9edb68599069389ee39f333d77fc68fe (commit) from 421102e775e8822f0c48f730dff86efc8cd20ce8 (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 5e0a1a503b90c5c80016399308bb2585edba219b Merge: 421102e b96220a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 23 05:02:34 2012 -0400 Merge remote-tracking branch 'origin/next' into thirteen Conflicts: make.sh ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dhcp | 5 +++-- config/rootfiles/core/{strongswan => 63}/exclude | 1 + .../{oldcore/51 => core/63}/filelists/dhcp | 0 .../{oldcore/58 => core/63}/filelists/files | 4 +--- .../rootfiles/core/{61 => 63}/filelists/fireinfo | 0 config/rootfiles/core/{60 => 63}/meta | 0 config/rootfiles/core/{62 => 63}/update.sh | 3 +++ config/rootfiles/packages/clamav | 6 +++--- html/cgi-bin/index.cgi | 17 ++++++++++------- lfs/clamav | 4 ++-- lfs/dhcp | 4 ++-- make.sh | 2 +- 12 files changed, 26 insertions(+), 20 deletions(-) copy config/rootfiles/core/{strongswan => 63}/exclude (90%) copy config/rootfiles/{oldcore/51 => core/63}/filelists/dhcp (100%) copy config/rootfiles/{oldcore/58 => core/63}/filelists/files (62%) copy config/rootfiles/core/{61 => 63}/filelists/fireinfo (100%) copy config/rootfiles/core/{60 => 63}/meta (100%) copy config/rootfiles/core/{62 => 63}/update.sh (97%) Difference in files: diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp index c2f5aed..381309c 100644 --- a/config/rootfiles/common/dhcp +++ b/config/rootfiles/common/dhcp @@ -1,5 +1,6 @@ -#etc/dhclient.conf -etc/dhcpd.conf +#etc/dhcp +#etc/dhcp/dhclient.conf +etc/dhcp/dhcpd.conf #usr/bin/omshell #usr/include/dhcpctl #usr/include/dhcpctl/dhcpctl.h diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/core/63/exclude @@ -0,0 +1,13 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/63/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files new file mode 100644 index 0000000..1455a87 --- /dev/null +++ b/config/rootfiles/core/63/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/network-vlans +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/63/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/63/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh new file mode 100644 index 0000000..9b3fec5 --- /dev/null +++ b/config/rootfiles/core/63/update.sh @@ -0,0 +1,83 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=62 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove old symlink to DHCP server configuration file. +rm -f /etc/dhcpd.conf + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 6987ade..db38453 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.14 +usr/lib/libclamav.so.6.1.15 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.14 +usr/lib/libclamunrar.so.6.1.15 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.14 +usr/lib/libclamunrar_iface.so.6.1.15 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 04a87cf..6919c8c 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -241,19 +241,22 @@ END print <<END; +  <table border='0' width=80%> - <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'} - <th bgcolor='$color{'color20'}'>IP - <th bgcolor='$color{'color20'}'>$Lang::tr{'status'} - <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br> - <td width='30%' align='center'>$ipaddr - <td width='45%' align='center'>$connstate + <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th> + <th bgcolor='$color{'color20'}'>IP</th> + <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr> + <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td> + <td width='30%' align='center'>$ipaddr </td> + <td width='45%' align='center'>$connstate END if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){ print `/usr/local/bin/dialctrl.pl show`; print <<END; - <tr><td colspan='2'> + </td></tr> + <tr><td colspan='2'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}: <select name='PROFILE'> END diff --git a/lfs/clamav b/lfs/clamav index a717023..f5924d9 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.97.5 +VER = 0.97.6 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895 +$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2 install : $(TARGET) diff --git a/lfs/dhcp b/lfs/dhcp index 603dbd7..083c31f 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/dhcp \ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ --disable-static \ --enable-paranoia \ @@ -125,6 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -pv /var/state/dhcp touch /var/state/dhcp/dhcpd.leases - ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf + ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index e02365f..c139bf5 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="62" # Core Level (Filename) +CORE="63" # Core Level (Filename) PAKFIRE_CORE="62" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b96220a4274284723db83a2b73dbda1ff4adfd37
by git＠ipfire.org 22 Sep '12

22 Sep '12

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 b96220a4274284723db83a2b73dbda1ff4adfd37 (commit) from c7d6609dc0196d9cc87b2013c0bee039574b0bea (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 b96220a4274284723db83a2b73dbda1ff4adfd37 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 22 15:00:24 2012 +0200 Don't overwrite the lease file in core update 63. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/63/exclude | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude index 7360266..b6a8d1d 100644 --- a/config/rootfiles/core/63/exclude +++ b/config/rootfiles/core/63/exclude @@ -10,3 +10,4 @@ var/ipfire/ovpn etc/ssh/ssh_config etc/ssh/sshd_config etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 421102e775e8822f0c48f730dff86efc8cd20ce8
by git＠ipfire.org 22 Sep '12

22 Sep '12

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, thirteen has been updated via 421102e775e8822f0c48f730dff86efc8cd20ce8 (commit) via cc45d23e03e7632b13bd6625408b9dde6fe553ef (commit) from ff284736aa0ec6d59a00e8642c0e3a55b76759a5 (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 421102e775e8822f0c48f730dff86efc8cd20ce8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 21 15:21:02 2012 -0400 rpi: updated firmware and patchset. commit cc45d23e03e7632b13bd6625408b9dde6fe553ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 21 15:19:55 2012 -0400 v4l-dvb: enabled build for rpi and kirkwood. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-rpi | 36 +++++++++++++++++++---- config/rootfiles/common/armv5tel/rpi-firmware | 1 + config/rpi-firmware/config.txt | 28 +++++++++++++++++ lfs/linux | 5 +-- lfs/rpi-firmware | 5 ++- make.sh | 4 +- 6 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 config/rpi-firmware/config.txt Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 45bd742..c2445ad 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.28 Kernel Configuration +# Linux/arm 3.2.30 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -17,10 +17,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_FIQ=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_NEED_MACH_MEMORY_H=y @@ -371,6 +373,29 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y # # CPU Power Management # + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# ARM CPU frequency scaling drivers +# +CONFIG_ARM_BCM2835_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y @@ -1469,9 +1494,6 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m # CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m @@ -1485,6 +1507,7 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m +CONFIG_RTL8192CU=m # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1777,7 +1800,7 @@ CONFIG_W1_SLAVE_DS2760=m CONFIG_W1_SLAVE_DS2780=m CONFIG_W1_SLAVE_BQ27000=m # CONFIG_POWER_SUPPLY is not set -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -1885,8 +1908,9 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m -CONFIG_THERMAL=m +CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_BCM2835=y CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_CORE is not set # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware index 4d5d270..4b6d128 100644 --- a/config/rootfiles/common/armv5tel/rpi-firmware +++ b/config/rootfiles/common/armv5tel/rpi-firmware @@ -5,6 +5,7 @@ boot/arm224_start.elf boot/arm240_start.elf boot/bootcode.bin boot/cmdline.txt +boot/config.txt #boot/first32k.bin boot/loader.bin boot/start.elf diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt new file mode 100644 index 0000000..e9bd9bf --- /dev/null +++ b/config/rpi-firmware/config.txt @@ -0,0 +1,28 @@ +############################################################################### +# +# Raspberry Pi - Videocore configuration file +# +############################################################################### + +############################################################################### +# +# Turbo Mode (cpufreq) Settings ... +# default clocks are arm=700, core=250 and sdram=400 +# +############################################################################### +# +# underclock at idle +arm_freq_min=500 +sdram_freq_min=250 +# +# use following paramters to overclock at load +#arm_freq=1000 +#core_freq=450 +#sdram_freq=450 +#over_voltage=2 + +################################################################################ +# +# end +# +################################################################################ diff --git a/lfs/linux b/lfs/linux index c06fc49..b481e65 100644 --- a/lfs/linux +++ b/lfs/linux @@ -26,7 +26,7 @@ include Config VER = 3.2.30 -RPI_PATCHES = linux-3.2.27-091073b +RPI_PATCHES = linux-3.2.27-807223a THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.bz2 @@ -76,7 +76,7 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(DL_FILE)_MD5 = d899e65520424a27661009ea43b28103 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9daec752fba403a488818df6dd57a714 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = b072ccb2534ff910fd5867fc0da1b24a install : $(TARGET) @@ -146,7 +146,6 @@ endif ifeq "$(KCFG)" "-rpi" # Apply Raspberry Pi kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch endif ifeq "$(HEADERS)" "1" diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware index b2afde2..2143d23 100644 --- a/lfs/rpi-firmware +++ b/lfs/rpi-firmware @@ -24,7 +24,7 @@ include Config -VER = b2200cd +VER = 9f7cff0 THISAPP = rpi-firmware-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d4b0a5b5fe8cdbe5df17aadd5ec60ff0 +$(DL_FILE)_MD5 = 4de4db529fc2c0000d381d016675e115 install : $(TARGET) @@ -70,4 +70,5 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @cd / && tar axf $(DIR_DL)/$(DL_FILE) + cp $(DIR_SRC)/config/rpi-firmware/config.txt /boot @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0e0192c..e02365f 100755 --- a/make.sh +++ b/make.sh @@ -422,7 +422,7 @@ buildipfire() { else # arm-omap kernel build ipfiremake linux KCFG="-rpi" -# ipfiremake v4l-dvb KCFG="-rpi" + ipfiremake v4l-dvb KCFG="-rpi" # ipfiremake kvm-kmod KCFG="-rpi" # ipfiremake mISDN KCFG="-rpi" ipfiremake cryptodev KCFG="-rpi" @@ -449,7 +449,7 @@ buildipfire() { # arm-kirkwood kernel build ipfiremake linux KCFG="-kirkwood" -# ipfiremake v4l-dvb KCFG="-kirkwood" + ipfiremake v4l-dvb KCFG="-kirkwood" # ipfiremake kvm-kmod KCFG="-kirkwood" # ipfiremake mISDN KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7d6609dc0196d9cc87b2013c0bee039574b0bea
by git＠ipfire.org 21 Sep '12

21 Sep '12

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 c7d6609dc0196d9cc87b2013c0bee039574b0bea (commit) from 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (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 c7d6609dc0196d9cc87b2013c0bee039574b0bea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 21 14:55:36 2012 +0200 Create core update 63. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{60 => 63}/exclude | 0 .../{oldcore/51 => core/63}/filelists/dhcp | 0 .../{oldcore/58 => core/63}/filelists/files | 4 +--- .../rootfiles/core/{61 => 63}/filelists/fireinfo | 0 config/rootfiles/core/{60 => 63}/meta | 0 config/rootfiles/core/{62 => 63}/update.sh | 3 +++ make.sh | 2 +- 7 files changed, 5 insertions(+), 4 deletions(-) copy config/rootfiles/core/{60 => 63}/exclude (100%) copy config/rootfiles/{oldcore/51 => core/63}/filelists/dhcp (100%) copy config/rootfiles/{oldcore/58 => core/63}/filelists/files (62%) copy config/rootfiles/core/{61 => 63}/filelists/fireinfo (100%) copy config/rootfiles/core/{60 => 63}/meta (100%) copy config/rootfiles/core/{62 => 63}/update.sh (97%) Difference in files: diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/63/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/63/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files new file mode 100644 index 0000000..1455a87 --- /dev/null +++ b/config/rootfiles/core/63/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/network-vlans +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/63/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/63/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh new file mode 100644 index 0000000..9b3fec5 --- /dev/null +++ b/config/rootfiles/core/63/update.sh @@ -0,0 +1,83 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=62 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove old symlink to DHCP server configuration file. +rm -f /etc/dhcpd.conf + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 576e997..773da66 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="62" # Core Level (Filename) +CORE="63" # Core Level (Filename) PAKFIRE_CORE="62" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 789e6f5c8ebf3eacebf40d56f0b972df851e9d40
by git＠ipfire.org 21 Sep '12

21 Sep '12

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 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (commit) via 1cded5eefd1516f5e35f16086b4fde737907e20f (commit) from 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc (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 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 Merge: 1cded5e 00f9fa1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 21 14:06:57 2012 +0200 Merge branch 'next' of ssh://git.ipfire.org/srv/git/ipfire-2.x into next commit 1cded5eefd1516f5e35f16086b4fde737907e20f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 21 14:06:37 2012 +0200 dhcp: Fix installation of configuration files. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dhcp | 5 +++-- lfs/dhcp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp index c2f5aed..381309c 100644 --- a/config/rootfiles/common/dhcp +++ b/config/rootfiles/common/dhcp @@ -1,5 +1,6 @@ -#etc/dhclient.conf -etc/dhcpd.conf +#etc/dhcp +#etc/dhcp/dhclient.conf +etc/dhcp/dhcpd.conf #usr/bin/omshell #usr/include/dhcpctl #usr/include/dhcpctl/dhcpctl.h diff --git a/lfs/dhcp b/lfs/dhcp index fa26b5c..816a75d 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -111,7 +111,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/dhcp \ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ --disable-static \ --enable-paranoia \ @@ -123,6 +123,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -pv /var/state/dhcp touch /var/state/dhcp/dhcpd.leases - ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf + ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc
by git＠ipfire.org 20 Sep '12

20 Sep '12

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 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc (commit) from e851b1c35c1a7962a9087b7e0c78fb1410c42037 (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 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Thu Sep 20 23:25:15 2012 +0200 clamav: update to 0.97.6. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 6987ade..db38453 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.14 +usr/lib/libclamav.so.6.1.15 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.14 +usr/lib/libclamunrar.so.6.1.15 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.14 +usr/lib/libclamunrar_iface.so.6.1.15 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index a717023..f5924d9 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.97.5 +VER = 0.97.6 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895 +$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ad134621260cee8bc62a0df09b288a96b694be85
by git＠ipfire.org 20 Sep '12

20 Sep '12

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 ad134621260cee8bc62a0df09b288a96b694be85 (commit) via 9df4923ff12e7b131e0ff389ab296e4d3b8c9e7a (commit) from 577ebde09079ed794c3af4b9c718cf80540dd033 (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 ad134621260cee8bc62a0df09b288a96b694be85 Merge: 577ebde 9df4923 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 20:11:59 2012 +0200 Merge remote-tracking branch 'ms/gcc-update' commit 9df4923ff12e7b131e0ff389ab296e4d3b8c9e7a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 17:06:09 2012 +0000 gcc: Update to 4.7.2. This is the second bugfix release of the GCC 4.7 series. ----------------------------------------------------------------------- Summary of changes: gcc/gcc.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 69f6fd2..2723547 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,8 +7,8 @@ build_cloog_ppl = 1 name = gcc -version = 4.7.1 -release = 3 +version = 4.7.2 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 577ebde09079ed794c3af4b9c718cf80540dd033
by git＠ipfire.org 20 Sep '12

20 Sep '12

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 577ebde09079ed794c3af4b9c718cf80540dd033 (commit) via 24ff60d371205c8d96cf258f277c5846b53a3774 (commit) via e18810fd8c59577a1dd06d94408931d79b0ef246 (commit) via dc065a45ed06e1fecad9b25d1e45a219dce92f4f (commit) via 3f642be327385aa8b89460b4a52029bc5cdff26e (commit) via 9233291e08e5c97925b07f19e2e144b424bd7eba (commit) from 74c80ab12d86cb537a6ccf7d573feec71535677c (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 577ebde09079ed794c3af4b9c718cf80540dd033 Merge: 24ff60d dc065a4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 18:49:44 2012 +0200 Merge remote-tracking branch 'ms/iptraf-ng' commit 24ff60d371205c8d96cf258f277c5846b53a3774 Merge: 3f642be e18810f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 18:49:38 2012 +0200 Merge remote-tracking branch 'ms/bash-completion' commit e18810fd8c59577a1dd06d94408931d79b0ef246 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 16:45:27 2012 +0000 bash-completion: Install this package by default. I think it is very handy and makes using the command line prompt more easy. Especially for newbies. commit dc065a45ed06e1fecad9b25d1e45a219dce92f4f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 16:42:52 2012 +0000 iptraf-ng: New package. Similar to iptraf, as we all know it. commit 3f642be327385aa8b89460b4a52029bc5cdff26e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 16:23:53 2012 +0000 coreutils: Enable 256 color terminals. commit 9233291e08e5c97925b07f19e2e144b424bd7eba Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 16:23:13 2012 +0000 setup: Update /etc/bashrc. ----------------------------------------------------------------------- Summary of changes: bash-completion/bash-completion.nm | 8 +- coreutils/DIR_COLORS | 248 ++++++++++++++++++++ coreutils/DIR_COLORS.256color | 221 +++++++++++++++++ coreutils/DIR_COLORS.lightbgcolor | 224 ++++++++++++++++++ coreutils/coreutils.nm | 6 +- coreutils/profile.d/term256.sh | 26 ++ iptraf-ng/iptraf-ng.nm | 55 +++++ ...g-kernel-v3.5-kill-off-token-ring-support.patch | 128 ++++++++++ setup/bashrc | 57 +++-- setup/setup.nm | 2 +- 10 files changed, 943 insertions(+), 32 deletions(-) create mode 100644 coreutils/DIR_COLORS create mode 100644 coreutils/DIR_COLORS.256color create mode 100644 coreutils/DIR_COLORS.lightbgcolor create mode 100644 coreutils/profile.d/term256.sh create mode 100644 iptraf-ng/iptraf-ng.nm create mode 100644 iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch Difference in files: diff --git a/bash-completion/bash-completion.nm b/bash-completion/bash-completion.nm index 6e0eda4..2648f96 100644 --- a/bash-completion/bash-completion.nm +++ b/bash-completion/bash-completion.nm @@ -5,7 +5,7 @@ name = bash-completion version = 1.99 -release = 1 +release = 2 arch = noarch groups = Development/Languages @@ -32,8 +32,10 @@ end packages package %{name} + groups += Base - requires - bash >= 4.1 + requires + bash >= 4.1 + end end end diff --git a/coreutils/DIR_COLORS b/coreutils/DIR_COLORS new file mode 100644 index 0000000..5683e39 --- /dev/null +++ b/coreutils/DIR_COLORS @@ -0,0 +1,248 @@ +# Configuration file for the color ls utility +# Synchronized with coreutils 8.5 dircolors +# This file goes in the /etc directory, and must be world readable. +# You can copy this file to .dir_colors in your $HOME directory to override +# the system defaults. + +# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not +# pipes. 'all' adds color characters to all output. 'none' shuts colorization +# off. +COLOR tty + +# Extra command line options for ls go here. +# Basically these ones are: +# -F = show '/' for dirs, '*' for executables, etc. +# -T 0 = don't trust tab spacing when formatting ls output. +OPTIONS -F -T 0 + +# Below, there should be one TERM entry for each termtype that is colorizable +TERM Eterm +TERM ansi +TERM color-xterm +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM eterm-color +TERM gnome +TERM gnome-256color +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM rxvt-unicode-256color +TERM rxvt-unicode256 +TERM screen +TERM screen-256color +TERM screen-256color-bce +TERM screen-bce +TERM screen-w +TERM screen.rxvt +TERM screen.linux +TERM terminator +TERM vt100 +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian + +# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) +EIGHTBIT 1 + +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # normal file, use no color at all +RESET 0 # reset to "normal" color +DIR 01;34 # directory +LINK 01;36 # symbolic link (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 01;35 # socket +DOOR 01;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file +MISSING 01;05;37;41 # ... and the files they point to +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable + +# This is for files with execute permission: +EXEC 01;32 + +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +# executables (bright green) +#.cmd 01;32 +#.exe 01;32 +#.com 01;32 +#.btm 01;32 +#.bat 01;32 +#.sh 01;32 +#.csh 01;32 + # archives or compressed (bright red) +.tar 01;31 +.tgz 01;31 +.arj 01;31 +.taz 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.zip 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lz 01;31 +.xz 01;31 +.bz2 01;31 +.tbz 01;31 +.tbz2 01;31 +.bz 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.war 01;31 +.ear 01;31 +.sar 01;31 +.rar 01;31 +.ace 01;31 +.zoo 01;31 +.cpio 01;31 +.7z 01;31 +.rz 01;31 + +# image formats (magenta) +.jpg 01;35 +.jpeg 01;35 +.gif 01;35 +.bmp 01;35 +.pbm 01;35 +.pgm 01;35 +.ppm 01;35 +.tga 01;35 +.xbm 01;35 +.xpm 01;35 +.tif 01;35 +.tiff 01;35 +.png 01;35 +.svg 01;35 +.svgz 01;35 +.mng 01;35 +.pcx 01;35 +.mov 01;35 +.mpg 01;35 +.mpeg 01;35 +.m2v 01;35 +.mkv 01;35 +.ogm 01;35 +.mp4 01;35 +.m4v 01;35 +.mp4v 01;35 +.vob 01;35 +.qt 01;35 +.nuv 01;35 +.wmv 01;35 +.asf 01;35 +.rm 01;35 +.rmvb 01;35 +.flc 01;35 +.avi 01;35 +.fli 01;35 +.flv 01;35 +.gl 01;35 +.dl 01;35 +.xcf 01;35 +.xwd 01;35 +.yuv 01;35 +.cgm 01;35 +.emf 01;35 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 01;35 +.anx 01;35 +.ogv 01;35 +.ogx 01;35 + +# audio formats (cyan) +.aac 01;36 +.au 01;36 +.flac 01;36 +.mid 01;36 +.midi 01;36 +.mka 01;36 +.mp3 01;36 +.mpc 01;36 +.ogg 01;36 +.ra 01;36 +.wav 01;36 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 01;36 +.oga 01;36 +.spx 01;36 +.xspf 01;36 + +# colorize binary documents (brown) +#.pdf 00;33 +#.ps 00;33 +#.ps.gz 00;33 +#.tex 00;33 +#.xls 00;33 +#.xlsx 00;33 +#.ppt 00;33 +#.pptx 00;33 +#.rtf 00;33 +#.doc 00;33 +#.docx 00;33 +#.odt 00;33 +#.ods 00;33 +#.odp 00;33 +#.epub 00;33 +#.abw 00;33 +#.wpd 00;33 +# +# colorize text documents (brown) +#.txt 00;33 +#.patch 00;33 +#.diff 00;33 +#.log 00;33 +#.htm 00;33 +#.html 00;33 +#.shtml 00;33 +#.xml 00;33 diff --git a/coreutils/DIR_COLORS.256color b/coreutils/DIR_COLORS.256color new file mode 100644 index 0000000..14e27d4 --- /dev/null +++ b/coreutils/DIR_COLORS.256color @@ -0,0 +1,221 @@ +# Configuration file for the 256color ls utility +# This file goes in the /etc directory, and must be world readable. +# Synchronized with coreutils 8.5 dircolors +# You can copy this file to .dir_colors in your $HOME directory to override +# the system defaults. +# In the case that you are not satisfied with supplied colors, please +# submit your color configuration or attach your file with colors readable +# on ALL color background schemas (white,gray,black) to RedHat Bugzilla +# ticket on https://bugzilla.redhat.com/show_bug.cgi?id=429121 . TIA. +# Please just keep ls color conventions from 8 color scheme. + +# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not +# pipes. 'all' adds color characters to all output. 'none' shuts colorization +# off. +COLOR tty + +# Extra command line options for ls go here. +# Basically these ones are: +# -F = show '/' for dirs, '*' for executables, etc. +# -T 0 = don't trust tab spacing when formatting ls output. +OPTIONS -F -T 0 + +# Below, there should be one TERM entry for each termtype that is colorizable +TERM putty-256color +TERM rxvt-256color +TERM rxvt-unicode-256color +TERM rxvt-unicode256 +TERM screen-256color +TERM xterm-256color +TERM gnome-256color + +# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) +EIGHTBIT 1 + +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color(8 colors mode) codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color(8 colors mode) codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +# Text color(256 colors mode) codes: +# Valid syntax for text 256color is 38;5;<color number> , where color number +# is number between 0 and 255. +# You may find following command useful to search the best one for you: +# for ((x=0; x<=255; x++));do echo -e "${x}:\033[38;5;${x}mcolor\033[000m";done +# Background color(256 colors mode) codes: +# Valid syntax for background 256color is 48;5;<color number> , where +# color number is number between 0 and 255. +# You may find following command useful to search the best one for you: +# for ((x=0; x<=255; x++));do echo -e "${x}:\033[48;5;${x}mcolor\033[000m";done + +#NORMAL 00 # global default, no color code at all +#FILE 00 # normal file, use no color at all +RESET 0 # reset to "normal" color +DIR 38;5;27 # directory +LINK 38;5;51 # symbolic link (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 44;38;5;15 # regular file with more than one link +FIFO 40;38;5;11 # pipe +SOCK 38;5;13 # socket +DOOR 38;5;5 # door +BLK 48;5;232;38;5;11 # block device driver +CHR 48;5;232;38;5;3 # character device driver +ORPHAN 48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file +MISSING 05;48;5;232;38;5;15 # ... and the files they point to +SETUID 48;5;196;38;5;15 # file that is setuid (u+s) +SETGID 48;5;11;38;5;16 # file that is setgid (g+s) +CAPABILITY 48;5;196;38;5;226 # file with capability +STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky +STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable + +# This is for files with execute permission: +EXEC 38;5;34 + +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +# executables (bright green) +#.cmd 38;5;34 +#.exe 38;5;34 +#.com 38;5;34 +#.btm 38;5;34 +#.bat 38;5;34 +#.sh 38;5;34 +#.csh 38;5;34 + # archives or compressed (bright red) +.tar 38;5;9 +.tgz 38;5;9 +.arj 38;5;9 +.taz 38;5;9 +.lzh 38;5;9 +.lzma 38;5;9 +.tlz 38;5;9 +.txz 38;5;9 +.zip 38;5;9 +.z 38;5;9 +.Z 38;5;9 +.dz 38;5;9 +.gz 38;5;9 +.lz 38;5;9 +.xz 38;5;9 +.bz2 38;5;9 +.tbz 38;5;9 +.tbz2 38;5;9 +.bz 38;5;9 +.tz 38;5;9 +.deb 38;5;9 +.rpm 38;5;9 +.jar 38;5;9 +.war 38;5;9 +.ear 38;5;9 +.sar 38;5;9 +.rar 38;5;9 +.ace 38;5;9 +.zoo 38;5;9 +.cpio 38;5;9 +.7z 38;5;9 +.rz 38;5;9 + +# image formats (magenta) +.jpg 38;5;13 +.jpeg 38;5;13 +.gif 38;5;13 +.bmp 38;5;13 +.pbm 38;5;13 +.pgm 38;5;13 +.ppm 38;5;13 +.tga 38;5;13 +.xbm 38;5;13 +.xpm 38;5;13 +.tif 38;5;13 +.tiff 38;5;13 +.png 38;5;13 +.svg 38;5;13 +.svgz 38;5;13 +.mng 38;5;13 +.pcx 38;5;13 +.mov 38;5;13 +.mpg 38;5;13 +.mpeg 38;5;13 +.m2v 38;5;13 +.mkv 38;5;13 +.ogm 38;5;13 +.mp4 38;5;13 +.m4v 38;5;13 +.mp4v 38;5;13 +.vob 38;5;13 +.qt 38;5;13 +.nuv 38;5;13 +.wmv 38;5;13 +.asf 38;5;13 +.rm 38;5;13 +.rmvb 38;5;13 +.flc 38;5;13 +.avi 38;5;13 +.fli 38;5;13 +.flv 38;5;13 +.gl 38;5;13 +.dl 38;5;13 +.xcf 38;5;13 +.xwd 38;5;13 +.yuv 38;5;13 +.cgm 38;5;13 +.emf 38;5;13 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 38;5;13 +.anx 38;5;13 +.ogv 38;5;13 +.ogx 38;5;13 + +# audio formats (cyan) +.aac 38;5;45 +.au 38;5;45 +.flac 38;5;45 +.mid 38;5;45 +.midi 38;5;45 +.mka 38;5;45 +.mp3 38;5;45 +.mpc 38;5;45 +.ogg 38;5;45 +.ra 38;5;45 +.wav 38;5;45 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 38;5;45 +.oga 38;5;45 +.spx 38;5;45 +.xspf 38;5;45 + +# colorize binary documents (brown) +#.pdf 00;33 +#.ps 00;33 +#.ps.gz 00;33 +#.tex 00;33 +#.xls 00;33 +#.xlsx 00;33 +#.ppt 00;33 +#.pptx 00;33 +#.rtf 00;33 +#.doc 00;33 +#.docx 00;33 +#.odt 00;33 +#.ods 00;33 +#.odp 00;33 +#.epub 00;33 +#.abw 00;33 +#.wpd 00;33 +# +# colorize text documents (brown) +#.txt 00;33 +#.patch 00;33 +#.diff 00;33 +#.log 00;33 +#.htm 00;33 +#.html 00;33 +#.shtml 00;33 +#.xml 00;33 diff --git a/coreutils/DIR_COLORS.lightbgcolor b/coreutils/DIR_COLORS.lightbgcolor new file mode 100644 index 0000000..ac46288 --- /dev/null +++ b/coreutils/DIR_COLORS.lightbgcolor @@ -0,0 +1,224 @@ +# Configuration file for the color ls utility - modified for gray backgrounds +# Synchronized with coreutils 8.5 dircolors +# This file goes in the /etc directory, and must be world readable. +# You can copy this file to .dir_colors in your $HOME directory to override +# the system defaults. + +# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not +# pipes. 'all' adds color characters to all output. 'none' shuts colorization +# off. +COLOR tty + +# Extra command line options for ls go here. +# Basically these ones are: +# -F = show '/' for dirs, '*' for executables, etc. +# -T 0 = don't trust tab spacing when formatting ls output. +OPTIONS -F -T 0 + +# Below, there should be one TERM entry for each termtype that is colorizable +TERM linux +TERM console +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM cons25 +TERM xterm +TERM xterm-16color +TERM xterm-88color +TERM xterm-256color +TERM rxvt +TERM rxvt-256color +TERM rxvt-unicode +TERM rxvt-unicode-256color +TERM rxvt-unicode256 +TERM xterm-color +TERM color-xterm +TERM vt100 +TERM dtterm +TERM color_xterm + +# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) +EIGHTBIT 1 + +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # normal file, use no color at all +RESET 0 +DIR 00;34 # directory +LINK 00;36 # symbolic link (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 00;35 # socket +DOOR 00;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file +MISSING 01;05;37;41 # ... and the files they point to +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable + + +# This is for files with execute permission: +EXEC 00;32 + +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +#.cmd 00;32 # executables (green) +#.exe 00;32 +#.com 00;32 +#.btm 00;32 +#.bat 00;32 +#.sh 00;32 +#.csh 00;32 + # archives or compressed (red) +.tar 00;31 +.tgz 00;31 +.arj 00;31 +.taz 00;31 +.lzh 00;31 +.lzma 00;31 +.tlz 00;31 +.txz 00;31 +.zip 00;31 +.z 00;31 +.Z 00;31 +.dz 00;31 +.gz 00;31 +.lz 00;31 +.xz 00;31 +.bz2 00;31 +.tbz 00;31 +.tbz2 00;31 +.bz 00;31 +.tz 00;31 +.deb 00;31 +.rpm 00;31 +.jar 00;31 +.war 00;31 +.ear 00;31 +.sar 00;31 +.rar 00;31 +.ace 00;31 +.zoo 00;31 +.cpio 00;31 +.7z 00;31 +.rz 00;31 +# image formats (magenta) +.jpg 00;35 +.jpeg 00;35 +.gif 00;35 +.bmp 00;35 +.pbm 00;35 +.pgm 00;35 +.ppm 00;35 +.tga 00;35 +.xbm 00;35 +.xpm 00;35 +.tif 00;35 +.tiff 00;35 +.png 00;35 +.svg 00;35 +.svgz 00;35 +.mng 00;35 +.pcx 00;35 +.mov 00;35 +.mpg 00;35 +.mpeg 00;35 +.m2v 00;35 +.mkv 00;35 +.ogm 00;35 +.mp4 00;35 +.m4v 00;35 +.mp4v 00;35 +.vob 00;35 +.qt 00;35 +.nuv 00;35 +.wmv 00;35 +.asf 00;35 +.rm 00;35 +.rmvb 00;35 +.flc 00;35 +.avi 00;35 +.fli 00;35 +.flv 00;35 +.gl 00;35 +.dl 00;35 +.xcf 00;35 +.xwd 00;35 +.yuv 00;35 +.cgm 00;35 +.emf 00;35 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 00;35 +.anx 00;35 +.ogv 00;35 +.ogx 00;35 + +# audio formats (cyan) +.aac 00;36 +.au 00;36 +.flac 00;36 +.mid 00;36 +.midi 00;36 +.mka 00;36 +.mp3 00;36 +.mpc 00;36 +.ogg 00;36 +.ra 00;36 +.wav 00;36 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 00;36 +.oga 00;36 +.spx 00;36 +.xspf 00;36 + +# colorize binary documents (brown) +#.pdf 00;33 +#.ps 00;33 +#.ps.gz 00;33 +#.tex 00;33 +#.xls 00;33 +#.xlsx 00;33 +#.ppt 00;33 +#.pptx 00;33 +#.rtf 00;33 +#.doc 00;33 +#.docx 00;33 +#.odt 00;33 +#.ods 00;33 +#.odp 00;33 +#.epub 00;33 +#.abw 00;33 +#.wpd 00;33 +# +# colorize text documents (brown) +#.txt 00;33 +#.patch 00;33 +#.diff 00;33 +#.log 00;33 +#.htm 00;33 +#.html 00;33 +#.shtml 00;33 +#.xml 00;33 diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 9cdc445..eb0b962 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -5,7 +5,7 @@ name = coreutils version = 8.17 -release = 1 +release = 2 groups = System/Base url = http://www.gnu.org/software/coreutils/ @@ -72,7 +72,9 @@ build # Dump /etc/DIR_COLORS mkdir -pv %{BUILDROOT}%{sysconfdir} - dircolors -p > %{BUILDROOT}/etc/DIR_COLORS + for i in DIR_COLORS DIR_COLORS.256color DIR_COLORS.lightbgcolor; do + install -m 644 %{DIR_SOURCE}/${i} %{BUILDROOT}%{sysconfdir} + done # Install profile.d. mkdir -pv %{BUILDROOT}%{sysconfdir}/profile.d/ diff --git a/coreutils/profile.d/term256.sh b/coreutils/profile.d/term256.sh new file mode 100644 index 0000000..546f67b --- /dev/null +++ b/coreutils/profile.d/term256.sh @@ -0,0 +1,26 @@ +# Enable 256 color capabilities for appropriate terminals + +# Set this variable in your local shell config (such as ~/.bashrc) +# if you want remote xterms connecting to this system, to be sent 256 colors. +# This must be set before reading global initialization such as /etc/bashrc. +# SEND_256_COLORS_TO_REMOTE=1 + +# Terminals with any of the following set, support 256 colors (and are local) +local256="$COLORTERM$XTERM_VERSION$ROXTERM_ID$KONSOLE_DBUS_SESSION" + +if [ -n "$local256" ] || [ -n "$SEND_256_COLORS_TO_REMOTE" ]; then + + case "$TERM" in + 'xterm') TERM=xterm-256color;; + 'screen') TERM=screen-256color;; + 'Eterm') TERM=Eterm-256color;; + esac + export TERM + + if [ -n "$TERMCAP" ] && [ "$TERM" = "screen-256color" ]; then + TERMCAP=$(echo "$TERMCAP" | sed -e 's/Co#8/Co#256/g') + export TERMCAP + fi +fi + +unset local256 diff --git a/iptraf-ng/iptraf-ng.nm b/iptraf-ng/iptraf-ng.nm new file mode 100644 index 0000000..353ed31 --- /dev/null +++ b/iptraf-ng/iptraf-ng.nm @@ -0,0 +1,55 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = iptraf-ng +version = 1.1.3.1 +release = 1 + +groups = Networking/Tools +url = https://fedorahosted.org/iptraf-ng/ +license = GPLv2+ +summary = A console-based network monitoring utility. + +description + IPTraf-ng is a console-based network monitoring utility. IPTraf gathers + data like TCP connection packet and byte counts, interface statistics + and activity indicators, TCP/UDP traffic breakdowns, and LAN station + packet and byte counts. IPTraf-ng features include an IP traffic monitor + which shows TCP flag information, packet and byte counts, ICMP + details, OSPF packet types, and oversized IP packet warnings; + interface statistics showing IP, TCP, UDP, ICMP, non-IP and other IP + packet counts, IP checksum errors, interface activity and packet size + counts; a TCP and UDP service monitor showing counts of incoming and + outgoing packets for common TCP and UDP application ports, a LAN + statistics module that discovers active hosts and displays statistics + about their activity; TCP, UDP and other protocol display filters so + you can view just the traffic you want; logging; support for Ethernet, + FDDI, ISDN, SLIP, PPP, and loopback interfaces; and utilization of the + built-in raw socket interface of the Linux kernel, so it can be used + on a wide variety of supported network cards. +end + +source_dl = https://fedorahosted.org/releases/i/p/iptraf-ng/ + +build + requires + ncurses-devel + end + + install_cmds + mkdir -pv %{BUILDROOT}%{localstatedir}/{lock,log,lib}/iptraf-ng + end +end + +packages + package %{name} + # Create an alias for iptraf. + provides = iptraf + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch b/iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch new file mode 100644 index 0000000..e5c04cd --- /dev/null +++ b/iptraf-ng/patches/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch @@ -0,0 +1,128 @@ +From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001 +Message-Id: <72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab.1337783673.git.npajkovs(a)redhat.com> +From: Nikola Pajkovsky <npajkovs(a)redhat.com> +Date: Wed, 23 May 2012 16:32:27 +0200 +Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support + +Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com> +--- + src/hostmon.c | 10 ---------- + src/iptraf-ng-compat.h | 1 - + src/othptab.c | 6 ------ + src/packet.c | 27 --------------------------- + src/tcptable.c | 4 ---- + 5 files changed, 48 deletions(-) + +diff --git a/src/hostmon.c b/src/hostmon.c +index 40a2b95..72b91f8 100644 +--- a/src/hostmon.c ++++ b/src/hostmon.c +@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, + FDDI_K_ALEN); + list = flist; + break; } +- case ARPHRD_IEEE802: +- case ARPHRD_IEEE802_TR: { +- struct trh_hdr *hdr_trh = +- (struct trh_hdr *)pkt.pkt_buf; +- memcpy(scratch_saddr, hdr_trh->saddr, +- TR_ALEN); +- memcpy(scratch_daddr, hdr_trh->daddr, +- TR_ALEN); +- list = flist; +- break; } + default: + /* unknown link protocol */ + continue; +diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h +index d5aee4a..2d9da96 100644 +--- a/src/iptraf-ng-compat.h ++++ b/src/iptraf-ng-compat.h +@@ -39,7 +39,6 @@ + #include <linux/if_ether.h> + #include <linux/if_packet.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> + #include <linux/types.h> + #include <linux/isdn.h> + +diff --git a/src/othptab.c b/src/othptab.c +index d12cdfd..1181eb1 100644 +--- a/src/othptab.c ++++ b/src/othptab.c +@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, + saddr), new_entry->smacaddr); + convmacaddr((char *) (((struct fddihdr *) packet)-> + daddr), new_entry->dmacaddr); +- } else if ((pkt->pkt_hatype == ARPHRD_IEEE802) +- || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), new_entry->smacaddr); +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- daddr), new_entry->dmacaddr); + } + } + +diff --git a/src/packet.c b/src/packet.c +index a43a27a..f3e4304 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len) + return (u_short) (~sum); + } + +-static unsigned int get_tr_ip_offset(char *pkt) +-{ +- struct trh_hdr *trh; +- unsigned int riflen = 0; +- +- trh = (struct trh_hdr *) pkt; +- +- /* +- * Check if this packet has TR routing information and get +- * its length. +- */ +- if (trh->saddr[0] & TR_RII) +- riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8; +- +- return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen + +- sizeof(struct trllc); +-} +- + static int packet_adjust(struct pkt_hdr *pkt) + { + int retval = 0; +@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt) + pkt->pkt_payload += sizeof(struct fddihdr); + pkt->pkt_len -= sizeof(struct fddihdr); + break; +- case ARPHRD_IEEE802_TR: +- case ARPHRD_IEEE802: +- pkt->pkt_payload = pkt->pkt_buf; +- /* Token Ring patch supplied by Tomas Dvorak */ +- /* Get the start of the IP packet from the Token Ring frame. */ +- unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload); +- pkt->pkt_payload += dataoffset; +- pkt->pkt_len -= dataoffset; +- break; + default: + /* return a NULL packet to signal an unrecognized link */ + /* protocol to the caller. Hopefully, this switch statement */ +diff --git a/src/tcptable.c b/src/tcptable.c +index 56c4780..b0e5ccc 100644 +--- a/src/tcptable.c ++++ b/src/tcptable.c +@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry, + } else if (linkproto == ARPHRD_FDDI) { + convmacaddr((char *) (((struct fddihdr *) packet)-> + saddr), newmacaddr); +- } else if ((linkproto == ARPHRD_IEEE802) +- || (linkproto == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), newmacaddr); + } + + if (tableentry->smacaddr[0] != '\0') { +-- +1.7.10 + diff --git a/setup/bashrc b/setup/bashrc index 1d0dc1b..901f5d5 100644 --- a/setup/bashrc +++ b/setup/bashrc @@ -10,35 +10,40 @@ # are we an interactive shell? if [ "$PS1" ]; then + if [ -z "$PROMPT_COMMAND" ]; then case $TERM in xterm*) - if [ -e /etc/sysconfig/bash-prompt-xterm ]; then - PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm - else - PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - fi - ;; + if [ -e /etc/sysconfig/bash-prompt-xterm ]; then + PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm + else + PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + fi + ;; screen) - if [ -e /etc/sysconfig/bash-prompt-screen ]; then - PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen - else - PROMPT_COMMAND='printf "\033]0;%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - fi - ;; + if [ -e /etc/sysconfig/bash-prompt-screen ]; then + PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen + else + PROMPT_COMMAND='printf "\033]0;%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + fi + ;; *) - [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default - ;; + [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default + ;; esac - # Turn on checkwinsize - shopt -s checkwinsize - [ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ " - # You might want to have e.g. tty in prompt (e.g. more virtual machines) - # and console windows - # If you want to do so, just add e.g. - # if [ "$PS1" ]; then - # PS1="[\u@\h:\l \W]\\$ " - # fi - # to your custom modification shell script in /etc/profile.d/ directory + fi + # Turn on parallel history + shopt -s histappend + history -a + # Turn on checkwinsize + shopt -s checkwinsize + [ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ " + # You might want to have e.g. tty in prompt (e.g. more virtual machines) + # and console windows + # If you want to do so, just add e.g. + # if [ "$PS1" ]; then + # PS1="[\u@\h:\l \W]\\$ " + # fi + # to your custom modification shell script in /etc/profile.d/ directory fi if ! shopt -q login_shell ; then # We're not a login shell @@ -73,12 +78,12 @@ if ! shopt -q login_shell ; then # We're not a login shell if [ "$PS1" ]; then . "$i" else - . "$i" >/dev/null 2>&1 + . "$i" >/dev/null fi fi done unset i - unset pathmunge + unset -f pathmunge fi # vim:ts=4:sw=4 diff --git a/setup/setup.nm b/setup/setup.nm index 0eb5c99..a622300 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@ name = setup version = 3.0 -release = 5 +release = 6 arch = noarch groups = Base Build System/Base hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2012