diff --git a/packages/linux/patches/linux-2.6.39-rc5-010-acpi_reboot.patch b/packages/linux/patches/linux-2.6.39-rc5-010-acpi_reboot.patch deleted file mode 100644 index c67cf950bc..0000000000 --- a/packages/linux/patches/linux-2.6.39-rc5-010-acpi_reboot.patch +++ /dev/null @@ -1,53 +0,0 @@ -Improve our reboot handling for compatibility with Windows. Upstream in .38? - -diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index c495aa8..c770e66 100644 ---- a/arch/x86/kernel/reboot.c -+++ b/arch/x86/kernel/reboot.c -@@ -34,7 +34,7 @@ EXPORT_SYMBOL(pm_power_off); - - static const struct desc_ptr no_idt = {}; - static int reboot_mode; --enum reboot_type reboot_type = BOOT_KBD; -+enum reboot_type reboot_type = BOOT_ACPI; - int reboot_force; - - #if defined(CONFIG_X86_32) && defined(CONFIG_SMP) -@@ -538,9 +538,23 @@ void __attribute__((weak)) mach_reboot_fixups(void) - { - } - -+/* -+ * Windows does the following on reboot: -+ * 1) If the FADT has the ACPI reboot register flag set, try it -+ * 2) If still alive, write to the keyboard controller -+ * 3) If still alive, write to the ACPI reboot register again -+ * 4) If still alive, write to the keyboard controller again -+ * -+ * If the machine is still alive at this stage, it gives up. We default to -+ * following the same pattern, except that if we're still alive after (4) we'll -+ * try to force a triple fault and then cycle between hitting the keyboard -+ * controller and doing that -+ */ - static void native_machine_emergency_restart(void) - { - int i; -+ int attempt = 0; -+ int orig_reboot_type = reboot_type; - - if (reboot_emergency) - emergency_vmx_disable_all(); -@@ -562,6 +576,13 @@ static void native_machine_emergency_restart(void) - outb(0xfe, 0x64); /* pulse reset low */ - udelay(50); - } -+ if (attempt == 0 && orig_reboot_type == BOOT_ACPI) { -+ attempt = 1; -+ reboot_type = BOOT_ACPI; -+ } else { -+ reboot_type = BOOT_TRIPLE; -+ } -+ break; - - case BOOT_TRIPLE: - load_idt(&no_idt); diff --git a/packages/linux/patches/linux-2.6.39-rc5-031-usb-pci-autosuspend.patch b/packages/linux/patches/linux-2.6.39-rc5-031-usb-pci-autosuspend.patch deleted file mode 100644 index 610a7654d9..0000000000 --- a/packages/linux/patches/linux-2.6.39-rc5-031-usb-pci-autosuspend.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 15d89120d03116adbbf3226a85fbd2fff0b12576 -Author: Matthew Garrett -Date: Fri Sep 17 11:09:12 2010 -0400 - - Enable USB PCI autosuspend by default - -diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c -index c3f9854..3c020e6 100644 ---- a/drivers/usb/core/hcd-pci.c -+++ b/drivers/usb/core/hcd-pci.c -@@ -248,8 +248,10 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) - goto err4; - set_hs_companion(dev, hcd); - -- if (pci_dev_run_wake(dev)) -+ if (pci_dev_run_wake(dev)) { - pm_runtime_put_noidle(&dev->dev); -+ pm_runtime_allow(&dev->dev); -+ } - return retval; - - err4: diff --git a/packages/linux/patches/linux-2.6.39-rc5-057_ite-resume-debug-0.1.patch b/packages/linux/patches/linux-2.6.39-rc5-057_ite-resume-debug-0.1.patch new file mode 100644 index 0000000000..8cff8abc06 --- /dev/null +++ b/packages/linux/patches/linux-2.6.39-rc5-057_ite-resume-debug-0.1.patch @@ -0,0 +1,14 @@ +diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c +index 43908a7..1a63d75 100644 +--- a/drivers/media/rc/ite-cir.c ++++ b/drivers/media/rc/ite-cir.c +@@ -1676,7 +1676,8 @@ static int ite_resume(struct pnp_dev *pdev) + struct ite_dev *dev = pnp_get_drvdata(pdev); + unsigned long flags; + +- ite_dbg("%s called", __func__); ++ ite_dbg("%s called (tx'ing: %s)", __func__, ++ dev->transmitting ? "true" : "false"); + + spin_lock_irqsave(&dev->lock, flags); + diff --git a/packages/network/install b/packages/network/install index d85bd74c04..2fd089413d 100755 --- a/packages/network/install +++ b/packages/network/install @@ -23,8 +23,8 @@ . config/options $1 $SCRIPTS/install connman -$SCRIPTS/install dropbear $SCRIPTS/install ethtool +$SCRIPTS/install openssh if [ "$NETMOUNT" = "yes" ]; then $SCRIPTS/install netmount diff --git a/packages/network/dropbear/build b/packages/network/openssh/build similarity index 79% rename from packages/network/dropbear/build rename to packages/network/openssh/build index b77923a970..62b0c5cc8a 100755 --- a/packages/network/dropbear/build +++ b/packages/network/openssh/build @@ -22,26 +22,23 @@ . config/options $1 +export LD="$TARGET_CC" +export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS" + cd $PKG_BUILD +ac_cv_have_space_for_dirent_d_name=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-largefile \ - --enable-zlib \ - --disable-pam \ - --enable-openpty \ - --enable-syslog \ - --enable-shadow \ + --disable-strip \ --disable-lastlog \ --disable-utmp \ --disable-utmpx \ --disable-wtmp \ --disable-wtmpx \ - --disable-loginfunc \ - --disable-pututline \ - --disable-pututxline \ + --without-rpath \ + --with-ssl-engine \ + --without-pam -make MULTI=1 -make scp +make diff --git a/packages/network/openssh/config/ssh_config b/packages/network/openssh/config/ssh_config new file mode 100644 index 0000000000..18936740f6 --- /dev/null +++ b/packages/network/openssh/config/ssh_config @@ -0,0 +1,47 @@ +# $OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for some commonly used options. For a comprehensive +# list of available options, their meanings and defaults, please see the +# ssh_config(5) man page. + +# Host * +# ForwardAgent no +# ForwardX11 no +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# GSSAPIAuthentication no +# GSSAPIDelegateCredentials no +# BatchMode no +# CheckHostIP yes +# AddressFamily any +# ConnectTimeout 0 +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc +# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 +# EscapeChar ~ +# Tunnel no +# TunnelDevice any:any +# PermitLocalCommand no +# VisualHostKey no +# ProxyCommand ssh -q -W %h:%p gateway.example.com diff --git a/packages/network/openssh/config/sshd_config b/packages/network/openssh/config/sshd_config new file mode 100644 index 0000000000..c382be2d32 --- /dev/null +++ b/packages/network/openssh/config/sshd_config @@ -0,0 +1,118 @@ +# $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey ~/.cache/ssh/ssh_host_key +# HostKeys for protocol version 2 +HostKey ~/.cache/ssh/ssh_host_rsa_key +HostKey ~/.cache/ssh/ssh_host_dsa_key +#HostKey ~/.cache/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server diff --git a/packages/network/dropbear/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd similarity index 56% rename from packages/network/dropbear/init.d/51_sshd rename to packages/network/openssh/init.d/51_sshd index 59a0f798d4..d00f8450d7 100644 --- a/packages/network/dropbear/init.d/51_sshd +++ b/packages/network/openssh/init.d/51_sshd @@ -23,32 +23,35 @@ # runlevels: openelec, textmode ( - RSA_KEY_FILE="/storage/.cache/dropbear/dropbear_rsa_host_key" - RSAPUB_KEY_FILE="/storage/.cache/dropbear/dropbear_rsa_host_key.pub" - DSS_KEY_FILE="/storage/.cache/dropbear/dropbear_dss_host_key" + RSA1_KEY="/storage/.cache/ssh/ssh_host_key" + RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key" + DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key" - # Check for the Dropbear RSA key - if [ ! -f $RSA_KEY_FILE ] ; then - progress "SSH: generating rsa key" + KEYGEN="/usr/bin/ssh-keygen" + SSHD="/usr/sbin/sshd" - mkdir -p /storage/.cache/dropbear - dropbearkey -t rsa -f $RSA_KEY_FILE > /dev/null 2>&1 + # Check for the SSH1 RSA key + if [ ! -f $RSA1_KEY ] ; then + progress "SSH: generating SSH1 RSA key" + + mkdir -p /storage/.cache/ssh + $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null fi - # Check for the Dropbear RSA public key - if [ ! -f $RSAPUB_KEY_FILE ] ; then - progress "SSH: generating rsa public key" + # Check for the SSH2 RSA key + if [ ! -f $RSA2_KEY ] ; then + progress "SSH: generating SSH2 RSA key" - mkdir -p /storage/.cache/dropbear - dropbearkey -f $RSA_KEY_FILE -y > $RSAPUB_KEY_FILE + mkdir -p /storage/.cache/ssh + $KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null fi - # Check for the Dropbear DSS key - if [ ! -f $DSS_KEY_FILE ] ; then - progress "SSH: generating dsa key" + # Check for the SSH2 DSA key + if [ ! -f $DSA2_KEY ] ; then + progress "SSH: generating SSH2 DSA key" - mkdir -p /storage/.cache/dropbear - dropbearkey -t dss -f $DSS_KEY_FILE > /dev/null 2>&1 + mkdir -p /storage/.cache/ssh + $KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null fi # Check for predifined known hosts file @@ -61,12 +64,9 @@ progress "Starting SSH Server" - $IONICE mkdir -p /var/log - $IONICE touch /var/log/lastlog - $IONICE touch /var/log/wtmp + wait_for_network - wait_for_network - - dropbear -b /etc/issue -P /var/run/dropbear.pid + mkdir -p /var/empty + $SSHD )& diff --git a/packages/network/dropbear/install b/packages/network/openssh/install similarity index 67% rename from packages/network/dropbear/install rename to packages/network/openssh/install index 80365cabc5..ab23340cb3 100755 --- a/packages/network/dropbear/install +++ b/packages/network/openssh/install @@ -22,21 +22,18 @@ . config/options $1 -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/dropbearmulti $INSTALL/usr/bin/ - ln -sf dropbearmulti $INSTALL/usr/bin/dbclient - ln -sf dropbearmulti $INSTALL/usr/bin/dropbearconvert - ln -sf dropbearmulti $INSTALL/usr/bin/dropbearkey - ln -sf dropbearmulti $INSTALL/usr/bin/ssh - cp $PKG_BUILD/scp $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/sbin - ln -sf ../bin/dropbearmulti $INSTALL/usr/sbin/dropbear +add_user sshd x 74 74 "Privilege-separated SSH" "/var/empty/sshd" "/bin/sh" +add_group sshd 74 mkdir -p $INSTALL/etc - ln -s /storage/.cache/dropbear $INSTALL/etc/dropbear + cp $PKG_DIR/config/* $INSTALL/etc -if [ -f $PROJECT_DIR/$PROJECT/ssh/known_hosts ]; then - mkdir -p $INSTALL/etc/ssh - cp $PROJECT_DIR/$PROJECT/ssh/known_hosts $INSTALL/etc/ssh -fi +mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/scp $INSTALL/usr/bin/ + cp $PKG_BUILD/ssh $INSTALL/usr/bin/ + cp $PKG_BUILD/ssh-add $INSTALL/usr/bin/ + cp $PKG_BUILD/ssh-agent $INSTALL/usr/bin/ + cp $PKG_BUILD/ssh-keygen $INSTALL/usr/bin/ + +mkdir -p $INSTALL/usr/sbin + cp $PKG_BUILD/sshd $INSTALL/usr/sbin/ diff --git a/packages/network/dropbear/meta b/packages/network/openssh/meta similarity index 54% rename from packages/network/dropbear/meta rename to packages/network/openssh/meta index c021700e9e..c869342df1 100644 --- a/packages/network/dropbear/meta +++ b/packages/network/openssh/meta @@ -18,19 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="dropbear" -PKG_VERSION="0.53.1" +PKG_NAME="openssh" +PKG_VERSION="5.8p2" PKG_REV="1" PKG_ARCH="any" -PKG_LICENSE="MIT" -PKG_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html" -PKG_URL="http://matt.ucc.asn.au/dropbear/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib connman" -PKG_BUILD_DEPENDS="toolchain zlib" +PKG_LICENSE="OSS" +PKG_SITE="http://www.openssh.com/" +PKG_URL="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="zlib openssl" +PKG_BUILD_DEPENDS="toolchain zlib openssl" PKG_PRIORITY="optional" -PKG_SECTION="security" -PKG_SHORTDESC="dropbear: A relatively small SSH 2 server and client" -PKG_LONGDESC="Dropbear is a relatively small SSH 2 server and client suitable for embedded systems. It runs on a variety of POSIX-based platforms." +PKG_SECTION="network" +PKG_SHORTDESC="openssh: An open re-implementation of the SSH package" +PKG_LONGDESC="This is a Linux port of OpenBSD's excellent OpenSSH. OpenSSH is based on the last free version of Tatu Ylonen's SSH with all patent-encumbered algorithms removed, all known security bugs fixed, new features reintroduced, and many other clean-ups. SSH (Secure Shell) is a program to log into another computer over a network, to execute commands in a remote machine, and to move files from one machine to another. It provides strong authentication and secure communications over insecure channels. It is intended as a replacement for rlogin, rsh, rcp, and rdist." PKG_IS_ADDON="no" PKG_AUTORECONF="yes" diff --git a/packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch b/packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch new file mode 100644 index 0000000000..95cc6c85cc --- /dev/null +++ b/packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch @@ -0,0 +1,53 @@ +diff -Naur openssh-5.8p1-old/configure.ac openssh-5.8p1-new/configure.ac +--- openssh-5.8p1-old/configure.ac 2011-02-21 17:41:23.000000000 -0800 ++++ openssh-5.8p1-new/configure.ac 2011-02-21 17:42:20.000000000 -0800 +@@ -41,7 +41,7 @@ + AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_EGREP +-AC_PATH_PROG(AR, ar) ++AC_PATH_TOOL(AR, ar) + AC_PATH_PROG(CAT, cat) + AC_PATH_PROG(KILL, kill) + AC_PATH_PROGS(PERL, perl5 perl) +@@ -1188,25 +1188,25 @@ + + AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include ]) + +-AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ ++AC_CACHE_CHECK( ++ [whether struct dirent allocates space for d_name], ++ [ac_cv_have_space_for_dirent_d_name], ++ [AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([[ + #include + #include + int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} +- ]])], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, +- [Define if your struct dirent expects you to +- allocate extra space for d_name]) +- ], +- [ +- AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME]) +- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) +- ] ++ ]])], ++ [ ac_cv_have_space_for_dirent_d_name="yes" ], ++ [ ac_cv_have_space_for_dirent_d_name="no" ], ++ [ ac_cv_have_space_for_dirent_d_name="no" ] ++ )] + ) ++if test "x$ac_cv_have_space_for_dirent_d_name" = "xno" ; then ++ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, ++ [Define if your struct dirent expects you to ++ allocate extra space for d_name]) ++fi + + AC_MSG_CHECKING([for /proc/pid/fd directory]) + if test -d "/proc/$$/fd" ; then diff --git a/packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch b/packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch new file mode 100644 index 0000000000..934cd1c343 --- /dev/null +++ b/packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch @@ -0,0 +1,49 @@ +diff -Naur openssh-5.8p1-old/channels.c openssh-5.8p1-new/channels.c +--- openssh-5.8p1-old/channels.c 2010-11-30 17:02:35.000000000 -0800 ++++ openssh-5.8p1-new/channels.c 2011-02-21 17:41:34.000000000 -0800 +@@ -61,6 +61,7 @@ + #include + #include + #include ++#include + + #include "openbsd-compat/sys-queue.h" + #include "xmalloc.h" +@@ -3353,6 +3354,8 @@ + { + int sock; + struct sockaddr_un addr; ++ int abstract = 0; ++ int addrsize = 0; + + sock = socket(AF_UNIX, SOCK_STREAM, 0); + if (sock < 0) +@@ -3360,8 +3363,15 @@ + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strlcpy(addr.sun_path, pathname, sizeof addr.sun_path); +- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) ++ addrsize = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path); ++ if (addr.sun_path[0] = '@') ++ abstract = 1; ++ if (abstract) ++ addr.sun_path[0] = '\0'; ++ if (connect(sock, (struct sockaddr *)&addr, addrsize) == 0) + return sock; ++ if (abstract) ++ addr.sun_path[0] = '@'; + close(sock); + error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); + return -1; +diff -Naur openssh-5.8p1-old/defines.h openssh-5.8p1-new/defines.h +--- openssh-5.8p1-old/defines.h 2011-01-17 02:15:31.000000000 -0800 ++++ openssh-5.8p1-new/defines.h 2011-02-21 17:41:34.000000000 -0800 +@@ -411,7 +411,7 @@ + # ifdef __hpux + # define X_UNIX_PATH "/var/spool/sockets/X11/%u" + # else +-# define X_UNIX_PATH "/tmp/.X11-unix/X%u" ++# define X_UNIX_PATH "@/tmp/.X11-unix/X%u" + # endif + #endif /* X_UNIX_PATH */ + #define _PATH_UNIX_X X_UNIX_PATH diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta index 302a07fbdb..39fcd34117 100644 --- a/packages/sysutils/util-linux/meta +++ b/packages/sysutils/util-linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="util-linux" -PKG_VERSION="2.19" +PKG_VERSION="2.19.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 0fc9e9119b..0ed7a9e1e1 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5-git2 Kernel Configuration +# Linux/i386 2.6.39-rc5-git4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2206,10 +2206,10 @@ CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 3e0db5d90c..95546bc82e 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5-git2 Kernel Configuration +# Linux/i386 2.6.39-rc5-git4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2443,10 +2443,10 @@ CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index bbaabaed4b..0626d07bd2 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc5-git2 Kernel Configuration +# Linux/x86_64 2.6.39-rc5-git4 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2386,10 +2386,10 @@ CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index d079c67837..bac540bb68 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5-git2 Kernel Configuration +# Linux/i386 2.6.39-rc5-git4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2440,10 +2440,10 @@ CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index bdb2a5e70d..c15b2cc3b5 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc5-git2 Kernel Configuration +# Linux/x86_64 2.6.39-rc5-git4 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2379,10 +2379,10 @@ CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y #