diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-04-13 22:20:15 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-04-13 22:20:15 +0000 |
commit | 737022a15e9e7b872ffd8220604f29c6e4bc399d (patch) | |
tree | 94118554cd257124b0bf579ac85441270645b86f /package/atftp | |
parent | 589cbb3338e9e85dc482b76f35f735cddfa7c572 (diff) |
remove lots of non-essential packages
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3641 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/atftp')
-rw-r--r-- | package/atftp/Config.in | 25 | ||||
-rw-r--r-- | package/atftp/Makefile | 71 | ||||
-rw-r--r-- | package/atftp/ipkg/atftp.control | 5 | ||||
-rw-r--r-- | package/atftp/ipkg/atftpd.control | 5 | ||||
-rwxr-xr-x | package/atftp/ipkg/files/postinst | 8 | ||||
-rw-r--r-- | package/atftp/patches/100-mconfig.patch | 20 | ||||
-rw-r--r-- | package/atftp/patches/110-services.patch | 77 | ||||
-rw-r--r-- | package/atftp/patches/120-retry_setting.patch | 117 |
8 files changed, 0 insertions, 328 deletions
diff --git a/package/atftp/Config.in b/package/atftp/Config.in deleted file mode 100644 index 296faec842..0000000000 --- a/package/atftp/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -#menu "atftp............................. TFTP implementation" - -config BR2_COMPILE_ATFTP - tristate - default n - depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD - select BR2_PACKAGE_LIBREADLINE - -config BR2_PACKAGE_ATFTP - prompt "atftp............................. TFTP client" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_ATFTP - help - TFTP client - -config BR2_PACKAGE_ATFTPD - prompt "atftpd............................ TFTP server" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_ATFTP - help - TFTP server - -#endmenu diff --git a/package/atftp/Makefile b/package/atftp/Makefile deleted file mode 100644 index f49aab6701..0000000000 --- a/package/atftp/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=atftp -PKG_VERSION:=0.7 -PKG_RELEASE:=1 -PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82 - -PKG_SOURCE_URL:=ftp://ftp.mamalinux.com/pub/atftp/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - ); - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install - touch $@ - -$(IPKG_ATFTP): - install -d -m0755 $(IDIR_ATFTP)/usr/bin - $(CP) $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin - $(RSTRIP) $(IDIR_ATFTP) - $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR) - -$(IPKG_ATFTPD): - install -d -m0755 $(IDIR_ATFTPD)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin - $(RSTRIP) $(IDIR_ATFTPD) - $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR) diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control deleted file mode 100644 index 83b1858c47..0000000000 --- a/package/atftp/ipkg/atftp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: atftp -Priority: optional -Section: net -Description: tftp client -Depends: libreadline, libncurses diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control deleted file mode 100644 index 94f49f3f7c..0000000000 --- a/package/atftp/ipkg/atftpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: atftpd -Priority: optional -Section: net -Description: tftp server -Depends: libreadline, libpcre diff --git a/package/atftp/ipkg/files/postinst b/package/atftp/ipkg/files/postinst deleted file mode 100755 index a29644996e..0000000000 --- a/package/atftp/ipkg/files/postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null -if [ $? -ne 0 ]; then - echo "tftp 69/tcp" >>${IPKG_INSTROOT}/etc/services - echo "tftp 69/udp" >>${IPKG_INSTROOT}/etc/services - echo "tftp-mcast 1758/tcp" >>${IPKG_INSTROOT}/etc/services - echo "tftp-mcast 1758/udp" >>${IPKG_INSTROOT}/etc/services -fi diff --git a/package/atftp/patches/100-mconfig.patch b/package/atftp/patches/100-mconfig.patch deleted file mode 100644 index 552204ee23..0000000000 --- a/package/atftp/patches/100-mconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur netkit-tftp-0.17/MCONFIG netkit-tftp-0.17.patched/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 -@@ -0,0 +1,16 @@ -+# Generated by configure (confgen version 2) on Sun Jun 19 21:13:24 CEST 2005 -+# -+ -+BINDIR=/usr/bin -+SBINDIR=/usr/sbin -+MANDIR=/usr/man -+BINMODE=755 -+DAEMONMODE=755 -+MANMODE=644 -+PREFIX=/usr -+EXECPREFIX=/usr -+INSTALLROOT= -+CC= -+CFLAGS= -+LDFLAGS= -+LIBS= diff --git a/package/atftp/patches/110-services.patch b/package/atftp/patches/110-services.patch deleted file mode 100644 index 0a5972fcf4..0000000000 --- a/package/atftp/patches/110-services.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -urN atftp.old/tftp.c atftp.dev/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 -@@ -409,7 +409,7 @@ - int set_peer(int argc, char **argv) - { - struct hostent *host; /* for host name lookup */ -- struct servent *sp; /* server entry for tftp service */ -+ int port = htons(69); - - /* sanity check */ - if ((argc < 2) || (argc > 3)) -@@ -418,13 +418,6 @@ - return ERR; - } - -- /* get the server entry */ -- sp = getservbyname("tftp", "udp"); -- if (sp == 0) { -- fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); -- return ERR; -- } -- - /* look up the host */ - host = gethostbyname(argv[1]); - /* if valid, update s_inn structure */ -@@ -437,7 +430,7 @@ - Strncpy(data.hostname, host->h_name, - sizeof(data.hostname)); - data.hostname[sizeof(data.hostname)-1] = 0; -- data.sa_peer.sin_port = sp->s_port; -+ data.sa_peer.sin_port = port; - } - else - { -@@ -448,17 +441,17 @@ - /* get the server port */ - if (argc == 3) - { -- sp->s_port = htons(atoi(argv[2])); -- if (sp->s_port < 0) -+ port = htons(atoi(argv[2])); -+ if (port < 0) - { - fprintf(stderr, "%s: bad port number.\n", argv[2]); - data.connected = 0; - return ERR; - } -- data.sa_peer.sin_port = sp->s_port; -+ data.sa_peer.sin_port = port; - } - /* copy port number to data structure */ -- data.port = ntohs(sp->s_port); -+ data.port = ntohs(port); - - data.connected = 1; - return OK; -diff -urN atftp.old/tftpd.c atftp.dev/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 -@@ -230,14 +230,8 @@ - - /* find the port */ - if (tftpd_port == 0) -- { -- if ((serv = getservbyname("tftp", "udp")) == NULL) -- { -- logger(LOG_ERR, "atftpd: udp/tftp, unknown service"); -- exit(1); -- } -- tftpd_port = ntohs(serv->s_port); -- } -+ tftpd_port = htons(69); -+ - /* initialise sockaddr_in structure */ - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; diff --git a/package/atftp/patches/120-retry_setting.patch b/package/atftp/patches/120-retry_setting.patch deleted file mode 100644 index b77ed30d23..0000000000 --- a/package/atftp/patches/120-retry_setting.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -urN atftp.old/tftp.c atftp.dev/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 -@@ -967,6 +967,7 @@ - { "tftp-timeout", 1, NULL, 'T'}, - { "mode", 1, NULL, 'M'}, - { "option", 1, NULL, 'O'}, -+ { "retry", 1, NULL, 'R'}, - #if 1 - { "timeout", 1, NULL, 't'}, - { "blksize", 1, NULL, 'b'}, -@@ -986,11 +987,16 @@ - }; - - /* Support old argument until 0.8 */ -- while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:sm", -+ while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:smR:", - options, &option_index)) != EOF) - { - switch (c) - { -+ case 'R': -+ snprintf(string, sizeof(string), "option retry %s", optarg); -+ make_arg(string, &ac, &av); -+ process_cmd(ac, av); -+ break; - case 'g': - interactive = 0; - if ((action == PUT) || (action == MGET)) -diff -urN atftp.old/tftp_def.c atftp.dev/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 -@@ -37,6 +37,7 @@ - { "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */ - { "blksize", "512", 0, 1 }, /* This is the default option */ - { "multicast", "", 0, 1 }, /* structure */ -+ { "retry", "5", 0, 1 }, - { "", "", 0, 0} - }; - -diff -urN atftp.old/tftp_def.h atftp.dev/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 -@@ -40,7 +40,8 @@ - #define OPT_TIMEOUT 3 - #define OPT_BLKSIZE 4 - #define OPT_MULTICAST 5 --#define OPT_NUMBER 7 -+#define OPT_RETRY 6 -+#define OPT_NUMBER 8 - - #define OPT_SIZE 12 - #define VAL_SIZE MAXLEN -diff -urN atftp.old/tftp_file.c atftp.dev/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 -@@ -123,6 +123,7 @@ - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp = NULL; /* the local file pointer */ - int number_of_timeout = 0; -+ int num_retry = atoi(data->tftp_options[OPT_RETRY].value); - int convert = 0; /* if true, do netascii convertion */ - - int oacks = 0; /* count OACK for improved error checking */ -@@ -141,7 +142,7 @@ - - int prev_block_number = 0; /* needed to support netascii convertion */ - int temp = 0; -- -+ - data->file_size = 0; - tftp_cancel = 0; - from.sin_addr.s_addr = 0; -@@ -288,7 +289,7 @@ - case GET_TIMEOUT: - number_of_timeout++; - fprintf(stderr, "timeout: retrying...\n"); -- if (number_of_timeout > NB_OF_RETRY) -+ if ((num_retry > 0) && (number_of_timeout > num_retry)) - state = S_ABORT; - else - state = timeout_state; -@@ -325,7 +326,7 @@ - number_of_timeout++; - fprintf(stderr, "tftp: packet discard <%s:%d>.\n", - inet_ntoa(from.sin_addr), ntohs(from.sin_port)); -- if (number_of_timeout > NB_OF_RETRY) -+ if ((num_retry > 0) && (number_of_timeout > num_retry)) - state = S_ABORT; - break; - case ERR: -@@ -614,6 +615,7 @@ - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp; /* the local file pointer */ - int number_of_timeout = 0; -+ int num_retry = atoi(data->tftp_options[OPT_RETRY].value); - struct stat file_stat; - int convert = 0; /* if true, do netascii convertion */ - char string[MAXLEN]; -@@ -751,7 +753,7 @@ - case GET_TIMEOUT: - number_of_timeout++; - fprintf(stderr, "timeout: retrying...\n"); -- if (number_of_timeout > NB_OF_RETRY) -+ if ((num_retry > 0) && (number_of_timeout > num_retry)) - state = S_ABORT; - else - state = timeout_state; -@@ -797,7 +799,7 @@ - number_of_timeout++; - fprintf(stderr, "tftp: packet discard <%s:%d>.\n", - inet_ntoa(from.sin_addr), ntohs(from.sin_port)); -- if (number_of_timeout > NB_OF_RETRY) -+ if ((num_retry > 0) && (number_of_timeout > num_retry)) - state = S_ABORT; - break; - case ERR: |