diff options
Diffstat (limited to 'package')
18 files changed, 185 insertions, 8 deletions
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 157d9db03..3ebdc2f6b 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= kexec-tools PKG_VERSION:= 2.0.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257 PKG_DESCR:= kexec tools PKG_SECTION:= misc diff --git a/package/kexec-tools/patches/patch-kexec_kexec_c b/package/kexec-tools/patches/patch-kexec_kexec_c index 68dc2bee9..8ce2ac370 100644 --- a/package/kexec-tools/patches/patch-kexec_kexec_c +++ b/package/kexec-tools/patches/patch-kexec_kexec_c @@ -1,6 +1,6 @@ ---- kexec-tools-2.0.2.orig/kexec/kexec.c 2010-07-29 06:19:59.000000000 +0200 -+++ kexec-tools-2.0.2/kexec/kexec.c 2011-09-05 18:50:27.679232756 +0200 -@@ -796,17 +796,14 @@ int k_unload (unsigned long kexec_flags) +--- kexec-tools-2.0.5.orig/kexec/kexec.c 2013-12-13 01:52:47.000000000 +0100 ++++ kexec-tools-2.0.5/kexec/kexec.c 2014-03-18 14:46:58.000000000 +0100 +@@ -807,17 +807,14 @@ static int k_unload (unsigned long kexec static int my_shutdown(void) { char *args[] = { diff --git a/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c new file mode 100644 index 000000000..5f6484789 --- /dev/null +++ b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c @@ -0,0 +1,41 @@ +--- kexec-tools-2.0.5.orig/vmcore-dmesg/vmcore-dmesg.c 2014-01-15 00:51:14.000000000 +0100 ++++ kexec-tools-2.0.5/vmcore-dmesg/vmcore-dmesg.c 2014-03-18 15:00:45.000000000 +0100 +@@ -26,14 +26,14 @@ static Elf64_Ehdr ehdr; + static Elf64_Phdr *phdr; + + static char osrelease[4096]; +-static loff_t log_buf_vaddr; +-static loff_t log_end_vaddr; +-static loff_t log_buf_len_vaddr; +-static loff_t logged_chars_vaddr; ++static off_t log_buf_vaddr; ++static off_t log_end_vaddr; ++static off_t log_buf_len_vaddr; ++static off_t logged_chars_vaddr; + + /* record format logs */ +-static loff_t log_first_idx_vaddr; +-static loff_t log_next_idx_vaddr; ++static off_t log_first_idx_vaddr; ++static off_t log_next_idx_vaddr; + + /* struct log size */ + static uint64_t log_sz; +@@ -266,7 +266,7 @@ static void scan_vmcoreinfo(char *start, + const char *str; + const char *name; + size_t len; +- loff_t *vaddr; ++ off_t *vaddr; + } symbol[] = { + SYMBOL(log_buf), + SYMBOL(log_end), +@@ -344,7 +344,7 @@ static void scan_vmcoreinfo(char *start, + } + } + +-static void scan_notes(int fd, loff_t start, loff_t lsize) ++static void scan_notes(int fd, off_t start, off_t lsize) + { + char *buf, *last, *note, *next; + size_t size; diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 52c36bf0c..570febc37 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sane-backends PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5 PKG_DESCR:= Scanner access now easy PKG_SECTION:= misc diff --git a/package/sane-backends/patches/patch-backend_canon630u-common_c b/package/sane-backends/patches/patch-backend_canon630u-common_c new file mode 100644 index 000000000..d9acb4bf1 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_canon630u-common_c @@ -0,0 +1,12 @@ +--- sane-backends-1.0.22.orig/backend/canon630u-common.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/canon630u-common.c 2014-03-18 08:33:31.000000000 +0100 +@@ -58,9 +58,7 @@ + #include <unistd.h> /* usleep */ + #include <time.h> + #include <math.h> /* exp() */ +-#ifdef HAVE_OS2_H + #include <sys/types.h> /* mode_t */ +-#endif + #include <sys/stat.h> + #include "lm9830.h" + diff --git a/package/sane-backends/patches/patch-backend_epson2-commands_c b/package/sane-backends/patches/patch-backend_epson2-commands_c new file mode 100644 index 000000000..3b2c46841 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_epson2-commands_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/epson2-commands.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/epson2-commands.c 2014-03-18 08:34:27.000000000 +0100 +@@ -19,6 +19,7 @@ + + #include "sane/config.h" + ++#include <sys/types.h> + #include <byteorder.h> + #include <math.h> + diff --git a/package/sane-backends/patches/patch-backend_genesys_c b/package/sane-backends/patches/patch-backend_genesys_c new file mode 100644 index 000000000..fc0398856 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_genesys_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/genesys.c 2011-02-14 00:10:18.000000000 +0100 ++++ sane-backends-1.0.22/backend/genesys.c 2014-03-18 08:36:00.000000000 +0100 +@@ -65,6 +65,7 @@ + #include <errno.h> + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <unistd.h> + #include <math.h> + diff --git a/package/sane-backends/patches/patch-backend_genesys_h b/package/sane-backends/patches/patch-backend_genesys_h new file mode 100644 index 000000000..efc830be1 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_genesys_h @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/genesys.h 2011-01-16 02:01:28.000000000 +0100 ++++ sane-backends-1.0.22/backend/genesys.h 2014-03-18 08:36:42.000000000 +0100 +@@ -52,6 +52,7 @@ + */ + #undef UNIT_TESTING + ++#include <sys/types.h> + #include "genesys_low.h" + + #define FREE_IFNOT_NULL(x) if(x!=NULL) { free(x); x=NULL;} diff --git a/package/sane-backends/patches/patch-backend_genesys_low_c b/package/sane-backends/patches/patch-backend_genesys_low_c new file mode 100644 index 000000000..430ab3791 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_genesys_low_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/genesys_low.c 2011-02-14 00:10:18.000000000 +0100 ++++ sane-backends-1.0.22/backend/genesys_low.c 2014-03-18 08:37:27.000000000 +0100 +@@ -46,6 +46,7 @@ + #include <errno.h> + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <unistd.h> + #include <math.h> + diff --git a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c new file mode 100644 index 000000000..59b9b5a9b --- /dev/null +++ b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/hp3900_rts8822.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/hp3900_rts8822.c 2014-03-18 08:38:21.000000000 +0100 +@@ -64,6 +64,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> /* bzero() */ ++#include <sys/types.h> + #include <time.h> /* clock() */ + #include <math.h> /* truncf() */ + #include <ctype.h> /* tolower() */ diff --git a/package/sane-backends/patches/patch-backend_hp5400_sanei_c b/package/sane-backends/patches/patch-backend_hp5400_sanei_c new file mode 100644 index 000000000..7f340d607 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_hp5400_sanei_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/hp5400_sanei.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/hp5400_sanei.c 2014-03-18 08:39:35.000000000 +0100 +@@ -56,6 +56,7 @@ + #include "hp5400_xfer.h" + #include "hp5400_debug.h" + #include <stdio.h> ++#include <sys/types.h> + #include "../include/sane/sanei_usb.h" + + #define CMD_INITBULK1 0x0087 /* send 0x14 */ diff --git a/package/sane-backends/patches/patch-backend_hp5590_low_c b/package/sane-backends/patches/patch-backend_hp5590_low_c new file mode 100644 index 000000000..7812886dc --- /dev/null +++ b/package/sane-backends/patches/patch-backend_hp5590_low_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/hp5590_low.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/hp5590_low.c 2014-03-18 08:38:55.000000000 +0100 +@@ -46,6 +46,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <sys/types.h> + #include <errno.h> + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> diff --git a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c new file mode 100644 index 000000000..253699d14 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/kvs20xx_opt.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/kvs20xx_opt.c 2014-03-18 08:41:24.000000000 +0100 +@@ -8,6 +8,7 @@ + + #include "../include/sane/config.h" + ++#include <sys/types.h> + #include <string.h> + + #define DEBUG_DECLARE_ONLY diff --git a/package/sane-backends/patches/patch-backend_rts88xx_lib_c b/package/sane-backends/patches/patch-backend_rts88xx_lib_c new file mode 100644 index 000000000..060f0a10e --- /dev/null +++ b/package/sane-backends/patches/patch-backend_rts88xx_lib_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/rts88xx_lib.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/rts88xx_lib.c 2014-03-18 08:42:41.000000000 +0100 +@@ -54,6 +54,7 @@ + + #include <stdio.h> + #include <sys/time.h> ++#include <sys/types.h> + + #include "../include/_stdint.h" + diff --git a/package/sane-backends/patches/patch-backend_xerox_mfp_c b/package/sane-backends/patches/patch-backend_xerox_mfp_c new file mode 100644 index 000000000..d58262197 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_xerox_mfp_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/xerox_mfp.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/xerox_mfp.c 2014-03-18 08:44:56.000000000 +0100 +@@ -22,6 +22,7 @@ + #include <math.h> + #include <unistd.h> + #include <sys/time.h> ++#include <sys/types.h> + #include "../include/sane/sane.h" + #include "../include/sane/sanei.h" + #include "../include/sane/saneopts.h" diff --git a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h new file mode 100644 index 000000000..4ba390003 --- /dev/null +++ b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/include/sane/sanei_tcp.h 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/include/sane/sanei_tcp.h 2014-03-18 08:31:07.000000000 +0100 +@@ -20,6 +20,7 @@ + + #include <sane/sane.h> + ++#include <sys/types.h> + #include <netinet/in.h> + #include <netdb.h> + diff --git a/package/sane-backends/patches/patch-include_sane_sanei_udp_h b/package/sane-backends/patches/patch-include_sane_sanei_udp_h new file mode 100644 index 000000000..3d70edada --- /dev/null +++ b/package/sane-backends/patches/patch-include_sane_sanei_udp_h @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/include/sane/sanei_udp.h 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/include/sane/sanei_udp.h 2014-03-18 08:31:40.000000000 +0100 +@@ -20,6 +20,7 @@ + + #include <sane/sane.h> + ++#include <sys/types.h> + #include <netinet/in.h> + #include <netdb.h> + diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile index dc038027f..8fd111b3d 100644 --- a/package/tzdata/Makefile +++ b/package/tzdata/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= tzdata PKG_VERSION:= 2013d -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890 PKG_DESCR:= Timezone data (/usr/share/zoneinfo) PKG_SECTION:= utils @@ -39,8 +39,12 @@ ALL_TARGET:= ALL INSTALL_TARGET:= INSTALL tzdata-install: - $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share $(IDIR_TZDATA)/etc - $(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share + $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share/zoneinfo $(IDIR_TZDATA)/etc + cd ${WRKINST} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s usr/share/zoneinfo/"$$f" || continue; \ + echo usr/share/zoneinfo/"$$f" | \ + ${STAGING_HOST_DIR}/usr/bin/cpio -pdu ${IDIR_TZDATA}/; \ + done tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \ for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ test -s "$$f" || continue; \ |