diff options
Diffstat (limited to 'package')
42 files changed, 1970 insertions, 95 deletions
diff --git a/package/Depends.mk b/package/Depends.mk index bb5191b78..5b50f0c2a 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -37,7 +37,7 @@ davfs2-compile: libiconv-compile neon-compile dbus-compile: expat-compile deco-compile: ncurses-compile dhcpv6-compile: libnl-compile ncurses-compile -digitemp-compile: libusb-compile +digitemp-compile: libusb-compile libusb-compat-compile dsniff-compile: libnids-compile openssl-compile gdbm-compile elinks-compile: openssl-compile esound-compile: libaudiofile-compile @@ -96,13 +96,14 @@ libnids-compile: libnet-compile libpcap-compile libp11-compile: openssl-compile libtool-compile libpng-compile: zlib-compile libshout-compile: libvorbis-compile -libusb-compile: libusb-compat-compile +libusb-compat-compile: libusb-compile libtorrent-compile: openssl-compile libsigc++-compile libvorbis-compile: libogg-compile libfontenc-compile: xproto-compile zlib-compile libICE-compile: xtrans-compile libSM-compile: libICE-compile libXt-compile: libSM-compile +libXv-compile: libX11-compile videoproto-compile libXmu-compile: libXt-compile libXext-compile: libX11-compile libXaw-compile: libXext-compile libXmu-compile libXpm-compile @@ -229,6 +230,7 @@ endif wx200d-compile: postgresql-compile xfsprogs-compile: e2fsprogs-compile libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile +xkeyboard-config-compile: xkbcomp-compile xf86-video-geode-compile: xorg-server-compile xf86dga-compile: libXxf86dga-compile xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ diff --git a/package/bind/Makefile b/package/bind/Makefile index 748328cf4..b88119be4 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -80,11 +80,11 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/ # bind lib ${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib - ${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cbtt/patches/patch-base64_cpp b/package/cbtt/patches/patch-base64_cpp new file mode 100644 index 000000000..d69e6f997 --- /dev/null +++ b/package/cbtt/patches/patch-base64_cpp @@ -0,0 +1,20 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- cbtt80-20060211-src.orig/base64.cpp 2006-02-07 18:44:58.000000000 +0100 ++++ cbtt80-20060211-src/base64.cpp 2009-06-01 19:00:07.000000000 +0200 +@@ -112,7 +112,7 @@ uchar pBase64[] = { + /* Returns: bool - True (!0) if the operation was successful. */
+ /* False (0) if the operation was unsuccessful. */
+ /*---------------------------------------------------------------------------*/
+-char *b64decode(const char *s)
++char *b64decode(char *s)
+ {
+ int l = strlen(s); // Get length of Base64 string.
+ char *b; // Decoding buffer pointers.
+@@ -121,7 +121,6 @@ char *b64decode(const char *s)
+ int y = 0;
+
+ static // Collating sequence...
+- const // ...independant "===".
+ char pPad[] = {0x3d, 0x3d, 0x3d, 0x00};
+
+ if (l % 4) // If it's not modulo 4, then it...
diff --git a/package/ctorrent/patches/patch-bencode_cpp b/package/ctorrent/patches/patch-bencode_cpp new file mode 100644 index 000000000..9f2a4381e --- /dev/null +++ b/package/ctorrent/patches/patch-bencode_cpp @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ctorrent-dnh2.orig/bencode.cpp 2006-01-02 03:38:01.000000000 +0100 ++++ ctorrent-dnh2/bencode.cpp 2009-06-01 19:10:05.000000000 +0200 +@@ -213,10 +213,10 @@ size_t bencode_end_dict_list(FILE *fp) + return (EOF == fputc('e',fp)) ? 0 : 1; + } + +-size_t bencode_path2list(const char *pathname, FILE *fp) ++size_t bencode_path2list(char *pathname, FILE *fp) + { + char *pn; +- const char *p = pathname; ++ char *p = pathname; + + if( bencode_begin_list(fp) != 1 ) return 0; + diff --git a/package/ctorrent/patches/patch-bencode_h b/package/ctorrent/patches/patch-bencode_h new file mode 100644 index 000000000..594fa668a --- /dev/null +++ b/package/ctorrent/patches/patch-bencode_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ctorrent-dnh2.orig/bencode.h 2005-08-27 05:43:00.000000000 +0200 ++++ ctorrent-dnh2/bencode.h 2009-06-01 19:11:29.000000000 +0200 +@@ -31,6 +31,6 @@ size_t bencode_int(const int integer, FI + size_t bencode_begin_dict(FILE *fp); + size_t bencode_begin_list(FILE *fp); + size_t bencode_end_dict_list(FILE *fp); +-size_t bencode_path2list(const char *pathname, FILE *fp); ++size_t bencode_path2list(char *pathname, FILE *fp); + + #endif diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c new file mode 100644 index 000000000..c1f3a3e94 --- /dev/null +++ b/package/cups/patches/patch-scheduler_auth_c @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- cups-1.3.10.orig/scheduler/auth.c 2009-02-07 06:06:11.000000000 +0100 ++++ cups-1.3.10/scheduler/auth.c 2009-06-01 19:17:20.000000000 +0200 +@@ -54,6 +54,7 @@ + * Include necessary headers... + */ + ++#define _GNU_SOURCE + #include "cupsd.h" + #include <grp.h> + #ifdef HAVE_SHADOW_H diff --git a/package/cxxtools/patches/patch-src_hdstream_cpp b/package/cxxtools/patches/patch-src_hdstream_cpp new file mode 100644 index 000000000..796b9cdf1 --- /dev/null +++ b/package/cxxtools/patches/patch-src_hdstream_cpp @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- cxxtools-1.4.8.orig/src/hdstream.cpp 2008-05-04 17:55:37.000000000 +0200 ++++ cxxtools-1.4.8/src/hdstream.cpp 2009-06-01 19:40:12.000000000 +0200 +@@ -20,6 +20,7 @@ + */ + + #include "cxxtools/hdstream.h" ++#include <cstdio> + #include <iomanip> + #include <cctype> + diff --git a/package/dbus/Makefile b/package/dbus/Makefile index b240bc043..456c283d6 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,9 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus -PKG_VERSION:= 1.0.3 +PKG_VERSION:= 1.2.14 PKG_RELEASE:= 1 -PKG_MD5SUM:= ce328423db5743fe9006d39113b5324d +PKG_MD5SUM:= 2c267ccd45d0b18db8c9edacad63ec98 PKG_DESCR:= DBUS library PKG_SECTION:= net PKG_DEPENDS:= libexpat @@ -17,7 +17,7 @@ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index ea99684be..8df9304e8 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= digitemp -PKG_VERSION:= 3.3.2 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0b6cfb36d198767836de54d9fb11bbdb +PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 PKG_DESCR:= simple to use program for reading values from 1-wire devices -PKG_SECTION:= app +PKG_SECTION:= misc PKG_DEPENDS:= libusb PKG_URL:= http://www.digitemp.com/software/linux PKG_SITES:= http://www.digitemp.com/software/linux/ @@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TCFLAGS+= -I./src -I./userial ALL_TARGET= ds2490 BUILD_STYLE= auto diff --git a/package/digitemp/patches/001-Makefile.patch b/package/digitemp/patches/001-Makefile.patch deleted file mode 100644 index a08164b86..000000000 --- a/package/digitemp/patches/001-Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- digitemp-3.3.2.orig/Makefile 2004-02-04 15:17:10.000000000 +0100 -+++ digitemp-3.3.2/Makefile 2006-08-16 20:17:27.000000000 +0200 -@@ -15,8 +15,6 @@ - - VERSION = 3.3.2 - -- --CC = gcc - CFLAGS = -I./src -I./userial -O2 # -g -Wall - LIBS = -lm - -@@ -57,7 +55,7 @@ - CFLAGS += -DLINUX - - # Set LOCK to yes for serial port locking support -- LOCK = yes -+ #LOCK = yes - - endif - -@@ -123,7 +121,7 @@ - $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS) - - ds2490: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS2490OBJS) -- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) -+ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) - - - # Clean up the object files and the sub-directory for distributions diff --git a/package/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile new file mode 100644 index 000000000..10ac0c97f --- /dev/null +++ b/package/digitemp/patches/patch-Makefile @@ -0,0 +1,14 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 ++++ digitemp-3.6.0/Makefile 2009-06-01 20:04:20.000000000 +0200 +@@ -11,8 +11,8 @@ + + VERSION = 3.6.0 + +-CC = gcc +-CFLAGS = -I./src -I./userial -O2 -Wall # -g ++CC ?= gcc ++CFLAGS ?= -I./src -I./userial + + OBJS = src/digitemp.o src/device_name.o src/ds2438.o + HDRS = src/digitemp.h src/device_name.h diff --git a/package/digitemp/patches/patch-Makefile.orig b/package/digitemp/patches/patch-Makefile.orig new file mode 100644 index 000000000..b42427f23 --- /dev/null +++ b/package/digitemp/patches/patch-Makefile.orig @@ -0,0 +1,14 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 ++++ digitemp-3.6.0/Makefile 2009-06-01 20:03:24.000000000 +0200 +@@ -11,8 +11,8 @@ + + VERSION = 3.6.0 + +-CC = gcc +-CFLAGS = -I./src -I./userial -O2 -Wall # -g ++CC ?= gcc ++CFLAGS = -I./src -I./userial + + OBJS = src/digitemp.o src/device_name.o src/ds2438.o + HDRS = src/digitemp.h src/device_name.h diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 3c9bc296c..14328595e 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -43,7 +43,11 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/ ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/ +ifeq ($(ADK_TARGET_LIB_GLIBC),y) + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib +else ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib +endif rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 569bf7d4a..1cb8c5a50 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -26,7 +26,7 @@ ifeq ($(ADK_SSP),y) endif $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_GLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_GLIBC)/lib/ - -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_GLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done diff --git a/package/httping/patches/patch-str_c b/package/httping/patches/patch-str_c new file mode 100644 index 000000000..8778ef40b --- /dev/null +++ b/package/httping/patches/patch-str_c @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- httping-1.3.0.orig/str.c 2009-02-18 16:32:43.000000000 +0100 ++++ httping-1.3.0/str.c 2009-06-01 21:31:19.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "mem.h" + #include "utils.h" + ++/* + #ifndef strndup + char *strndup(char *in, int size) + { +@@ -29,3 +30,4 @@ char *strndup(char *in, int size) + return out; + } + #endif ++*/ diff --git a/package/httping/patches/patch-str_h b/package/httping/patches/patch-str_h new file mode 100644 index 000000000..c7b81ed65 --- /dev/null +++ b/package/httping/patches/patch-str_h @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- httping-1.3.0.orig/str.h 2009-02-18 16:32:43.000000000 +0100 ++++ httping-1.3.0/str.h 2009-06-01 21:30:39.000000000 +0200 +@@ -15,6 +15,8 @@ + + #include <string.h> + ++/* + #ifndef strndup + char *strndup(char *in, int size); + #endif ++*/ diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c index d9f399bd6..7d8512c96 100644 --- a/package/knock/patches/patch-src_knockd_c +++ b/package/knock/patches/patch-src_knockd_c @@ -1,7 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- knock-0.5.orig/src/knockd.c 2005-06-27 07:11:34.000000000 +0200 -+++ knock-0.5/src/knockd.c 2009-05-29 17:03:55.776378324 +0200 -@@ -1064,7 +1064,7 @@ char* get_ip(const char* iface, char *bu ++++ knock-0.5/src/knockd.c 2009-06-01 21:43:53.000000000 +0200 +@@ -46,6 +46,7 @@ + #include <syslog.h> + #include <pcap.h> + #include <errno.h> ++#include <linux/limits.h> + #include "list.h" + + static char version[] = "0.5"; +@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu return(NULL); } diff --git a/package/linux-atm/patches/patch-src_led_main_c b/package/linux-atm/patches/patch-src_led_main_c new file mode 100644 index 000000000..63c5b5e9b --- /dev/null +++ b/package/linux-atm/patches/patch-src_led_main_c @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- linux-atm-2.5.0.orig/src/led/main.c 2005-10-06 19:27:50.000000000 +0200 ++++ linux-atm-2.5.0/src/led/main.c 2009-06-01 22:38:27.000000000 +0200 +@@ -31,6 +31,7 @@ + #endif + + /* Global includes */ ++#include <limits.h> + #include <stdlib.h> + #include <stdio.h> + #include <sys/time.h> diff --git a/package/mini_httpd/patches/patch-htpasswd_c b/package/mini_httpd/patches/patch-htpasswd_c new file mode 100644 index 000000000..bfea3fc7c --- /dev/null +++ b/package/mini_httpd/patches/patch-htpasswd_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mini_httpd-1.19.orig/htpasswd.c 2001-12-19 01:08:10.000000000 +0100 ++++ mini_httpd-1.19/htpasswd.c 2009-06-01 22:50:44.000000000 +0200 +@@ -49,7 +49,7 @@ static void getword(char *word, char *li + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int getline2(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) { + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(getline2(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; diff --git a/package/mrd6/patches/patch-src_bgp_bgp_cpp b/package/mrd6/patches/patch-src_bgp_bgp_cpp new file mode 100644 index 000000000..ac83dc5a4 --- /dev/null +++ b/package/mrd6/patches/patch-src_bgp_bgp_cpp @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mrd6-0.9.6.orig/src/bgp/bgp.cpp 2008-01-25 11:44:46.000000000 +0100 ++++ mrd6-0.9.6/src/bgp/bgp.cpp 2009-06-01 22:57:15.000000000 +0200 +@@ -29,6 +29,7 @@ + + #include <mrdpriv/bgp/def.h> + ++#include <limits.h> + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <sys/times.h> /* times */ diff --git a/package/mrd6/patches/patch-src_mrd_cpp b/package/mrd6/patches/patch-src_mrd_cpp new file mode 100644 index 000000000..cb2e1dceb --- /dev/null +++ b/package/mrd6/patches/patch-src_mrd_cpp @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mrd6-0.9.6.orig/src/mrd.cpp 2008-01-24 11:59:47.000000000 +0100 ++++ mrd6-0.9.6/src/mrd.cpp 2009-06-01 22:55:38.000000000 +0200 +@@ -45,6 +45,7 @@ + #include <cstdlib> + #include <errno.h> + ++#include <limits.h> + #include <unistd.h> + #include <fcntl.h> + diff --git a/package/netperf/patches/patch-src_netlib_c b/package/netperf/patches/patch-src_netlib_c new file mode 100644 index 000000000..688054fde --- /dev/null +++ b/package/netperf/patches/patch-src_netlib_c @@ -0,0 +1,17 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- netperf-2.4.3.orig/src/netlib.c 2007-02-15 01:12:35.000000000 +0100 ++++ netperf-2.4.3/src/netlib.c 2009-06-01 23:36:22.000000000 +0200 +@@ -1900,8 +1900,13 @@ bind_to_specific_processor(int processor + + #if defined(__CPU_SETSIZE) + #define NETPERF_CPU_SETSIZE __CPU_SETSIZE ++#if defined(__CPU_SET_S) ++#define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET_S(cpu, sizeof (cpu_set_t), cpusetp) ++#define NETPERF_CPU_ZERO(cpusetp) __CPU_ZERO_S (sizeof (cpu_set_t), cpusetp) ++#else + #define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET(cpu, cpusetp) + #define NETPERF_CPU_ZERO(cpusetp) __CPU_ZERO (cpusetp) ++#endif + typedef cpu_set_t netperf_cpu_set_t; + #else + #define NETPERF_CPU_SETSIZE sizeof(unsigned long) diff --git a/package/netperf/patches/patch-src_netlib_c.orig b/package/netperf/patches/patch-src_netlib_c.orig new file mode 100644 index 000000000..f3e023cc0 --- /dev/null +++ b/package/netperf/patches/patch-src_netlib_c.orig @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- netperf-2.4.3.orig/src/netlib.c 2007-02-15 01:12:35.000000000 +0100 ++++ netperf-2.4.3/src/netlib.c 2009-06-01 23:30:34.000000000 +0200 +@@ -59,6 +59,7 @@ char netlib_id[]="\ + /* This is based on a spot-check of a couple systems at my disposal. */ + /* If you have trouble compiling you may want to add "sys/" raj 10/95 */ + #include <limits.h> ++#include <sched.h> + #include <signal.h> + #ifdef MPE + # define NSIG _NSIG diff --git a/package/nut/Config.in b/package/nut/Config.in index 2da404567..9539f8a03 100644 --- a/package/nut/Config.in +++ b/package/nut/Config.in @@ -78,26 +78,11 @@ config ADK_PACKAGE_NUT_DRIVER_BESTUFERRUPS boolean default n -config ADK_PACKAGE_NUT_DRIVER_BLAZER - prompt "blazer............................ Driver for Blazer UPS models" - boolean - default n - -config ADK_PACKAGE_NUT_DRIVER_CPSUPS - prompt "cpsups............................ Driver for CyberPower text protocol UPS" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_CYBERPOWER prompt "cyberpower........................ Driver for Cyber Power Systems" boolean default n -config ADK_PACKAGE_NUT_DRIVER_ESUPSSMART - prompt "esupssmart........................ Driver for ES UPS" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_ETAPRO prompt "etapro............................ Driver for ETA UPS" boolean @@ -108,11 +93,6 @@ config ADK_PACKAGE_NUT_DRIVER_EVERUPS boolean default n -config ADK_PACKAGE_NUT_DRIVER_FENTONUPS - prompt "fentonups......................... Driver for Fenton Technologies units" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_GAMATRONIC prompt "gamatronic........................ Driver for Gamatronic UPS" boolean @@ -123,11 +103,6 @@ config ADK_PACKAGE_NUT_DRIVER_GENERICUPS boolean default n -config ADK_PACKAGE_NUT_DRIVER_IPPON - prompt "ippon............................. Driver for Ippon UPS devices" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_ISBMEX prompt "isbmex............................ Driver for SOLA/BASIC Mexico models" boolean @@ -158,11 +133,6 @@ config ADK_PACKAGE_NUT_DRIVER_MGE_UTALK boolean default n -config ADK_PACKAGE_NUT_DRIVER_MUSTEK - prompt "mustek............................ Driver for Mustek UPS models" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_ONEAC prompt "oneac............................. Driver for UPS using the Oneac Advanced Interface" boolean @@ -185,6 +155,12 @@ config ADK_PACKAGE_NUT_DRIVER_POWERMUST prompt "powermust......................... Driver for Powermust" boolean default n + +config ADK_PACKAGE_NUT_DRIVER_POWERPANEL + prompt "powerpanel........................ Driver for Powerpanel units" + boolean + default n + help config ADK_PACKAGE_NUT_DRIVER_RHINO prompt "rhino............................. Driver for Microsol Rhino UPS" @@ -206,11 +182,6 @@ config ADK_PACKAGE_NUT_DRIVER_SAFENET * - Sweex 500/1000 * - others using SafeNet software and serial interface -config ADK_PACKAGE_NUT_DRIVER_SMS - prompt "sms............................... Driver for SMS UPS hardware" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_SOLIS prompt "solis............................. Driver for Microsol Solis UPS" boolean diff --git a/package/nut/Makefile b/package/nut/Makefile index 2bf1c12f8..97418808b 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -38,12 +38,12 @@ endef DRIVERS_y:= $(eval $(call DRIVER_template,BESTUPS,bestups)) -$(eval $(call DRIVER_template,FENTONUPS,fentonups)) $(eval $(call DRIVER_template,APCSMART,apcsmart)) $(eval $(call DRIVER_template,EVERUPS,everups)) $(eval $(call DRIVER_template,BELKIN,belkin)) $(eval $(call DRIVER_template,MASTERGUARD,masterguard)) $(eval $(call DRIVER_template,POWERCOM,powercom)) +$(eval $(call DRIVER_template,POWERPANEL,powerpanel)) $(eval $(call DRIVER_template,CYBERPOWER,cyberpower)) $(eval $(call DRIVER_template,TRIPPLITE,tripplite)) $(eval $(call DRIVER_template,VICTRONUPS,victronups)) @@ -53,16 +53,10 @@ $(eval $(call DRIVER_template,BESTUFERRUPS,bestuferrups)) $(eval $(call DRIVER_template,ISBMEX,isbmex)) $(eval $(call DRIVER_template,ETAPRO,etapro)) $(eval $(call DRIVER_template,LIEBERT,liebert)) -$(eval $(call DRIVER_template,SMS,sms)) -$(eval $(call DRIVER_template,ESUPSSMART,esupssmart)) $(eval $(call DRIVER_template,TRIPPLITESU,tripplitesu)) -$(eval $(call DRIVER_template,BLAZER,blazer)) $(eval $(call DRIVER_template,SAFENET,safenet)) $(eval $(call DRIVER_template,BELKINUNV,belkinunv)) $(eval $(call DRIVER_template,ONEAC,oneac)) -$(eval $(call DRIVER_template,IPPON,ippon)) -$(eval $(call DRIVER_template,CPSUPS,cpsups)) -$(eval $(call DRIVER_template,MUSTEK,mustek)) $(eval $(call DRIVER_template,METASYS,metasys)) $(eval $(call DRIVER_template,BESTFCOM,bestfcom)) $(eval $(call DRIVER_template,UPSCODE2,upscode2)) @@ -75,7 +69,7 @@ CONFIG_DRIVERS=$(shell echo ${DRIVERS_y} | tr ' ' ',') INSTALL_DRIVERS_tmp=${DRIVERS_y} ifneq (${ADK_PACKAGE_NUT_USB},) -INSTALL_DRIVERS_tmp+= hidups energizerups newhidups tripplite_usb +INSTALL_DRIVERS_tmp+= usbhid-ups tripplite_usb endif ifneq (${ADK_PACKAGE_NUT_SNMP},) INSTALL_DRIVERS_tmp+= snmp-ups @@ -86,8 +80,8 @@ CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \ --without-cgi \ --with-drivers=${INSTALL_DRIVERS} \ - --with-group=root \ - --with-user=root + --with-group=0 \ + --with-user=0 ifneq (${ADK_PACKAGE_NUT_SSL},) CONFIGURE_ARGS+= --with-ssl @@ -108,7 +102,7 @@ INSTALL_TARGET+= install-snmp endif post-install: - ${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin + ${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin ${IDIR_NUT}/etc ${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched} \ ${IDIR_NUT}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/{${INSTALL_DRIVERS}} \ diff --git a/package/procmail/patches/patch-src_fields_c b/package/procmail/patches/patch-src_fields_c new file mode 100644 index 000000000..73586c79b --- /dev/null +++ b/package/procmail/patches/patch-src_fields_c @@ -0,0 +1,23 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- procmail-3.22.orig/src/fields.c 2001-09-11 06:57:08.000000000 +0200 ++++ procmail-3.22/src/fields.c 2009-06-02 00:23:11.000000000 +0200 +@@ -110,16 +110,16 @@ void dispfield(p)register const struct f + /* try and append one valid field to rdheader from stdin */ + int readhead P((void)) + { int idlen; +- getline(); ++ getline2(); + if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */ + return 0; + if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ + { if(rdheader) + return 0; /* the From_ line was a fake! */ +- for(;buflast=='>';getline()); /* gather continued >From_ lines */ ++ for(;buflast=='>';getline2()); /* gather continued >From_ lines */ + |