* [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 033ba0349c946f9ca705029a5368ae5db2db461e
@ 2012-11-17 11:59 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-11-17 11:59 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 14138 bytes --]
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 033ba0349c946f9ca705029a5368ae5db2db461e (commit)
via 275f872d706bed14bf62c306e09da1061b73cccb (commit)
via a30cf68cd22752af40efe7c294fa0bf057c46f3c (commit)
via c9fa828c774ecef372ebc5eac821a93aff7d1965 (commit)
via b33c0aee3eb914489806492ab8ee9345c5af261f (commit)
via 7e616a3297626457639b9708b4e31efe41c4fff8 (commit)
via 2fe90b7cc0ce34124dba7f93ced22a08c7456a2d (commit)
via 7064ed3fc0f5c7f93ad79133bd61d550433b7d2b (commit)
from 83cc9084a9c86d64cc092ae766cf0884b44f6e24 (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 033ba0349c946f9ca705029a5368ae5db2db461e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 17 12:54:06 2012 +0100
collectd: pluto -> charon.
commit 275f872d706bed14bf62c306e09da1061b73cccb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 17 12:21:42 2012 +0100
updater: remove old profile.d and terminfo.
commit a30cf68cd22752af40efe7c294fa0bf057c46f3c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 17 12:21:12 2012 +0100
updater: add sendsignals initskript.
commit c9fa828c774ecef372ebc5eac821a93aff7d1965
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 17 11:58:28 2012 +0100
updater: add new bash profile to updater.
commit b33c0aee3eb914489806492ab8ee9345c5af261f
Merge: 7e616a3 83cc908
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Nov 16 17:14:30 2012 +0100
Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
commit 7e616a3297626457639b9708b4e31efe41c4fff8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 15 18:24:16 2012 +0100
w_scan: add new w_scan_start skript.
commit 2fe90b7cc0ce34124dba7f93ced22a08c7456a2d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 15 18:15:13 2012 +0100
newt: add whiptail to rootfile.
commit 7064ed3fc0f5c7f93ad79133bd61d550433b7d2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 15 18:13:24 2012 +0100
rootfile updates: bash, openssl.
-----------------------------------------------------------------------
Summary of changes:
config/collectd/collectd.conf | 2 +-
config/rootfiles/common/bash | 6 +-
config/rootfiles/common/newt | 2 +-
config/rootfiles/common/openssl | 1 +
config/rootfiles/common/stage2 | 8 +-
config/rootfiles/core/65/filelists/files | 1 +
config/rootfiles/core/65/filelists/stage2-partial | 17 +++
config/rootfiles/core/65/update.sh | 8 ++
config/rootfiles/packages/w_scan | 1 +
config/w_scan/w_scan_start | 134 ++++++++++++++++++++++
lfs/w_scan | 3 +-
11 files changed, 174 insertions(+), 9 deletions(-)
create mode 100644 config/rootfiles/core/65/filelists/stage2-partial
create mode 100644 config/w_scan/w_scan_start
Difference in files:
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 939dd4b..67d9e19 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -68,7 +68,7 @@ include "/etc/collectd.precache"
Process "nmbd"
Process "squid"
Process "squidguard"
- Process "pluto"
+ Process "charon"
Process "snort"
Process "openvpn"
Process "qemu"
diff --git a/config/rootfiles/common/bash b/config/rootfiles/common/bash
index 43eecc9..ecaeb1b 100644
--- a/config/rootfiles/common/bash
+++ b/config/rootfiles/common/bash
@@ -1,6 +1,6 @@
bin/sh
bin/bash
#bin/bashbug
-#usr/info/bash.info
-#usr/man/man1/bash.1
-#usr/man/man1/bashbug.1
+#usr/share/info/bash.info
+#usr/share/man/man1/bash.1
+#usr/share/man/man1/bashbug.1
diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt
index f5f0fa4..08fb2ce 100644
--- a/config/rootfiles/common/newt
+++ b/config/rootfiles/common/newt
@@ -1,4 +1,4 @@
-#usr/bin/whiptail
+usr/bin/whiptail
#usr/include/newt.h
#usr/lib/libnewt.a
usr/lib/libnewt.so
diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index bc1ac49..296a0c0 100644
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1164,6 +1164,7 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/md5.3
#usr/share/man/man3/mdc2.3
#usr/share/man/man3/pem.3
+#usr/share/man/man3/rand.3
#usr/share/man/man3/rc4.3
#usr/share/man/man3/ripemd.3
#usr/share/man/man3/rsa.3
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index b01290c..7fa4a43 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -4,8 +4,6 @@ bin/echo
bin/pwd
bin/stty
#boot
-dev/console
-dev/null
etc/bashrc
etc/certparams
etc/e2fsck.conf
@@ -32,6 +30,8 @@ etc/passwd
etc/profile
#etc/profile.d
etc/profile.d/colorls.sh
+etc/profile.d/extrapaths.sh
+etc/profile.d/glib2-locale.sh
etc/profile.d/i18n.sh
etc/profile.d/lang.sh
etc/profile.d/readline.sh
@@ -57,7 +57,6 @@ root/.bashrc
root/ipfire
#sbin
#srv
-tmp
#usr/bin
#usr/bin/perl
#usr/include
@@ -145,3 +144,6 @@ var/run
var/run/utmp
#var/spool
var/tmp
+dev/console
+dev/null
+tmp
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 669a8d1..c7879a6 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -6,6 +6,7 @@ opt/pakfire/etc/pakfire.conf
etc/rc.d/init.d/partresize
etc/rc.d/init.d/firewall
etc/rc.d/init.d/fsresize
+etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/tmpfs
etc/rc.d/init.d/udev
diff --git a/config/rootfiles/core/65/filelists/stage2-partial b/config/rootfiles/core/65/filelists/stage2-partial
new file mode 100644
index 0000000..df9ad8f
--- /dev/null
+++ b/config/rootfiles/core/65/filelists/stage2-partial
@@ -0,0 +1,17 @@
+etc/bashrc
+etc/profile
+etc/profile.d/colorls.sh
+etc/profile.d/extrapaths.sh
+etc/profile.d/glib2-locale.sh
+etc/profile.d/i18n.sh
+etc/profile.d/lang.sh
+etc/profile.d/readline.sh
+etc/profile.d/term256.sh
+etc/profile.d/umask.sh
+etc/securetty
+etc/sysctl.conf
+root/.bash_logout
+root/.bash_profile
+root/.bashrc
+usr/lib/libgcc_s.so.1
+usr/lib/libstdc++.so.6
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index 3ac74e2..b9ff01c 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -84,6 +84,10 @@ add_to_backup etc/snort
add_to_backup usr/lib/snort_*
add_to_backup usr/share/zoneinfo
add_to_backup lib/libncurses*
+add_to_backup etc/dircolors
+add_to_backup etc/profile.d
+add_to_backup usr/share/terminfo
+
# Backup the files
tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
@@ -101,6 +105,10 @@ rm -rf /boot/vmlinuz-*
rm -rf /boot/uImage-ipfire-*
rm -rf /boot/uInit-ipfire-*
rm -rf /lib/modules
+rm -rf /etc/dircolors
+rm -rf /etc/profile.d
+rm -rf /usr/share/terminfo
+
#
# Remove old udev rules.
#
diff --git a/config/rootfiles/packages/w_scan b/config/rootfiles/packages/w_scan
index 7e7d50a..b0744c2 100644
--- a/config/rootfiles/packages/w_scan
+++ b/config/rootfiles/packages/w_scan
@@ -1,2 +1,3 @@
usr/bin/w_scan
+usr/bin/w_scan_start
#usr/share/man/man1/w_scan.1
diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start
new file mode 100644
index 0000000..7a908e6
--- /dev/null
+++ b/config/w_scan/w_scan_start
@@ -0,0 +1,134 @@
+#!/bin/bash
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2012 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 #
+# 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/>. #
+# #
+###############################################################################
+###############################################################################
+# w_scan_start for IPFire v 1.00 - 2012-11-15 Arne Fitzenreiter - inital vers.#
+###############################################################################
+
+err_msg ()
+{
+ whiptail --msgbox "$1" 8 70 --title "Error"
+ clear
+ exit 1
+}
+
+chk_cancel ()
+{
+ if [ ! "${?}" == 0 ];then
+ clear
+ echo "Terminated by user!"
+ exit 0
+ fi
+}
+
+yes_no ()
+{
+ whiptail --yesno "$1" 8 70
+ chk_cancel
+}
+
+WSCAN=$(which w_scan)
+
+# Some initial checks...
+if [ -z $WSCAN ];then
+ err_msg "w_scan not found!";
+fi
+if [ ! -e /dev/dvb/adapter[0-9]/frontend[0-9] ];then
+ err_msg "No dvb tuner frontend found!";
+fi
+
+# Is vdr running?
+if [ "$(ps -A | grep " runvdr$")" != "" ] ;then
+ yes_no "Vdr is runnung. Cannot scan with active vdr. Should i stop it?"
+ clear
+ /etc/init.d/vdr stop
+ HAS_VDR_STOPPED=YES
+fi
+
+# Select DVB type
+whiptail --checklist "\nSelect DVB type" 12 40 3 \
+ DVB-T "Terrestrial" yes \
+ DVB-C "Cable" no \
+ DVB-S "Satelite" no \
+ 2>/tmp/w_scan_type
+chk_cancel
+W_SCAN_TYPE=$(cat /tmp/w_scan_type)
+rm /tmp/w_scan_type
+
+if [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then
+ # Generate and run separate country menubox and default germany
+ echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh
+ echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh
+ $WSCAN -c? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh
+ echo ' 2>/tmp/w_scan_country' >> /tmp/w_scan_countryselect.sh
+ sh /tmp/w_scan_countryselect.sh
+ chk_cancel
+ rm /tmp/w_scan_countryselect.sh
+ W_SCAN_COUNTRY=$(cat /tmp/w_scan_country)
+ rm /tmp/w_scan_country
+fi
+
+if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then
+ # Generate and run separate satelite menubox and default astra
+ echo '#!/bin/bash' > /tmp/w_scan_satselect.sh
+ echo 'whiptail --checklist "\nSelect satelites" 19 70 10 \' >> /tmp/w_scan_satselect.sh
+ $WSCAN -s? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh
+ echo ' 2>/tmp/w_scan_satelite' >> /tmp/w_scan_satselect.sh
+ sh /tmp/w_scan_satselect.sh
+ chk_cancel
+ rm /tmp/w_scan_satselect.sh
+ W_SCAN_SATELITE=$(cat /tmp/w_scan_satelite | sed 's|"||g')
+ rm /tmp/w_scan_satelite
+fi
+
+# Now start the scan ...
+clear
+rm -rf /tmp/channels.conf
+if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then
+ echo ":->W-SCAN DVB-T $(date)" >>/tmp/channels.conf
+ $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf
+fi
+if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then
+ echo ":->W-SCAN DVB-C $(date)" >>/tmp/channels.conf
+ $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf
+fi
+if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then
+ for SATELITE in $W_SCAN_SATELITE;
+ do
+ echo ":->W-SCAN DVB-S-$SATELITE $(date)" >>/tmp/channels.conf
+ $WSCAN -f s -s $SATELITE -C UTF-8 >>/tmp/channels.conf
+ done
+fi
+
+# Save result to current dir.
+cp /tmp/channels.conf w_scan-$(date +%Y%m%d%H%M).channels.conf
+echo Results saved to w_scan-$(date +%Y%m%d%H%M).channels.conf
+
+# Do this only if vdr is installed ...
+if [ -e /opt/pakfire/db/installed/meta-vdr ]; then
+ yes_no "Install new channels-conf for vdr."
+ # Backup old channels conf...
+ cp -f /opt/vdr/etc/channels.conf \
+ /opt/vdr/etc/channels.conf.backup$(date +%Y%m%d%H%M)
+ cp -f /tmp/channels.conf /opt/vdr/etc/
+ yes_no "Should i start the vdr?"
+ clear
+ /etc/init.d/vdr start
+fi
diff --git a/lfs/w_scan b/lfs/w_scan
index f6e8b9d..7df4b42 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = w_scan
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -81,5 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ install -m 755 $(DIR_SRC)/config/w_scan/w_scan_start /usr/bin/
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-11-17 11:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-17 11:59 [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 033ba0349c946f9ca705029a5368ae5db2db461e git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox