mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' into openelec-next
This commit is contained in:
Stephan Raue
commit
7e2433c2e6
@ -154,5 +154,5 @@ strip_linker_plugin() {
|
||||
|
||||
strip_kmod() {
|
||||
[ -z $1 ] && echo "usage strip_kmod <dir>" && exit 1
|
||||
find $1 -type f -name '*.ko' | xargs -r $STRIP -R .comment -R .note -g --strip-unneeded
|
||||
find $1 -type f -name '*.ko' | xargs -r $STRIP --strip-debug
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ HOST_NAME=`$SCRIPTS/configtools/config.guess`
|
||||
TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
|
||||
|
||||
OPENELEC_SRC=http://sources.openelec.tv/src/$OPENELEC_VERSION
|
||||
BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
|
||||
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
|
||||
TARGET_IMG=$ROOT/$TARGET
|
||||
TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
|
||||
ADDON_BUILD="$BUILD/$ADDONS/$1"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="libogg"
|
||||
PKG_VERSION="1.2.1"
|
||||
PKG_VERSION="1.2.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
||||
@ -5,14 +5,6 @@
|
||||
# sqlite fails to compile with fast-math link time optimization.
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||"`
|
||||
|
||||
export config_BUILD_CC="$HOST_CC"
|
||||
export config_BUILD_CFLAGS="$HOST_CFLAGS"
|
||||
export config_BUILD_LIBS="$HOST_LDFLAGS"
|
||||
export config_TARGET_CC="$CC"
|
||||
export config_TARGET_LINK="$LD"
|
||||
export config_TARGET_CFLAGS="$CFLAGS"
|
||||
export config_TARGET_LFLAGS="$LDFLAGS -ldl"
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
@ -22,9 +14,12 @@ cd $PKG_BUILD
|
||||
--enable-shared \
|
||||
--disable-readline \
|
||||
--enable-threadsafe \
|
||||
--enable-dynamic-extensions \
|
||||
--with-gnu-ld
|
||||
|
||||
|
||||
make
|
||||
|
||||
$STRIP .libs/sqlite3
|
||||
|
||||
$MAKEINSTALL
|
||||
$MAKEINSTALL
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
PKG_NAME="sqlite"
|
||||
PKG_VERSION="3.7.3"
|
||||
PKG_VERSION="autoconf-3070400"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="PublicDomain"
|
||||
PKG_SITE="http://www.sqlite.org/"
|
||||
PKG_URL="http://www.hwaci.com/sw/sqlite/$PKG_NAME-amalgamation-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="http://www.hwaci.com/sw/sqlite/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -6,8 +6,5 @@ cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--disable-documentation \
|
||||
|
||||
make
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="w_scan"
|
||||
PKG_VERSION="20101001"
|
||||
PKG_VERSION="20101204"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -16,6 +16,6 @@ PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
if [ $MESA_MASTER = "yes" ]; then
|
||||
PKG_VERSION="20101122"
|
||||
PKG_VERSION="20101205"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
fi
|
||||
|
||||
@ -2,14 +2,6 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# cairo fails to build with graphite support
|
||||
# see also http://bugs.gentoo.org/336157
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
|
||||
@ -16,6 +16,6 @@ PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
if [ $LIBDRM_MASTER = "yes" ]; then
|
||||
PKG_VERSION="20101122"
|
||||
PKG_VERSION="20101205"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
fi
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="libpng"
|
||||
PKG_VERSION="1.4.4"
|
||||
PKG_VERSION="1.4.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff -Naur libpng-1.4.4-old/configure.ac libpng-1.4.4-new/configure.ac
|
||||
--- libpng-1.4.4-old/configure.ac 2010-09-23 05:18:36.000000000 -0700
|
||||
+++ libpng-1.4.4-new/configure.ac 2010-09-23 12:20:45.000000000 -0700
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
dnl Version number stuff here:
|
||||
|
||||
-PNGLIB_VERSION=1.4.4
|
||||
-PNGLIB_MAJOR=1
|
||||
-PNGLIB_MINOR=4
|
||||
-PNGLIB_RELEASE=4
|
||||
-
|
||||
AC_INIT([libpng], [1.4.4], [png-mng-implement@lists.sourceforge.net])
|
||||
AM_INIT_AUTOMAKE
|
||||
dnl stop configure from automagically running automake
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
+PNGLIB_VERSION=1.4.4
|
||||
+PNGLIB_MAJOR=1
|
||||
+PNGLIB_MINOR=4
|
||||
+PNGLIB_RELEASE=4
|
||||
+
|
||||
dnl End of version number stuff
|
||||
|
||||
AC_CONFIG_SRCDIR([pngget.c])
|
||||
@ -35,6 +35,8 @@ setup_toolchain target
|
||||
# this fixes problems with expat (maybe)
|
||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
|
||||
|
||||
strip_lto
|
||||
|
||||
ac_cv_file_dev_ptc=no \
|
||||
ac_cv_file_dev_ptmx=yes \
|
||||
ac_cv_func_lchflags_works=no \
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
diff -Naur bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_linux.c bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_linux.c
|
||||
--- bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_linux.c 2010-10-22 04:18:57.000000000 +0200
|
||||
+++ bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_linux.c 2010-12-02 05:17:28.037326623 +0100
|
||||
@@ -187,7 +187,7 @@
|
||||
static int nompc = 0;
|
||||
module_param(nompc, int, 0);
|
||||
|
||||
-static char name[IFNAMSIZ] = "eth%d";
|
||||
+static char name[IFNAMSIZ] = "wlan%d";
|
||||
module_param_string(name, name, IFNAMSIZ, 0);
|
||||
|
||||
#ifndef SRCBASE
|
||||
diff -Naur bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_linux.c bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_linux.c
|
||||
--- bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_linux.c 2010-10-22 04:23:55.000000000 +0200
|
||||
+++ bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_linux.c 2010-12-02 05:17:42.554495917 +0100
|
||||
@@ -187,7 +187,7 @@
|
||||
static int nompc = 0;
|
||||
module_param(nompc, int, 0);
|
||||
|
||||
-static char name[IFNAMSIZ] = "eth%d";
|
||||
+static char name[IFNAMSIZ] = "wlan%d";
|
||||
module_param_string(name, name, IFNAMSIZ, 0);
|
||||
|
||||
#ifndef SRCBASE
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur orig/HAL/rtl8192/rtl_dm.c rtl8192se-0018.1025.2010/HAL/rtl8192/rtl_dm.c
|
||||
--- orig/HAL/rtl8192/rtl_dm.c 2010-10-13 07:24:00.000000000 +0200
|
||||
+++ rtl8192se-0018.1025.2010/HAL/rtl8192/rtl_dm.c 2010-12-04 23:19:57.529063406 +0100
|
||||
@@ -3826,7 +3826,7 @@
|
||||
if(priv->pwrdown)
|
||||
{
|
||||
u1Tmp = read_nic_byte(dev, 0x06);
|
||||
- printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp);
|
||||
+ //printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp);
|
||||
retval = (u1Tmp & BIT6) ? eRfOn: eRfOff;
|
||||
|
||||
if(u1Tmp == 0xff)
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -4,7 +4,8 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="http://www.intellinuxwireless.org"
|
||||
PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
2992
packages/linux/linux-2.6.36.2-051_add_ite-cir_driver-0.2.patch
Normal file
2992
packages/linux/linux-2.6.36.2-051_add_ite-cir_driver-0.2.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="2.6.36.1"
|
||||
PKG_VERSION="2.6.36.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
PKG_NAME="xbmc-dharma-theme-Confluence"
|
||||
PKG_VERSION="35492"
|
||||
PKG_VERSION="35615"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -64,6 +64,8 @@ fi
|
||||
|
||||
# xbmc (ffmpeg) fails to build with LTO optimization
|
||||
strip_lto
|
||||
strip_gold
|
||||
strip_linker_plugin
|
||||
|
||||
# dont use some optimizations because of problems
|
||||
# this fixes problems with faac implementation of ffmpeg
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="xbmc-dharma"
|
||||
PKG_VERSION="35492"
|
||||
PKG_VERSION="35615"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 647 KiB After Width: | Height: | Size: 130 KiB |
BIN
packages/mediacenter/xbmc-dharma/splash/splash4.png
Normal file
BIN
packages/mediacenter/xbmc-dharma/splash/splash4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 647 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 647 KiB After Width: | Height: | Size: 130 KiB |
BIN
packages/mediacenter/xbmc/splash/splash4.png
Normal file
BIN
packages/mediacenter/xbmc/splash/splash4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 647 KiB |
@ -1,5 +1,5 @@
|
||||
PKG_NAME="bluez"
|
||||
PKG_VERSION="4.80"
|
||||
PKG_VERSION="4.81"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
PKG_NAME="connman"
|
||||
PKG_VERSION="20101116"
|
||||
PKG_VERSION="0.64"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.connman.net"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp siglaunchd"
|
||||
PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -24,6 +24,14 @@ import dbus.mainloop.glib
|
||||
import gobject
|
||||
import time
|
||||
|
||||
WPAS_DBUS_SERVICE = "fi.w1.wpa_supplicant1"
|
||||
WPAS_DBUS_INTERFACE = "fi.w1.wpa_supplicant1"
|
||||
WPAS_DBUS_PATH = "/fi/w1/wpa_supplicant1"
|
||||
|
||||
WPAS_DBUS_INTERFACES_INTERFACE = "fi.w1.wpa_supplicant1.Interface"
|
||||
WPAS_DBUS_INTERFACES_OPATH = "/fi/w1/wpa_supplicant1/Interfaces"
|
||||
WPAS_DBUS_BSS_INTERFACE = "fi.w1.wpa_supplicant1.BSS"
|
||||
|
||||
stamp = False
|
||||
|
||||
class ArgumentException(Exception):
|
||||
@ -43,8 +51,8 @@ def get_manager(bus=None):
|
||||
if bus == None:
|
||||
bus = get_bus()
|
||||
|
||||
return dbus.Interface(bus.get_object("org.moblin.connman", "/"),
|
||||
"org.moblin.connman.Manager")
|
||||
return dbus.Interface(bus.get_object("net.connman", "/"),
|
||||
"net.connman.Manager")
|
||||
|
||||
def usage(name):
|
||||
print "Usage: %s <command>" % (name)
|
||||
@ -66,6 +74,9 @@ def usage(name):
|
||||
print " modem list"
|
||||
print " modem pin <number>"
|
||||
print " modem puk <number>"
|
||||
print " wpas list"
|
||||
print " wpas networks"
|
||||
print " wpas bss"
|
||||
print ""
|
||||
print "Properties:"
|
||||
print " apn <name>"
|
||||
@ -78,13 +89,22 @@ def usage(name):
|
||||
return
|
||||
|
||||
def is_connected(state):
|
||||
connected = [ "ready", "online"]
|
||||
connected = [ "ready", "offline", "online"]
|
||||
|
||||
if state in connected:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def is_associating(state):
|
||||
return state == "association"
|
||||
|
||||
def is_configuration(state):
|
||||
return state == "configuration"
|
||||
|
||||
def is_failed(state):
|
||||
return state == "failure"
|
||||
|
||||
def find_service(name):
|
||||
bus = get_bus()
|
||||
manager = get_manager(bus)
|
||||
@ -93,9 +113,9 @@ def find_service(name):
|
||||
path = "/profile/default/" + name
|
||||
|
||||
if path in manager_properties["Services"]:
|
||||
service = dbus.Interface(bus.get_object("org.moblin.connman",
|
||||
service = dbus.Interface(bus.get_object("net.connman",
|
||||
path),
|
||||
"org.moblin.connman.Service")
|
||||
"net.connman.Service")
|
||||
return service
|
||||
|
||||
# service not found with the path, let's try find it with name
|
||||
@ -103,9 +123,9 @@ def find_service(name):
|
||||
found = []
|
||||
|
||||
for path in manager_properties["Services"]:
|
||||
service = dbus.Interface(bus.get_object("org.moblin.connman",
|
||||
service = dbus.Interface(bus.get_object("net.connman",
|
||||
path),
|
||||
"org.moblin.connman.Service")
|
||||
"net.connman.Service")
|
||||
|
||||
properties = service.GetProperties()
|
||||
|
||||
@ -125,9 +145,9 @@ def get_service_name(path):
|
||||
bus = get_bus()
|
||||
|
||||
try:
|
||||
service = dbus.Interface(bus.get_object("org.moblin.connman",
|
||||
service = dbus.Interface(bus.get_object("net.connman",
|
||||
path),
|
||||
"org.moblin.connman.Service")
|
||||
"net.connman.Service")
|
||||
properties = service.GetProperties()
|
||||
name = properties["Name"]
|
||||
if len(name) == 0:
|
||||
@ -141,6 +161,8 @@ def get_service_name(path):
|
||||
def extract_dict(values):
|
||||
s = ""
|
||||
for k, v in values.items():
|
||||
if type(v) is dbus.Array:
|
||||
v = extract_list(v)
|
||||
s += " %s=%s" % (k,v)
|
||||
return "{ %s }" % s
|
||||
|
||||
@ -174,15 +196,15 @@ def get_devices():
|
||||
|
||||
properties = manager.GetProperties()
|
||||
for path in properties["Technologies"]:
|
||||
technology = dbus.Interface(bus.get_object("org.moblin.connman",
|
||||
technology = dbus.Interface(bus.get_object("net.connman",
|
||||
path),
|
||||
"org.moblin.connman.Technology")
|
||||
"net.connman.Technology")
|
||||
properties = technology.GetProperties()
|
||||
|
||||
for path in properties["Devices"]:
|
||||
d = dbus.Interface(bus.get_object("org.moblin.connman",
|
||||
d = dbus.Interface(bus.get_object("net.connman",
|
||||
path),
|
||||
"org.moblin.connman.Device")
|
||||
"net.connman.Device")
|
||||
result.append(d)
|
||||
|
||||
return result
|
||||
@ -215,16 +237,23 @@ def cmd_services():
|
||||
manager_properties = manager.GetProperties()
|
||||
|
||||
for path in manager_properties["Services"]:
|
||||
service = dbus.Interface(bus.get_object("org.moblin.connman",
|
||||
service = dbus.Interface(bus.get_object("net.connman",
|
||||
path),
|
||||
"org.moblin.connman.Service")
|
||||
"net.connman.Service")
|
||||
|
||||
properties = service.GetProperties()
|
||||
|
||||
identifier = path[path.rfind("/") + 1:]
|
||||
state = properties["State"]
|
||||
|
||||
if is_connected(properties["State"]):
|
||||
if is_connected(state):
|
||||
connected = "*"
|
||||
elif is_configuration(state):
|
||||
connected = "+"
|
||||
elif is_associating(state):
|
||||
connected = "-"
|
||||
elif is_failed(state):
|
||||
connected = "f"
|
||||
else:
|
||||
connected = " "
|
||||
|
||||
@ -459,6 +488,7 @@ def cmd_show(argv):
|
||||
|
||||
order = [ "Name", "Type", "State", "Strength", "Mode", "Security",
|
||||
"IPv4", "IPv4.Configuration",
|
||||
"IPv6", "IPv6.Configuration",
|
||||
"Ethernet",
|
||||
"Nameservers", "Nameservers.Configuration",
|
||||
"Domains", "Domains.Configuration",
|
||||
@ -469,16 +499,18 @@ def cmd_show(argv):
|
||||
|
||||
keys = properties.keys()
|
||||
|
||||
print "[ %s ]" % service.object_path
|
||||
|
||||
for key in order:
|
||||
if key in keys:
|
||||
keys.remove(key)
|
||||
val = convert_dbus_value(properties[key])
|
||||
print "%s: %s" % (key, val)
|
||||
print " %s = %s" % (key, val)
|
||||
|
||||
# print properties missing in the order
|
||||
for key in keys:
|
||||
val = convert_dbus_value(properties[key])
|
||||
print "%s: %s" % (key, val)
|
||||
print " %s = %s" % (key, val)
|
||||
|
||||
def connman_property_changed(name, value, path, interface):
|
||||
global stamp
|
||||
@ -488,11 +520,11 @@ def connman_property_changed(name, value, path, interface):
|
||||
else:
|
||||
timestamp = ""
|
||||
|
||||
if interface == "org.moblin.connman.Service":
|
||||
if interface == "net.connman.Service":
|
||||
val = convert_dbus_value(value)
|
||||
print "%s[%s] %s: %s" % (timestamp, get_service_name(path),
|
||||
name, val)
|
||||
elif interface == "org.moblin.connman.Manager":
|
||||
elif interface == "net.connman.Manager":
|
||||
val = convert_dbus_value(value)
|
||||
print "%s%s: %s" % (timestamp, name, val)
|
||||
|
||||
@ -504,7 +536,7 @@ def cmd_event(argv):
|
||||
|
||||
bus = get_bus(async=True)
|
||||
bus.add_signal_receiver(connman_property_changed,
|
||||
bus_name="org.moblin.connman",
|
||||
bus_name="net.connman",
|
||||
signal_name = "PropertyChanged",
|
||||
path_keyword="path",
|
||||
interface_keyword="interface")
|
||||
@ -525,22 +557,16 @@ def print_sms_manager(path):
|
||||
value = convert_dbus_value(properties[key])
|
||||
print " %s = %s" % (key, value)
|
||||
|
||||
def print_context(path):
|
||||
bus = get_bus()
|
||||
interface = "org.ofono.PrimaryDataContext"
|
||||
manager = dbus.Interface(bus.get_object("org.ofono", path),
|
||||
interface)
|
||||
|
||||
def print_context(path, properties):
|
||||
print " [ %s ]" % path
|
||||
|
||||
properties = manager.GetProperties()
|
||||
for key in properties.keys():
|
||||
value = convert_dbus_value(properties[key])
|
||||
print " %s = %s" % (key, value)
|
||||
|
||||
def print_data_manager(path):
|
||||
bus = get_bus()
|
||||
interface = "org.ofono.DataConnectionManager"
|
||||
interface = "org.ofono.ConnectionManager"
|
||||
manager = dbus.Interface(bus.get_object("org.ofono", path),
|
||||
interface)
|
||||
|
||||
@ -551,11 +577,10 @@ def print_data_manager(path):
|
||||
value = convert_dbus_value(properties[key])
|
||||
print " %s = %s" % (key, value)
|
||||
|
||||
if "PrimaryContexts" not in properties:
|
||||
return
|
||||
contexts = manager.GetContexts()
|
||||
|
||||
for context in properties["PrimaryContexts"]:
|
||||
print_context(context)
|
||||
for path, properties in contexts:
|
||||
print_context(path, properties)
|
||||
|
||||
def print_cell_broadcast(path):
|
||||
bus = get_bus()
|
||||
@ -609,14 +634,9 @@ def print_sim_manager(path):
|
||||
value = convert_dbus_value(properties[key])
|
||||
print " %s = %s" % (key, value)
|
||||
|
||||
def print_modem(path):
|
||||
bus = get_bus()
|
||||
manager = dbus.Interface(bus.get_object("org.ofono", path),
|
||||
"org.ofono.Modem")
|
||||
|
||||
def print_modem(path, properties):
|
||||
print "[ %s ]" % path
|
||||
|
||||
properties = manager.GetProperties()
|
||||
for key in properties.keys():
|
||||
value = convert_dbus_value(properties[key])
|
||||
print " %s = %s" % (key, value)
|
||||
@ -627,7 +647,7 @@ def print_modem(path):
|
||||
for interface in properties["Interfaces"]:
|
||||
if interface == "org.ofono.SmsManager":
|
||||
print_sms_manager(path)
|
||||
elif interface == "org.ofono.DataConnectionManager":
|
||||
elif interface == "org.ofono.ConnectionManager":
|
||||
print_data_manager(path)
|
||||
elif interface == "org.ofono.CellBroadcast":
|
||||
print_cell_broadcast(path)
|
||||
@ -642,16 +662,18 @@ def cmd_modem_list(argv):
|
||||
bus = get_bus()
|
||||
manager = dbus.Interface(bus.get_object("org.ofono", "/"),
|
||||
"org.ofono.Manager")
|
||||
properties = manager.GetProperties()
|
||||
|
||||
if "Modems" not in properties or len(properties["Modems"]) == 0:
|
||||
try:
|
||||
modems = manager.GetModems()
|
||||
except dbus.exceptions.DBusException as e:
|
||||
raise ArgumentException("Failed to contact ofonod:", e)
|
||||
|
||||
if len(modems) == 0:
|
||||
print "No modems found"
|
||||
return
|
||||
|
||||
modems = properties["Modems"]
|
||||
|
||||
for path in modems:
|
||||
print_modem(path)
|
||||
for path, properties in modems:
|
||||
print_modem(path, properties)
|
||||
|
||||
def cmd_modem_pin(pin_type, argv):
|
||||
if len(argv) < 1:
|
||||
@ -662,13 +684,13 @@ def cmd_modem_pin(pin_type, argv):
|
||||
bus = get_bus()
|
||||
manager = dbus.Interface(bus.get_object("org.ofono", "/"),
|
||||
"org.ofono.Manager")
|
||||
properties = manager.GetProperties()
|
||||
modems = manager.GetModems()
|
||||
|
||||
if "Modems" not in properties or len(properties["Modems"]) == 0:
|
||||
if len(modems) == 0:
|
||||
print "No modems found"
|
||||
return
|
||||
|
||||
modem = properties["Modems"][0]
|
||||
(modem, properties) = modems[0]
|
||||
|
||||
print "Using modem %s" % modem
|
||||
|
||||
@ -683,8 +705,9 @@ def cmd_modem_pin(pin_type, argv):
|
||||
return
|
||||
|
||||
if properties["PinRequired"] != pin_type:
|
||||
print "pin type '%s' not required by modem (%s)" % (pin_type,
|
||||
properties["PinRequired"])
|
||||
print "pin type '%s' not required by modem %s (%s)" % (pin_type,
|
||||
modem,
|
||||
properties["PinRequired"])
|
||||
return
|
||||
try:
|
||||
sim_manager.EnterPin(pin_type, pin)
|
||||
@ -704,6 +727,124 @@ def cmd_modem(argv):
|
||||
else:
|
||||
raise ArgumentException("unknown modem commmand: %s" % cmd)
|
||||
|
||||
def print_wpas_network_properties(properties):
|
||||
print " Properties = {"
|
||||
|
||||
for p in properties:
|
||||
print " %s = %s" % (p, convert_dbus_value(properties[p]))
|
||||
|
||||
print " }"
|
||||
|
||||
def print_wpas_network(props):
|
||||
for prop in props:
|
||||
if prop == "Properties":
|
||||
print_wpas_network_properties(props["Properties"])
|
||||
else:
|
||||
print " %s = %s" % (prop,
|
||||
convert_dbus_value(props[prop]))
|
||||
|
||||
def print_wpas_networks(networks):
|
||||
bus = get_bus()
|
||||
|
||||
for path in networks:
|
||||
print
|
||||
network = bus.get_object("fi.w1.wpa_supplicant1", path)
|
||||
props = network.GetAll("fi.w1.wpa_supplicant1.Network",
|
||||
dbus_interface=dbus.PROPERTIES_IFACE)
|
||||
print "[ %s ]" % path
|
||||
print_wpas_network(props)
|
||||
|
||||
def print_wpas_bss(props):
|
||||
for prop in props:
|
||||
if prop in ["RSN", "IEs", "Rates"]:
|
||||
pass
|
||||
elif prop in ["SSID", "BSSID"]:
|
||||
print " %s =" % prop,
|
||||
|
||||
for b in props[prop]:
|
||||
print "%x" % b,
|
||||
|
||||
print
|
||||
else:
|
||||
print " %s = %s" % (prop,
|
||||
convert_dbus_value(props[prop]))
|
||||
|
||||
def print_wpas_bsss(bsss):
|
||||
bus = get_bus()
|
||||
|
||||
for path in bsss:
|
||||
print
|
||||
bss = bus.get_object("fi.w1.wpa_supplicant1", path)
|
||||
props = bss.GetAll("fi.w1.wpa_supplicant1.BSS",
|
||||
dbus_interface=dbus.PROPERTIES_IFACE)
|
||||
print "[ %s ]" % path
|
||||
print_wpas_bss(props)
|
||||
|
||||
def print_wpas_interface(props):
|
||||
for prop in props:
|
||||
if prop == "Capabilities":
|
||||
pass
|
||||
else:
|
||||
print " %s = %s" % (prop, convert_dbus_value(props[prop]))
|
||||
|
||||
def print_wpas(props):
|
||||
print "[ %s ]" % WPAS_DBUS_PATH
|
||||
|
||||
for prop in props:
|
||||
print " %s = %s " % (prop, convert_dbus_value(props[prop]))
|
||||
|
||||
def cmd_wpas_list(argv, show_bss=False, show_networks=False):
|
||||
bus = get_bus()
|
||||
wpas = bus.get_object(WPAS_DBUS_SERVICE, WPAS_DBUS_PATH)
|
||||
|
||||
try:
|
||||
props = wpas.GetAll("fi.w1.wpa_supplicant1",
|
||||
dbus_interface=dbus.PROPERTIES_IFACE)
|
||||
except dbus.exceptions.DBusException as e:
|
||||
raise ArgumentException("Failed to contact wpasupplicant: %s"
|
||||
"\nAre you root?" % e)
|
||||
|
||||
|
||||
print_wpas(props)
|
||||
|
||||
if "Interfaces" not in props:
|
||||
raise ArgumentException("No Interfaces in properties")
|
||||
|
||||
bsss = []
|
||||
networks = []
|
||||
|
||||
for path in props["Interfaces"]:
|
||||
print
|
||||
print "[ %s ]" % path
|
||||
interface = bus.get_object("fi.w1.wpa_supplicant1", path)
|
||||
props = interface.GetAll("fi.w1.wpa_supplicant1.Interface",
|
||||
dbus_interface=dbus.PROPERTIES_IFACE)
|
||||
print_wpas_interface(props)
|
||||
|
||||
bsss = bsss + props["BSSs"]
|
||||
networks = networks + props["Networks"]
|
||||
|
||||
if show_bss:
|
||||
print_wpas_bsss(bsss)
|
||||
|
||||
if show_networks:
|
||||
print_wpas_networks(networks)
|
||||
|
||||
def cmd_wpas(argv):
|
||||
if len(argv) < 1:
|
||||
raise ArgumentException("wpas command missing")
|
||||
|
||||
cmd = argv.pop(0)
|
||||
|
||||
if cmd == "list":
|
||||
cmd_wpas_list(argv)
|
||||
elif cmd == "networks":
|
||||
cmd_wpas_list(argv, show_networks=True)
|
||||
elif cmd == "bss":
|
||||
cmd_wpas_list(argv, show_bss=True, show_networks=True)
|
||||
else:
|
||||
raise ArgumentException("unknown wpas commmand: %s" % cmd)
|
||||
|
||||
def cmd_connect_hidden(argv):
|
||||
|
||||
if (len(argv) < 1):
|
||||
@ -762,6 +903,8 @@ def handle_cmd(cmd, argv, name):
|
||||
cmd_event(argv)
|
||||
elif cmd == "modem":
|
||||
cmd_modem(argv)
|
||||
elif cmd == "wpas":
|
||||
cmd_wpas(argv)
|
||||
elif cmd == "connect-hidden":
|
||||
cmd_connect_hidden(argv)
|
||||
else:
|
||||
|
||||
@ -5,6 +5,9 @@
|
||||
$SCRIPTS/install connman
|
||||
$SCRIPTS/install dropbear
|
||||
$SCRIPTS/install ethtool
|
||||
$SCRIPTS/install netmount
|
||||
|
||||
if [ "$NETMOUNT" = "yes" ]; then
|
||||
$SCRIPTS/install netmount
|
||||
fi
|
||||
|
||||
#[ "$PPP_DAEMON" = yes ] && $SCRIPTS/install ppp
|
||||
|
||||
15
packages/network/libnfsidmap/build
Executable file
15
packages/network/libnfsidmap/build
Executable file
@ -0,0 +1,15 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
10
packages/network/libnfsidmap/install
Executable file
10
packages/network/libnfsidmap/install
Executable file
@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/.libs/libnfsidmap.so* $INSTALL/usr/lib/
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/libnfsidmap
|
||||
cp -P $PKG_BUILD/.libs/nsswitch.so $INSTALL/usr/lib/libnfsidmap/
|
||||
cp -P $PKG_BUILD/.libs/static.so $INSTALL/usr/lib/libnfsidmap/
|
||||
16
packages/network/libnfsidmap/meta
Normal file
16
packages/network/libnfsidmap/meta
Normal file
@ -0,0 +1,16 @@
|
||||
PKG_NAME="libnfsidmap"
|
||||
PKG_VERSION="0.23"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.citi.umich.edu/projects/nfsv4/linux/"
|
||||
PKG_URL="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="libnfsidmap: Library to help mapping id's, mainly for NFSv4"
|
||||
PKG_LONGDESC="Library to help mapping id's, mainly for NFSv4."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -2,8 +2,6 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
|
||||
@ -1,18 +1,22 @@
|
||||
# netmount.conf
|
||||
#
|
||||
# This configuration file allows you to setup network mounts via
|
||||
# CIFS (Samba) while the system is booting
|
||||
# CIFS (Samba) or NFS while the system is booting
|
||||
#
|
||||
# This is an sample file, please rename or copy this file to
|
||||
# netmount.conf in the samba share "Configfiles" (or /storage/.config/)
|
||||
#
|
||||
# Usage:
|
||||
# service | share on server | local mountpoint | mount options
|
||||
# service | share on server | local mountpoint <| mount options>
|
||||
#
|
||||
# - "service" can be "nfs" for NFS mounts or "cifs" for CIFS (Samba) mounts
|
||||
# - Please use an "|" as delimiter
|
||||
# - Don't use spaces in usernames, passwords and options
|
||||
# - for NFS mounts there is no support for options
|
||||
# - be aware of the different syntax for NFS shares
|
||||
# - Local mountpoints should only be on /storage
|
||||
#
|
||||
# Examples:
|
||||
# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,password=secret
|
||||
# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,password=secret
|
||||
# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
|
||||
# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
|
||||
# nfs | 192.168.1.44:/videos | /storage/mount/videos
|
||||
|
||||
@ -30,31 +30,25 @@
|
||||
|
||||
if [ -f $NETMOUNT_USERCONF ]; then
|
||||
|
||||
progress "Mounting Network shares"
|
||||
|
||||
if [ -f /usr/bin/mount.cifs ]; then
|
||||
|
||||
IFS="
|
||||
"
|
||||
for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
|
||||
SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
|
||||
SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
|
||||
|
||||
progress "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
|
||||
|
||||
progress "... mounting $SHARE to $MOUNTPOINT ..."
|
||||
mkdir -p $MOUNTPOINT
|
||||
|
||||
mkdir -p $MOUNTPOINT
|
||||
|
||||
case "$SERVICE" in
|
||||
cifs|smb|samba)
|
||||
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
|
||||
;;
|
||||
# nfs)
|
||||
# mount.nfs $SHARE $MOUNTPOINT -o $OPTIONS
|
||||
# ;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
case "$SERVICE" in
|
||||
cifs|smb|samba)
|
||||
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
|
||||
;;
|
||||
nfs)
|
||||
mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
|
||||
@ -5,7 +5,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS="samba connman"
|
||||
PKG_DEPENDS="samba nfs-utils connman"
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="tools"
|
||||
|
||||
36
packages/network/nfs-utils/build
Executable file
36
packages/network/nfs-utils/build
Executable file
@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options $1
|
||||
|
||||
CFLAGS_FOR_BUILD="$HOST_CFLAGS"
|
||||
CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS"
|
||||
CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
|
||||
LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
|
||||
|
||||
cd $PKG_BUILD
|
||||
libblkid_is_recent="yes" \
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--with-sysroot="$SYSROOT_PREFIX/usr" \
|
||||
--enable-nfsv3 \
|
||||
--enable-nfsv4 \
|
||||
--disable-nfsv41 \
|
||||
--disable-gss \
|
||||
--disable-kprefix \
|
||||
--enable-uuid \
|
||||
--enable-mount \
|
||||
--disable-tirpc \
|
||||
--disable-ipv6 \
|
||||
--enable-mountconfig \
|
||||
--without-tcp-wrappers \
|
||||
--without-krb5 \
|
||||
--disable-caps \
|
||||
--enable-largefile \
|
||||
--with-mountfile=/etc/nfsmounts.conf \
|
||||
--with-gnu-ld
|
||||
|
||||
make
|
||||
154
packages/network/nfs-utils/config/protocols
Normal file
154
packages/network/nfs-utils/config/protocols
Normal file
@ -0,0 +1,154 @@
|
||||
# /etc/protocols:
|
||||
# $Id: protocols,v 1.5 2006/10/11 15:39:11 pknirsch Exp $
|
||||
#
|
||||
# Internet (IP) protocols
|
||||
#
|
||||
# from: @(#)protocols 5.1 (Berkeley) 4/17/89
|
||||
#
|
||||
# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
|
||||
#
|
||||
# See also http://www.iana.org/assignments/protocol-numbers
|
||||
|
||||
ip 0 IP # internet protocol, pseudo protocol number
|
||||
hopopt 0 HOPOPT # hop-by-hop options for ipv6
|
||||
icmp 1 ICMP # internet control message protocol
|
||||
igmp 2 IGMP # internet group management protocol
|
||||
ggp 3 GGP # gateway-gateway protocol
|
||||
ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'')
|
||||
st 5 ST # ST datagram mode
|
||||
tcp 6 TCP # transmission control protocol
|
||||
cbt 7 CBT # CBT, Tony Ballardie <A.Ballardie@cs.ucl.ac.uk>
|
||||
egp 8 EGP # exterior gateway protocol
|
||||
igp 9 IGP # any private interior gateway (Cisco: for IGRP)
|
||||
bbn-rcc 10 BBN-RCC-MON # BBN RCC Monitoring
|
||||
nvp 11 NVP-II # Network Voice Protocol
|
||||
pup 12 PUP # PARC universal packet protocol
|
||||
argus 13 ARGUS # ARGUS
|
||||
emcon 14 EMCON # EMCON
|
||||
xnet 15 XNET # Cross Net Debugger
|
||||
chaos 16 CHAOS # Chaos
|
||||
udp 17 UDP # user datagram protocol
|
||||
mux 18 MUX # Multiplexing protocol
|
||||
dcn 19 DCN-MEAS # DCN Measurement Subsystems
|
||||
hmp 20 HMP # host monitoring protocol
|
||||
prm 21 PRM # packet radio measurement protocol
|
||||
xns-idp 22 XNS-IDP # Xerox NS IDP
|
||||
trunk-1 23 TRUNK-1 # Trunk-1
|
||||
trunk-2 24 TRUNK-2 # Trunk-2
|
||||
leaf-1 25 LEAF-1 # Leaf-1
|
||||
leaf-2 26 LEAF-2 # Leaf-2
|
||||
rdp 27 RDP # "reliable datagram" protocol
|
||||
irtp 28 IRTP # Internet Reliable Transaction Protocol
|
||||
iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4
|
||||
netblt 30 NETBLT # Bulk Data Transfer Protocol
|
||||
mfe-nsp 31 MFE-NSP # MFE Network Services Protocol
|
||||
merit-inp 32 MERIT-INP # MERIT Internodal Protocol
|
||||
dccp 33 DCCP # Datagram Congestion Control Protocol
|
||||
3pc 34 3PC # Third Party Connect Protocol
|
||||
idpr 35 IDPR # Inter-Domain Policy Routing Protocol
|
||||
xtp 36 XTP # Xpress Tranfer Protocol
|
||||
ddp 37 DDP # Datagram Delivery Protocol
|
||||
idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto
|
||||
tp++ 39 TP++ # TP++ Transport Protocol
|
||||
il 40 IL # IL Transport Protocol
|
||||
ipv6 41 IPv6 # IPv6
|
||||
sdrp 42 SDRP # Source Demand Routing Protocol
|
||||
ipv6-route 43 IPv6-Route # Routing Header for IPv6
|
||||
ipv6-frag 44 IPv6-Frag # Fragment Header for IPv6
|
||||
idrp 45 IDRP # Inter-Domain Routing Protocol
|
||||
rsvp 46 RSVP # Resource ReSerVation Protocol
|
||||
gre 47 GRE # Generic Routing Encapsulation
|
||||
dsr 48 DSR # Dynamic Source Routing Protocol
|
||||
bna 49 BNA # BNA
|
||||
esp 50 ESP # Encap Security Payload
|
||||
ah 51 AH # Authentication Header
|
||||
i-nlsp 52 I-NLSP # Integrated Net Layer Security TUBA
|
||||
swipe 53 SWIPE # IP with Encryption
|
||||
narp 54 NARP # NBMA Address Resolution Protocol
|
||||
mobile 55 MOBILE # IP Mobility
|
||||
tlsp 56 TLSP # Transport Layer Security Protocol
|
||||
skip 57 SKIP # SKIP
|
||||
ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6
|
||||
ipv6-nonxt 59 IPv6-NoNxt # No Next Header for IPv6
|
||||
ipv6-opts 60 IPv6-Opts # Destination Options for IPv6
|
||||
# 61 # any host internal protocol
|
||||
cftp 62 CFTP # CFTP
|
||||
# 63 # any local network
|
||||
sat-expak 64 SAT-EXPAK # SATNET and Backroom EXPAK
|
||||
kryptolan 65 KRYPTOLAN # Kryptolan
|
||||
rvd 66 RVD # MIT Remote Virtual Disk Protocol
|
||||
ippc 67 IPPC # Internet Pluribus Packet Core
|
||||
# 68 # any distributed file system
|
||||
sat-mon 69 SAT-MON # SATNET Monitoring
|
||||
visa 70 VISA # VISA Protocol
|
||||
ipcv 71 IPCV # Internet Packet Core Utility
|
||||
cpnx 72 CPNX # Computer Protocol Network Executive
|
||||
cphb 73 CPHB # Computer Protocol Heart Beat
|
||||
wsn 74 WSN # Wang Span Network
|
||||
pvp 75 PVP # Packet Video Protocol
|
||||
br-sat-mon 76 BR-SAT-MON # Backroom SATNET Monitoring
|
||||
sun-nd 77 SUN-ND # SUN ND PROTOCOL-Temporary
|
||||
wb-mon 78 WB-MON # WIDEBAND Monitoring
|
||||
wb-expak 79 WB-EXPAK # WIDEBAND EXPAK
|
||||
iso-ip 80 ISO-IP # ISO Internet Protocol
|
||||
vmtp 81 VMTP # Versatile Message Transport
|
||||
secure-vmtp 82 SECURE-VMTP # SECURE-VMTP
|
||||
vines 83 VINES # VINES
|
||||
ttp 84 TTP # TTP
|
||||
nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP
|
||||
dgp 86 DGP # Dissimilar Gateway Protocol
|
||||
tcf 87 TCF # TCF
|
||||
eigrp 88 EIGRP # Enhanced Interior Routing Protocol (Cisco)
|
||||
ospf 89 OSPFIGP # Open Shortest Path First IGP
|
||||
sprite-rpc 90 Sprite-RPC # Sprite RPC Protocol
|
||||
larp 91 LARP # Locus Address Resolution Protocol
|
||||
mtp 92 MTP # Multicast Transport Protocol
|
||||
ax.25 93 AX.25 # AX.25 Frames
|
||||
ipip 94 IPIP # Yet Another IP encapsulation
|
||||
micp 95 MICP # Mobile Internetworking Control Pro.
|
||||
scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro.
|
||||
etherip 97 ETHERIP # Ethernet-within-IP Encapsulation
|
||||
encap 98 ENCAP # Yet Another IP encapsulation
|
||||
# 99 # any private encryption scheme
|
||||
gmtp 100 GMTP # GMTP
|
||||
ifmp 101 IFMP # Ipsilon Flow Management Protocol
|
||||
pnni 102 PNNI # PNNI over IP
|
||||
pim 103 PIM # Protocol Independent Multicast
|
||||
aris 104 ARIS # ARIS
|
||||
scps 105 SCPS # SCPS
|
||||
qnx 106 QNX # QNX
|
||||
a/n 107 A/N # Active Networks
|
||||
ipcomp 108 IPComp # IP Payload Compression Protocol
|
||||
snp 109 SNP # Sitara Networks Protocol
|
||||
compaq-peer 110 Compaq-Peer # Compaq Peer Protocol
|
||||
ipx-in-ip 111 IPX-in-IP # IPX in IP
|
||||
vrrp 112 VRRP # Virtual Router Redundancy Protocol
|
||||
pgm 113 PGM # PGM Reliable Transport Protocol
|
||||
# 114 # any 0-hop protocol
|
||||
l2tp 115 L2TP # Layer Two Tunneling Protocol
|
||||
ddx 116 DDX # D-II Data Exchange
|
||||
iatp 117 IATP # Interactive Agent Transfer Protocol
|
||||
stp 118 STP # Schedule Transfer
|
||||
srp 119 SRP # SpectraLink Radio Protocol
|
||||
uti 120 UTI # UTI
|
||||
smp 121 SMP # Simple Message Protocol
|
||||
sm 122 SM # SM
|
||||
ptp 123 PTP # Performance Transparency Protocol
|
||||
isis 124 ISIS # ISIS over IPv4
|
||||
fire 125 FIRE
|
||||
crtp 126 CRTP # Combat Radio Transport Protocol
|
||||
crdup 127 CRUDP # Combat Radio User Datagram
|
||||
sscopmce 128 SSCOPMCE
|
||||
iplt 129 IPLT
|
||||
sps 130 SPS # Secure Packet Shield
|
||||
pipe 131 PIPE # Private IP Encapsulation within IP
|
||||
sctp 132 SCTP # Stream Control Transmission Protocol
|
||||
fc 133 FC # Fibre Channel
|
||||
rsvp-e2e-ignore 134 RSVP-E2E-IGNORE
|
||||
# 135 # Mobility Header
|
||||
udplite 136 UDPLite
|
||||
mpls-in-ip 137 MPLS-in-IP
|
||||
# 138-252 Unassigned [IANA]
|
||||
# 253 Use for experimentation and testing [RFC3692]
|
||||
# 254 Use for experimentation and testing [RFC3692]
|
||||
# 255 Reserved [IANA]
|
||||
37
packages/network/nfs-utils/init.d/25_nfsutils
Executable file
37
packages/network/nfs-utils/init.d/25_nfsutils
Executable file
@ -0,0 +1,37 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.openelec.tv
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
# create directories needed for nfs-utils
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
. /etc/profile
|
||||
|
||||
progress "create directories needed for nfs-utils"
|
||||
|
||||
install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs
|
||||
install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs/sm
|
||||
install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs/sm.bak
|
||||
touch /var/lib/nfs/etab && chown rpcuser:rpcuser /var/lib/nfs/etab
|
||||
touch /var/lib/nfs/rmtab && chown rpcuser:rpcuser /var/lib/nfs/rmtab
|
||||
touch /var/lib/nfs/state && chown rpcuser:rpcuser /var/lib/nfs/state
|
||||
touch /var/lib/nfs/xtab && chown rpcuser:rpcuser /var/lib/nfs/xtab
|
||||
20
packages/network/nfs-utils/install
Executable file
20
packages/network/nfs-utils/install
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options $1
|
||||
|
||||
add_user rpcuser x 29 29 "RPC Service User" "/var/lib/nfs" "/bin/sh"
|
||||
add_group rpcuser 29
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp $PKG_BUILD/utils/mount/mount.nfs $INSTALL/sbin/
|
||||
ln -sf mount.nfs $INSTALL/sbin/mount.nfs4
|
||||
ln -sf mount.nfs $INSTALL/sbin/umount.nfs
|
||||
ln -sf mount.nfs $INSTALL/sbin/umount.nfs4
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp $PKG_BUILD/utils/statd/statd $INSTALL/usr/sbin/rpc.statd
|
||||
cp $PKG_BUILD/utils/statd/start-statd $INSTALL/usr/sbin/
|
||||
chmod +x $INSTALL/usr/sbin/start-statd
|
||||
|
||||
mkdir -p $INSTALL/etc
|
||||
cp $PKG_DIR/config/protocols $INSTALL/etc
|
||||
16
packages/network/nfs-utils/meta
Normal file
16
packages/network/nfs-utils/meta
Normal file
@ -0,0 +1,16 @@
|
||||
PKG_NAME="nfs-utils"
|
||||
PKG_VERSION="1.2.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://nfs.sourceforge.net/"
|
||||
PKG_URL="https://downloads.sourceforge.net/project/nfs/nfs-utils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libevent libnfsidmap portmap util-linux-ng"
|
||||
PKG_BUILD_DEPENDS="toolchain libevent libnfsidmap"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="nfs-utils: Linux NFS client and server utilities"
|
||||
PKG_LONGDESC="The nfs-utils package provides a daemon for the kernel NFS server and related tools, which provides a much higher level of performance than the traditional Linux NFS server used by most users. This package also contains the showmount program. Showmount queries the mount daemon on a remote host for information about the NFS (Network File System) server on the remote host. For example, showmount can display the clients which are mounted on that host."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -0,0 +1,46 @@
|
||||
diff -Naur nfs-utils-1.1.0-old/tools/locktest/Makefile.am nfs-utils-1.1.0-new/tools/locktest/Makefile.am
|
||||
--- nfs-utils-1.1.0-old/tools/locktest/Makefile.am 2007-05-10 20:40:57.000000000 -0700
|
||||
+++ nfs-utils-1.1.0-new/tools/locktest/Makefile.am 2007-08-11 19:18:59.000000000 -0700
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
noinst_PROGRAMS = testlk
|
||||
testlk_SOURCES = testlk.c
|
||||
-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
diff -Naur nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am
|
||||
--- nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am 2007-05-10 20:40:57.000000000 -0700
|
||||
+++ nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am 2007-08-11 19:19:37.000000000 -0700
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
sbin_PROGRAMS = rpcdebug
|
||||
rpcdebug_SOURCES = rpcdebug.c
|
||||
-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
|
||||
-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
diff -Naur nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am
|
||||
--- nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am 2007-05-10 20:40:57.000000000 -0700
|
||||
+++ nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am 2007-08-11 19:19:57.000000000 -0700
|
||||
@@ -9,9 +9,9 @@
|
||||
rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
|
||||
rpc_scan.h rpc_util.h
|
||||
|
||||
-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
11
packages/network/portmap/build
Executable file
11
packages/network/portmap/build
Executable file
@ -0,0 +1,11 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
make FACILITY=LOG_AUTH \
|
||||
ZOMBIES='-DIGNORE_SIGCHLD -Dlint' \
|
||||
LIBS="-lnsl" \
|
||||
AUX="" \
|
||||
HOSTS_ACCESS="" \
|
||||
|
||||
30
packages/network/portmap/init.d/26_portmap
Executable file
30
packages/network/portmap/init.d/26_portmap
Executable file
@ -0,0 +1,30 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.openelec.tv
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
# starting portmap
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
. /etc/profile
|
||||
|
||||
progress "starting portmap"
|
||||
portmap
|
||||
10
packages/network/portmap/install
Executable file
10
packages/network/portmap/install
Executable file
@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp $PKG_BUILD/portmap $INSTALL/sbin/
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp $PKG_BUILD/pmap_set $INSTALL/usr/sbin/
|
||||
cp $PKG_BUILD/pmap_dump $INSTALL/usr/sbin/
|
||||
16
packages/network/portmap/meta
Normal file
16
packages/network/portmap/meta
Normal file
@ -0,0 +1,16 @@
|
||||
PKG_NAME="portmap"
|
||||
PKG_VERSION="4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="ftp://ftp.porcupine.org/pub/security/"
|
||||
PKG_URL="ftp://ftp.porcupine.org/pub/security/${PKG_NAME}_${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="portmap: RPC portmapper"
|
||||
PKG_LONGDESC="This is an RPC portmapper that prevents theft of NIS (YP), NFS, and other sensitive information via the portmapper. As an option, the program supports access control in the style of the tcp wrapper (log_tcp) package."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
18
packages/network/portmap/patches/portmap-4-errno.patch
Normal file
18
packages/network/portmap/patches/portmap-4-errno.patch
Normal file
@ -0,0 +1,18 @@
|
||||
--- portmap_4/portmap.c.old 1996-05-31 09:52:59.000000000 -0400
|
||||
+++ portmap_4/portmap.c 2002-12-13 11:44:16.000000000 -0500
|
||||
@@ -94,6 +94,7 @@
|
||||
#ifdef SYSV40
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
+#include <errno.h>
|
||||
|
||||
extern char *strerror();
|
||||
#include <stdlib.h>
|
||||
@@ -124,7 +125,6 @@
|
||||
static void callit();
|
||||
struct pmaplist *pmaplist;
|
||||
int debugging = 0;
|
||||
-extern int errno;
|
||||
|
||||
#include "pmap_check.h"
|
||||
|
||||
27
packages/network/portmap/patches/portmap-4-linux.patch
Normal file
27
packages/network/portmap/patches/portmap-4-linux.patch
Normal file
@ -0,0 +1,27 @@
|
||||
--- portmap_4/Makefile.orig Fri May 31 09:50:40 1996
|
||||
+++ portmap_4/Makefile Fri Aug 9 17:40:43 1996
|
||||
@@ -67,9 +67,9 @@
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
-COPT = -Dconst= -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
|
||||
+COPT = -Dconst= $(HOSTS_ACCESS) $(CHECK_PORT) \
|
||||
$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN)
|
||||
-CFLAGS = $(COPT) -O $(NSARCHS) $(SETPGRP)
|
||||
+CFLAGS = $(COPT) $(RPM_OPT_FLAGS) $(NSARCHS) $(SETPGRP)
|
||||
OBJECTS = portmap.o pmap_check.o from_local.o $(AUX)
|
||||
|
||||
all: portmap pmap_dump pmap_set
|
||||
--- portmap_4/Makefile.bad 1996-05-31 09:50:40.000000000 -0400
|
||||
+++ portmap_4/Makefile 2002-12-12 09:54:00.000000000 -0500
|
||||
@@ -74,8 +74,8 @@
|
||||
|
||||
all: portmap pmap_dump pmap_set
|
||||
|
||||
-portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
|
||||
- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_DIR)/libwrap.a $(LIBS)
|
||||
+portmap: $(OBJECTS)
|
||||
+ $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS)
|
||||
|
||||
pmap_dump: pmap_dump.c
|
||||
$(CC) $(CFLAGS) -o $@ $? $(LIBS)
|
||||
51
packages/network/portmap/patches/portmap-4-loopback.patch
Normal file
51
packages/network/portmap/patches/portmap-4-loopback.patch
Normal file
@ -0,0 +1,51 @@
|
||||
--- portmap_4/portmap.c.orig 2004-08-12 10:48:13.405000000 -0400
|
||||
+++ portmap_4/portmap.c 2004-08-12 10:58:13.666000000 -0400
|
||||
@@ -126,6 +126,7 @@
|
||||
static void callit();
|
||||
struct pmaplist *pmaplist;
|
||||
int debugging = 0;
|
||||
+int localhost_only = 0;
|
||||
|
||||
#include "pmap_check.h"
|
||||
|
||||
@@ -140,13 +141,17 @@
|
||||
int len = sizeof(struct sockaddr_in);
|
||||
register struct pmaplist *pml;
|
||||
|
||||
- while ((c = getopt(argc, argv, "dv")) != EOF) {
|
||||
+ while ((c = getopt(argc, argv, "dlv")) != EOF) {
|
||||
switch (c) {
|
||||
|
||||
case 'd':
|
||||
debugging = 1;
|
||||
break;
|
||||
|
||||
+ case 'l':
|
||||
+ localhost_only = 1;
|
||||
+ break;
|
||||
+
|
||||
case 'v':
|
||||
verboselog = 1;
|
||||
break;
|
||||
@@ -154,6 +159,7 @@
|
||||
default:
|
||||
(void) fprintf(stderr, "usage: %s [-dv]\n", argv[0]);
|
||||
(void) fprintf(stderr, "-d: debugging mode\n");
|
||||
+ (void) fprintf(stderr, "-l: listen on localhost only\n");
|
||||
(void) fprintf(stderr, "-v: verbose logging\n");
|
||||
exit(1);
|
||||
}
|
||||
@@ -176,7 +182,12 @@
|
||||
exit(1);
|
||||
}
|
||||
|
||||
- addr.sin_addr.s_addr = 0;
|
||||
+ if (localhost_only) {
|
||||
+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
||||
+ syslog(LOG_NOTICE, "Only binding to LOOPBACK address!");
|
||||
+ } else {
|
||||
+ addr.sin_addr.s_addr = 0;
|
||||
+ }
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(PMAPPORT);
|
||||
if (bind(sock, (struct sockaddr *)&addr, len) != 0) {
|
||||
42
packages/network/portmap/patches/portmap-4-pie.patch
Normal file
42
packages/network/portmap/patches/portmap-4-pie.patch
Normal file
@ -0,0 +1,42 @@
|
||||
--- portmap_4/Makefile.pie 2003-10-28 20:18:32.000000000 -0800
|
||||
+++ portmap_4/Makefile 2003-10-28 20:18:32.000000000 -0800
|
||||
@@ -74,8 +74,11 @@
|
||||
|
||||
all: portmap pmap_dump pmap_set
|
||||
|
||||
+$(OBJECTS): %.o: %.c
|
||||
+ $(CC) $(CFLAGS) -fpie -c $<
|
||||
+
|
||||
portmap: $(OBJECTS)
|
||||
- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS)
|
||||
+ $(CC) $(CFLAGS) -o $@ -pie $(OBJECTS) $(LIBS)
|
||||
|
||||
pmap_dump: pmap_dump.c
|
||||
$(CC) $(CFLAGS) -o $@ $? $(LIBS)
|
||||
--- portmap_4/pmap_check.h.pie 2003-10-28 20:26:34.000000000 -0800
|
||||
+++ portmap_4/pmap_check.h 2003-10-28 20:26:49.000000000 -0800
|
||||
@@ -6,6 +6,6 @@
|
||||
extern int check_setunset();
|
||||
extern int check_privileged_port();
|
||||
extern int check_callit();
|
||||
-extern int verboselog;
|
||||
-extern int allow_severity;
|
||||
-extern int deny_severity;
|
||||
+extern int verboselog __attribute__ ((visibility ("hidden")));
|
||||
+extern int allow_severity __attribute__ ((visibility ("hidden")));
|
||||
+extern int deny_severity __attribute__ ((visibility ("hidden")));
|
||||
--- portmap_4/pmap_check.c.pie 2003-10-28 20:27:38.000000000 -0800
|
||||
+++ portmap_4/pmap_check.c 2003-10-28 20:27:40.000000000 -0800
|
||||
@@ -63,9 +63,9 @@
|
||||
|
||||
static void logit();
|
||||
static void toggle_verboselog();
|
||||
-int verboselog = 0;
|
||||
-int allow_severity = LOG_INFO;
|
||||
-int deny_severity = LOG_WARNING;
|
||||
+int verboselog __attribute ((visibility ("hidden"))) = 0;
|
||||
+int allow_severity __attribute ((visibility ("hidden"))) = LOG_INFO;
|
||||
+int deny_severity __attribute ((visibility ("hidden"))) = LOG_WARNING;
|
||||
|
||||
/* A handful of macros for "readability". */
|
||||
|
||||
12
packages/network/portmap/patches/portmap-4-sigpipe.patch
Normal file
12
packages/network/portmap/patches/portmap-4-sigpipe.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- portmap_4/portmap.c.sigpipe Sun Feb 11 17:45:11 2001
|
||||
+++ portmap_4/portmap.c Sun Feb 11 17:45:51 2001
|
||||
@@ -228,6 +228,9 @@
|
||||
#else
|
||||
(void)signal(SIGCHLD, reap);
|
||||
#endif
|
||||
+ /* Dying on SIGPIPE doesn't help anyone */
|
||||
+ (void)signal(SIGPIPE, SIG_IGN);
|
||||
+
|
||||
svc_run();
|
||||
syslog(LOG_ERR, "run_svc returned unexpectedly");
|
||||
abort();
|
||||
@ -4,8 +4,11 @@
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/source3/bin/smbtree $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
|
||||
|
||||
if [ $NETMOUNT = "yes" ]; then
|
||||
cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
|
||||
fi
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="freetype"
|
||||
PKG_VERSION="2.4.3"
|
||||
PKG_VERSION="2.4.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="openssl"
|
||||
PKG_VERSION="1.0.0b"
|
||||
PKG_VERSION="1.0.0c"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PKG_NAME="LVM2"
|
||||
PKG_VERSION="2.02.75"
|
||||
PKG_VERSION="2.02.77"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE=""
|
||||
|
||||
@ -10,6 +10,9 @@ REBOOT=0
|
||||
/bin/busybox mount -t devtmpfs none /dev
|
||||
/bin/busybox mount -t proc none /proc
|
||||
|
||||
# hide kernel log messages on console
|
||||
echo '1 4 1 7' > /proc/sys/kernel/printk
|
||||
|
||||
# parse command line arguments
|
||||
for arg in $(cat /proc/cmdline); do
|
||||
case $arg in
|
||||
|
||||
@ -32,7 +32,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
|
||||
ln -sf /var/cache/resolv.conf $INSTALL/etc/resolv.conf
|
||||
|
||||
# /etc/mtab is needed by udisks etc...
|
||||
ln -sf /proc/mounts $INSTALL/etc/mtab
|
||||
ln -sf /proc/self/mounts $INSTALL/etc/mtab
|
||||
|
||||
# create /etc/hostname
|
||||
echo $HOSTNAME > $INSTALL/etc/hostname
|
||||
@ -46,3 +46,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
|
||||
|
||||
mkdir -p $INSTALL/etc/modprobe.d
|
||||
cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d
|
||||
|
||||
# add user modprobe.d dir
|
||||
mkdir -p $INSTALL/usr/config/modprobe.d
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur busybox-1.13.2/init/halt.c busybox-1.13.2a/init/halt.c
|
||||
--- busybox-1.13.2/init/halt.c 2008-11-09 18:28:19.000000000 +0100
|
||||
+++ busybox-1.13.2a/init/halt.c 2009-02-01 16:38:37.000000000 +0100
|
||||
@@ -79,7 +79,7 @@
|
||||
|
||||
/* Perform action. */
|
||||
rc = 1;
|
||||
- if (!(flags & 4)) { /* no -f */
|
||||
+ if (ENABLE_INIT && !(flags & 4)) { /* no -f */
|
||||
//TODO: I tend to think that signalling linuxrc is wrong
|
||||
// pity original author didn't comment on it...
|
||||
if (ENABLE_FEATURE_INITRD) {
|
||||
@ -1,12 +0,0 @@
|
||||
diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c
|
||||
--- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200
|
||||
+++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200
|
||||
@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent
|
||||
query_len = strlen(query_string) + 1;
|
||||
/* may be unaligned! */
|
||||
unaligned_type_class = (void *)(query_string + query_len);
|
||||
- query_len += sizeof(unaligned_type_class);
|
||||
+ query_len += sizeof(*unaligned_type_class);
|
||||
/* where to append answer block */
|
||||
answb = (void *)(unaligned_type_class + 1);
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c
|
||||
--- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200
|
||||
+++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200
|
||||
@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha
|
||||
#if ENABLE_FEATURE_SORT_BIG
|
||||
/* Open output file _after_ we read all input ones */
|
||||
if (option_mask32 & FLAG_o)
|
||||
- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
|
||||
+ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
|
||||
#endif
|
||||
flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
|
||||
for (i = 0; i < linecount; i++)
|
||||
@ -1,12 +0,0 @@
|
||||
diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c
|
||||
--- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200
|
||||
+++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200
|
||||
@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p
|
||||
}
|
||||
}
|
||||
if (stats)
|
||||
- stats->byte_count = stats->unicode_count = (d - dst);
|
||||
+ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
|
||||
return dst;
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
diff -Naur busybox-1.18.0/modutils/modprobe.c busybox-1.18.0.patch/modutils/modprobe.c
|
||||
--- busybox-1.18.0/modutils/modprobe.c 2010-11-22 21:43:22.000000000 +0100
|
||||
+++ busybox-1.18.0.patch/modutils/modprobe.c 2010-11-30 08:46:36.961605729 +0100
|
||||
@@ -560,6 +560,7 @@
|
||||
|
||||
read_config("/etc/modprobe.conf");
|
||||
read_config("/etc/modprobe.d");
|
||||
+ read_config("/storage/.config/modprobe.d");
|
||||
if (ENABLE_FEATURE_MODUTILS_SYMBOLS && G.need_symbols)
|
||||
read_config("modules.symbols");
|
||||
load_modules_dep();
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user