summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkos <kos@dev3>2013-01-17 08:03:44 (GMT)
committerkos <kos@dev3>2013-01-17 08:03:44 (GMT)
commite0a5e46b1f37c907fc584f9a503aa04c53d79594 (patch)
tree70f8920b5975fbb60d838448a733fdbfee94022c
parentc83955412f7f8fa1488c668478dec0376f6820a3 (diff)
parentdcf4bb14cdfa1a51d6313932ff0cc85e6a6c058d (diff)
Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
-rw-r--r--meta-openvuplus/conf/distro/vuplus.conf4
-rw-r--r--meta-openvuplus/recipes-connectivity/samba/samba/smb.conf4
-rw-r--r--meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend2
-rw-r--r--meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch4
-rw-r--r--meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf105
-rw-r--r--meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket8
-rw-r--r--meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in7
-rw-r--r--meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service5
-rw-r--r--meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb3
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/bm750/fstab10
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.19
-rw-r--r--meta-openvuplus/recipes-core/base-files/base-files/fstab8
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab9
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.19
-rw-r--r--meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile26
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab10
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.19
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab9
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.19
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab10
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.19
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab10
-rwxr-xr-xmeta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.19
-rw-r--r--meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend5
-rw-r--r--meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket8
-rw-r--r--meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in7
-rw-r--r--meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service5
-rw-r--r--meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in8
-rw-r--r--meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend6
-rw-r--r--meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch19
-rw-r--r--meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch36
-rw-r--r--meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend8
-rw-r--r--meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket8
-rw-r--r--meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in10
-rw-r--r--meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service5
-rw-r--r--meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket8
-rw-r--r--meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in10
-rw-r--r--meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service5
-rw-r--r--meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb35
-rw-r--r--meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch908
-rw-r--r--meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb19
41 files changed, 1136 insertions, 262 deletions
diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index da0866b..ed8a5e4 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -1,6 +1,6 @@
#@TYPE: Distribution
-#@NAME: OpenDreambox
-#@DESCRIPTION: Distribution configuration for OpenDreambox
+#@NAME: OpenVuplus
+#@DESCRIPTION: Distribution configuration for OpenVuplus
QA_LOG = "1"
#USER_CLASSES += "image-prelink"
diff --git a/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf b/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf
index 83ac00d..6ca902d 100644
--- a/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf
+++ b/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf
@@ -4,8 +4,8 @@
log file = /tmp/smb.log
log level = 1
security = share
- server string = Dreambox %h network services
- workgroup = Dream
+ server string = Vuplus %h network services
+ workgroup = Vuplus
netbios name = %h
case sensitive=yes
preserve case=yes
diff --git a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
index c6512c2..a8d4d07 100644
--- a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
+++ b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
@@ -1,4 +1,4 @@
-PR .= "-vuplus0"
+PR .= "-vuplus1"
SRC_URI += " \
file://01samba-kill \
diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch
index 6d7965d..6c980c5 100644
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch
+++ b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch
@@ -68,7 +68,7 @@ diff -Naurp vsftpd.orig/vsftpd.conf vsftpd/vsftpd.conf
# You may specify an explicit list of local users to chroot() to their home
# directory. If chroot_local_user is YES, then this list becomes a list of
# users to NOT chroot().
-@@ -103,12 +125,20 @@ connect_from_port_20=YES
+@@ -103,12 +123,22 @@ connect_from_port_20=YES
# the presence of the "-R" option, so there is a strong case for enabling it.
#ls_recurse_enable=YES
#
@@ -97,6 +97,8 @@ diff -Naurp vsftpd.orig/vsftpd.conf vsftpd/vsftpd.conf
+# This option specifies the location of the RSA certificate to use for SSL
+# encrypted connections.
+rsa_cert_file=/etc/ssl/private/vsftpd.pem
++#
++local_root=/
diff -Naurp vsftpd.orig/vsftpd.conf.5 vsftpd/vsftpd.conf.5
--- vsftpd.orig/vsftpd.conf.5 2009-11-06 08:41:11.000000000 +0100
+++ vsftpd/vsftpd.conf.5 2009-11-06 13:37:10.000000000 +0100
diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf
deleted file mode 100644
index 28ad4e0..0000000
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-# Opendreambox /etc/vsftpd.conf
-#
-# Please see vsftpd.conf.5 for all compiled in defaults.
-#
-# READ THIS: This example file is NOT an exhaustive list of vsftpd options.
-# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
-# capabilities.
-#
-# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
-anonymous_enable=NO
-#
-# Uncomment this to allow local users to log in.
-local_enable=YES
-#
-# Uncomment this to enable any form of FTP write command.
-write_enable=YES
-#
-# Default umask for local users is 077. You may wish to change this to 022,
-# if your users expect that (022 is used by most other ftpd's)
-#local_umask=022
-#
-# Uncomment this to allow the anonymous FTP user to upload files. This only
-# has an effect if the above global write enable is activated. Also, you will
-# obviously need to create a directory writable by the FTP user.
-#anon_upload_enable=YES
-#
-# Uncomment this if you want the anonymous FTP user to be able to create
-# new directories.
-#anon_mkdir_write_enable=YES
-#
-# Activate directory messages - messages given to remote users when they
-# go into a certain directory.
-dirmessage_enable=YES
-#
-# Activate logging of uploads/downloads.
-#xferlog_enable=YES
-#
-# Make sure PORT transfer connections originate from port 20 (ftp-data).
-connect_from_port_20=YES
-#
-# If you want, you can arrange for uploaded anonymous files to be owned by
-# a different user. Note! Using "root" for uploaded files is not
-# recommended!
-#chown_uploads=YES
-#chown_username=whoever
-#
-# You may override where the log file goes if you like. The default is shown
-# below.
-#xferlog_file=/var/log/vsftpd.log
-#
-# If you want, you can have your log file in standard ftpd xferlog format
-#xferlog_std_format=YES
-#
-# You may change the default value for timing out an idle session.
-#idle_session_timeout=600
-#
-# You may change the default value for timing out a data connection.
-#data_connection_timeout=120
-#
-# It is recommended that you define on your system a unique user which the
-# ftp server can use as a totally isolated and unprivileged user.
-#nopriv_user=ftpsecure
-#
-# Enable this and the server will recognise asynchronous ABOR requests. Not
-# recommended for security (the code is non-trivial). Not enabling it,
-# however, may confuse older FTP clients.
-async_abor_enable=YES
-#
-# By default the server will pretend to allow ASCII mode but in fact ignore
-# the request. Turn on the below options to have the server actually do ASCII
-# mangling on files when in ASCII mode.
-# Beware that turning on ascii_download_enable enables malicious remote parties
-# to consume your I/O resources, by issuing the command "SIZE /big/file" in
-# ASCII mode.
-# These ASCII options are split into upload and download because you may wish
-# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking),
-# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
-# on the client anyway..
-#ascii_upload_enable=YES
-#ascii_download_enable=YES
-#
-# You may fully customise the login banner string:
-ftpd_banner=Welcome to the OpenDreambox FTP service.
-#
-# You may specify a file of disallowed anonymous e-mail addresses. Apparently
-# useful for combatting certain DoS attacks.
-#deny_email_enable=YES
-# (default follows)
-#banned_email_file=/etc/vsftpd.banned_emails
-#
-# You may specify an explicit list of local users to chroot() to their home
-# directory. If chroot_local_user is YES, then this list becomes a list of
-# users to NOT chroot().
-#chroot_list_enable=YES
-# (default follows)
-#chroot_list_file=/etc/vsftpd.chroot_list
-#
-# You may activate the "-R" option to the builtin ls. This is disabled by
-# default to avoid remote users being able to cause excessive I/O on large
-# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
-# the presence of the "-R" option, so there is a strong case for enabling it.
-ls_recurse_enable=YES
-#
-secure_chroot_dir=/dev/shm
-local_root=/
diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket
deleted file mode 100644
index 4505235..0000000
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-
-[Socket]
-ListenStream=21
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in
deleted file mode 100644
index 000f62a..0000000
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in
+++ /dev/null
@@ -1,7 +0,0 @@
-service ftp
-{
- socket_type = stream
- user = root
- server = @SBINDIR@/vsftpd
- wait = no
-}
diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service
deleted file mode 100644
index 68e89d1..0000000
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd
-StandardInput=socket
diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
index 22397c4..899b368 100644
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
+++ b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
DEPENDS = "libcap openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r4"
+PR = "r5"
SRC_URI = " \
https://security.appspot.com/downloads/${BP}.tar.gz \
@@ -69,6 +69,7 @@ do_configure() {
set_default ls_recurse_enable YES
set_default secure_chroot_dir "${SECURE_CHROOT_DIR}"
set_default rsa_cert_file "${RSA_CERT_FILE}"
+ set_default local_root "/"
}
do_compile() {
oe_runmake 'CFLAGS=${CFLAGS}' 'LIBS=${LIBS}' 'LINK=${LINK}'
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab
new file mode 100755
index 0000000..5e15a51
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab
@@ -0,0 +1,10 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+/dev/mtdblock2 /boot jffs2 ro 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.1
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.1
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/fstab b/meta-openvuplus/recipes-core/base-files/base-files/fstab
deleted file mode 100644
index 07099a8..0000000
--- a/meta-openvuplus/recipes-core/base-files/base-files/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
-/dev/root / rootfs noatime 0 1
-tmpfs /proc proc nodev,noexec,nosuid 0 0
-tmpfs /proc/bus/usb usbfs nodev,noexec,nosuid 0 0
-tmpfs /sys sysfs nodev,noexec,nosuid 0 0
-tmpfs /dev/pts devpts noexec,nosuid,mode=0620,gid=5 0 0
-tmpfs /dev/shm tmpfs nosuid,nodev 0 0
-tmpfs /var/volatile tmpfs mode=0755 0 0
-/dev/sda1 /media/hdd auto defaults 0 0
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.1
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.1
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile b/meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile
new file mode 100644
index 0000000..2046847
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile
@@ -0,0 +1,26 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/bin/vi" # needed for packages like cron
+TERM="xterm" # Basic terminal capab. For screen etc.
+
+if [ "`id -u`" -eq 0 ]; then
+ PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+ PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+ for i in `ls /etc/profile.d/`; do
+ . /etc/profile.d/$i
+ done
+ unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab
new file mode 100755
index 0000000..5e15a51
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab
@@ -0,0 +1,10 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+/dev/mtdblock2 /boot jffs2 ro 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.1
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.1
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.1
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.1
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab
new file mode 100755
index 0000000..5e15a51
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab
@@ -0,0 +1,10 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+/dev/mtdblock2 /boot jffs2 ro 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.1
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.1
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab
new file mode 100755
index 0000000..5e15a51
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab
@@ -0,0 +1,10 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+/dev/mtdblock2 /boot jffs2 ro 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.1
new file mode 100755
index 0000000..13869e9
--- /dev/null
+++ b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.1
@@ -0,0 +1,9 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+/dev/sda1 /media/hdd auto defaults 0 0
+
diff --git a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
index d27b04d..3d5c1d9 100644
--- a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,4 @@
-PR .= "-vuplus1"
+PR .= "-vuplus2"
do_install_append() {
ln -s media/hdd ${D}/hdd
@@ -6,9 +6,6 @@ do_install_append() {
rm -r ${D}/mnt
ln -s media ${D}/mnt
- rmdir ${D}/tmp
- ln -s var/tmp ${D}/tmp
-
ln -s var/run ${D}/run
}
diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket
deleted file mode 100644
index 88b2189..0000000
--- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-
-[Socket]
-ListenStream=23
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in
deleted file mode 100644
index 86e1e5e..0000000
--- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in
+++ /dev/null
@@ -1,7 +0,0 @@
-service telnet
-{
- socket_type = stream
- user = root
- server = @SBINDIR@/telnetd
- wait = no
-}
diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service
deleted file mode 100644
index a493a9e..0000000
--- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-
-[Service]
-ExecStart=-/usr/sbin/telnetd
-StandardInput=socket
diff --git a/meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in b/meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in
deleted file mode 100644
index 7e3e247..0000000
--- a/meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in
+++ /dev/null
@@ -1,8 +0,0 @@
-service ssh
-{
- socket_type = stream
- user = root
- server = @SBINDIR@/dropbear
- server_args = -i
- wait = no
-}
diff --git a/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend b/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend
index 429c37f..f57cc55 100644
--- a/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend
+++ b/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend
@@ -1,3 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR .= "-vuplus0"
+PR .= "-vuplus1"
+
+do_install_append () {
+ touch ${D}${sysconfdir}/resolv.conf
+}
diff --git a/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch b/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch
deleted file mode 100644
index d9384d9..0000000
--- a/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mtd-utils-1.4.9.org/Makefile 2012-04-02 11:41:10.339446661 +0200
-+++ mtd-utils-1.4.9/Makefile 2012-04-02 11:40:33.659447111 +0200
-@@ -30,13 +30,13 @@
- ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
-
- BINS = $(MTD_BINS)
--BINS += mkfs.ubifs/mkfs.ubifs
--BINS += $(addprefix ubi-utils/,$(UBI_BINS))
-+#BINS += mkfs.ubifs/mkfs.ubifs
-+#BINS += $(addprefix ubi-utils/,$(UBI_BINS))
- SCRIPTS = flash_eraseall
-
- TARGETS = $(BINS)
- TARGETS += lib/libmtd.a
--TARGETS += ubi-utils/libubi.a
-+#TARGETS += ubi-utils/libubi.a
-
- OBJDEPS = $(BUILDDIR)/include/version.h
-
diff --git a/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch b/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch
new file mode 100644
index 0000000..63f7ae2
--- /dev/null
+++ b/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch
@@ -0,0 +1,36 @@
+diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
+index f77e5e6..e002be5 100644
+--- a/mkfs.ubifs/mkfs.ubifs.c
++++ b/mkfs.ubifs/mkfs.ubifs.c
+@@ -324,6 +324,22 @@ static int in_path(const char *dir_name, const char *file_name)
+ return ret;
+ }
+
++/*
++ * same_device - determine if a file is on the same blockdevice as a directory.
++ * @dir_name: directory path name
++ * @file_name: file path name
++ */
++static int same_device(const char *dir_name, const char *file_name)
++{
++ struct stat stat1, stat2;
++
++ if (stat(dir_name, &stat1) == -1)
++ return -1;
++ if (stat(file_name, &stat2) == -1)
++ return -1;
++ return stat1.st_dev == stat2.st_dev;
++}
++
+ /**
+ * calc_min_log_lebs - calculate the minimum number of log LEBs needed.
+ * @max_bud_bytes: journal size (buds only)
+@@ -376,7 +392,7 @@ static int validate_options(void)
+
+ if (!output)
+ return err_msg("no output file or UBI volume specified");
+- if (root && in_path(root, output))
++ if (root && same_device(root, output) && in_path(root, output))
+ return err_msg("output file cannot be in the UBIFS root "
+ "directory");
+ if (!is_power_of_2(c->min_io_size))
diff --git a/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend b/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend
index 6eb3342..6b9198a 100644
--- a/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend
+++ b/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend
@@ -1,7 +1,5 @@
-PR .= "-vuplus0"
+PR .= "-vuplus1"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
-
-DREAMBOX_KERNEL_VERSION = "3.2"
+SRC_URI += "file://mkfs.ubifs-allow-output-file-creation-on-different-device.patch"
-SRC_URI += "${@base_version_less_or_equal('DREAMBOX_KERNEL_VERSION', '2.6.18', 'file://disable-ubi.patch', '', d)}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket
deleted file mode 100644
index 020201e..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-
-[Socket]
-ListenStream=8001
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in
deleted file mode 100644
index d559929..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in
+++ /dev/null
@@ -1,10 +0,0 @@
-service streamproxy
-{
- type = UNLISTED
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = @BINDIR@/streamproxy
- port = 8001
-}
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service
deleted file mode 100644
index 9e4c78e..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-
-[Service]
-ExecStart=-/usr/bin/streamproxy
-StandardInput=socket
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket
deleted file mode 100644
index 21258f8..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-
-[Socket]
-ListenStream=8002
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in
deleted file mode 100644
index 9761df2..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in
+++ /dev/null
@@ -1,10 +0,0 @@
-service transtreamproxy
-{
- type = UNLISTED
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = @BINDIR@/transtreamproxy
- port = 8002
-}
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service
deleted file mode 100644
index b6c83e3..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-
-[Service]
-ExecStart=-/usr/bin/transtreamproxy
-StandardInput=socket
diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
new file mode 100644
index 0000000..eb45d65
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Tuxbox common files"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
+
+PN = "tuxbox-common"
+PR = "r3"
+SRCDATE = "20090305"
+PV = "0.0+cvs${SRCDATE}"
+
+SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox/;module=cdk/root/share/tuxbox;method=ext;tag=dreambox;date=${SRCDATE} \
+ http://dreamboxupdate.com/download/opendreambox/tuxbox-common-r11.tar.gz \
+ file://satellites_20120206.patch;patch=1;pnum=0"
+
+FILES_${PN} = "/"
+
+S = "${WORKDIR}/tuxbox-common-r11"
+
+TRANSPONDER_LISTS = "satellites.xml terrestrial.xml"
+
+do_install() {
+ install -d ${D}/etc/tuxbox/
+ install -d ${D}/usr/share/tuxbox
+ install -m 0644 ${S}/scart.conf ${D}/etc/tuxbox/scart.conf
+ install -m 0644 ${S}/timezone.xml ${D}/etc/tuxbox/timezone.xml
+ ln -sf /etc/tuxbox/timezone.xml ${D}/etc/
+ ln -sf /usr/share ${D}/share
+
+ for i in ${TRANSPONDER_LISTS}; do
+ install -m 0644 ${WORKDIR}/tuxbox/$i ${D}/etc/tuxbox/$i
+ ln -sf /etc/tuxbox/$i ${D}/etc/;
+ ln -sf /etc/tuxbox/$i ${D}/usr/share/;
+ ln -sf /etc/tuxbox/$i ${D}/usr/share/tuxbox/;
+ done;
+}
diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch
new file mode 100644
index 0000000..9adbb1c
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch
@@ -0,0 +1,908 @@
+diff --git ../tuxbox/satellites.xml ../tuxbox/satellites.xml
+index 7393703..4c00ec2 100644
+--- ../tuxbox/satellites.xml
++++ ../tuxbox/satellites.xml
+@@ -359,6 +359,8 @@
+ <transponder fec_inner="3" frequency="11650000" modulation="1" polarization="0" symbol_rate="21350000" system="0"/>
+ <transponder fec_inner="3" frequency="11670000" modulation="1" polarization="0" symbol_rate="10005000" system="0"/>
+ <transponder fec_inner="3" frequency="11690000" modulation="1" polarization="0" symbol_rate="7200000" system="0"/>
++ <transponder fec_inner="4" frequency="11258000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="4" frequency="11336000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+ </sat>
+ <sat flags="1" name="NSS 806 (40.5W)" position="-405">
+ <transponder fec_inner="1" frequency="3470000" modulation="1" polarization="L" symbol_rate="4444000" system="0"/>
+@@ -732,6 +734,200 @@
+ <transponder fec_inner="3" frequency="12723000" modulation="1" onid="1" polarization="0" symbol_rate="27500000" system="0" tsid="2"/>
+ <transponder fec_inner="4" frequency="12735000" modulation="1" onid="4369" polarization="1" symbol_rate="8800000" system="0" tsid="1"/>
+ </sat>
++ <sat flags="1" name="Astra/Sirius (5.0E)" position="50">
++ <transponder fec_inner="1" frequency="10920750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="10935500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="10964250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="10979000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="0" frequency="10987000" modulation="1" polarization="0" symbol_rate="6111000" system="0"/>
++ <transponder fec_inner="1" frequency="10993750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11008500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11023250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11038000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11052750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11067500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11082250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11097000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11111750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11126500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11141250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11156000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="0" frequency="11158000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="1" frequency="11170750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11185500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11214250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11229000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11243750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11258500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11273250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11288000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11302750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11317500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11332250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11347000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11361750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11376500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11391250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11406000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11420750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="1" frequency="11435500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
++ <transponder fec_inner="3" frequency="11727480" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="11747000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="10"/>
++ <transponder fec_inner="3" frequency="11766000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="12"/>
++ <transponder fec_inner="3" frequency="11785000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="11"/>
++ <transponder fec_inner="3" frequency="11804000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="8"/>
++ <transponder fec_inner="3" frequency="11823000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="9"/>
++ <transponder fec_inner="3" frequency="11843000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="11862000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="21"/>
++ <transponder fec_inner="3" frequency="11881000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="7"/>
++ <transponder fec_inner="3" frequency="11900000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="11919000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="24"/>
++ <transponder fec_inner="3" frequency="11938000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="22"/>
++ <transponder fec_inner="3" frequency="11958000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="14"/>
++ <transponder fec_inner="3" frequency="11977000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="4"/>
++ <transponder fec_inner="3" frequency="11996000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="6"/>
++ <transponder fec_inner="4" frequency="12015000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="28"/>
++ <transponder fec_inner="3" frequency="12034000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="5"/>
++ <transponder fec_inner="3" frequency="12054000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="3"/>
++ <transponder fec_inner="3" frequency="12073000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="15"/>
++ <transponder fec_inner="3" frequency="12092000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="23"/>
++ <transponder fec_inner="4" frequency="12111000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12130000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12149000" modulation="1" onid="366" polarization="0" symbol_rate="27500000" system="0" tsid="200"/>
++ <transponder fec_inner="3" frequency="12169000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
++ <transponder fec_inner="5" frequency="12188000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12207000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
++ <transponder fec_inner="5" frequency="12226000" modulation="1" onid="94" polarization="0" symbol_rate="25540000" system="0" tsid="1"/>
++ <transponder fec_inner="5" frequency="12245000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12265000" modulation="1" onid="366" polarization="0" symbol_rate="27500000" system="0" tsid="256"/>
++ <transponder fec_inner="3" frequency="12284000" modulation="1" onid="85" polarization="1" symbol_rate="27500000" system="0" tsid="1"/>
++ <transponder fec_inner="5" frequency="12303000" modulation="1" polarization="0" symbol_rate="25547000" system="0"/>
++ <transponder fec_inner="3" frequency="12322000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12341000" modulation="1" onid="366" polarization="0" symbol_rate="27500000" system="0" tsid="101"/>
++ <transponder fec_inner="5" frequency="12360000" modulation="1" onid="1" polarization="1" symbol_rate="27500000" system="0" tsid="8800"/>
++ <transponder fec_inner="3" frequency="12380000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="2"/>
++ <transponder fec_inner="2" frequency="12399000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
++ <transponder fec_inner="3" frequency="12418000" modulation="1" onid="1" polarization="0" symbol_rate="27500000" system="0" tsid="101"/>
++ <transponder fec_inner="2" frequency="12437000" modulation="2" onid="86" polarization="1" symbol_rate="27500000" system="1" tsid="27"/>
++ <transponder fec_inner="3" frequency="12456000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12476000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="26"/>
++ <transponder fec_inner="3" frequency="12608000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="12614000" modulation="1" polarization="1" symbol_rate="14685000" system="0"/>
++ <transponder fec_inner="3" frequency="12633000" modulation="1" polarization="1" symbol_rate="3720000" system="0"/>
++ <transponder fec_inner="3" frequency="12637000" modulation="1" polarization="0" symbol_rate="14465000" system="0"/>
++ <transponder fec_inner="3" frequency="12644000" modulation="1" polarization="1" symbol_rate="3200000" system="0"/>
++ <transponder fec_inner="3" frequency="12649000" modulation="1" polarization="1" symbol_rate="3977000" system="0"/>
++ <transponder fec_inner="1" frequency="12668000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="3" frequency="12672000" modulation="1" polarization="0" symbol_rate="3300000" system="0"/>
++ <transponder fec_inner="4" frequency="12678000" modulation="1" polarization="1" symbol_rate="13333000" system="0"/>
++ <transponder fec_inner="3" frequency="12680000" modulation="1" onid="95" polarization="0" symbol_rate="9404000" system="0" tsid="1"/>
++ <transponder fec_inner="3" frequency="12690000" modulation="1" polarization="0" symbol_rate="3330000" system="0"/>
++ <transponder fec_inner="3" frequency="12690000" modulation="1" polarization="1" symbol_rate="2650000" system="0"/>
++ <transponder fec_inner="3" frequency="12697000" modulation="1" polarization="1" symbol_rate="6150000" system="1"/>
++ <transponder fec_inner="3" frequency="12701000" modulation="1" polarization="0" symbol_rate="6111000" system="0"/>
++ <transponder fec_inner="0" frequency="12701000" modulation="1" polarization="1" symbol_rate="6150000" system="0"/>
++ <transponder fec_inner="3" frequency="12715000" modulation="1" polarization="0" symbol_rate="3330000" system="0"/>
++ <transponder fec_inner="3" frequency="12724000" modulation="1" polarization="0" symbol_rate="1772000" system="0"/>
++ <transponder fec_inner="3" frequency="12736000" modulation="1" polarization="0" symbol_rate="3038000" system="0"/>
++ </sat>
++ <sat flags="1" name="Eutelsat W3 (7.0E)" position="70">
++ <transponder fec_inner="3" frequency="10762000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="10880000" modulation="2" polarization="1" symbol_rate="17360000" system="1"/>
++ <transponder fec_inner="3" frequency="10899000" modulation="1" polarization="1" symbol_rate="9404000" system="0"/>
++ <transponder fec_inner="2" frequency="10928000" modulation="2" polarization="0" symbol_rate="30000000" system="1"/>
++ <transponder fec_inner="3" frequency="10928000" modulation="1" onid="126" polarization="1" symbol_rate="27500000" system="0" tsid="2578"/>
++ <transponder fec_inner="0" frequency="10960000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10960000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10968000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10968000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10977000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10978000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10982000" modulation="1" polarization="1" symbol_rate="13333000" system="0"/>
++ <transponder fec_inner="0" frequency="10986000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10986000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="10994000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
++ <transponder fec_inner="0" frequency="10996000" modulation="1" onid="235" polarization="0" symbol_rate="6666000" system="0" tsid="17185"/>
++ <transponder fec_inner="0" frequency="11000000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
++ <transponder fec_inner="0" frequency="11004000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11014000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11014000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11023000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11043000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11052000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11052000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11061000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11061000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11066000" modulation="1" polarization="0" symbol_rate="13333000" system="0"/>
++ <transponder fec_inner="0" frequency="11070000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11071000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11078000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
++ <transponder fec_inner="0" frequency="11079000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11084000" modulation="1" polarization="0" symbol_rate="13333000" system="0"/>
++ <transponder fec_inner="0" frequency="11084000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
++ <transponder fec_inner="0" frequency="11088000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11097000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11102000" modulation="1" polarization="0" symbol_rate="13333000" system="0"/>
++ <transponder fec_inner="0" frequency="11106000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11106000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="5" frequency="11125000" modulation="1" polarization="1" symbol_rate="2677000" system="0"/>
++ <transponder fec_inner="0" frequency="11126000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="3" frequency="11126000" modulation="1" polarization="1" symbol_rate="5697000" system="0"/>
++ <transponder fec_inner="0" frequency="11142000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="0" frequency="11152000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
++ <transponder fec_inner="3" frequency="11175000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="2" frequency="11262000" modulation="1" onid="126" polarization="0" symbol_rate="27500000" system="0" tsid="50500"/>
++ <transponder fec_inner="3" frequency="11283000" modulation="1" onid="126" polarization="1" symbol_rate="27500000" system="0" tsid="40400"/>
++ <transponder fec_inner="3" frequency="11298000" modulation="1" polarization="0" symbol_rate="13500000" system="0"/>
++ <transponder fec_inner="2" frequency="11324000" modulation="1" onid="16" polarization="1" symbol_rate="27500000" system="0" tsid="1"/>
++ <transponder fec_inner="2" frequency="11346000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="11361000" modulation="1" polarization="1" symbol_rate="18086000" system="0"/>
++ <transponder fec_inner="4" frequency="11386000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11405000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="0" frequency="11429000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="2" frequency="11451000" modulation="1" polarization="1" symbol_rate="25066000" system="0"/>
++ <transponder fec_inner="3" frequency="11471000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11492000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11513000" modulation="1" onid="126" polarization="0" symbol_rate="27500000" system="0" tsid="50900"/>
++ <transponder fec_inner="3" frequency="11534000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11554000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
++ <transponder fec_inner="3" frequency="11575000" modulation="1" onid="126" polarization="1" symbol_rate="30000000" system="0" tsid="50600"/>
++ <transponder fec_inner="3" frequency="11596000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11617000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11637000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11658000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="3" frequency="11678000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
++ <transponder fec_inner="4" frequency="12520000" modulation="1" polarization="1" symbol_rate="6111000" system="0"/>
++ </sat>
++ <sat name="Eurobird 9A (9.0E)" flags="0" position="90">
++ <transponder frequency="11727000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11747000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11785000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="11804000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11823000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11843000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11861000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="11881000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="11900000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11919000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11938000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11958000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11977000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11996000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12015000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12034000" symbol_rate="27500000" polarization="1" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12054000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12074000" symbol_rate="27500000" polarization="1" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12092000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12130000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12207000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12284000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12303000" symbol_rate="26400000" polarization="1" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12322000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12360000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12380000" symbol_rate="26400000" polarization="1" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12399000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12437000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ </sat>
+ <sat flags="1" name="Eutelsat W1 (10.0E)" position="100">
+ <transponder fec_inner="0" frequency="10960000" modulation="1" polarization="1" symbol_rate="4167000" system="0"/>
+ <transponder fec_inner="0" frequency="10965000" modulation="1" onid="65535" polarization="1" symbol_rate="4167000" system="0" tsid="1"/>
+@@ -1347,73 +1543,75 @@
+ <transponder fec_inner="4" frequency="12652000" modulation="1" polarization="1" symbol_rate="28000000" system="0"/>
+ <transponder fec_inner="3" frequency="12740000" modulation="1" polarization="1" symbol_rate="14550000" system="0"/>
+ </sat>
+- <sat flags="1" name="Eutelsat Sesat (36.0E)" position="360">
+- <transponder fec_inner="4" frequency="10962000" modulation="1" polarization="1" symbol_rate="3254000" system="0"/>
+- <transponder fec_inner="3" frequency="10978000" modulation="1" polarization="1" symbol_rate="3470000" system="0"/>
+- <transponder fec_inner="2" frequency="11041000" modulation="1" polarization="1" symbol_rate="3410000" system="0"/>
+- <transponder fec_inner="0" frequency="11043000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="3" frequency="11053000" modulation="1" polarization="1" symbol_rate="2892000" system="0"/>
+- <transponder fec_inner="0" frequency="11061000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="4" frequency="11062000" modulation="1" polarization="1" symbol_rate="3254000" system="0"/>
+- <transponder fec_inner="0" frequency="11070000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11079000" modulation="1" polarization="0" symbol_rate="6111000" system="0"/>
+- <transponder fec_inner="2" frequency="11108500" modulation="1" polarization="1" symbol_rate="3418000" system="0"/>
+- <transponder fec_inner="2" frequency="11136000" modulation="1" polarization="1" symbol_rate="4886000" system="0"/>
+- <transponder fec_inner="3" frequency="11633000" modulation="1" polarization="1" symbol_rate="5787000" system="0"/>
+- <transponder fec_inner="3" frequency="11638500" modulation="1" polarization="1" symbol_rate="2170000" system="0"/>
+- <transponder fec_inner="3" frequency="11644500" modulation="1" polarization="1" symbol_rate="2180000" system="0"/>
+- <transponder fec_inner="3" frequency="11647500" modulation="1" polarization="1" symbol_rate="2500000" system="0"/>
+- <transponder fec_inner="3" frequency="11651000" modulation="1" polarization="1" symbol_rate="2530000" system="0"/>
+- <transponder fec_inner="3" frequency="11689000" modulation="1" polarization="0" symbol_rate="11571000" system="0"/>
+- <transponder fec_inner="1" frequency="11691000" modulation="1" polarization="1" symbol_rate="4883000" system="0"/>
+- <transponder fec_inner="3" frequency="11727000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12073000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12173000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12178000" modulation="1" polarization="L" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="3" frequency="12226000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12245000" modulation="1" polarization="R" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12303000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12322000" modulation="1" polarization="R" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12380000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12399000" modulation="1" polarization="R" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12456000" modulation="1" polarization="L" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12476000" modulation="1" polarization="R" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="4" frequency="12507000" modulation="1" polarization="1" symbol_rate="3320000" system="0"/>
+- <transponder fec_inner="1" frequency="12512000" modulation="1" polarization="0" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="4" frequency="12516000" modulation="1" onid="42" polarization="1" symbol_rate="10370000" system="0" tsid="21"/>
+- <transponder fec_inner="1" frequency="12521000" modulation="1" polarization="0" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="2" frequency="12525000" modulation="1" polarization="0" symbol_rate="1110000" system="0"/>
+- <transponder fec_inner="2" frequency="12527500" modulation="1" polarization="0" symbol_rate="2238000" system="0"/>
+- <transponder fec_inner="5" frequency="12531000" modulation="1" polarization="1" symbol_rate="3100000" system="0"/>
+- <transponder fec_inner="1" frequency="12532000" modulation="1" onid="177" polarization="0" symbol_rate="4340000" system="0" tsid="176"/>
+- <transponder fec_inner="3" frequency="12537000" modulation="1" onid="8192" polarization="0" symbol_rate="2100000" system="0" tsid="1"/>
+- <transponder fec_inner="1" frequency="12541000" modulation="1" polarization="0" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="4" frequency="12546500" modulation="1" polarization="0" symbol_rate="2734000" system="0"/>
+- <transponder fec_inner="2" frequency="12558000" modulation="1" onid="878" polarization="1" symbol_rate="8138000" system="0" tsid="60200"/>
+- <transponder fec_inner="5" frequency="12560000" modulation="1" polarization="0" symbol_rate="1302000" system="0"/>
+- <transponder fec_inner="2" frequency="12568500" modulation="1" polarization="1" symbol_rate="2848000" system="0"/>
+- <transponder fec_inner="3" frequency="12575500" modulation="1" polarization="0" symbol_rate="2894000" system="0"/>
+- <transponder fec_inner="2" frequency="12596500" modulation="1" polarization="1" symbol_rate="2500000" system="0"/>
+- <transponder fec_inner="3" frequency="12600000" modulation="1" polarization="1" symbol_rate="1447000" system="0"/>
+- <transponder fec_inner="3" frequency="12611000" modulation="1" polarization="1" symbol_rate="5787000" system="0"/>
+- <transponder fec_inner="2" frequency="12614000" modulation="1" polarization="0" symbol_rate="2441000" system="0"/>
+- <transponder fec_inner="2" frequency="12616500" modulation="1" polarization="1" symbol_rate="1628000" system="0"/>
+- <transponder fec_inner="3" frequency="12625500" modulation="1" polarization="1" symbol_rate="2668000" system="0"/>
+- <transponder fec_inner="3" frequency="12630000" modulation="1" polarization="1" symbol_rate="1000000" system="0"/>
+- <transponder fec_inner="5" frequency="12652000" modulation="1" onid="65535" polarization="1" symbol_rate="2480000" system="0" tsid="1"/>
+- <transponder fec_inner="3" frequency="12656000" modulation="1" polarization="0" symbol_rate="2963000" system="0"/>
+- <transponder fec_inner="2" frequency="12680000" modulation="1" polarization="1" symbol_rate="3002000" system="0"/>
+- <transponder fec_inner="1" frequency="12685000" modulation="1" polarization="1" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="2" frequency="12686000" modulation="1" polarization="0" symbol_rate="3254000" system="0"/>
+- <transponder fec_inner="2" frequency="12689000" modulation="1" polarization="1" symbol_rate="3254000" system="0"/>
+- <transponder fec_inner="2" frequency="12694000" modulation="1" polarization="0" symbol_rate="2498000" system="0"/>
+- <transponder fec_inner="3" frequency="12694000" modulation="1" polarization="1" symbol_rate="3030000" system="0"/>
+- <transponder fec_inner="1" frequency="12698000" modulation="1" polarization="0" symbol_rate="4883000" system="0"/>
+- <transponder fec_inner="2" frequency="12702000" modulation="1" polarization="0" symbol_rate="3410000" system="0"/>
+- <transponder fec_inner="1" frequency="12707500" modulation="1" polarization="1" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="2" frequency="12710000" modulation="1" polarization="1" symbol_rate="3002000" system="0"/>
+- <transponder fec_inner="1" frequency="12720000" modulation="1" polarization="1" symbol_rate="13017000" system="0"/>
+- <transponder fec_inner="3" frequency="12739000" modulation="1" polarization="1" symbol_rate="2532000" system="0"/>
++ <sat name="Eutelsat W4/W7 (36.0E)" flags="0" position="360">
++ <transponder frequency="11057000" symbol_rate="2894000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11109000" symbol_rate="3418000" polarization="1" fec_inner="2" system="0" modulation="0"/>
++ <transponder frequency="11464000" symbol_rate="2890000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11510000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11637000" symbol_rate="22000000" polarization="1" fec_inner="0" system="0" modulation="0"/>
++ <transponder frequency="11639000" symbol_rate="2200000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11643000" symbol_rate="2170000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11648000" symbol_rate="3111000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11652000" symbol_rate="3111000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11658000" symbol_rate="1800000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="11687000" symbol_rate="1800000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="11716000" symbol_rate="3141000" polarization="1" fec_inner="0" system="1" modulation="2"/>
++ <transponder frequency="11727000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11747000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11766000" symbol_rate="27500000" polarization="0" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="11785000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11785000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11804000" symbol_rate="27500000" polarization="0" fec_inner="3" system="1" modulation="0"/>
++ <transponder frequency="11823000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11862000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11881000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11900000" symbol_rate="26480000" polarization="0" fec_inner="1" system="0" modulation="0"/>
++ <transponder frequency="11919000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11940000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11958000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11977000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11996000" symbol_rate="27500000" polarization="1" fec_inner="0" system="0" modulation="0"/>
++ <transponder frequency="12015000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12034000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12054000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12073000" symbol_rate="27500000" polarization="0" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12073000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12092000" symbol_rate="27500000" polarization="0" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12111000" symbol_rate="27500000" polarization="0" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12130000" symbol_rate="27500000" polarization="0" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12175000" symbol_rate="4340000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12190000" symbol_rate="20000000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12207000" symbol_rate="27500000" polarization="1" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12226000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12245000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12245000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12265000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12284000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12303000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12322000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12341000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12360000" symbol_rate="27500000" polarization="1" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12380000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12399000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12418000" symbol_rate="27500000" polarization="0" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12437000" symbol_rate="23437000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12437000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12456000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12476000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12511000" symbol_rate="4340000" polarization="0" fec_inner="1" system="0" modulation="0"/>
++ <transponder frequency="12516000" symbol_rate="10370000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12516000" symbol_rate="2170000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12520000" symbol_rate="4340000" polarization="0" fec_inner="1" system="0" modulation="0"/>
++ <transponder frequency="12532000" symbol_rate="4340000" polarization="0" fec_inner="1" system="0" modulation="0"/>
++ <transponder frequency="12545000" symbol_rate="2734000" polarization="0" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12555000" symbol_rate="5695000" polarization="1" fec_inner="2" system="0" modulation="0"/>
++ <transponder frequency="12563000" symbol_rate="3255000" polarization="1" fec_inner="2" system="0" modulation="0"/>
++ <transponder frequency="12568000" symbol_rate="2500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12591000" symbol_rate="2170000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12600000" symbol_rate="1824000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12620000" symbol_rate="2894000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12630000" symbol_rate="2238000" polarization="0" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="12634000" symbol_rate="1331000" polarization="1" fec_inner="3" system="0" modulation="0"/>
+ </sat>
+ <sat flags="1" name="Hellas Sat 2 (39.0E)" position="390">
+ <transponder fec_inner="5" frequency="10956000" modulation="1" onid="65535" polarization="1" symbol_rate="4123000" system="0" tsid="1"/>
+@@ -1498,158 +1696,75 @@
+ <transponder fec_inner="3" frequency="4137000" modulation="1" polarization="R" symbol_rate="3240000" system="0"/>
+ <transponder fec_inner="3" frequency="4140000" modulation="1" polarization="R" symbol_rate="3230000" system="0"/>
+ </sat>
+- <sat flags="1" name="Turk-/Eurasiasat(42.0E)" position="420">
+- <transponder fec_inner="4" frequency="10955000" modulation="1" polarization="1" symbol_rate="5860000" system="0"/>
+- <transponder fec_inner="4" frequency="10962000" modulation="1" polarization="1" symbol_rate="3670000" system="0"/>
+- <transponder fec_inner="3" frequency="10968000" modulation="1" polarization="1" symbol_rate="4557000" system="0"/>
+- <transponder fec_inner="4" frequency="10980000" modulation="1" polarization="1" symbol_rate="14150000" system="0"/>
+- <transponder fec_inner="3" frequency="10986000" modulation="1" polarization="0" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="3" frequency="10999000" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="3" frequency="11002600" modulation="1" polarization="1" symbol_rate="2175000" system="0"/>
+- <transponder fec_inner="4" frequency="11007000" modulation="1" polarization="1" symbol_rate="2950000" system="0"/>
+- <transponder fec_inner="4" frequency="11011000" modulation="1" polarization="1" symbol_rate="2125000" system="0"/>
+- <transponder fec_inner="3" frequency="11014000" modulation="1" polarization="1" symbol_rate="2050000" system="0"/>
+- <transponder fec_inner="3" frequency="11018000" modulation="1" polarization="1" symbol_rate="2150000" system="0"/>
+- <transponder fec_inner="4" frequency="11022500" modulation="1" polarization="1" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="3" frequency="11028500" modulation="1" polarization="1" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="4" frequency="11039000" modulation="1" polarization="1" symbol_rate="4400000" system="0"/>
+- <transponder fec_inner="4" frequency="11062000" modulation="1" polarization="1" symbol_rate="4400000" system="0"/>
+- <transponder fec_inner="4" frequency="11069000" modulation="1" polarization="1" symbol_rate="4000000" system="0"/>
+- <transponder fec_inner="3" frequency="11083000" modulation="1" polarization="1" symbol_rate="8888000" system="0"/>
+- <transponder fec_inner="4" frequency="11097000" modulation="1" polarization="0" symbol_rate="2500000" system="0"/>
+- <transponder fec_inner="3" frequency="11129000" modulation="1" polarization="1" symbol_rate="4268000" system="0"/>
+- <transponder fec_inner="3" frequency="11135500" modulation="1" polarization="1" symbol_rate="2170000" system="0"/>
+- <transponder fec_inner="3" frequency="11142500" modulation="1" polarization="1" symbol_rate="2200000" system="0"/>
+- <transponder fec_inner="3" frequency="11158500" modulation="1" polarization="1" symbol_rate="2596000" system="0"/>
+- <transponder fec_inner="4" frequency="11162500" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="3" frequency="11165500" modulation="1" polarization="1" symbol_rate="2960000" system="0"/>
+- <transponder fec_inner="4" frequency="11172000" modulation="1" polarization="1" symbol_rate="5000000" system="0"/>
+- <transponder fec_inner="3" frequency="11175000" modulation="1" polarization="0" symbol_rate="14440000" system="0"/>
+- <transponder fec_inner="3" frequency="11176500" modulation="1" polarization="1" symbol_rate="2200000" system="0"/>
+- <transponder fec_inner="4" frequency="11189000" modulation="1" polarization="1" symbol_rate="5860000" system="0"/>
+- <transponder fec_inner="4" frequency="11196000" modulation="1" polarization="1" symbol_rate="2955000" system="0"/>
+- <transponder fec_inner="3" frequency="11466000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="0" frequency="11492000" modulation="1" polarization="1" symbol_rate="3100000" system="0"/>
+- <transponder fec_inner="4" frequency="11498000" modulation="1" polarization="1" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="4" frequency="11519000" modulation="1" polarization="0" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="4" frequency="11522000" modulation="1" polarization="1" symbol_rate="3150000" system="0"/>
+- <transponder fec_inner="2" frequency="11554000" modulation="1" onid="65535" polarization="0" symbol_rate="2916000" system="0" tsid="1"/>
+- <transponder fec_inner="4" frequency="11576000" modulation="1" polarization="0" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="4" frequency="11584000" modulation="1" polarization="1" symbol_rate="8800000" system="0"/>
+- <transponder fec_inner="2" frequency="11607000" modulation="1" polarization="0" symbol_rate="3750000" system="0"/>
+- <transponder fec_inner="3" frequency="11608500" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="4" frequency="11612000" modulation="1" polarization="1" symbol_rate="2900000" system="0"/>
+- <transponder fec_inner="4" frequency="11662000" modulation="1" polarization="1" symbol_rate="4232000" system="0"/>
+- <transponder fec_inner="3" frequency="11682000" modulation="1" polarization="1" symbol_rate="5632000" system="0"/>
+- <transponder fec_inner="3" frequency="11691000" modulation="1" polarization="1" symbol_rate="5632000" system="0"/>
+- <transponder fec_inner="3" frequency="11694000" modulation="1" polarization="0" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="3" frequency="11712500" modulation="1" polarization="1" symbol_rate="2963000" system="0"/>
+- <transponder fec_inner="3" frequency="11716500" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="4" frequency="11729000" modulation="1" onid="126" polarization="1" symbol_rate="15555000" system="0" tsid="50600"/>
+- <transponder fec_inner="3" frequency="11734000" modulation="1" polarization="0" symbol_rate="3291000" system="0"/>
+- <transponder fec_inner="3" frequency="11739000" modulation="1" polarization="0" symbol_rate="3125000" system="0"/>
+- <transponder fec_inner="3" frequency="11743000" modulation="1" polarization="0" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="3" frequency="11743000" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="4" frequency="11748000" modulation="1" polarization="0" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="5" frequency="11753500" modulation="1" polarization="0" symbol_rate="3000000" system="0"/>
+- <transponder fec_inner="4" frequency="11753500" modulation="1" polarization="1" symbol_rate="3900000" system="0"/>
+- <transponder fec_inner="3" frequency="11758500" modulation="1" polarization="1" symbol_rate="2962000" system="0"/>
+- <transponder fec_inner="3" frequency="11760000" modulation="1" polarization="0" symbol_rate="5925000" system="0"/>
+- <transponder fec_inner="3" frequency="11762500" modulation="1" polarization="1" symbol_rate="2155000" system="0"/>
+- <transponder fec_inner="3" frequency="11766000" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="5" frequency="11769500" modulation="1" polarization="1" symbol_rate="2177000" system="0"/>
+- <transponder fec_inner="4" frequency="11773000" modulation="1" polarization="1" symbol_rate="2420000" system="0"/>
+- <transponder fec_inner="3" frequency="11775000" modulation="1" polarization="0" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="4" frequency="11777000" modulation="1" polarization="1" symbol_rate="3150000" system="0"/>
+- <transponder fec_inner="4" frequency="11781000" modulation="1" polarization="1" symbol_rate="2815000" system="0"/>
+- <transponder fec_inner="3" frequency="11788000" modulation="1" polarization="0" symbol_rate="2893000" system="0"/>
+- <transponder fec_inner="3" frequency="11794000" modulation="1" polarization="0" symbol_rate="5632000" system="0"/>
+- <transponder fec_inner="4" frequency="11800000" modulation="1" polarization="0" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="4" frequency="11804000" modulation="1" onid="66" polarization="1" symbol_rate="24444000" system="0" tsid="3"/>
+- <transponder fec_inner="5" frequency="11819000" modulation="1" polarization="0" symbol_rate="3000000" system="0"/>
+- <transponder fec_inner="3" frequency="11830500" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="3" frequency="11839000" modulation="1" polarization="1" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="4" frequency="11846000" modulation="1" polarization="1" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="4" frequency="11852000" modulation="1" polarization="0" symbol_rate="6000000" system="0"/>
+- <transponder fec_inner="4" frequency="11852000" modulation="1" polarization="1" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="5" frequency="11857500" modulation="1" polarization="1" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="4" frequency="11867000" modulation="1" polarization="1" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="5" frequency="11873000" modulation="1" polarization="1" symbol_rate="3400000" system="0"/>
+- <transponder fec_inner="4" frequency="11877500" modulation="1" polarization="1" symbol_rate="3750000" system="0"/>
+- <transponder fec_inner="4" frequency="11882000" modulation="1" polarization="1" symbol_rate="2965000" system="0"/>
+- <transponder fec_inner="5" frequency="11887000" modulation="1" polarization="1" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="4" frequency="11892000" modulation="1" polarization="0" symbol_rate="12800000" system="0"/>
+- <transponder fec_inner="4" frequency="11892000" modulation="1" polarization="1" symbol_rate="2960000" system="0"/>
+- <transponder fec_inner="3" frequency="11896000" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="3" frequency="11905000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="4" frequency="11912500" modulation="1" polarization="0" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="4" frequency="11916000" modulation="1" polarization="0" symbol_rate="2000000" system="0"/>
+- <transponder fec_inner="3" frequency="11918000" modulation="1" polarization="1" symbol_rate="24440000" system="0"/>
+- <transponder fec_inner="3" frequency="11943000" modulation="1" polarization="1" symbol_rate="2950000" system="0"/>
+- <transponder fec_inner="4" frequency="11951000" modulation="1" polarization="1" symbol_rate="8800000" system="0"/>
+- <transponder fec_inner="3" frequency="11959000" modulation="1" polarization="1" symbol_rate="2960000" system="0"/>
+- <transponder fec_inner="4" frequency="11963000" modulation="1" polarization="1" symbol_rate="2300000" system="0"/>
+- <transponder fec_inner="0" frequency="11966000" modulation="1" polarization="1" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="3" frequency="11968000" modulation="1" polarization="1" symbol_rate="4340000" system="0"/>
+- <transponder fec_inner="4" frequency="11970000" modulation="1" polarization="0" symbol_rate="17900000" system="0"/>
+- <transponder fec_inner="4" frequency="11973000" modulation="1" polarization="1" symbol_rate="2240000" system="0"/>
+- <transponder fec_inner="4" frequency="11977500" modulation="1" polarization="0" symbol_rate="5700000" system="0"/>
+- <transponder fec_inner="4" frequency="11984000" modulation="1" polarization="0" symbol_rate="4000000" system="0"/>
+- <transponder fec_inner="4" frequency="11996000" modulation="1" onid="1" polarization="1" symbol_rate="26000000" system="0" tsid="0"/>
+- <transponder fec_inner="4" frequency="12002000" modulation="1" polarization="0" symbol_rate="4800000" system="0"/>
+- <transponder fec_inner="4" frequency="12008000" modulation="1" polarization="0" symbol_rate="4400000" system="0"/>
+- <transponder fec_inner="4" frequency="12015000" modulation="1" polarization="0" symbol_rate="4800000" system="0"/>
+- <transponder fec_inner="4" frequency="12021500" modulation="1" polarization="0" symbol_rate="5380000" system="0"/>
+- <transponder fec_inner="4" frequency="12028500" modulation="1" polarization="0" symbol_rate="4557000" system="0"/>
+- <transponder fec_inner="4" frequency="12126000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="4" frequency="12127000" modulation="1" polarization="0" symbol_rate="7400000" system="0"/>
+- <transponder fec_inner="3" frequency="12133500" modulation="1" polarization="1" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="4" frequency="12136000" modulation="1" polarization="0" symbol_rate="3703000" system="0"/>
+- <transponder fec_inner="3" frequency="12139500" modulation="1" polarization="1" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="3" frequency="12140000" modulation="1" polarization="0" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="4" frequency="12506000" modulation="1" polarization="1" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="4" frequency="12507000" modulation="1" polarization="0" symbol_rate="3900000" system="0"/>
+- <transponder fec_inner="3" frequency="12510000" modulation="1" polarization="1" symbol_rate="2960000" system="0"/>
+- <transponder fec_inner="4" frequency="12513000" modulation="1" polarization="0" symbol_rate="4400000" system="0"/>
+- <transponder fec_inner="3" frequency="12518500" modulation="1" polarization="0" symbol_rate="3125000" system="0"/>
+- <transponder fec_inner="4" frequency="12524000" modulation="1" polarization="0" symbol_rate="4250000" system="0"/>
+- <transponder fec_inner="3" frequency="12529000" modulation="1" polarization="1" symbol_rate="7400000" system="0"/>
+- <transponder fec_inner="4" frequency="12530000" modulation="1" polarization="0" symbol_rate="4444000" system="0"/>
+- <transponder fec_inner="3" frequency="12535500" modulation="1" polarization="0" symbol_rate="2962000" system="0"/>
+- <transponder fec_inner="3" frequency="12536500" modulation="1" polarization="1" symbol_rate="2960000" system="0"/>
+- <transponder fec_inner="3" frequency="12540000" modulation="1" polarization="0" symbol_rate="3125000" system="0"/>
+- <transponder fec_inner="4" frequency="12541000" modulation="1" polarization="1" symbol_rate="2150000" system="0"/>
+- <transponder fec_inner="5" frequency="12565000" modulation="1" polarization="0" symbol_rate="27283000" system="0"/>
+- <transponder fec_inner="5" frequency="12572000" modulation="1" polarization="0" symbol_rate="7000000" system="0"/>
+- <transponder fec_inner="4" frequency="12590000" modulation="1" polarization="1" symbol_rate="3000000" system="0"/>
+- <transponder fec_inner="4" frequency="12595000" modulation="1" polarization="1" symbol_rate="2500000" system="0"/>
+- <transponder fec_inner="3" frequency="12601500" modulation="1" polarization="1" symbol_rate="1850000" system="0"/>
+- <transponder fec_inner="3" frequency="12605000" modulation="1" polarization="1" symbol_rate="2962000" system="0"/>
+- <transponder fec_inner="4" frequency="12609500" modulation="1" polarization="1" symbol_rate="3700000" system="0"/>
+- <transponder fec_inner="4" frequency="12614500" modulation="1" polarization="1" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="3" frequency="12620000" modulation="1" polarization="1" symbol_rate="6161000" system="0"/>
+- <transponder fec_inner="3" frequency="12631000" modulation="1" polarization="0" symbol_rate="3500000" system="0"/>
+- <transponder fec_inner="4" frequency="12633000" modulation="1" polarization="1" symbol_rate="4800000" system="0"/>
+- <transponder fec_inner="4" frequency="12635500" modulation="1" polarization="0" symbol_rate="4800000" system="0"/>
+- <transponder fec_inner="4" frequency="12637500" modulation="1" polarization="1" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="0" frequency="12641000" modulation="1" polarization="1" symbol_rate="3800000" system="0"/>
+- <transponder fec_inner="4" frequency="12647000" modulation="1" polarization="1" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="4" frequency="12652000" modulation="1" polarization="0" symbol_rate="22500000" system="0"/>
+- <transponder fec_inner="4" frequency="12652000" modulation="1" polarization="1" symbol_rate="3900000" system="0"/>
+- <transponder fec_inner="4" frequency="12660000" modulation="1" polarization="1" symbol_rate="9150000" system="0"/>
+- <transponder fec_inner="4" frequency="12672000" modulation="1" polarization="0" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="3" frequency="12673000" modulation="1" polarization="1" symbol_rate="3500000" system="0"/>
+- <transponder fec_inner="3" frequency="12680500" modulation="1" polarization="0" symbol_rate="8888000" system="0"/>
+- <transponder fec_inner="4" frequency="12688500" modulation="1" polarization="0" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="4" frequency="12692000" modulation="1" polarization="0" symbol_rate="2800000" system="0"/>
+- <transponder fec_inner="3" frequency="12695500" modulation="1" polarization="0" symbol_rate="2222000" system="0"/>
+- <transponder fec_inner="5" frequency="12699000" modulation="1" polarization="0" symbol_rate="2400000" system="0"/>
+- <transponder fec_inner="5" frequency="12702500" modulation="1" polarization="0" symbol_rate="2285000" system="0"/>
+- <transponder fec_inner="3" frequency="12706000" modulation="1" polarization="0" symbol_rate="2399000" system="0"/>
+- <transponder fec_inner="4" frequency="12717000" modulation="1" polarization="1" symbol_rate="5925000" system="0"/>
+- <transponder fec_inner="0" frequency="12727000" modulation="1" polarization="1" symbol_rate="2941000" system="0"/>
+- <transponder fec_inner="3" frequency="12731000" modulation="1" polarization="1" symbol_rate="3333000" system="0"/>
+- <transponder fec_inner="5" frequency="12743000" modulation="1" polarization="0" symbol_rate="2285000" system="0"/>
++ <sat name="Turksat 2A/3A (42.0E)" flags="0" position="420">
++ <transponder frequency="10954000" symbol_rate="2960000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="10965000" symbol_rate="12800000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="10970000" symbol_rate="30000000" polarization="1" fec_inner="3" inversion="2" modulation="2" system="1" pilot="2" rolloff="0"/>
++ <transponder frequency="10982000" symbol_rate="9600000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11012000" symbol_rate="30000000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11041000" symbol_rate="6400000" polarization="1" fec_inner="3" inversion="2" modulation="2" system="1" pilot="2" rolloff="0"/>
++ <transponder frequency="11049000" symbol_rate="2400000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11054000" symbol_rate="30000000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11064000" symbol_rate="13000000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11096000" symbol_rate="30000000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11096000" symbol_rate="30000000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11194000" symbol_rate="7200000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11572000" symbol_rate="3600000" polarization="0" fec_inner="0" inversion="2" modulation="2" system="1"/>
++ <transponder frequency="11628000" symbol_rate="6666000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11645000" symbol_rate="2222000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11717000" symbol_rate="2222000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11729000" symbol_rate="15555000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11741000" symbol_rate="3600000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11746000" symbol_rate="27500000" polarization="0" fec_inner="4" inversion="2" modulation="1" system="0"/>
++ <transponder frequency="11777000" symbol_rate="4800000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11792000" symbol_rate="16000000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11804000" symbol_rate="24444000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11830000" symbol_rate="7200000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11839000" symbol_rate="4444000" polarization="1" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11844000" symbol_rate="2222000" polarization="1" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11857000" symbol_rate="3150000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11862000" symbol_rate="27500000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11870000" symbol_rate="8888000" polarization="1" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11887000" symbol_rate="9200000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11896000" symbol_rate="11200000" polarization="0" fec_inner="2" inversion="2" modulation="2" system="1" pilot="2" rolloff="0"/>
++ <transponder frequency="11906000" symbol_rate="4800000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11919000" symbol_rate="24444000" polarization="1" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11938000" symbol_rate="27500000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11957000" symbol_rate="27500000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11964000" symbol_rate="5925000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11973000" symbol_rate="7200000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11981000" symbol_rate="5200000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11988000" symbol_rate="2222000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="11996000" symbol_rate="27500000" polarization="1" fec_inner="4" inversion="2" modulation="1" system="0"/>
++ <transponder frequency="12015000" symbol_rate="27500000" polarization="0" fec_inner="4" inversion="2" modulation="1" system="0"/>
++ <transponder frequency="12121000" symbol_rate="12500000" polarization="0" fec_inner="3" inversion="2" modulation="2" system="1" pilot="2" rolloff="0"/>
++ <transponder frequency="12130000" symbol_rate="27500000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12138000" symbol_rate="14580000" polarization="0" fec_inner="2" inversion="2" modulation="2" system="1" pilot="2" rolloff="0"/>
++ <transponder frequency="12525000" symbol_rate="30000000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12544000" symbol_rate="24000000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12562000" symbol_rate="25000000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12569000" symbol_rate="2800000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12577000" symbol_rate="2590000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12589000" symbol_rate="2260000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12592000" symbol_rate="8888000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12596000" symbol_rate="3700000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12601000" symbol_rate="4400000" polarization="0" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12602000" symbol_rate="2960000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12609000" symbol_rate="3700000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12615000" symbol_rate="4800000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12618000" symbol_rate="2800000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12630000" symbol_rate="3740000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12634000" symbol_rate="2222000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12640000" symbol_rate="2400000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12643000" symbol_rate="4800000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12650000" symbol_rate="4250000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12652000" symbol_rate="4444000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12654000" symbol_rate="4444000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12656000" symbol_rate="4444000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12679000" symbol_rate="8888000" polarization="1" fec_inner="3" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12685000" symbol_rate="30000000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12729000" symbol_rate="30000000" polarization="1" fec_inner="4" inversion="2" modulation="0" system="0"/>
++ <transponder frequency="12729000" symbol_rate="30000000" polarization="0" fec_inner="4" inversion="2" modulation="0" system="0"/>
+ </sat>
+ <sat flags="1" name="Europe*Star (45.0E)" position="450">
+ <transponder fec_inner="5" frequency="11500000" modulation="1" onid="65529" polarization="1" symbol_rate="4340000" system="0" tsid="1"/>
+@@ -1679,128 +1794,45 @@
+ <transponder fec_inner="3" frequency="3982000" modulation="1" polarization="L" symbol_rate="4285000" system="0"/>
+ <transponder fec_inner="4" frequency="4066000" modulation="1" polarization="L" symbol_rate="29763000" system="0"/>
+ </sat>
+- <sat flags="1" name="Astra/Sirius (5.0E)" position="50">
+- <transponder fec_inner="1" frequency="10920750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="10935500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="10964250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="10979000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="0" frequency="10987000" modulation="1" polarization="0" symbol_rate="6111000" system="0"/>
+- <transponder fec_inner="1" frequency="10993750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11008500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11023250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11038000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11052750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11067500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11082250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11097000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11111750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11126500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11141250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11156000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="0" frequency="11158000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="1" frequency="11170750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11185500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11214250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11229000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11243750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11258500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11273250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11288000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11302750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11317500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11332250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11347000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11361750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11376500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11391250" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11406000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11420750" modulation="1" polarization="0" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="1" frequency="11435500" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="3" frequency="11727480" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11747000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="10"/>
+- <transponder fec_inner="3" frequency="11766000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="12"/>
+- <transponder fec_inner="3" frequency="11785000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="11"/>
+- <transponder fec_inner="3" frequency="11804000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="8"/>
+- <transponder fec_inner="3" frequency="11823000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="9"/>
+- <transponder fec_inner="3" frequency="11843000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11862000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="21"/>
+- <transponder fec_inner="3" frequency="11881000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="7"/>
+- <transponder fec_inner="3" frequency="11900000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11919000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="24"/>
+- <transponder fec_inner="3" frequency="11938000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="22"/>
+- <transponder fec_inner="3" frequency="11958000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="14"/>
+- <transponder fec_inner="3" frequency="11977000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="4"/>
+- <transponder fec_inner="3" frequency="11996000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="6"/>
+- <transponder fec_inner="4" frequency="12015000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="28"/>
+- <transponder fec_inner="3" frequency="12034000" modulation="1" onid="86" polarization="0" symbol_rate="27500000" system="0" tsid="5"/>
+- <transponder fec_inner="3" frequency="12054000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="3"/>
+- <transponder fec_inner="3" frequency="12073000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="15"/>
+- <transponder fec_inner="3" frequency="12092000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="23"/>
+- <transponder fec_inner="4" frequency="12111000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12130000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12149000" modulation="1" onid="366" polarization="0" symbol_rate="27500000" system="0" tsid="200"/>
+- <transponder fec_inner="3" frequency="12169000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
+- <transponder fec_inner="5" frequency="12188000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12207000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
+- <transponder fec_inner="5" frequency="12226000" modulation="1" onid="94" polarization="0" symbol_rate="25540000" system="0" tsid="1"/>
+- <transponder fec_inner="5" frequency="12245000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12265000" modulation="1" onid="366" polarization="0" symbol_rate="27500000" system="0" tsid="256"/>
+- <transponder fec_inner="3" frequency="12284000" modulation="1" onid="85" polarization="1" symbol_rate="27500000" system="0" tsid="1"/>
+- <transponder fec_inner="5" frequency="12303000" modulation="1" polarization="0" symbol_rate="25547000" system="0"/>
+- <transponder fec_inner="3" frequency="12322000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12341000" modulation="1" onid="366" polarization="0" symbol_rate="27500000" system="0" tsid="101"/>
+- <transponder fec_inner="5" frequency="12360000" modulation="1" onid="1" polarization="1" symbol_rate="27500000" system="0" tsid="8800"/>
+- <transponder fec_inner="3" frequency="12380000" modulation="1" onid="85" polarization="0" symbol_rate="27500000" system="0" tsid="2"/>
+- <transponder fec_inner="2" frequency="12399000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
+- <transponder fec_inner="3" frequency="12418000" modulation="1" onid="1" polarization="0" symbol_rate="27500000" system="0" tsid="101"/>
+- <transponder fec_inner="2" frequency="12437000" modulation="2" onid="86" polarization="1" symbol_rate="27500000" system="1" tsid="27"/>
+- <transponder fec_inner="3" frequency="12456000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12476000" modulation="1" onid="86" polarization="1" symbol_rate="27500000" system="0" tsid="26"/>
+- <transponder fec_inner="3" frequency="12608000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="12614000" modulation="1" polarization="1" symbol_rate="14685000" system="0"/>
+- <transponder fec_inner="3" frequency="12633000" modulation="1" polarization="1" symbol_rate="3720000" system="0"/>
+- <transponder fec_inner="3" frequency="12637000" modulation="1" polarization="0" symbol_rate="14465000" system="0"/>
+- <transponder fec_inner="3" frequency="12644000" modulation="1" polarization="1" symbol_rate="3200000" system="0"/>
+- <transponder fec_inner="3" frequency="12649000" modulation="1" polarization="1" symbol_rate="3977000" system="0"/>
+- <transponder fec_inner="1" frequency="12668000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="3" frequency="12672000" modulation="1" polarization="0" symbol_rate="3300000" system="0"/>
+- <transponder fec_inner="4" frequency="12678000" modulation="1" polarization="1" symbol_rate="13333000" system="0"/>
+- <transponder fec_inner="3" frequency="12680000" modulation="1" onid="95" polarization="0" symbol_rate="9404000" system="0" tsid="1"/>
+- <transponder fec_inner="3" frequency="12690000" modulation="1" polarization="0" symbol_rate="3330000" system="0"/>
+- <transponder fec_inner="3" frequency="12690000" modulation="1" polarization="1" symbol_rate="2650000" system="0"/>
+- <transponder fec_inner="3" frequency="12697000" modulation="1" polarization="1" symbol_rate="6150000" system="1"/>
+- <transponder fec_inner="3" frequency="12701000" modulation="1" polarization="0" symbol_rate="6111000" system="0"/>
+- <transponder fec_inner="0" frequency="12701000" modulation="1" polarization="1" symbol_rate="6150000" system="0"/>
+- <transponder fec_inner="3" frequency="12715000" modulation="1" polarization="0" symbol_rate="3330000" system="0"/>
+- <transponder fec_inner="3" frequency="12724000" modulation="1" polarization="0" symbol_rate="1772000" system="0"/>
+- <transponder fec_inner="3" frequency="12736000" modulation="1" polarization="0" symbol_rate="3038000" system="0"/>
+- </sat>
+- <sat flags="1" name="Express AM22 (53.0E)" position="530">
+- <transponder fec_inner="3" frequency="10974000" modulation="1" onid="1326" polarization="0" symbol_rate="8150000" system="0" tsid="801"/>
+- <transponder fec_inner="5" frequency="10974000" modulation="1" polarization="1" symbol_rate="32223000" system="0"/>
+- <transponder fec_inner="3" frequency="11031000" modulation="1" polarization="0" symbol_rate="3750000" system="0"/>
+- <transponder fec_inner="3" frequency="11044000" modulation="1" onid="4369" polarization="1" symbol_rate="44950000" system="0" tsid="4"/>
+- <transponder fec_inner="3" frequency="11081500" modulation="1" polarization="0" symbol_rate="1466000" system="0"/>
+- <transponder fec_inner="3" frequency="11083000" modulation="1" polarization="1" symbol_rate="3000000" system="0"/>
+- <transponder fec_inner="3" frequency="11096000" modulation="1" polarization="1" symbol_rate="6400000" system="0"/>
+- <transponder fec_inner="3" frequency="11097000" modulation="1" polarization="0" symbol_rate="3979000" system="0"/>
+- <transponder fec_inner="3" frequency="11160000" modulation="1" polarization="1" symbol_rate="5786000" system="0"/>
+- <transponder fec_inner="3" frequency="11184000" modulation="1" polarization="1" symbol_rate="11111000" system="0"/>
+- <transponder fec_inner="3" frequency="11481000" modulation="1" polarization="0" symbol_rate="41250000" system="0"/>
+- <transponder fec_inner="3" frequency="11616500" modulation="1" polarization="1" symbol_rate="2894000" system="0"/>
+- <transponder fec_inner="3" frequency="11630000" modulation="1" polarization="1" symbol_rate="2894000" system="0"/>
+- <transponder fec_inner="3" frequency="12633000" modulation="1" polarization="0" symbol_rate="2170000" system="0"/>
+- <transponder fec_inner="3" frequency="12637000" modulation="1" polarization="0" symbol_rate="2532000" system="0"/>
+- <transponder fec_inner="3" frequency="12639000" modulation="1" polarization="1" symbol_rate="2893000" system="0"/>
+- <transponder fec_inner="3" frequency="12642000" modulation="1" polarization="1" symbol_rate="2170000" system="0"/>
+- <transponder fec_inner="3" frequency="12645000" modulation="1" polarization="0" symbol_rate="2532000" system="0"/>
+- <transponder fec_inner="3" frequency="12648000" modulation="1" polarization="0" symbol_rate="2532000" system="0"/>
+- <transponder fec_inner="3" frequency="12652000" modulation="1" polarization="0" symbol_rate="2532000" system="0"/>
+- <transponder fec_inner="1" frequency="12656000" modulation="1" polarization="0" symbol_rate="3125000" system="0"/>
+- <transponder fec_inner="1" frequency="12661000" modulation="1" polarization="0" symbol_rate="3125000" system="0"/>
+- <transponder fec_inner="3" frequency="12664000" modulation="1" onid="3030" polarization="1" symbol_rate="30000000" system="0" tsid="60"/>
+- <transponder fec_inner="5" frequency="12724000" modulation="1" polarization="0" symbol_rate="2480000" system="0"/>
+- <transponder fec_inner="3" frequency="12741000" modulation="1" polarization="0" symbol_rate="7086000" system="0"/>
++ <sat name="Express AM22 (53.0E)" flags="0" position="530">
++ <transponder frequency="10962000" symbol_rate="12000000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="10974000" symbol_rate="8150000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="10975000" symbol_rate="1800000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="10978000" symbol_rate="1800000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="10995000" symbol_rate="3255000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11044000" symbol_rate="44950000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11096000" symbol_rate="6164000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="11098000" symbol_rate="3978000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11124000" symbol_rate="8776000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="11161000" symbol_rate="5785000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11477000" symbol_rate="2222000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11496000" symbol_rate="5000000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11528000" symbol_rate="2530000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11534000" symbol_rate="2893000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11543000" symbol_rate="2893000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11548000" symbol_rate="2893000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11612000" symbol_rate="3125000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="11616000" symbol_rate="2894000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11626000" symbol_rate="3125000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="11630000" symbol_rate="2893000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11647000" symbol_rate="2893000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11690000" symbol_rate="3125000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12631000" symbol_rate="2532000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12632000" symbol_rate="2170000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12635000" symbol_rate="2893000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12637000" symbol_rate="2532000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12639000" symbol_rate="2894000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12643000" symbol_rate="2170000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12644000" symbol_rate="2532000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12648000" symbol_rate="2894000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12652000" symbol_rate="2532000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12656000" symbol_rate="3125000" polarization="0" fec_inner="1" system="0" modulation="0"/>
++ <transponder frequency="12661000" symbol_rate="3125000" polarization="0" fec_inner="1" system="0" modulation="0"/>
++ <transponder frequency="12664000" symbol_rate="27500000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12716000" symbol_rate="27500000" polarization="1" fec_inner="2" system="0" modulation="0"/>
++ <transponder frequency="12721000" symbol_rate="1865000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12727000" symbol_rate="2592000" polarization="0" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12740000" symbol_rate="2172000" polarization="0" fec_inner="3" system="0" modulation="0"/>
+ </sat>
+ <sat flags="1" name="Intelsat 702 (55.0E)" position="550">
+ <transponder fec_inner="4" frequency="11126000" modulation="1" polarization="1" symbol_rate="3125000" system="0"/>
+@@ -1899,74 +1931,6 @@
+ <transponder fec_inner="3" frequency="4185000" modulation="1" polarization="0" symbol_rate="20000000" system="0"/>
+ <transponder fec_inner="2" frequency="4190000" modulation="1" polarization="1" symbol_rate="12207000" system="0"/>
+ </sat>
+- <sat flags="1" name="Eutelsat W3 (7.0E)" position="70">
+- <transponder fec_inner="3" frequency="10762000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="10880000" modulation="2" polarization="1" symbol_rate="17360000" system="1"/>
+- <transponder fec_inner="3" frequency="10899000" modulation="1" polarization="1" symbol_rate="9404000" system="0"/>
+- <transponder fec_inner="2" frequency="10928000" modulation="2" polarization="0" symbol_rate="30000000" system="1"/>
+- <transponder fec_inner="3" frequency="10928000" modulation="1" onid="126" polarization="1" symbol_rate="27500000" system="0" tsid="2578"/>
+- <transponder fec_inner="0" frequency="10960000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10960000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10968000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10968000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10977000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10978000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10982000" modulation="1" polarization="1" symbol_rate="13333000" system="0"/>
+- <transponder fec_inner="0" frequency="10986000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10986000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="10994000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
+- <transponder fec_inner="0" frequency="10996000" modulation="1" onid="235" polarization="0" symbol_rate="6666000" system="0" tsid="17185"/>
+- <transponder fec_inner="0" frequency="11000000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
+- <transponder fec_inner="0" frequency="11004000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11014000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11014000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11023000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11043000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11052000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11052000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11061000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11061000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11066000" modulation="1" polarization="0" symbol_rate="13333000" system="0"/>
+- <transponder fec_inner="0" frequency="11070000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11071000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11078000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
+- <transponder fec_inner="0" frequency="11079000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11084000" modulation="1" polarization="0" symbol_rate="13333000" system="0"/>
+- <transponder fec_inner="0" frequency="11084000" modulation="1" polarization="1" symbol_rate="4434000" system="0"/>
+- <transponder fec_inner="0" frequency="11088000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11097000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11102000" modulation="1" polarization="0" symbol_rate="13333000" system="0"/>
+- <transponder fec_inner="0" frequency="11106000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11106000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="5" frequency="11125000" modulation="1" polarization="1" symbol_rate="2677000" system="0"/>
+- <transponder fec_inner="0" frequency="11126000" modulation="1" polarization="0" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="3" frequency="11126000" modulation="1" polarization="1" symbol_rate="5697000" system="0"/>
+- <transponder fec_inner="0" frequency="11142000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="0" frequency="11152000" modulation="1" polarization="1" symbol_rate="6666000" system="0"/>
+- <transponder fec_inner="3" frequency="11175000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="2" frequency="11262000" modulation="1" onid="126" polarization="0" symbol_rate="27500000" system="0" tsid="50500"/>
+- <transponder fec_inner="3" frequency="11283000" modulation="1" onid="126" polarization="1" symbol_rate="27500000" system="0" tsid="40400"/>
+- <transponder fec_inner="3" frequency="11298000" modulation="1" polarization="0" symbol_rate="13500000" system="0"/>
+- <transponder fec_inner="2" frequency="11324000" modulation="1" onid="16" polarization="1" symbol_rate="27500000" system="0" tsid="1"/>
+- <transponder fec_inner="2" frequency="11346000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11361000" modulation="1" polarization="1" symbol_rate="18086000" system="0"/>
+- <transponder fec_inner="4" frequency="11386000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11405000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="0" frequency="11429000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="2" frequency="11451000" modulation="1" polarization="1" symbol_rate="25066000" system="0"/>
+- <transponder fec_inner="3" frequency="11471000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11492000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11513000" modulation="1" onid="126" polarization="0" symbol_rate="27500000" system="0" tsid="50900"/>
+- <transponder fec_inner="3" frequency="11534000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11554000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11575000" modulation="1" onid="126" polarization="1" symbol_rate="30000000" system="0" tsid="50600"/>
+- <transponder fec_inner="3" frequency="11596000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11617000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11637000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11658000" modulation="1" polarization="1" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="3" frequency="11678000" modulation="1" polarization="0" symbol_rate="30000000" system="0"/>
+- <transponder fec_inner="4" frequency="12520000" modulation="1" polarization="1" symbol_rate="6111000" system="0"/>
+- </sat>
+ <sat flags="1" name="Eutelsat W5 (70.5E)" position="705">
+ <transponder fec_inner="2" frequency="11214000" modulation="1" polarization="0" symbol_rate="13020000" system="0"/>
+ <transponder fec_inner="5" frequency="11377000" modulation="1" polarization="1" symbol_rate="7440000" system="0"/>
+@@ -1984,41 +1948,45 @@
+ <transponder fec_inner="3" frequency="12677000" modulation="1" polarization="1" symbol_rate="1447000" system="0"/>
+ <transponder fec_inner="1" frequency="12702000" modulation="1" polarization="0" symbol_rate="26656000" system="0"/>
+ </sat>
+- <sat flags="1" name="LMI 1 (75.0E)" position="750">
+- <transponder fec_inner="5" frequency="12518000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="3" frequency="12549000" modulation="1" polarization="1" symbol_rate="12300000" system="0"/>
+- <transponder fec_inner="5" frequency="12579000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="5" frequency="12610000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="3" frequency="12640000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="5" frequency="12670000" modulation="1" polarization="1" symbol_rate="22000000" system="0"/>
+- <transponder fec_inner="3" frequency="12693000" modulation="1" polarization="1" symbol_rate="10000000" system="0"/>
+- <transponder fec_inner="5" frequency="12701000" modulation="1" polarization="1" symbol_rate="8290000" system="0"/>
+- <transponder fec_inner="3" frequency="12722000" modulation="1" polarization="1" symbol_rate="3215000" system="0"/>
+- <transponder fec_inner="3" frequency="12729000" modulation="1" polarization="1" symbol_rate="2963000" system="0"/>
+- <transponder fec_inner="3" frequency="12732000" modulation="1" polarization="1" symbol_rate="4400000" system="0"/>
+- <transponder fec_inner="3" frequency="12742000" modulation="1" polarization="1" symbol_rate="4400000" system="0"/>
++ <sat name="ABS 1/1A/Eutelsat W75 (75.0E)" flags="0" position="750">
++ <transponder frequency="3449000" symbol_rate="2960000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="3451000" symbol_rate="1001000" polarization="1" fec_inner="3" system="1" modulation="2"/>
++ <transponder frequency="3455000" symbol_rate="3100000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="3559000" symbol_rate="28800000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="3659000" symbol_rate="27500000" polarization="0" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="3679000" symbol_rate="30000000" polarization="1" fec_inner="4" system="1" modulation="2"/>
++ <transponder frequency="12505000" symbol_rate="2500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12518000" symbol_rate="22000000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12548000" symbol_rate="22000000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12559000" symbol_rate="1851000" polarization="0" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12579000" symbol_rate="22000000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12579000" symbol_rate="22000000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12601000" symbol_rate="5170000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12610000" symbol_rate="22000000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12612000" symbol_rate="5000000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12640000" symbol_rate="22000000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12670000" symbol_rate="22000000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12694000" symbol_rate="10750000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12704000" symbol_rate="3900000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12708000" symbol_rate="3900000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12732000" symbol_rate="22000000" polarization="1" fec_inner="5" system="0" modulation="0"/>
+ </sat>
+- <sat flags="1" name="Eurobird 9 (9.0E)" position="90">
+- <transponder fec_inner="4" frequency="11727000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11747000" modulation="1" onid="157" polarization="0" symbol_rate="27500000" system="0" tsid="1"/>
+- <transponder fec_inner="4" frequency="11766000" modulation="1" onid="110" polarization="1" symbol_rate="27500000" system="0" tsid="33"/>
+- <transponder fec_inner="3" frequency="11785000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11804000" modulation="1" onid="158" polarization="1" symbol_rate="27500000" system="0" tsid="158"/>
+- <transponder fec_inner="3" frequency="11823000" modulation="1" onid="1325" polarization="0" symbol_rate="27500000" system="0" tsid="1"/>
+- <transponder fec_inner="3" frequency="11843000" modulation="1" onid="158" polarization="1" symbol_rate="27500000" system="0" tsid="5600"/>
+- <transponder fec_inner="3" frequency="11862000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11881000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="4" frequency="11900000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="4" frequency="11919000" modulation="1" onid="100" polarization="1" symbol_rate="27500000" system="0" tsid="6000"/>
+- <transponder fec_inner="3" frequency="11938000" modulation="1" onid="158" polarization="0" symbol_rate="27500000" system="0" tsid="6100"/>
+- <transponder fec_inner="3" frequency="11958000" modulation="1" polarization="1" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="3" frequency="11977000" modulation="1" onid="158" polarization="0" symbol_rate="27500000" system="0" tsid="6300"/>
+- <transponder fec_inner="3" frequency="11994000" modulation="2" polarization="1" symbol_rate="19909000" system="0"/>
+- <transponder fec_inner="3" frequency="12015000" modulation="1" polarization="0" symbol_rate="27500000" system="0"/>
+- <transponder fec_inner="2" frequency="12034000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
+- <transponder fec_inner="3" frequency="12054000" modulation="1" onid="156" polarization="0" symbol_rate="27500000" system="0" tsid="6700"/>
+- <transponder fec_inner="2" frequency="12073000" modulation="2" polarization="1" symbol_rate="27500000" system="1"/>
+- <transponder fec_inner="3" frequency="12092000" modulation="1" onid="156" polarization="0" symbol_rate="27500000" system="0" tsid="6900"/>
++ <sat name="Express AM2/MD1 (80.0E)" flags="0" position="800">
++ <transponder frequency="3625000" symbol_rate="33483000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="3675000" symbol_rate="33483000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="3875000" symbol_rate="32000000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11044000" symbol_rate="44948000" polarization="0" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="11101000" symbol_rate="3227000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="11606000" symbol_rate="44948000" polarization="1" fec_inner="4" system="0" modulation="0"/>
+ </sat>
++ <sat name="Intelsat 15 (85.2E)" flags="0" position="852">
++ <transponder frequency="11594000" symbol_rate="2500000" polarization="0" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12504000" symbol_rate="4217000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12510000" symbol_rate="3700000" polarization="1" fec_inner="5" system="0" modulation="0"/>
++ <transponder frequency="12533000" symbol_rate="6667000" polarization="1" fec_inner="3" system="0" modulation="0"/>
++ <transponder frequency="12565000" symbol_rate="6564000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ <transponder frequency="12600000" symbol_rate="30000000" polarization="1" fec_inner="2" system="1" modulation="2"/>
++ <transponder frequency="12640000" symbol_rate="30000000" polarization="1" fec_inner="4" system="0" modulation="0"/>
++ </sat>
+ </satellites>
+
diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb
deleted file mode 100644
index 6b24cc0..0000000
--- a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Tuxbox common files"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRCREV = "77ff3efbac5eb01c2fc914ba8fb99374d0970ff5"
-PR = "r1"
-
-inherit opendreambox-git
-
-do_install() {
- install -d ${D}${sysconfdir}
- install -d ${D}${sysconfdir}/tuxbox
- install -m 0644 timezone.xml ${D}${sysconfdir}
- install -m 0644 satellites.xml ${D}${sysconfdir}/tuxbox
- install -m 0644 terrestrial.xml ${D}${sysconfdir}/tuxbox
-}
-
-FILES_${PN} = "${sysconfdir}"
-
-OPENDREAMBOX_PROJECT = "obi/enigma2-xml-data"