summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-22 09:30:45 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-22 09:30:45 +0000
commit0a73412043c7e5c0f7814b4121ce1da8d182927b (patch)
treeb699228d21e0d6156f44c664e3d21a19a16d630c /package
parent804658290d902c79213723fbb8bcc7f929aeb000 (diff)
remove atftp dependency on /etc/services, add dependency on libncurses (#384)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3444 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile2
-rw-r--r--package/atftp/ipkg/atftp.control2
-rw-r--r--package/atftp/patches/100-mconfig.patch (renamed from package/atftp/patches/mconfig.patch)0
-rw-r--r--package/atftp/patches/110-services.patch77
4 files changed, 79 insertions, 2 deletions
diff --git a/package/Makefile b/package/Makefile
index 049a47a99..d5e42ab35 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -295,7 +295,7 @@ $(INSTALL_PACKAGES): base-files-install
amwall-compile: libamsel-compile
arpd-compile: libpcap-compile libdnet-compile libevent-compile
arpwatch-compile: libpcap-compile
-atftp-compile: readline-compile
+atftp-compile: readline-compile ncurses-compile
avahi-compile: libdaemon-compile expat-compile libgdbm-compile
bind-compile: openssl-compile
bitchx-compile: ncurses-compile
diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control
index ca4d86a30..83b1858c4 100644
--- a/package/atftp/ipkg/atftp.control
+++ b/package/atftp/ipkg/atftp.control
@@ -2,4 +2,4 @@ Package: atftp
Priority: optional
Section: net
Description: tftp client
-Depends: libreadline
+Depends: libreadline, libncurses
diff --git a/package/atftp/patches/mconfig.patch b/package/atftp/patches/100-mconfig.patch
index 552204ee2..552204ee2 100644
--- a/package/atftp/patches/mconfig.patch
+++ b/package/atftp/patches/100-mconfig.patch
diff --git a/package/atftp/patches/110-services.patch b/package/atftp/patches/110-services.patch
new file mode 100644
index 000000000..0a5972fcf
--- /dev/null
+++ b/package/atftp/patches/110-services.patch
@@ -0,0 +1,77 @@
+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;