From 56df778d52d6aa41c812fba42ff1af07e4d1288f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:04:59 +0200 Subject: fix cross-compile under Darwin, better style --- package/pcrepp/Makefile | 8 ++++---- package/pcrepp/patches/patch-Makefile_in | 6 +++--- package/pcrepp/patches/patch-configure | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 package/pcrepp/patches/patch-configure diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index 639f5ad53..ae848d3d6 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -19,15 +19,15 @@ PKG_CXX:= pcrepp PKG_CFLINE_PCREPP:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC DISTFILES:= pcre++-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/pcre++-${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PCREPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -post-extract: - mv ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}/pcre++-${PKG_VERSION} ${WRKBUILD} - post-install: - ${CP} ${WRKINST}/* ${WRKINST}/../pkg-${PKG_NAME} + $(INSTALL_DIR) $(IDIR_PCREPP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpcre++.so* \ + $(IDIR_PCREPP)/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcrepp/patches/patch-Makefile_in b/package/pcrepp/patches/patch-Makefile_in index c10eab68d..d64d1e99a 100644 --- a/package/pcrepp/patches/patch-Makefile_in +++ b/package/pcrepp/patches/patch-Makefile_in @@ -1,6 +1,6 @@ ---- pcrepp-0.9.5.orig/Makefile.in 2011-05-13 10:25:39.126696935 +0200 -+++ pcrepp-0.9.5/Makefile.in 2011-05-13 10:18:08.619616044 +0200 -@@ -77,7 +77,7 @@ +--- pcre++-0.9.5.orig/Makefile.in 2004-08-25 01:38:03.000000000 +0200 ++++ pcre++-0.9.5/Makefile.in 2011-08-05 07:28:46.000000000 +0200 +@@ -77,7 +77,7 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ diff --git a/package/pcrepp/patches/patch-configure b/package/pcrepp/patches/patch-configure new file mode 100644 index 000000000..0ee82218e --- /dev/null +++ b/package/pcrepp/patches/patch-configure @@ -0,0 +1,20 @@ +--- pcre++-0.9.5.orig/configure 2004-08-25 01:38:03.000000000 +0200 ++++ pcre++-0.9.5/configure 2011-08-05 07:30:53.000000000 +0200 +@@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the + CPPFLAGS="$CPPFLAGS -I/include" + ;; + *-*-linux*) +- CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I/usr/include -I/usr/local/include" ++ CPPFLAGS="$CPPFLAGS `pcre-config --cflags`" + ;; + *-*-freebsd*) + CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I/usr/local/include" +@@ -8621,7 +8621,7 @@ if test "x$with_pcre_include" = "x"; the + CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I$prefix/include -I/usr/local/include" + ;; + *) +- CPPFLAGS="-I/usr/include -I/usr/local/include" ++ CPPFLAGS="$CPPFLAGS `pcre-config --cflags`" + ;; + esac + fi -- cgit v1.2.3 From 9030c3feff75a65db47a5c23351e59ed58c14bb5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:05:26 +0200 Subject: update to latest stable upstream version --- package/dnsmasq/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 3cca7cc35..39dd371a5 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.55 -PKG_RELEASE:= 3 -PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a +PKG_VERSION:= 2.57 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d10faeb409717eae94718d7716ca63a4 PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns PKG_URL:= http://thekelleys.org.uk/dnsmasq/ @@ -20,7 +20,7 @@ CONFIG_STYLE:= manual post-install: ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin ${INSTALL_DATA} ./files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 95f26c769c56b8d0febae717524f38287b832105 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:05:32 +0200 Subject: update to latest stable upstream version --- package/openssh/Makefile | 4 ++-- package/openssh/patches/patch-openbsd-compat_port-linux_c | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 package/openssh/patches/patch-openbsd-compat_port-linux_c diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 0ce3b3f52..0eca41056 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 5.6p1 +PKG_VERSION:= 5.8p2 PKG_RELEASE:= 1 -PKG_MD5SUM:= e6ee52e47c768bf0ec42a232b5d18fb0 +PKG_MD5SUM:= 0541579adf9d55abb15ef927048d372e PKG_DESCR:= OpenSSH PKG_SECTION:= net/security PKG_DEPENDS:= zlib libopenssl libpthread diff --git a/package/openssh/patches/patch-openbsd-compat_port-linux_c b/package/openssh/patches/patch-openbsd-compat_port-linux_c deleted file mode 100644 index cf57335e0..000000000 --- a/package/openssh/patches/patch-openbsd-compat_port-linux_c +++ /dev/null @@ -1,14 +0,0 @@ -avoid following warning in syslog: -sshd (1111): /proc/1111/oom_adj is deprecated, please use /proc/1111/oom_score_adj instead. - ---- openssh-5.6p1.orig/openbsd-compat/port-linux.c 2010-03-01 05:52:50.000000000 +0100 -+++ openssh-5.6p1/openbsd-compat/port-linux.c 2011-01-27 19:16:12.000000000 +0100 -@@ -208,7 +208,7 @@ ssh_selinux_change_context(const char *n - #endif /* WITH_SELINUX */ - - #ifdef LINUX_OOM_ADJUST --#define OOM_ADJ_PATH "/proc/self/oom_adj" -+#define OOM_ADJ_PATH "/proc/self/oom_score_adj" - /* - * The magic "don't kill me", as documented in eg: - * http://lxr.linux.no/#linux+v2.6.32/Documentation/filesystems/proc.txt -- cgit v1.2.3 From c79eb088483dff89d6150ed9317b0e82cc619a57 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:05:38 +0200 Subject: update to latest stable upstream version --- package/mksh/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 3b0a3c072..a599d572f 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mksh -PKG_VERSION:= 39c +PKG_VERSION:= 40b PKG_RELEASE:= 1 -PKG_MD5SUM:= 0c3cd172b47eefcdf9a302baa42f5092 +PKG_MD5SUM:= afb08b65272ace550ec59b26a876a7de PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org/ -- cgit v1.2.3 From c349b02151e718b62643a13c1d170aeeceb7f53c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:05:44 +0200 Subject: update to latest stable upstream version --- package/qemu/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/qemu/Makefile b/package/qemu/Makefile index f82e852b8..69bc964c9 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 0.14.0 +PKG_VERSION:= 0.14.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f9d145d5c09de9f0984ffe9bd1229970 +PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc PKG_DEPENDS:= zlib libsdl @@ -23,7 +23,6 @@ $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ - --disable-user \ --prefix=/usr \ --sysconfdir=/etc \ --bindir=/usr/bin -- cgit v1.2.3 From 602e9729c8276379a8779e503f3b3fa360c2d407 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:05:49 +0200 Subject: update to latest stable upstream version --- package/dropbear/Makefile | 6 +++--- package/dropbear/patches/patch-Makefile_in | 23 +++++++++++++++++++++++ package/dropbear/patches/patch-cli-runopts_c | 8 ++++---- package/dropbear/patches/patch-options_h | 22 +++++----------------- package/dropbear/patches/patch-svr-main_c | 15 --------------- 5 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 package/dropbear/patches/patch-Makefile_in delete mode 100644 package/dropbear/patches/patch-svr-main_c diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 5ee4e7d3d..07dc414b3 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 0.52 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e +PKG_VERSION:= 0.53.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6b8d901859d9b8a18e2f6bfe0a892a03 PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net/security PKG_URL:= http://matt.ucc.asn.au/dropbear/ diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in new file mode 100644 index 000000000..9f5447d74 --- /dev/null +++ b/package/dropbear/patches/patch-Makefile_in @@ -0,0 +1,23 @@ +--- dropbear-0.53.1.orig/Makefile.in 2011-03-02 14:23:34.000000000 +0100 ++++ dropbear-0.53.1/Makefile.in 2011-08-02 20:34:28.000000000 +0200 +@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \ + queue.o \ + atomicio.o compat.o fake-rfc2553.o + +-SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \ ++SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \ + svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \ + svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\ + svr-tcpfwd.o svr-authpam.o +@@ -75,9 +75,8 @@ AR=@AR@ + RANLIB=@RANLIB@ + STRIP=@STRIP@ + INSTALL=@INSTALL@ +-CPPFLAGS=@CPPFLAGS@ +-CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +-LIBS+=@LIBS@ ++CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) ++LIBS+=@LIBS@ @CRYPTLIB@ + LDFLAGS=@LDFLAGS@ + + EXEEXT=@EXEEXT@ diff --git a/package/dropbear/patches/patch-cli-runopts_c b/package/dropbear/patches/patch-cli-runopts_c index 46e03dfca..b2f98da81 100644 --- a/package/dropbear/patches/patch-cli-runopts_c +++ b/package/dropbear/patches/patch-cli-runopts_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/cli-runopts.c 2008-11-11 15:09:02.000000000 +0100 -+++ dropbear-0.52/cli-runopts.c 2009-03-19 19:20:16.000000000 +0100 -@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv) +--- dropbear-0.53.1.orig/cli-runopts.c 2011-03-02 14:23:35.000000000 +0100 ++++ dropbear-0.53.1/cli-runopts.c 2011-08-02 20:03:12.000000000 +0200 +@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -12,7 +12,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case 'F': case 'e': case 'c': -@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv) +@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv) #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index 00914dda2..c6fbe7871 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,20 +1,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/options.h 2008-11-11 15:13:50.000000000 +0100 -+++ dropbear-0.52/options.h 2010-03-14 23:30:26.277667006 +0100 -@@ -10,6 +10,11 @@ - * parts are to allow for commandline -DDROPBEAR_XXX options etc. - ******************************************************************/ - -+#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER) -+#define DROPBEAR_SERVER -+#define DROPBEAR_CLIENT -+#endif -+ - #ifndef DROPBEAR_DEFPORT - #define DROPBEAR_DEFPORT "22" +--- dropbear-0.53.1.orig/options.h 2011-03-02 14:23:36.000000000 +0100 ++++ dropbear-0.53.1/options.h 2011-08-02 20:03:13.000000000 +0200 +@@ -144,7 +144,7 @@ much traffic. */ #endif -@@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende - /* #define DSS_PROTOK */ /* Whether to do reverse DNS lookups. */ -#define DO_HOST_LOOKUP @@ -22,11 +10,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ -@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende +@@ -236,7 +236,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND --#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" +-#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" +#define XAUTH_COMMAND "/usr/bin/xauth -q" #endif diff --git a/package/dropbear/patches/patch-svr-main_c b/package/dropbear/patches/patch-svr-main_c deleted file mode 100644 index eaf066158..000000000 --- a/package/dropbear/patches/patch-svr-main_c +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - - * bzero is obsolete, use memset - ---- dropbear-0.52.orig/svr-main.c 2008-11-11 15:09:03.000000000 +0100 -+++ dropbear-0.52/svr-main.c 2009-05-23 16:13:30.569366604 +0200 -@@ -133,7 +133,7 @@ void main_noinetd() { - for (i = 0; i < MAX_UNAUTH_CLIENTS; i++) { - childpipes[i] = -1; - } -- bzero(preauth_addrs, sizeof(preauth_addrs)); -+ memset(preauth_addrs, 0, sizeof(preauth_addrs)); - - /* Set up the listening sockets */ - listensockcount = listensockets(listensocks, MAX_LISTEN_ADDR, &maxsock); -- cgit v1.2.3 From 9d02d77d7e672c9360f949dd19dddb94aa2555d4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:06:21 +0200 Subject: patching needs earlier done --- package/apr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/apr/Makefile b/package/apr/Makefile index 4d5f90ba2..3362e3d31 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -44,7 +44,7 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-build: +pre-build: # we need to patch paths to get apr-util compiling $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ ${WRKBUILD}/apr-1-config -- cgit v1.2.3 From 37c9ea3cb1b50e51371f49b9fd1d4e7b3b44b19f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:06:44 +0200 Subject: not for darwin --- mk/modules.mk | 2 -- package/cluster-glue/Makefile | 1 + package/llvm/Makefile | 1 + package/openjdk/Makefile | 1 + package/pacemaker/Makefile | 1 + package/resource-agents/Makefile | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mk/modules.mk b/mk/modules.mk index c429f114e..c9819c697 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -940,8 +940,6 @@ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ ,10)) $(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\ - $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \ - $(MODULES_DIR)/kernel/lib/lzo/lzo_decompress \ $(MODULES_DIR)/kernel/crypto/lzo \ ,10)) diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile index a2d8f365e..0e889194f 100644 --- a/package/cluster-glue/Makefile +++ b/package/cluster-glue/Makefile @@ -14,6 +14,7 @@ PKG_URL:= http://www.linux-ha.org/wiki/Cluster_Glue PKG_SITES:= http://openadk.org/distfiles/ PKG_CFLINE_CLUSTER_GLUE:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_HOST_DEPENDS:= !darwin include $(TOPDIR)/mk/package.mk diff --git a/package/llvm/Makefile b/package/llvm/Makefile index a12d9f421..0dfd2d3ec 100644 --- a/package/llvm/Makefile +++ b/package/llvm/Makefile @@ -13,6 +13,7 @@ PKG_URL:= http://llvm.org/ PKG_SITES:= http://llvm.org/releases/2.9/ PKG_CFLINE_LLVM:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_HOST_DEPENDS:= !darwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index db8e28e6b..8149e9e54 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -25,6 +25,7 @@ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ http://icedtea.classpath.org/download/source/ PKG_CFLINE_OPENJDK:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG +PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index ec299c918..8f0b6bbe2 100644 --- a/package/pacemaker/Makefile +++ b/package/pacemaker/Makefile @@ -14,6 +14,7 @@ PKG_URL:= http://www.clusterlabs.org/ PKG_SITES:= http://openadk.org/distfiles/ PKG_CFLINE_PACEMAKER:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_HOST_DEPENDS:= !darwin include $(TOPDIR)/mk/package.mk diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile index b68da9226..30f63b07b 100644 --- a/package/resource-agents/Makefile +++ b/package/resource-agents/Makefile @@ -13,6 +13,7 @@ PKG_URL:= https://github.com/ClusterLabs/resource-agents PKG_SITES:= http://openadk.org/distfiles/ PKG_CFLINE_RESOURCE_AGENTS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_HOST_DEPENDS:= !darwin include $(TOPDIR)/mk/package.mk -- cgit v1.2.3