summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-21 12:35:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-21 12:35:48 +0200
commit187960a69f36d84730783fa9fcc418bef1f27ea7 (patch)
tree55f631e3b8dd408910ac692057445c7c0828b0b7
parentf80eda0c17801058135f47e7f5ac3f6970e718ff (diff)
parentaba1a43bf5b8a3cbf8251e4302dcbee58fc81fcd (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--Makefile10
-rw-r--r--TODO1
-rw-r--r--mk/build.mk2
-rw-r--r--package/Depends.mk3
-rw-r--r--package/file/patches/patch-magic_Magdir_macintosh.orig21
-rw-r--r--package/hdparm/Makefile1
-rw-r--r--package/ndisc/patches/patch-rdnssd_rdnssd_c.orig61
-rw-r--r--package/ndisc/patches/patch-src_ndisc_c.orig20
-rw-r--r--package/ndisc/patches/patch-src_tcpspray_c.orig31
-rw-r--r--package/ndisc/patches/patch-src_traceroute_c.orig128
-rw-r--r--package/ndisc/patches/patch-src_traceroute_h.orig26
-rw-r--r--package/nut/patches/patch-server_Makefile_in.orig14
-rw-r--r--package/openvpn/Makefile2
-rw-r--r--package/vsftpd/Makefile5
-rw-r--r--package/vsftpd/patches/patch-Makefile14
15 files changed, 23 insertions, 316 deletions
diff --git a/Makefile b/Makefile
index dfef6791e..8eaa1b51a 100644
--- a/Makefile
+++ b/Makefile
@@ -89,18 +89,18 @@ download: .prereq_done
@${GMAKE_INV} toolchain/download
@${GMAKE_INV} package/download
-cleankernel: .prereq_done
+cleankernel kernelclean: .prereq_done
-@${GMAKE_INV} cleankernel
-cleandir: .prereq_done
+cleandir dirclean: .prereq_done
-@${GMAKE_INV} clean cleandir
@-rm -f make.log .prereq_done
-cleandevice: .prereq_done
+cleandevice deviceclean: .prereq_done
-@${GMAKE_INV} clean cleandevice
@-rm -f make.log
-distclean: .prereq_done
+distclean cleandist: .prereq_done
-@${GMAKE_INV} clean cleandir distclean
@-rm -f make.log .prereq_done
@@ -110,7 +110,7 @@ image: .prereq_done
switch: .prereq_done
@${GMAKE_INV} switch
-image_clean: .prereq_done
+image_clean imageclean cleanimage: .prereq_done
@${GMAKE_INV} image_clean
menuconfig: .prereq_done
diff --git a/TODO b/TODO
index 9ac5c047f..0726b65f4 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
+- stripping of kernel is not working for all targets
- rescue initramfs image (more archs, generic kernel config )
- usb boot via stick
- fix init scripts pidof? vs. killall
diff --git a/mk/build.mk b/mk/build.mk
index b9e6b5d56..df07fcba8 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -179,7 +179,7 @@ _config: $(CONFIG)/conf
.NOTPARALLEL: _mconfig
_mconfig: ${CONFIG}/conf _mconfig2 _config
_mconfig2: ${CONFIG}/conf
- @${CONFIG}/conf -M ${RCONFIG} >/dev/null
+ @${CONFIG}/conf -m ${RCONFIG} >/dev/null
distclean:
@$(MAKE) -C $(CONFIG) clean
diff --git a/package/Depends.mk b/package/Depends.mk
index ef792d9df..50f659263 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -96,6 +96,9 @@ libp11-compile: openssl-compile libtool-compile
libpng-compile: zlib-compile
libshout-compile: libvorbis-compile
libusb-compat-compile: libusb-compile
+ifeq (${ADK_IPV6},y)
+libtirpc-compile: libgssglue-compile
+endif
libtorrent-compile: openssl-compile libsigc++-compile
libvorbis-compile: libogg-compile
libfontenc-compile: xproto-compile zlib-compile
diff --git a/package/file/patches/patch-magic_Magdir_macintosh.orig b/package/file/patches/patch-magic_Magdir_macintosh.orig
deleted file mode 100644
index f85819da4..000000000
--- a/package/file/patches/patch-magic_Magdir_macintosh.orig
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- file-5.03.orig/magic/Magdir/macintosh 2008-10-20 19:20:23.000000000 +0200
-+++ file-5.03/magic/Magdir/macintosh 2009-05-31 04:07:12.000000000 +0200
-@@ -8,17 +8,6 @@
- !:mime application/mac-binhex40
- >41 string x \b, version %.3s
-
--# Stuffit archives are the de facto standard of compression for Macintosh
--# files obtained from most archives. (franklsm@tuns.ca)
--0 string SIT! StuffIt Archive (data)
--!:mime application/x-stuffit
--!:apple SIT!SIT!
-->2 string x : %s
--0 string SITD StuffIt Deluxe (data)
-->2 string x : %s
--0 string Seg StuffIt Deluxe Segment (data)
-->2 string x : %s
--
- # Newer StuffIt archives (grant@netbsd.org)
- 0 string StuffIt StuffIt Archive
- !:mime application/x-stuffit
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index a24108ea4..2e8921870 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+MAKE_ENV+= STRIP=${TARGET_CROSS}strip
BUILD_STYLE= auto
post-install:
diff --git a/package/ndisc/patches/patch-rdnssd_rdnssd_c.orig b/package/ndisc/patches/patch-rdnssd_rdnssd_c.orig
deleted file mode 100644
index be06580f6..000000000
--- a/package/ndisc/patches/patch-rdnssd_rdnssd_c.orig
+++ /dev/null
@@ -1,61 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ndisc6-0.9.8.orig/rdnssd/rdnssd.c 2008-05-01 14:52:28.000000000 +0200
-+++ ndisc6-0.9.8/rdnssd/rdnssd.c 2009-05-10 19:41:53.000000000 +0200
-@@ -76,6 +76,7 @@ static struct
-
- static void write_resolv(const char *resolvpath)
- {
-+ size_t i;
- FILE *resolv;
- int rval;
- char tmpfile[strlen(resolvpath) + sizeof(".tmp")];
-@@ -89,7 +90,7 @@ static void write_resolv(const char *res
- return;
- }
-
-- for (size_t i = 0; i < servers.count; i++) {
-+ for (i = 0; i < servers.count; i++) {
- char addr[INET6_ADDRSTRLEN];
- inet_ntop(AF_INET6, &servers.list[i].addr, addr, INET6_ADDRSTRLEN);
-
-@@ -132,6 +133,7 @@ static int rdnss_older (const void *a, c
- static void rdnss_update (const struct in6_addr *addr, unsigned int ifindex, time_t expiry)
- {
- size_t i;
-+ unsigned int j;
-
- /* Does this entry already exist? */
- for (i = 0; i < servers.count; i++)
-@@ -165,12 +167,12 @@ static void rdnss_update (const struct i
- qsort (servers.list, servers.count, sizeof (rdnss_t), rdnss_older);
-
- #ifndef NDEBUG
-- for (unsigned i = 0; i < servers.count; i++)
-+ for (j = 0; j < servers.count; j++)
- {
- char buf[INET6_ADDRSTRLEN];
-- inet_ntop (AF_INET6, &servers.list[i].addr, buf,
-+ inet_ntop (AF_INET6, &servers.list[j].addr, buf,
- sizeof (buf));
-- syslog (LOG_DEBUG, "%u: %48s expires at %u\n", i, buf,
-+ syslog (LOG_DEBUG, "%u: %48s expires at %u\n", j, buf,
- (unsigned)servers.list[i].expiry);
- }
- #endif
-@@ -178,6 +180,7 @@ static void rdnss_update (const struct i
-
- int parse_nd_opts (const struct nd_opt_hdr *opt, size_t opts_len, unsigned int ifindex)
- {
-+ struct in6_addr *addr;
- for (; opts_len >= sizeof(struct nd_opt_hdr);
- opts_len -= opt->nd_opt_len << 3,
- opt = (const struct nd_opt_hdr *)
-@@ -206,7 +209,7 @@ int parse_nd_opts (const struct nd_opt_h
-
- lifetime = now + ntohl(rdnss_opt->nd_opt_rdnss_lifetime);
-
-- for (struct in6_addr *addr = (struct in6_addr *) (rdnss_opt + 1);
-+ for (addr = (struct in6_addr *) (rdnss_opt + 1);
- nd_opt_len >= 2; addr++, nd_opt_len -= 2)
- rdnss_update(addr, ifindex, lifetime);
-
diff --git a/package/ndisc/patches/patch-src_ndisc_c.orig b/package/ndisc/patches/patch-src_ndisc_c.orig
deleted file mode 100644
index 8bc600948..000000000
--- a/package/ndisc/patches/patch-src_ndisc_c.orig
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ndisc6-0.9.8.orig/src/ndisc.c 2008-05-01 14:52:28.000000000 +0200
-+++ ndisc6-0.9.8/src/ndisc.c 2009-05-10 19:16:18.000000000 +0200
-@@ -521,6 +521,7 @@ static ssize_t
- recvfromLL (int fd, void *buf, size_t len, int flags,
- struct sockaddr_in6 *addr)
- {
-+ struct cmsghdr *cmsg;
- char cbuf[CMSG_SPACE (sizeof (int))];
- struct iovec iov =
- {
-@@ -542,7 +543,7 @@ recvfromLL (int fd, void *buf, size_t le
- return val;
-
- /* ensures the hop limit is 255 */
-- for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&hdr);
-+ for (cmsg = CMSG_FIRSTHDR (&hdr);
- cmsg != NULL;
- cmsg = CMSG_NXTHDR (&hdr, cmsg))
- {
diff --git a/package/ndisc/patches/patch-src_tcpspray_c.orig b/package/ndisc/patches/patch-src_tcpspray_c.orig
deleted file mode 100644
index 15106ea1c..000000000
--- a/package/ndisc/patches/patch-src_tcpspray_c.orig
+++ /dev/null
@@ -1,31 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ndisc6-0.9.8.orig/src/tcpspray.c 2008-05-01 14:52:28.000000000 +0200
-+++ ndisc6-0.9.8/src/tcpspray.c 2009-05-10 19:11:15.000000000 +0200
-@@ -60,7 +60,7 @@ static unsigned verbose = 0;
-
- static int tcpconnect (const char *host, const char *serv)
- {
-- struct addrinfo hints, *res;
-+ struct addrinfo hints, *res, *p;
-
- memset (&hints, 0, sizeof (hints));
- hints.ai_family = family;
-@@ -78,7 +78,7 @@ static int tcpconnect (const char *host,
-
- val = -1;
-
-- for (struct addrinfo *p = res; (p != NULL) && (val == -1); p = p->ai_next)
-+ for (p = res; (p != NULL) && (val == -1); p = p->ai_next)
- {
- val = socket (p->ai_family, p->ai_socktype, p->ai_protocol);
- if (val == -1)
-@@ -172,7 +172,8 @@ tcpspray (const char *host, const char *
- switch (child)
- {
- case 0:
-- for (unsigned i = 0; i < n; i++)
-+ unsigned int i;
-+ for (i = 0; i < n; i++)
- {
- ssize_t val = recv (fd, block, blen, MSG_WAITALL);
- if (val != (ssize_t)blen)
diff --git a/package/ndisc/patches/patch-src_traceroute_c.orig b/package/ndisc/patches/patch-src_traceroute_c.orig
deleted file mode 100644
index a7ff0cd44..000000000
--- a/package/ndisc/patches/patch-src_traceroute_c.orig
+++ /dev/null
@@ -1,128 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ndisc6-0.9.8.orig/src/traceroute.c 2008-05-01 14:52:28.000000000 +0200
-+++ ndisc6-0.9.8/src/traceroute.c 2009-05-10 19:29:37.000000000 +0200
-@@ -149,6 +149,7 @@ static ssize_t
- recv_payload (int fd, void *buf, size_t len,
- struct sockaddr_in6 *addr, int *hlim)
- {
-+ struct cmsghdr *cmsg;
- char cbuf[CMSG_SPACE (sizeof (int))];
- struct iovec iov =
- {
-@@ -170,7 +171,7 @@ recv_payload (int fd, void *buf, size_t
- return val;
-
- /* ensures the hop limit is 255 */
-- for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&hdr);
-+ for (cmsg = CMSG_FIRSTHDR (&hdr);
- cmsg != NULL;
- cmsg = CMSG_NXTHDR (&hdr, cmsg))
- if ((cmsg->cmsg_level == IPPROTO_IPV6)
-@@ -625,14 +626,16 @@ static void
- display (const tracetest_t *tab, unsigned min_ttl, unsigned max_ttl,
- unsigned retries)
- {
-- for (unsigned ttl = min_ttl; ttl <= max_ttl; ttl++)
-+ unsigned int ttl, col;
-+
-+ for (ttl = min_ttl; ttl <= max_ttl; ttl++)
- {
- struct sockaddr_in6 hop = { .sin6_family = AF_UNSPEC };
- const tracetest_t *line = tab + retries * (ttl - min_ttl);
-
- printf ("%2d ", ttl);
-
-- for (unsigned col = 0; col < retries; col++)
-+ for (col = 0; col < retries; col++)
- {
- const tracetest_t *test = line + col;
- if (test->result == TRACE_TIMEOUT)
-@@ -821,6 +824,7 @@ static void setup_socket (int fd)
-
- static int setsock_rth (int fd, int type, const char **segv, int segc)
- {
-+ int i;
- uint8_t hdr[inet6_rth_space (type, segc)];
- inet6_rth_init (hdr, sizeof (hdr), type, segc);
-
-@@ -829,7 +833,7 @@ static int setsock_rth (int fd, int type
- hints.ai_family = AF_INET6;
- hints.ai_flags = AI_IDN;
-
-- for (int i = 0; i < segc; i++)
-+ for (i = 0; i < segc; i++)
- {
- struct addrinfo *res;
-
-@@ -868,7 +872,8 @@ static struct
-
- static int prepare_sockets (void)
- {
-- for (unsigned i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++)
-+ unsigned int i;
-+ for (i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++)
- {
- protofd[i].fd = socket (AF_INET6, SOCK_RAW, protofd[i].protocol);
- if (protofd[i].fd == -1)
-@@ -883,8 +888,9 @@ static int prepare_sockets (void)
-
- static int get_socket (int protocol)
- {
-+ unsigned int i;
- errno = EPROTONOSUPPORT;
-- for (unsigned i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++)
-+ for (i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++)
- if (protofd[i].protocol == protocol)
- {
- int fd = protofd[i].fd;
-@@ -902,7 +908,8 @@ static int get_socket (int protocol)
-
- static void drop_sockets (void)
- {
-- for (unsigned i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++)
-+ unsigned int i;
-+ for (i = 0; i < sizeof (protofd) / sizeof (protofd[0]); i++)
- if (protofd[i].fd != -1)
- close (protofd[i].fd);
- }
-@@ -914,6 +921,8 @@ traceroute (const char *dsthost, const c
- unsigned timeout, unsigned delay, unsigned retries,
- size_t packet_len, int min_ttl, int max_ttl)
- {
-+ unsigned int i, j, step;
-+
- /* Creates ICMPv6 socket to collect error packets */
- int icmpfd = get_socket (IPPROTO_ICMPV6);
- if (icmpfd == -1)
-@@ -1020,7 +1029,7 @@ traceroute (const char *dsthost, const c
- .filter = f,
- };
-
-- for (unsigned i = 0; i < 4; i++)
-+ for (i = 0; i < 4; i++)
- {
- /* A = icmp->ip6_dst.s6_addr32[i]; */
- pc->code = BPF_LD + BPF_W + BPF_ABS;
-@@ -1076,7 +1085,7 @@ traceroute (const char *dsthost, const c
- tracetest_t tab[(1 + max_ttl - min_ttl) * retries];
- memset (tab, 0, sizeof (tab));
-
-- for (unsigned step = 1, progress = 0;
-+ for (step = 1, progress = 0;
- step < (1 + max_ttl - min_ttl) + retries;
- step++)
- {
-@@ -1093,10 +1102,10 @@ traceroute (const char *dsthost, const c
- mono_nanosleep (&delay_ts);
-
- /* Sends requests */
-- for (unsigned i = 0; i < retries; i++)
-+ for (j = 0; j < retries; j++)
- {
-- int attempt = (retries - 1) - i;
-- int hlim = min_ttl + step + i - retries;
-+ int attempt = (retries - 1) - j;
-+ int hlim = min_ttl + step + j - retries;
-
- if ((hlim > max_ttl) || (hlim < min_ttl))
- continue;
diff --git a/package/ndisc/patches/patch-src_traceroute_h.orig b/package/ndisc/patches/patch-src_traceroute_h.orig
deleted file mode 100644
index 48da9765a..000000000
--- a/package/ndisc/patches/patch-src_traceroute_h.orig
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ndisc6-0.9.8.orig/src/traceroute.h 2008-05-01 14:52:28.000000000 +0200
-+++ ndisc6-0.9.8/src/traceroute.h 2009-05-10 19:23:18.000000000 +0200
-@@ -24,9 +24,9 @@
- typedef ssize_t (*trace_send_t) (int fd, unsigned ttl, unsigned n,
- size_t plen, uint16_t port);
-
--typedef ssize_t (*trace_parser_t) (const void *restrict data, size_t len,
-- int *restrict ttl,
-- unsigned *restrict n, uint16_t port);
-+typedef ssize_t (*trace_parser_t) (const void data, size_t len,
-+ int ttl,
-+ unsigned n, uint16_t port);
-
- typedef struct tracetype
- {
-@@ -34,7 +34,8 @@ typedef struct tracetype
- int protocol;
- int checksum_offset;
- trace_send_t send_probe;
-- trace_parser_t parse_resp, parse_err;
-+ trace_parser_t parse_resp;
-+ trace_parser_t parse_err;
- } tracetype;
-
- # ifdef __cplusplus
diff --git a/package/nut/patches/patch-server_Makefile_in.orig b/package/nut/patches/patch-server_Makefile_in.orig
deleted file mode 100644
index bfedb0951..000000000
--- a/package/nut/patches/patch-server_Makefile_in.orig
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nut-2.4.1.orig/server/Makefile.in 2009-02-17 10:24:10.000000000 +0100
-+++ nut-2.4.1/server/Makefile.in 2009-05-31 06:01:01.000000000 +0200
-@@ -460,7 +460,9 @@ distdir: $(DISTFILES)
- done
- check-am: all-am
- check: check-am
--all-am: Makefile $(PROGRAMS)
-+all-am: $(PROGRAMS)
-+ @echo foo
-+
- installdirs:
- for dir in "$(DESTDIR)$(sbindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 93482c9e9..c0914b98f 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -50,8 +50,6 @@ ENABLE_SMALL:=--enable-small
endif
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+= CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib"
CONFIGURE_ARGS+= --disable-pthread \
--disable-plugins \
--disable-management \
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index e0cb84ec2..8456fac83 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= vsftpd
-PKG_VERSION:= 2.1.2
+PKG_VERSION:= 2.2.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6a8c8579d50adf0d0fc07226c03bfb52
+PKG_MD5SUM:= e4eb190af270ae65d57a84274a38ec31
PKG_DESCR:= a fast and secure FTP server
PKG_SECTION:= net
PKG_URL:= http://vsftpd.beasts.org
@@ -17,7 +17,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
BUILD_STYLE:= auto
-XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
ALL_TARGET:= vsftpd
INSTALL_STYLE:= auto
diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile
index eecb47336..a6ebc0f30 100644
--- a/package/vsftpd/patches/patch-Makefile
+++ b/package/vsftpd/patches/patch-Makefile
@@ -1,9 +1,15 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- vsftpd-2.1.2.orig/Makefile 2009-05-22 21:44:52.000000000 +0200
-+++ vsftpd-2.1.2/Makefile 2009-06-04 22:15:07.000000000 +0200
-@@ -5,8 +5,8 @@ IFLAGS = -idirafter dummyinc
+--- vsftpd-2.2.0.orig/Makefile 2009-05-22 21:44:52.000000000 +0200
++++ vsftpd-2.2.0/Makefile 2009-08-21 00:46:32.980346849 +0200
+@@ -1,12 +1,12 @@
+ # Makefile for systems with GNU tools
+-CC = gcc
++CC ?= gcc
+ INSTALL = install
+ IFLAGS = -idirafter dummyinc
#CFLAGS = -g
- CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+-CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
++CFLAGS ?= -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-LIBS = `./vsf_findlibs.sh`
-LINK = -Wl,-s