Skip to contentSkip to conversation

A couple of backported fixes for daisy

PATCH New Paul Eggleton 1 participant 3 messages Oct 27, 2014

lore
Share & tools
lore
#0 lore raw

cover A couple of backported fixes for daisy

The following changes since commit 0692743b51f7daa0154fd4d8982236b4702ea2da:

gnupg: CVE-2013-4242 (2014-10-23 21:42:03 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/daisy-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/daisy-fixes

Paul Eggleton (2):
python: force off_t size to 8 to enable large file support
openssh: avoid screen sessions being killed on disconnect with systemd

 meta/recipes-connectivity/openssh/openssh/[email protected] | 1 +
 meta/recipes-devtools/python/python_2.7.3.bb            | 3 +++
 2 files changed, 4 insertions(+)
Signature · 1 line
1.9.3
#1 lore raw

PATCH 1/2 python: force off_t size to 8 to enable large file support

If DISTRO_FEATURES contains "largefile", force the size of off_t to 8 as a workaround for having ac_cv_sizeof_off_t=4 on 32-bit systems. In future we will likely drop the value from the site file, but for now this is a slightly safer fix.

Fixes [YOCTO #6813].

(From OE-Core master rev: a8216030ee6c65531de8fbf3eed878a345a94edc)

---
 meta/recipes-devtools/python/python_2.7.3.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/python/python_2.7.3.bb +3 -0
index 0d64172..5270df9 100644
@@ -47,6 +47,9 @@ inherit autotools multilib_header python-dir pythonnative
 TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
 TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
 
+# The following is a hack until we drop ac_cv_sizeof_off_t from site files
+EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}"
+
 do_configure_prepend() {
 	rm -f ${S}/Makefile.orig
 	autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf"
Signature · 1 line
1.9.3
#2 lore raw

PATCH 2/2 openssh: avoid screen sessions being killed on disconnect with systemd

In reply to Paul Eggleton

Tell systemd just to kill the sshd process when the ssh connection drops instead of the entire cgroup for sshd, so that any screen sessions (and more to the point, processes within them) do not get killed.

(This is what the Fedora sshd service file does, and what we're already doing in the dropbear service file).

(From OE-Core master rev: 3c238dff41fbd3687457989c7b17d22b2cc844be)

---
 meta/recipes-connectivity/openssh/openssh/[email protected] | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-connectivity/openssh/openssh/[email protected] +1 -0
index 4eda659..bb2d68e 100644
@@ -8,3 +8,4 @@ ExecStart=-@SBINDIR@/sshd -i
 ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
 StandardInput=socket
 StandardError=syslog
+KillMode=process
Signature · 1 line
1.9.3