summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/iperf/Makefile5
-rw-r--r--package/logitechmediaserver/Makefile2
-rw-r--r--package/openswan/Makefile8
-rw-r--r--package/openswan/patches/patch-Makefile_inc40
-rw-r--r--package/openswan/patches/patch-lib_libipsecconf_starterwhack_c6
-rw-r--r--package/openswan/patches/patch-lib_liblwres_Makefile8
-rw-r--r--package/openswan/patches/patch-lib_libopenswan_oswlog_c11
-rwxr-xr-xpackage/raddump/Makefile2
-rw-r--r--package/samba/Makefile4
-rw-r--r--package/samba/patches/patch-wscript_build22
-rw-r--r--package/strongswan/Makefile20
-rw-r--r--package/sysstat/Makefile13
-rw-r--r--package/tinyproxy/Makefile36
-rw-r--r--package/tmux/Makefile30
-rw-r--r--package/ulogd/Makefile2
-rw-r--r--package/ulogd/patches/0001-newer-kernel.patch100
-rw-r--r--package/webkitgtk/Makefile4
-rw-r--r--package/webkitgtk/patches/patch-CMakeLists_txt10
-rw-r--r--package/webkitgtk/patches/patch-CMakeLists_txt.orig10
-rw-r--r--package/weechat/Makefile24
-rw-r--r--package/weechat/patches/patch-configure_ac37
21 files changed, 223 insertions, 171 deletions
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 0f10ab1a1..a71a1ef21 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= iperf
-PKG_VERSION:= 2.0.4
+PKG_VERSION:= 2.0.5
PKG_RELEASE:= 1
-PKG_HASH:= 3b52f1c178d6a99c27114929d5469c009197d15379c967b329bafb956f397944
+PKG_HASH:= 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b
PKG_DESCR:= internet protocol bandwidth measuring tool
PKG_SECTION:= net/perf
PKG_DEPENDS:= libpthread
@@ -27,6 +27,7 @@ CONFIGURE_ENV+= LIBS="-luClibc++ -lc -lm -lpthread"
else
CONFIGURE_ENV+= LIBS="-lc -lm -lpthread"
endif
+CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes
iperf-install:
${INSTALL_DIR} ${IDIR_IPERF}/usr/bin
diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile
index 043904271..d4baf0dee 100644
--- a/package/logitechmediaserver/Makefile
+++ b/package/logitechmediaserver/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= logitechmediaserver
PKG_VERSION:= 7.9.0
PKG_RELEASE:= 1
-PKG_HASH:= f2b6dae92e76d9f21742adf74e83447e98e14f2a62ea2883208130a251fe2112
+PKG_HASH:= a7ebf01bbd95954c5f32e81fddb2315cb50f2d4388f63dec9c869dd9aef7da8a
PKG_DESCR:= popular media server
PKG_SECTION:= mm/audio
PKG_DEPENDS:= perl p5-xml-parser p5-dbi p5-ev p5-html-parser
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index a70454d15..525ddd2f1 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,12 +4,12 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= openswan
-PKG_VERSION:= 2.6.41
+PKG_VERSION:= 2.6.43
PKG_RELEASE:= 1
-PKG_HASH:= f9ebb395cb0f717dc43942662ab65161035a99dbf8e680c1d1511d4de130d0fb
+PKG_HASH:= ac7ef1d78766801f23c458cc7c3b080ca6e20c5144a1979598c319bc3bc7c88b
PKG_DESCR:= ipsec software
PKG_SECTION:= net/security
-PKG_DEPENDS:= ip libgmp libpthread
+PKG_DEPENDS:= libgmp libpthread
PKG_BUILDDEP:= gmp
PKG_URL:= http://www.openswan.org/
PKG_SITES:= http://www.openswan.org/download/
@@ -18,7 +18,7 @@ PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
# GLOB_BRACE usage
-PKG_LIBC_DEPENDS:= uclibc glibc
+PKG_LIBC_DEPENDS:= uclibc-ng uclibc glibc
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index 9c73c7ce0..b6c272859 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,39 +1,23 @@
---- openswan-2.6.41.orig/Makefile.inc 2014-02-21 21:46:57.000000000 +0100
-+++ openswan-2.6.41/Makefile.inc 2014-03-12 18:39:50.906115397 +0100
-@@ -169,7 +169,7 @@ INSTALL=install
- # how backup names are composed.
- # Note that the install procedures will never overwrite an existing config
- # file, which is why -b is not specified for them.
--INSTBINFLAGS=-b --suffix=.old
-+INSTBINFLAGS=
- INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
- INSTMANFLAGS=
- INSTCONFFLAGS=
-@@ -191,10 +191,10 @@ BISONOSFLAGS=
+--- openswan-2.6.43.orig/Makefile.inc 2015-03-13 13:49:09.000000000 -0500
++++ openswan-2.6.43/Makefile.inc 2015-05-01 04:11:06.067427001 -0500
+@@ -194,17 +194,17 @@ BISONOSFLAGS=
#Example for a cross compile:
#USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
GCC_LINT ?= -DGCC_LINT
--USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
-+USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
+-USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA}
++USERCOMPILE?=
# on fedora/rhel
#USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS
-KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
-+KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
++KLIPSCOMPILE=-DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
# Additional debugging for developers (warning: can crash openswan!)
#USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
# You can also run this before starting openswan on glibc systems:
-@@ -283,12 +283,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
- # Note you need a locally running bind9 nameserver with lwres{} enabled
- # to use this, or have the "lwres" package installed and running.
- # This only affects conns that use DNS for keys in lookups.
--USE_LWRES?=false
-+USE_LWRES?=true
+ #export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
- # Do a new lookup every time a connection is (re)started. This works better
- # on hosts with some dyndns service, since DPD will cause a new dns lookup,
- # but it could be a potential security issue if receiving spoofed dns.
--USE_DYNAMICDNS?=true
-+USE_DYNAMICDNS?=false
+ # extra link flags
+-USERLINK?=-Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now ${USERLINKEXTRA}
++USERLINK?=${USERLINKEXTRA}
+ # on fedora/rhel
+ #USERLINK=-g -pie
- # Do we want all the configuration files like ipsec.conf and ipsec.secrets
- # and any certificates to be in a single directory defined by
diff --git a/package/openswan/patches/patch-lib_libipsecconf_starterwhack_c b/package/openswan/patches/patch-lib_libipsecconf_starterwhack_c
index 2bc7e6910..46c6497fe 100644
--- a/package/openswan/patches/patch-lib_libipsecconf_starterwhack_c
+++ b/package/openswan/patches/patch-lib_libipsecconf_starterwhack_c
@@ -1,6 +1,6 @@
---- openswan-2.6.38.orig/lib/libipsecconf/starterwhack.c 2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libipsecconf/starterwhack.c 2014-03-26 21:21:22.000000000 +0100
-@@ -17,7 +17,7 @@
+--- openswan-2.6.43.orig/lib/libipsecconf/starterwhack.c 2015-03-13 13:49:09.000000000 -0500
++++ openswan-2.6.43/lib/libipsecconf/starterwhack.c 2015-05-01 04:01:15.147426999 -0500
+@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/package/openswan/patches/patch-lib_liblwres_Makefile b/package/openswan/patches/patch-lib_liblwres_Makefile
index 5aaa2112e..fb788473a 100644
--- a/package/openswan/patches/patch-lib_liblwres_Makefile
+++ b/package/openswan/patches/patch-lib_liblwres_Makefile
@@ -1,11 +1,11 @@
---- openswan-2.6.38.orig/lib/liblwres/Makefile 2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/liblwres/Makefile 2012-07-25 18:21:02.000000000 +0200
+--- openswan-2.6.43.orig/lib/liblwres/Makefile 2015-03-13 13:49:09.000000000 -0500
++++ openswan-2.6.43/lib/liblwres/Makefile 2015-05-01 04:01:15.175426999 -0500
@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/includ
-I${srcdir}../libisc/include \
- -I. -I./include -I${srcdir}include
+ -I. -I./include -I${srcdir}include
CDEFINES =
-CWARNINGS = -Werror
+#CWARNINGS = -Werror
- CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS}
+ CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS}
diff --git a/package/openswan/patches/patch-lib_libopenswan_oswlog_c b/package/openswan/patches/patch-lib_libopenswan_oswlog_c
deleted file mode 100644
index a093b4e1b..000000000
--- a/package/openswan/patches/patch-lib_libopenswan_oswlog_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.38.orig/lib/libopenswan/oswlog.c 2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libopenswan/oswlog.c 2014-03-26 21:09:43.000000000 +0100
-@@ -24,7 +24,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <signal.h> /* used only if MSG_NOSIGNAL not defined */
--#include <sys/queue.h>
-+#include "queue.h"
- #include <libgen.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index d2a20108b..a1e689eb9 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -20,6 +20,8 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,RADDUMP,raddump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes
+
raddump-install:
${INSTALL_DIR} ${IDIR_RADDUMP}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/raddump ${IDIR_RADDUMP}/usr/bin
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 508b7a9d6..e37e0f979 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= samba
PKG_VERSION:= 4.2.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_HASH:= 37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3
PKG_DESCR:= file and print server
PKG_SECTION:= net/fs
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --enable-fhs \
--disable-cups \
--disable-avahi \
--disable-rpath \
- --bundled-libraries='!asn1_compile,!compile_et' \
+ --bundled-libraries='com_err,!asn1_compile,!compile_et' \
--disable-rpath-install
CONFIGURE_ENV+= PYTHON_CONFIG="$(STAGING_TARGET_DIR)/usr/bin/python-config" \
python_LDFLAGS="" \
diff --git a/package/samba/patches/patch-wscript_build b/package/samba/patches/patch-wscript_build
new file mode 100644
index 000000000..ec7527dd8
--- /dev/null
+++ b/package/samba/patches/patch-wscript_build
@@ -0,0 +1,22 @@
+--- samba-4.2.1.orig/wscript_build 2014-12-20 09:07:55.000000000 -0600
++++ samba-4.2.1/wscript_build 2015-04-30 23:51:25.915427028 -0500
+@@ -123,18 +123,7 @@ bld.RECURSE('libcli/samsync')
+ bld.RECURSE('libcli/registry')
+ bld.RECURSE('source4/lib/policy')
+ bld.RECURSE('libcli/named_pipe_auth')
+-
+-if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
+- if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"):
+- # When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not equal,
+- # it means one is Heimdal-specific (krb5-config.heimdal, for example)
+- # and there is system heimdal
+- bld.PROCESS_SEPARATE_RULE('system_heimdal')
+- else:
+- bld.PROCESS_SEPARATE_RULE('embedded_heimdal')
+-else:
+- bld.PROCESS_SEPARATE_RULE('system_mitkrb5')
+-
++bld.PROCESS_SEPARATE_RULE('embedded_heimdal')
+ bld.RECURSE('libcli/smbreadline')
+ bld.RECURSE('codepages')
+ if bld.AD_DC_BUILD_IS_ENABLED():
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 0324b062d..32593fad5 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -4,19 +4,17 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= strongswan
-PKG_VERSION:= 5.1.3
+PKG_VERSION:= 5.3.0
PKG_RELEASE:= 1
-PKG_HASH:= 88438e5fd07fa6dbcd69954101cb300fc9a357495580a1fd1924bd8c49c7add1
+PKG_HASH:= 66d934340cde95c4fbb399880baa8703e7b17762134f1a411a186aad97ea5148
PKG_DESCR:= ipsec software
PKG_SECTION:= net/security
-PKG_DEPENDS:= ip libpthread
+PKG_DEPENDS:= libpthread
PKG_URL:= http://strongswan.org/index.htm
PKG_SITES:= http://download.strongswan.org/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_LIBC_DEPENDS:= uclibc glibc
-
PKG_CHOICES_STRONGSWAN:=WITH_GNUTLS WITH_OPENSSL WITH_GMP
PKGCD_WITH_GMP:= use gmp for crypto
PKGCS_WITH_GMP:= libgmp
@@ -68,17 +66,7 @@ strongswan-install:
$(CP) $(WRKINST)/usr/lib/ipsec/plugins/*.so \
$(IDIR_STRONGSWAN)/usr/lib/ipsec/plugins
$(CP) $(WRKINST)/etc/* $(IDIR_STRONGSWAN)/etc
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/charon \
- $(IDIR_STRONGSWAN)/usr/libexec/ipsec
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/starter \
- $(IDIR_STRONGSWAN)/usr/libexec/ipsec
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_updown \
- $(IDIR_STRONGSWAN)/usr/libexec/ipsec
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_copyright \
- $(IDIR_STRONGSWAN)/usr/libexec/ipsec
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/stroke \
- $(IDIR_STRONGSWAN)/usr/libexec/ipsec
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/ipsec/_updown_espmark \
+ $(CP) $(WRKINST)/usr/libexec/ipsec/* \
$(IDIR_STRONGSWAN)/usr/libexec/ipsec
$(INSTALL_BIN) $(WRKINST)/usr/sbin/ipsec \
$(IDIR_STRONGSWAN)/usr/sbin
diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile
index 9dd7f362b..64d3f6278 100644
--- a/package/sysstat/Makefile
+++ b/package/sysstat/Makefile
@@ -6,7 +6,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= sysstat
PKG_VERSION:= 11.1.4
PKG_RELEASE:= 1
-PKG_HASH:= ce66047a5600a741a51d347553721c05f3372896460323f25c3c19d9225e8ee7
+PKG_HASH:= b5d160bacc57a2e89873dee2ea3382b8811f0036520bf2e5789443797c4be46f
PKG_DESCR:= utilities for system monitoring and performance analysis
PKG_SECTION:= sys/utils
PKG_SITES:= http://pagesperso-orange.fr/sebastien.godard/
@@ -17,13 +17,10 @@ $(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
sysstat-install:
${INSTALL_DIR} ${IDIR_SYSSTAT}/usr/lib/sa
- ${INSTALL_BIN} ${WRKINST}/usr/lib/sa/sa1 ${IDIR_SYSSTAT}/usr/lib/sa
- ${INSTALL_BIN} ${WRKINST}/usr/lib/sa/sa2 ${IDIR_SYSSTAT}/usr/lib/sa
- ${INSTALL_BIN} ${WRKINST}/usr/lib/sa/sadc ${IDIR_SYSSTAT}/usr/lib/sa
${INSTALL_DIR} ${IDIR_SYSSTAT}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/sar ${IDIR_SYSSTAT}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/sadf ${IDIR_SYSSTAT}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/iostat ${IDIR_SYSSTAT}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/mpstat ${IDIR_SYSSTAT}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/lib/sa/{sa1,sa2,sadc} \
+ ${IDIR_SYSSTAT}/usr/lib/sa
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/{sar,sadf,iostat,mpstat} \
+ ${IDIR_SYSSTAT}/usr/bin
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index e7c30c09c..00f03b0f2 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= tinyproxy
PKG_VERSION:= 1.8.3
@@ -12,28 +12,26 @@ PKG_SECTION:= net/proxy
PKG_URL:= https://www.banu.com/tinyproxy/
PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.8/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TINYPROXY,tinyproxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ARGS+= --disable-regexcheck
+CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
+ ac_cv_func_realloc_0_nonnull=yes
tinyproxy-install:
- ${INSTALL_DIR} ${IDIR_TINYPROXY}/usr/sbin \
- ${IDIR_TINYPROXY}/etc/tinyproxy \
- ${IDIR_TINYPROXY}/usr/share/tinyproxy
- ${INSTALL_DATA} ./files/tinyproxy.conf \
- ${IDIR_TINYPROXY}/etc/tinyproxy
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/tinyproxy \
- ${IDIR_TINYPROXY}/usr/sbin/
- ${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/debug.html \
- ${IDIR_TINYPROXY}/usr/share/tinyproxy/
- ${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/default.html \
- ${IDIR_TINYPROXY}/usr/share/tinyproxy/
- ${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/stats.html \
- ${IDIR_TINYPROXY}/usr/share/tinyproxy/
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+ $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/sbin
+ $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc/tinyproxy
+ $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/share/tinyproxy
+ $(INSTALL_DATA) ./files/tinyproxy.conf \
+ $(IDIR_TINYPROXY)/etc/tinyproxy
+ $(INSTALL_BIN) $(WRKINST)/usr/sbin/tinyproxy \
+ $(IDIR_TINYPROXY)/usr/sbin/
+ $(INSTALL_DATA) $(WRKINST)/usr/share/tinyproxy/{default,stats,debug}.html \
+ $(IDIR_TINYPROXY)/usr/share/tinyproxy/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/tmux/Makefile b/package/tmux/Makefile
new file mode 100644
index 000000000..a88726b33
--- /dev/null
+++ b/package/tmux/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:= tmux
+PKG_VERSION:= 1.9a
+PKG_RELEASE:= 1
+PKG_HASH:= c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5
+PKG_DESCR:= terminal multiplexer
+PKG_SECTION:= sys/utils
+PKG_BUILDDEP:= libevent ncurses
+PKG_DEPENDS:= libevent libncurses libpthread
+PKG_URL:= http://tmux.sourceforge.net
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmux/}
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TMUX,tmux,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIGURE_ARGS+= --disable-static
+
+tmux-install:
+ $(INSTALL_DIR) $(IDIR_TMUX)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/tmux \
+ $(IDIR_TMUX)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 92fc5ce99..228b0688f 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= ulogd
PKG_VERSION:= 2.0.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd
PKG_DESCR:= netfilter userspace logging daemon
PKG_SECTION:= net/firewall
diff --git a/package/ulogd/patches/0001-newer-kernel.patch b/package/ulogd/patches/0001-newer-kernel.patch
new file mode 100644
index 000000000..c00dcd657
--- /dev/null
+++ b/package/ulogd/patches/0001-newer-kernel.patch
@@ -0,0 +1,100 @@
+From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Fri, 7 Nov 2014 18:33:01 +0100
+Subject: include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h
+
+This fixes compilation if you use a Linux kernel >= 3.17. This problem
+occurs since ULOG was removed from mainstream:
+
+http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb
+
+Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+
+diff --git a/configure.ac b/configure.ac
+index 522c345..c5f573c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
+
+ AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
+ include/linux/Makefile include/linux/netfilter/Makefile \
+- libipulog/Makefile \
++ include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
+ input/Makefile input/packet/Makefile input/flow/Makefile \
+ input/sum/Makefile \
+ filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index ca80d0d..18af1c2 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -1,2 +1,2 @@
+-
+-SUBDIRS = netfilter
++SUBDIRS = netfilter \
++ netfilter_ipv4
+diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am
+new file mode 100644
+index 0000000..41819a3
+--- /dev/null
++++ b/include/linux/netfilter_ipv4/Makefile.am
+@@ -0,0 +1 @@
++noinst_HEADERS = ipt_ULOG.h
+diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
+new file mode 100644
+index 0000000..417aad2
+--- /dev/null
++++ b/include/linux/netfilter_ipv4/ipt_ULOG.h
+@@ -0,0 +1,49 @@
++/* Header file for IP tables userspace logging, Version 1.8
++ *
++ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
++ *
++ * Distributed under the terms of GNU GPL */
++
++#ifndef _IPT_ULOG_H
++#define _IPT_ULOG_H
++
++#ifndef NETLINK_NFLOG
++#define NETLINK_NFLOG 5
++#endif
++
++#define ULOG_DEFAULT_NLGROUP 1
++#define ULOG_DEFAULT_QTHRESHOLD 1
++
++#define ULOG_MAC_LEN 80
++#define ULOG_PREFIX_LEN 32
++
++#define ULOG_MAX_QLEN 50
++/* Why 50? Well... there is a limit imposed by the slab cache 131000
++ * bytes. So the multipart netlink-message has to be < 131000 bytes.
++ * Assuming a standard ethernet-mtu of 1500, we could define this up
++ * to 80... but even 50 seems to be big enough. */
++
++/* private data structure for each rule with a ULOG target */
++struct ipt_ulog_info {
++ unsigned int nl_group;
++ size_t copy_range;
++ size_t qthreshold;
++ char prefix[ULOG_PREFIX_LEN];
++};
++
++/* Format of the ULOG packets passed through netlink */
++typedef struct ulog_packet_msg {
++ unsigned long mark;
++ long timestamp_sec;
++ long timestamp_usec;
++ unsigned int hook;
++ char indev_name[IFNAMSIZ];
++ char outdev_name[IFNAMSIZ];
++ size_t data_len;
++ char prefix[ULOG_PREFIX_LEN];
++ unsigned char mac_len;
++ unsigned char mac[ULOG_MAC_LEN];
++ unsigned char payload[0];
++} ulog_packet_msg_t;
++
++#endif /*_IPT_ULOG_H*/
+--
+cgit v0.10.2
+
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
index 43cae5da5..dacf52e2d 100644
--- a/package/webkitgtk/Makefile
+++ b/package/webkitgtk/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= webkitgtk
-PKG_VERSION:= 2.7.3
+PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
-PKG_HASH:= 06243dfda689e83d170a31d6ea288f51790ddc596faa8a6b44f464006528b7f8
+PKG_HASH:= 7d214459d216ca499ad75bccae7f248655d6ef5b295ffafd299773e7331860ff
PKG_DESCR:= web browser engine
PKG_SECTION:= libs/misc
PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup
diff --git a/package/webkitgtk/patches/patch-CMakeLists_txt b/package/webkitgtk/patches/patch-CMakeLists_txt
deleted file mode 100644
index 3c8adb8b3..000000000
--- a/package/webkitgtk/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- webkitgtk-2.7.3.orig/CMakeLists.txt 2014-12-02 07:49:21.000000000 -0600
-+++ webkitgtk-2.7.3/CMakeLists.txt 2015-01-02 07:12:58.481869248 -0600
-@@ -68,7 +68,6 @@ find_package(Gperf 3.0.1 REQUIRED)
- find_package(Perl 5.10.0 REQUIRED)
-
- find_package(PythonInterp 2.6.0 REQUIRED)
--find_package(Ruby 1.8.7)
-
- # -----------------------------------------------------------------------------
- # Determine the target processor
diff --git a/package/webkitgtk/patches/patch-CMakeLists_txt.orig b/package/webkitgtk/patches/patch-CMakeLists_txt.orig
deleted file mode 100644
index d5065cc2d..000000000
--- a/package/webkitgtk/patches/patch-CMakeLists_txt.orig
+++ /dev/null
@@ -1,10 +0,0 @@
---- webkitgtk-2.6.4.orig/CMakeLists.txt 2014-11-20 02:32:05.000000000 -0600
-+++ webkitgtk-2.6.4/CMakeLists.txt 2014-12-30 10:43:47.709729339 -0600
-@@ -69,7 +69,6 @@ find_package(Gperf 3.0.1 REQUIRED)
- find_package(Perl 5.10.0 REQUIRED)
-
- find_package(PythonInterp 2.6.0 REQUIRED)
--find_package(Ruby 1.8.7)
-
- # -----------------------------------------------------------------------------
- # Determine the target processor
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index da51651bd..5b63816e2 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -4,13 +4,13 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= weechat
-PKG_VERSION:= 0.4.3
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_HASH:= bfb5a34f78eaad0e22e1aa0783ff330907f253fcd50a1d3fd0aa19df9114dde9
+PKG_HASH:= a32f7e57d5e834195bacaffa874419b4a9d17cd42883c80d7ecb9fadbf601349
PKG_DESCR:= lightweight irc client
PKG_SECTION:= app/chat
-PKG_DEPENDS:= libncurses libgcrypt zlib libcurl
-PKG_BUILDDEP:= ncurses zlib libgcrypt curl
+PKG_DEPENDS:= libncurses zlib libcurl libgcrypt
+PKG_BUILDDEP:= cmake-host ncurses zlib curl libgcrypt
PKG_URL:= http://www.weechat.org/
PKG_SITES:= http://www.weechat.org/files/src/
@@ -20,15 +20,13 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-AUTOTOOL_STYLE:= autoreconf
-TARGET_LDFLAGS+= -ltinfo
-CONFIGURE_ARGS+= --with-debug=0 \
- --disable-perl \
- --disable-python \
- --disable-lua \
- --disable-tcl \
- --disable-gnutls \
- --disable-ruby
+CONFIG_STYLE:= cmake
+CMAKE_FLAGS+= -DENABLE_GNUTLS=OFF \
+ -DENABLE_PERL=OFF \
+ -DENABLE_PYTHON=OFF \
+ -DENABLE_NLS=OFF \
+ -DGCRYPT_LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib -ltinfo -lgcrypt" \
+ -DGCRYPT_CFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \
weechat-install:
${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
diff --git a/package/weechat/patches/patch-configure_ac b/package/weechat/patches/patch-configure_ac
deleted file mode 100644
index 757f673fb..000000000
--- a/package/weechat/patches/patch-configure_ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- weechat-0.4.3.orig/configure.ac 2014-02-09 09:52:53.000000000 +0100
-+++ weechat-0.4.3/configure.ac 2014-06-24 08:07:06.000000000 +0200
-@@ -232,33 +232,7 @@ fi
-
- ICONV_LFLAGS=""
-
--iconv_found="no"
--AC_CHECK_HEADER(iconv.h,ac_found_iconv_header="yes",ac_found_iconv_header="no")
--if test "x$ac_found_iconv_header" = "xyes" ; then
-- AC_CHECK_LIB(iconv,iconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
-- if test "x$ac_found_iconv_lib" = "xno" ; then
-- AC_CHECK_LIB(iconv,libiconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
-- fi
-- if test "x$ac_found_iconv_lib" = "xyes" ; then
-- ICONV_LFLAGS="-liconv"
-- LIBS="$LIBS $ICONV_LFLAGS"
-- fi
-- AC_MSG_CHECKING(for iconv usability in programs)
-- AC_TRY_RUN([
-- #include <iconv.h>
-- int main(int argc, char **argv) {
-- iconv_t conv = iconv_open("ISO8859-1", "UTF-8");
-- if (conv != (iconv_t) -1) {
-- return 0;
-- }
-- return 1;
-- }],iconv_found="yes")
-- if test "x$iconv_found" = "xno" ; then
-- AC_MSG_RESULT(no)
-- else
-- AC_MSG_RESULT(yes)
-- fi
--fi
-+iconv_found="yes"
-
- if test "x$iconv_found" = "xno" ; then
- AC_MSG_ERROR([