aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-daemons/atftp/atftp/atftpd.service (renamed from meta-oe/recipes-extended/atftp/atftp/atftpd.service)0
-rw-r--r--meta-networking/recipes-daemons/atftp/atftp_git.bb (renamed from meta-oe/recipes-extended/atftp/atftp_git.bb)4
-rw-r--r--meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch (renamed from meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch)5
-rw-r--r--meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch (renamed from meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch)7
-rw-r--r--meta-networking/recipes-daemons/atftp/files/atftpd.init (renamed from meta-oe/recipes-extended/atftp/files/atftpd.init)0
5 files changed, 14 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/atftp/atftp/atftpd.service b/meta-networking/recipes-daemons/atftp/atftp/atftpd.service
index 480bc702e9..480bc702e9 100644
--- a/meta-oe/recipes-extended/atftp/atftp/atftpd.service
+++ b/meta-networking/recipes-daemons/atftp/atftp/atftpd.service
diff --git a/meta-oe/recipes-extended/atftp/atftp_git.bb b/meta-networking/recipes-daemons/atftp/atftp_git.bb
index 3e55881cf9..09451bc7ab 100644
--- a/meta-oe/recipes-extended/atftp/atftp_git.bb
+++ b/meta-networking/recipes-daemons/atftp/atftp_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Advanced TFTP server and client"
+SUMMARY = "Advanced TFTP server and client"
SECTION = "network"
HOMEPAGE = "http://packages.debian.org/atftp"
LICENSE = "GPLv2"
@@ -38,7 +38,7 @@ do_install_append() {
install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
}
-PACKAGES =+ "atftpd"
+PACKAGES =+ "${PN}d"
FILES_${PN} = "${bindir}/*"
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
index 9aeb3515b5..280b570b22 100644
--- a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
+++ b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
@@ -8,6 +8,11 @@ hardwared BLOCKSIZE setting of 1432).
block rollover
http://www.compuphase.com/tftp.htm
+Patch originally from OpenSUSE:
+https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2
+
+Upstream-Status: Pending
+
Index: git/tftp_def.h
===================================================================
--- git.orig/tftp_def.h 2012-11-19 16:28:50.221027144 -0800
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
index 6faf5f9d9a..28fba6cf50 100644
--- a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
+++ b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
@@ -1,3 +1,10 @@
+Avoid assigning thread data outside of mutex lock
+
+Patch originally from OpenSUSE:
+https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2
+
+Upstream-Status: Pending
+
Index: git/tftpd_list.c
===================================================================
--- git.orig/tftpd_list.c 2012-10-24 21:48:47.000000000 -0700
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd.init b/meta-networking/recipes-daemons/atftp/files/atftpd.init
index 161d97aca7..161d97aca7 100644
--- a/meta-oe/recipes-extended/atftp/files/atftpd.init
+++ b/meta-networking/recipes-daemons/atftp/files/atftpd.init