summaryrefslogtreecommitdiff
path: root/netkit-tftp
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /netkit-tftp
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'netkit-tftp')
-rw-r--r--netkit-tftp/netkit-tftp-0.17/mconfig.patch20
-rw-r--r--netkit-tftp/netkit-tftp-0.17/pack_tftphdr.patch52
-rw-r--r--netkit-tftp/netkit-tftp-0.17/tftpd_add_debug.patch28
-rw-r--r--netkit-tftp/netkit-tftp_0.17.bb0
-rw-r--r--netkit-tftp/netkit-tftpd_0.17.bb0
5 files changed, 0 insertions, 100 deletions
diff --git a/netkit-tftp/netkit-tftp-0.17/mconfig.patch b/netkit-tftp/netkit-tftp-0.17/mconfig.patch
deleted file mode 100644
index 26f2f2b6b6..0000000000
--- a/netkit-tftp/netkit-tftp-0.17/mconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urNd netkit-base-0.17/MCONFIG netkit-base-0.17-new/MCONFIG
---- netkit-base-0.17/MCONFIG 1969-12-31 18:00:00.000000000 -0600
-+++ netkit-base-0.17-new/MCONFIG 2002-10-12 13:33:16.000000000 -0500
-@@ -0,0 +1,16 @@
-+BINDIR=/usr/bin
-+SBINDIR=/usr/sbin
-+MANDIR=/usr/man
-+ROOTBINDIR=/bin
-+BINMODE=755
-+DAEMONMODE=755
-+MANMODE=644
-+SUIDMODE=4755
-+PREFIX=/usr
-+EXECPREFIX=/usr
-+ROOTPREFIX=
-+INSTALLROOT=
-+CC=arm-linux-gcc
-+CFLAGS=-I/usr/src/coding/projects/userspace/buildroot/output/staging/usr/include -O2 -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline
-+LDFLAGS=
-+LIBS=
diff --git a/netkit-tftp/netkit-tftp-0.17/pack_tftphdr.patch b/netkit-tftp/netkit-tftp-0.17/pack_tftphdr.patch
deleted file mode 100644
index ea0fc8663f..0000000000
--- a/netkit-tftp/netkit-tftp-0.17/pack_tftphdr.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- netkit-tftp-0.17/include/arpa/tftp.h~pack_tftphdr.patch
-+++ netkit-tftp-0.17/include/arpa/tftp.h
-@@ -10,10 +10,6 @@
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
-- * 3. All advertising materials mentioning features or use of this software
-- * must display the following acknowledgement:
-- * This product includes software developed by the University of
-- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
-@@ -30,10 +26,7 @@
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
-- * From: @(#)tftp.h 8.1 (Berkeley) 6/2/93
-- * $Id$
-- *
-- * (Fixed for netkit to have well-defined field sizes)
-+ * @(#)tftp.h 8.1 (Berkeley) 6/2/93
- */
-
- #ifndef _ARPA_TFTP_H
-@@ -54,14 +47,14 @@
- #define ERROR 05 /* error code */
-
- struct tftphdr {
-- u_int16_t th_opcode; /* packet type */
-+ short th_opcode; /* packet type */
- union {
-- u_int16_t tu_block; /* block # */
-- u_int16_t tu_code; /* error code */
-- char tu_stuff[1]; /* request packet stuff */
-- } th_u;
-- char th_data[1]; /* data or error string */
--};
-+ unsigned short tu_block; /* block # */
-+ short tu_code; /* error code */
-+ char tu_stuff[1]; /* request packet stuff */
-+ } __attribute__ ((__packed__)) th_u;
-+ char th_data[1]; /* data or error string */
-+} __attribute__ ((__packed__));
-
- #define th_block th_u.tu_block
- #define th_code th_u.tu_code
diff --git a/netkit-tftp/netkit-tftp-0.17/tftpd_add_debug.patch b/netkit-tftp/netkit-tftp-0.17/tftpd_add_debug.patch
deleted file mode 100644
index f7dfd58ed4..0000000000
--- a/netkit-tftp/netkit-tftp-0.17/tftpd_add_debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- netkit-tftp-0.17/tftpd/tftpd.c~tftpd_add_debug
-+++ netkit-tftp-0.17/tftpd/tftpd.c
-@@ -252,6 +252,8 @@
- char *filename, *mode = NULL;
-
- filename = cp = tp->th_stuff;
-+ syslog(LOG_NOTICE, "tp->th_opcode=%x, tp = %p, &(tp->th_stuff)=%p, filename=%s", tp->th_opcode,tp, &(tp->th_stuff),filename);
-+
- again:
- while (cp < buf + size) {
- if (*cp == '\0')
-@@ -340,8 +342,10 @@
- return(EACCESS);
- }
- }
-- if (stat(filename, &stbuf) < 0)
-+ if (stat(filename, &stbuf) < 0) {
-+ syslog(LOG_NOTICE, "file %s not found", filename);
- return (errno == ENOENT ? ENOTFOUND : EACCESS);
-+ }
- #if 0
- /*
- * The idea is that symlinks are dangerous. However, a symlink
diff --git a/netkit-tftp/netkit-tftp_0.17.bb b/netkit-tftp/netkit-tftp_0.17.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/netkit-tftp/netkit-tftp_0.17.bb
+++ /dev/null
diff --git a/netkit-tftp/netkit-tftpd_0.17.bb b/netkit-tftp/netkit-tftpd_0.17.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/netkit-tftp/netkit-tftpd_0.17.bb
+++ /dev/null