atftp:
* Cleanup Makefile * Fix download URL * Refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/packages@8321 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
537650ad03
commit
4cecc68248
@ -13,12 +13,8 @@ PKG_VERSION:=0.7
|
|||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=ftp://ftp.mamalinux.com/pub/atftp/
|
PKG_SOURCE_URL:=http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/
|
||||||
PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82
|
PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82
|
||||||
PKG_CAT:=zcat
|
|
||||||
TAR_OPTIONS += || true
|
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
|
|
||||||
PKG_BUILD_DEPENDS:=libncurses libpcre libreadline
|
PKG_BUILD_DEPENDS:=libncurses libpcre libreadline
|
||||||
|
|
||||||
@ -28,7 +24,6 @@ define Package/atftp/Default
|
|||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
TITLE:=TFTP
|
TITLE:=TFTP
|
||||||
URL:=ftp://ftp.mamalinux.com/pub/atftp/
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/atftp
|
define Package/atftp
|
||||||
@ -54,18 +49,13 @@ if [ $$? -ne 0 ]; then
|
|||||||
fi
|
fi
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Configure
|
CONFIGURE_ARGS += \
|
||||||
$(call Build/Configure/Default, \
|
--disable-libwrap
|
||||||
--disable-libwrap \
|
|
||||||
)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Compile
|
MAKE_FLAGS += \
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
CFLAGS="$(TARGET_CFLAGS) \
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
-Wall -D_REENTRANT" \
|
||||||
CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \
|
all
|
||||||
all
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/atftp/install
|
define Package/atftp/install
|
||||||
$(INSTALL_DIR) $(1)/usr/sbin
|
$(INSTALL_DIR) $(1)/usr/sbin
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
diff -Nur netkit-tftp-0.17/MCONFIG netkit-tftp-0.17.patched/MCONFIG
|
Index: atftp-0.7/MCONFIG
|
||||||
--- netkit-tftp-0.17/MCONFIG 1970-01-01 01:00:00.000000000 +0100
|
===================================================================
|
||||||
+++ netkit-tftp-0.17.patched/MCONFIG 2005-06-19 21:16:52.422687029 +0200
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
|
+++ atftp-0.7/MCONFIG 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,16 @@
|
||||||
+# Generated by configure (confgen version 2) on Sun Jun 19 21:13:24 CEST 2005
|
+# Generated by configure (confgen version 2) on Sun Jun 19 21:13:24 CEST 2005
|
||||||
+#
|
+#
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
diff -urN atftp.old/tftp.c atftp.dev/tftp.c
|
Index: atftp-0.7/tftp.c
|
||||||
--- atftp.old/tftp.c 2004-03-16 00:55:56.000000000 +0100
|
===================================================================
|
||||||
+++ atftp.dev/tftp.c 2006-03-22 10:18:54.000000000 +0100
|
--- atftp-0.7.orig/tftp.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
|
+++ atftp-0.7/tftp.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -409,7 +409,7 @@
|
@@ -409,7 +409,7 @@
|
||||||
int set_peer(int argc, char **argv)
|
int set_peer(int argc, char **argv)
|
||||||
{
|
{
|
||||||
@ -55,9 +56,10 @@ diff -urN atftp.old/tftp.c atftp.dev/tftp.c
|
|||||||
|
|
||||||
data.connected = 1;
|
data.connected = 1;
|
||||||
return OK;
|
return OK;
|
||||||
diff -urN atftp.old/tftpd.c atftp.dev/tftpd.c
|
Index: atftp-0.7/tftpd.c
|
||||||
--- atftp.old/tftpd.c 2004-02-27 03:05:26.000000000 +0100
|
===================================================================
|
||||||
+++ atftp.dev/tftpd.c 2006-03-22 10:23:20.000000000 +0100
|
--- atftp-0.7.orig/tftpd.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
|
+++ atftp-0.7/tftpd.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -230,14 +230,8 @@
|
@@ -230,14 +230,8 @@
|
||||||
|
|
||||||
/* find the port */
|
/* find the port */
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
diff -urN atftp.old/tftp.c atftp.dev/tftp.c
|
Index: atftp-0.7/tftp.c
|
||||||
--- atftp.old/tftp.c 2006-03-25 16:41:49.000000000 +0100
|
===================================================================
|
||||||
+++ atftp.dev/tftp.c 2006-03-25 18:10:04.000000000 +0100
|
--- atftp-0.7.orig/tftp.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
|
+++ atftp-0.7/tftp.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -967,6 +967,7 @@
|
@@ -967,6 +967,7 @@
|
||||||
{ "tftp-timeout", 1, NULL, 'T'},
|
{ "tftp-timeout", 1, NULL, 'T'},
|
||||||
{ "mode", 1, NULL, 'M'},
|
{ "mode", 1, NULL, 'M'},
|
||||||
@ -27,9 +28,10 @@ diff -urN atftp.old/tftp.c atftp.dev/tftp.c
|
|||||||
case 'g':
|
case 'g':
|
||||||
interactive = 0;
|
interactive = 0;
|
||||||
if ((action == PUT) || (action == MGET))
|
if ((action == PUT) || (action == MGET))
|
||||||
diff -urN atftp.old/tftp_def.c atftp.dev/tftp_def.c
|
Index: atftp-0.7/tftp_def.c
|
||||||
--- atftp.old/tftp_def.c 2004-02-13 04:16:09.000000000 +0100
|
===================================================================
|
||||||
+++ atftp.dev/tftp_def.c 2006-03-25 18:10:04.000000000 +0100
|
--- atftp-0.7.orig/tftp_def.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
|
+++ atftp-0.7/tftp_def.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -37,6 +37,7 @@
|
@@ -37,6 +37,7 @@
|
||||||
{ "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */
|
{ "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */
|
||||||
{ "blksize", "512", 0, 1 }, /* This is the default option */
|
{ "blksize", "512", 0, 1 }, /* This is the default option */
|
||||||
@ -38,9 +40,10 @@ diff -urN atftp.old/tftp_def.c atftp.dev/tftp_def.c
|
|||||||
{ "", "", 0, 0}
|
{ "", "", 0, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
diff -urN atftp.old/tftp_def.h atftp.dev/tftp_def.h
|
Index: atftp-0.7/tftp_def.h
|
||||||
--- atftp.old/tftp_def.h 2004-02-13 04:16:09.000000000 +0100
|
===================================================================
|
||||||
+++ atftp.dev/tftp_def.h 2006-03-25 17:19:15.000000000 +0100
|
--- atftp-0.7.orig/tftp_def.h 2007-08-02 23:04:23.000000000 +0200
|
||||||
|
+++ atftp-0.7/tftp_def.h 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -40,7 +40,8 @@
|
@@ -40,7 +40,8 @@
|
||||||
#define OPT_TIMEOUT 3
|
#define OPT_TIMEOUT 3
|
||||||
#define OPT_BLKSIZE 4
|
#define OPT_BLKSIZE 4
|
||||||
@ -51,9 +54,10 @@ diff -urN atftp.old/tftp_def.h atftp.dev/tftp_def.h
|
|||||||
|
|
||||||
#define OPT_SIZE 12
|
#define OPT_SIZE 12
|
||||||
#define VAL_SIZE MAXLEN
|
#define VAL_SIZE MAXLEN
|
||||||
diff -urN atftp.old/tftp_file.c atftp.dev/tftp_file.c
|
Index: atftp-0.7/tftp_file.c
|
||||||
--- atftp.old/tftp_file.c 2004-02-13 04:16:09.000000000 +0100
|
===================================================================
|
||||||
+++ atftp.dev/tftp_file.c 2006-03-25 18:10:04.000000000 +0100
|
--- atftp-0.7.orig/tftp_file.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
|
+++ atftp-0.7/tftp_file.c 2007-08-02 23:04:23.000000000 +0200
|
||||||
@@ -123,6 +123,7 @@
|
@@ -123,6 +123,7 @@
|
||||||
struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer;
|
struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer;
|
||||||
FILE *fp = NULL; /* the local file pointer */
|
FILE *fp = NULL; /* the local file pointer */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user