summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rwxr-xr-xpackage/ctorrent/Makefile2
-rw-r--r--package/ctorrent/patches/patch-compat_c13
-rw-r--r--package/deco/Makefile3
-rw-r--r--package/hostapd/patches/patch-src_drivers_linux_wext_h19
-rw-r--r--package/iftop/Makefile2
-rw-r--r--package/kismet/Makefile2
-rw-r--r--package/kismet/patches/patch-dumpfile_tuntap_h18
-rw-r--r--package/lame/Makefile1
-rw-r--r--package/libshout/Makefile10
-rw-r--r--package/libshout/patches/patch-ltmain_sh11
-rw-r--r--package/m4/Makefile2
-rw-r--r--package/m4/patches/patch-lib_stdio_in_h13
-rw-r--r--package/nano/Makefile20
-rw-r--r--package/ntpclient/patches/patch-ntpclient_c11
-rw-r--r--package/open-iscsi/patches/patch-usr_idbm_c10
-rw-r--r--package/open-iscsi/patches/patch-usr_mgmt_ipc_c4
-rw-r--r--package/osiris/patches/patch-src_libosiris_Makefile_in4
-rw-r--r--package/osiris/patches/patch-src_libosiris_osi_common_h10
-rw-r--r--package/procps/Makefile1
-rw-r--r--package/proftpd/Makefile7
-rw-r--r--package/rdesktop/Makefile3
-rw-r--r--package/util-linux/Makefile2
-rw-r--r--package/xterm/Makefile3
23 files changed, 116 insertions, 55 deletions
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 470e159ca..ab59739bd 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ctorrent
PKG_VERSION:= dnh3.3.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6
PKG_DESCR:= console-based BitTorrent client
PKG_SECTION:= p2p
diff --git a/package/ctorrent/patches/patch-compat_c b/package/ctorrent/patches/patch-compat_c
new file mode 100644
index 000000000..44408b5db
--- /dev/null
+++ b/package/ctorrent/patches/patch-compat_c
@@ -0,0 +1,13 @@
+--- ctorrent-dnh3.3.2.orig/compat.c 2008-06-15 02:00:19.000000000 +0200
++++ ctorrent-dnh3.3.2/compat.c 2014-01-02 18:21:09.000000000 +0100
+@@ -67,8 +67,8 @@ int snprintf(char *str, size_t size, con
+ char *strnstr(const char *haystack, const char *needle, size_t haystacklen)
+ {
+ char *p;
+- ssize_t plen;
+- ssize_t len = strlen(needle);
++ size_t plen;
++ size_t len = strlen(needle);
+
+ if( *needle == '\0' )
+ return (char *)haystack;
diff --git a/package/deco/Makefile b/package/deco/Makefile
index 5aa535a9d..aa8ba0402 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= deco
PKG_VERSION:= 39
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f77f60e8be0cae1f814cba1ef61bf4d0
PKG_DESCR:= Text-based, full featured file manager
PKG_SECTION:= misc
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -ltinfo
INSTALL_STYLE:= manual
do-install:
diff --git a/package/hostapd/patches/patch-src_drivers_linux_wext_h b/package/hostapd/patches/patch-src_drivers_linux_wext_h
new file mode 100644
index 000000000..f09fa321e
--- /dev/null
+++ b/package/hostapd/patches/patch-src_drivers_linux_wext_h
@@ -0,0 +1,19 @@
+--- hostapd-2.0.orig/src/drivers/linux_wext.h 2013-01-12 16:42:53.000000000 +0100
++++ hostapd-2.0/src/drivers/linux_wext.h 2014-01-02 16:26:15.000000000 +0100
+@@ -21,11 +21,11 @@
+
+ #include <sys/types.h>
+ #include <net/if.h>
+-typedef __uint32_t __u32;
+-typedef __int32_t __s32;
+-typedef __uint16_t __u16;
+-typedef __int16_t __s16;
+-typedef __uint8_t __u8;
++typedef uint32_t __u32;
++typedef int32_t __s32;
++typedef uint16_t __u16;
++typedef int16_t __s16;
++typedef uint8_t __u8;
+ #ifndef __user
+ #define __user
+ #endif /* __user */
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index cbe15eb62..0d50f685c 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -ltinfo
+
iftop-install:
${INSTALL_DIR} ${IDIR_IFTOP}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/sbin/iftop ${IDIR_IFTOP}/usr/bin/
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index df52c74b8..110f6f78d 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -29,7 +29,7 @@ $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEAS
$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
AUTOTOOL_STYLE:= autoreconf
-TARGET_LDFLAGS+= -lpthread
+TARGET_LDFLAGS+= -lpthread -ltinfo
CONFIGURE_ARGS+= --sysconfdir=/etc/kismet
pre-build:
diff --git a/package/kismet/patches/patch-dumpfile_tuntap_h b/package/kismet/patches/patch-dumpfile_tuntap_h
new file mode 100644
index 000000000..f669446f5
--- /dev/null
+++ b/package/kismet/patches/patch-dumpfile_tuntap_h
@@ -0,0 +1,18 @@
+--- kismet-2013-03-R1b.orig/dumpfile_tuntap.h 2013-03-27 15:41:48.000000000 +0100
++++ kismet-2013-03-R1b/dumpfile_tuntap.h 2014-01-02 20:53:21.000000000 +0100
+@@ -65,7 +65,15 @@
+ #include "dumpfile.h"
+
+ #ifdef SYS_LINUX
++#if defined(__GLIBC__)
+ #include <linux/if_tun.h>
++#else
++#define IFF_TUN 0x0001
++#define IFF_TAP 0x0002
++#define IFF_NO_PI 0x1000
++#define TUNSETNOCSUM _IOW('T', 200, int)
++#define TUNSETIFF _IOW('T', 202, int)
++#endif
+
+ // Linux IEEE80211 link typ to set
+ #define LNX_LINKTYPE_80211 801
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 261ffe840..55d485de2 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -30,6 +30,7 @@ $(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
$(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+= -ltinfo
lame-install:
$(INSTALL_DIR) $(IDIR_LAME)/usr/bin
diff --git a/package/libshout/Makefile b/package/libshout/Makefile
index 13ef36c4c..26520e13a 100644
--- a/package/libshout/Makefile
+++ b/package/libshout/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libshout
-PKG_VERSION:= 2.2.2
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 4f75fc9901c724b712c371c9a1e782d3
+PKG_VERSION:= 2.3.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 11765b2592e7ea623ccd93d3f8df172c
PKG_DESCR:= Library which can be used to write a source client for streaming
PKG_SECTION:= libs
PKG_DEPENDS:= libvorbis libogg
@@ -19,8 +19,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIGURE_ARGS+= --with-speex=no \
- --with-theora=no
+CONFIGURE_ARGS+= --disable-speex \
+ --disable-theora
libshout-install:
${INSTALL_DIR} ${IDIR_LIBSHOUT}/usr/lib
diff --git a/package/libshout/patches/patch-ltmain_sh b/package/libshout/patches/patch-ltmain_sh
deleted file mode 100644
index 16c4c7888..000000000
--- a/package/libshout/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libshout-2.2.2.orig/ltmain.sh 2006-01-10 16:23:50.000000000 +0100
-+++ libshout-2.2.2/ltmain.sh 2011-01-15 23:03:59.000000000 +0100
-@@ -1623,7 +1623,7 @@ EOF
- # -pg pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
diff --git a/package/m4/Makefile b/package/m4/Makefile
index f7fe684b2..f34780964 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= m4
PKG_VERSION:= 1.4.17
PKG_RELEASE:= 1
-PKG_MD5SUM:= a5dfb4f2b7370e9d34293d23fd09b280
+PKG_MD5SUM:= a5e9954b1dae036762f7b13673a2cf76
PKG_DESCR:= macro processor
PKG_SECTION:= lang
PKG_BUILDDEP:= m4-host
diff --git a/package/m4/patches/patch-lib_stdio_in_h b/package/m4/patches/patch-lib_stdio_in_h
deleted file mode 100644
index 1d6eefc41..000000000
--- a/package/m4/patches/patch-lib_stdio_in_h
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4-1.4.16.orig/lib/stdio.in.h 2011-03-01 17:39:29.000000000 +0100
-+++ m4-1.4.16/lib/stdio.in.h 2013-10-29 10:45:30.000000000 +0100
-@@ -161,8 +161,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-+#if HAVE_RAW_DECL_GETS
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 42bb647df..b351ab73e 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= nano
-PKG_VERSION:= 2.2.4
+PKG_VERSION:= 2.2.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6304308afb1f7ef4a5e93eb99206632a
+PKG_MD5SUM:= 03233ae480689a008eb98feb1b599807
PKG_DESCR:= An enhanced clone of the Pico editor
PKG_SECTION:= editor
PKG_DEPENDS:= libncurses
@@ -14,30 +14,24 @@ PKG_BUILDDEP:= ncurses
PKG_URL:= http://www.nano-editor.org/
PKG_SITES:= http://www.nano-editor.org/dist/v2.2/
-PKG_FLAVOURS_NANO:= TINY
-PKGFD_TINY:= tiny nano
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_header_regex_h=no
CONFIGURE_ARGS+= --enable-nanorc \
- --disable-glibtest \
+ --enable-tiny \
--disable-utf8 \
+ --disable-glibtest \
--disable-color \
- --without-slang
-ifeq (${ADK_PACKAGE_NANO_TINY},y)
-CONFIGURE_ARGS+= --enable-tiny
-else
-CONFIGURE_ARGS+= --disable-browser \
+ --without-slang \
+ --disable-browser \
--disable-help \
--disable-mouse \
- --disable-nls \
--disable-speller \
--disable-operatingdir \
--enable-multibuffer
-endif
+TARGET_LDFLAGS+= -ltinfo
nano-install:
${INSTALL_DIR} ${IDIR_NANO}/usr/bin
diff --git a/package/ntpclient/patches/patch-ntpclient_c b/package/ntpclient/patches/patch-ntpclient_c
new file mode 100644
index 000000000..ed3b6c1d2
--- /dev/null
+++ b/package/ntpclient/patches/patch-ntpclient_c
@@ -0,0 +1,11 @@
+--- ntpclient-2010.orig/ntpclient.c 2010-12-31 18:28:36.000000000 +0100
++++ ntpclient-2010/ntpclient.c 2014-01-03 12:20:27.000000000 +0100
+@@ -441,7 +441,7 @@ static void stuff_net_addr(struct in_add
+ struct hostent *ntpserver;
+ ntpserver=gethostbyname(hostname);
+ if (ntpserver == NULL) {
+- herror(hostname);
++ perror(hostname);
+ exit(1);
+ }
+ if (ntpserver->h_length != 4) {
diff --git a/package/open-iscsi/patches/patch-usr_idbm_c b/package/open-iscsi/patches/patch-usr_idbm_c
new file mode 100644
index 000000000..38838c9a1
--- /dev/null
+++ b/package/open-iscsi/patches/patch-usr_idbm_c
@@ -0,0 +1,10 @@
+--- open-iscsi-2.0-871.orig/usr/idbm.c 2009-07-11 05:55:58.000000000 +0200
++++ open-iscsi-2.0-871/usr/idbm.c 2014-01-03 12:44:20.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <limits.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
++#include <fcntl.h>
+
+ #include "idbm.h"
+ #include "idbm_fields.h"
diff --git a/package/open-iscsi/patches/patch-usr_mgmt_ipc_c b/package/open-iscsi/patches/patch-usr_mgmt_ipc_c
index bc29bd21b..d1d936e0f 100644
--- a/package/open-iscsi/patches/patch-usr_mgmt_ipc_c
+++ b/package/open-iscsi/patches/patch-usr_mgmt_ipc_c
@@ -1,6 +1,6 @@
--- open-iscsi-2.0-871.orig/usr/mgmt_ipc.c 2009-07-11 05:55:58.000000000 +0200
-+++ open-iscsi-2.0-871/usr/mgmt_ipc.c 2010-11-22 22:47:25.000000000 +0100
-@@ -341,31 +341,7 @@ mgmt_ipc_notify_del_portal(queue_task_t
++++ open-iscsi-2.0-871/usr/mgmt_ipc.c 2014-01-03 12:35:32.000000000 +0100
+@@ -341,31 +341,7 @@ mgmt_ipc_notify_del_portal(queue_task_t
static int
mgmt_peeruser(int sock, char *user)
{
diff --git a/package/osiris/patches/patch-src_libosiris_Makefile_in b/package/osiris/patches/patch-src_libosiris_Makefile_in
index a7d09c693..458fc8bbd 100644
--- a/package/osiris/patches/patch-src_libosiris_Makefile_in
+++ b/package/osiris/patches/patch-src_libosiris_Makefile_in
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- osiris-4.2.3.orig/src/libosiris/Makefile.in 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/Makefile.in 2009-05-10 20:51:38.000000000 +0200
++++ osiris-4.2.3/src/libosiris/Makefile.in 2014-01-03 17:24:45.000000000 +0100
@@ -105,7 +105,7 @@ libosiris_a_SOURCES = list.c message.c s
filter_uid.c filter_gid.c filter_user.c \
filter_group.c filter_header.c filter_file.c \
@@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
string_list.h ssl_utilities.h utilities.h \
regex.h regex.c debug.h debug.c strcasestr.c \
error.h strptime.h
-@@ -128,11 +128,10 @@ am_libosiris_a_OBJECTS = list.$(OBJEXT)
+@@ -128,11 +128,10 @@ am_libosiris_a_OBJECTS = list.$(OBJEXT)
filter_python.$(OBJEXT) filter_script.$(OBJEXT) \
filter_gzip.$(OBJEXT) filter_zip.$(OBJEXT) filter_tar.$(OBJEXT) \
filter_pgp.$(OBJEXT) filter_rpm.$(OBJEXT) filter_uid.$(OBJEXT) \
diff --git a/package/osiris/patches/patch-src_libosiris_osi_common_h b/package/osiris/patches/patch-src_libosiris_osi_common_h
new file mode 100644
index 000000000..b30462a3c
--- /dev/null
+++ b/package/osiris/patches/patch-src_libosiris_osi_common_h
@@ -0,0 +1,10 @@
+--- osiris-4.2.3.orig/src/libosiris/osi_common.h 2006-07-28 01:57:51.000000000 +0200
++++ osiris-4.2.3/src/libosiris/osi_common.h 2014-01-03 17:33:53.000000000 +0100
+@@ -31,6 +31,7 @@
+ #ifndef OSI_COMMON_H
+ #define OSI_COMMON_H
+
++#include <sys/types.h>
+ #include "config.h"
+
+ /* for atomic_t */
diff --git a/package/procps/Makefile b/package/procps/Makefile
index ac309c63d..dd5f1139c 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
+TARGET_LDFLAGS+= -ltinfo
procps-install:
${INSTALL_DIR} ${IDIR_PROCPS}/{bin,sbin,usr/bin}
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index 9796c0a09..f44c94d17 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -4,15 +4,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= proftpd
-PKG_VERSION:= 1.3.3
+PKG_VERSION:= 1.3.4d
PKG_RELEASE:= 1
-PKG_MD5SUM:= 97ad29f31f4fe633a9f8d021bab2df20
+PKG_MD5SUM:= 13c6fd7ce320886adc371c81a3e23f07
PKG_DESCR:= A very configurable FTP server
PKG_SECTION:= www
PKG_URL:= http://www.proftpd.org/
PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/
PKG_NOPARALLEL:= 1
+PKG_LIBC_DEPENDS:= eglibc glibc
+
PKG_FLAVOURS_PROFTPD:= WITH_FTPUSERS
PKGFD_WITH_FTPUSERS:= install /etc/ftpusers along with proftpd
@@ -23,6 +25,7 @@ $(eval $(call PKG_template,PROFTPD,proftpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
CONFIGURE_ARGS+= --disable-cap
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \
ac_cv_func_setgrent_void=yes
+TARGET_LDFLAGS+= -ltinfo
proftpd-install:
$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile
index 784c19ee4..ebf30cf03 100644
--- a/package/rdesktop/Makefile
+++ b/package/rdesktop/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= f5382c5c85b0d2cc88b9b1aa9bbf1356
PKG_DESCR:= client for Windows Terminal Services
PKG_SECTION:= net
-PKG_BUILDDEP:= libiconv-tiny openssl
+PKG_DEPENDS:= libsamplerate libopenssl alsa-lib libao
+PKG_BUILDDEP:= libiconv-tiny openssl libsamplerate alsa-lib libao
PKG_URL:= http://www.rdesktop.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 591158f24..b449a985e 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --disable-use-tty-group \
--with-ncurses=$(STAGING_DIR)/usr/include \
--libdir=/usr/lib
FAKE_FLAGS+= INSTALLSUID="install -m 4755"
-TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
+TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo
util-linux-install:
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index 5e26c53b8..10bfaf21a 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xterm
PKG_VERSION:= 297
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 45610ae6fe90cf086fcd75b9cb97bbaf
PKG_DESCR:= Terminal Emulator for X Windows
PKG_SECTION:= x11/apps
@@ -20,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XTERM,xterm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -ltinfo
CONFIGURE_ARGS+= --with-app-defaults=/usr/lib/X11/app-defaults \
--disable-pty-handshake