mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-04 17:07:43 +00:00
- bump version
This commit is contained in:
parent
c1efa9b291
commit
014ad48f5f
@ -21,7 +21,7 @@
|
|||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||||
# USA
|
# USA
|
||||||
|
|
||||||
LIBPCAP_VER:=0.9.4
|
LIBPCAP_VER:=0.9.5
|
||||||
LIBPCAP_DIR:=$(BUILD_DIR)/libpcap-$(LIBPCAP_VER)
|
LIBPCAP_DIR:=$(BUILD_DIR)/libpcap-$(LIBPCAP_VER)
|
||||||
LIBPCAP_SITE:=http://www.tcpdump.org/release
|
LIBPCAP_SITE:=http://www.tcpdump.org/release
|
||||||
LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VER).tar.gz
|
LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VER).tar.gz
|
||||||
@ -35,7 +35,7 @@ libpcap-source: $(DL_DIR)/$(LIBPCAP_SOURCE)
|
|||||||
$(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
|
$(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
|
||||||
$(LIBPCAP_CAT) $(DL_DIR)/$(LIBPCAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
$(LIBPCAP_CAT) $(DL_DIR)/$(LIBPCAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||||
toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ *.patch
|
toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ *.patch
|
||||||
touch $(LIBPCAP_DIR)/.unpacked
|
touch $@
|
||||||
|
|
||||||
$(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
|
$(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
|
||||||
( \
|
( \
|
||||||
@ -66,7 +66,7 @@ $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
|
|||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--with-pcap=linux \
|
--with-pcap=linux \
|
||||||
)
|
)
|
||||||
touch $(LIBPCAP_DIR)/.configured
|
touch $@
|
||||||
|
|
||||||
$(LIBPCAP_DIR)/libpcap.a: $(LIBPCAP_DIR)/.configured
|
$(LIBPCAP_DIR)/libpcap.a: $(LIBPCAP_DIR)/.configured
|
||||||
$(MAKE) CC="$(TARGET_CC)" \
|
$(MAKE) CC="$(TARGET_CC)" \
|
||||||
|
30
package/tcpdump/tcpdump.00-extern-inline-fixup.patch
Normal file
30
package/tcpdump/tcpdump.00-extern-inline-fixup.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
--- tcpdump-3.9.5.oorig/tcpdump-stdinc.h 2006-06-23 04:07:27.000000000 +0200
|
||||||
|
+++ tcpdump-3.9.5/tcpdump-stdinc.h 2007-05-14 10:26:25.000000000 +0200
|
||||||
|
@@ -149,15 +149,15 @@ typedef char* caddr_t;
|
||||||
|
#undef htonl
|
||||||
|
#undef htons
|
||||||
|
|
||||||
|
- extern __inline__ unsigned long __ntohl (unsigned long x);
|
||||||
|
- extern __inline__ unsigned short __ntohs (unsigned short x);
|
||||||
|
+ static __inline__ unsigned long __ntohl (unsigned long x);
|
||||||
|
+ static __inline__ unsigned short __ntohs (unsigned short x);
|
||||||
|
|
||||||
|
#define ntohl(x) __ntohl(x)
|
||||||
|
#define ntohs(x) __ntohs(x)
|
||||||
|
#define htonl(x) __ntohl(x)
|
||||||
|
#define htons(x) __ntohs(x)
|
||||||
|
|
||||||
|
- extern __inline__ unsigned long __ntohl (unsigned long x)
|
||||||
|
+ static __inline__ unsigned long __ntohl (unsigned long x)
|
||||||
|
{
|
||||||
|
__asm__ ("xchgb %b0, %h0\n\t" /* swap lower bytes */
|
||||||
|
"rorl $16, %0\n\t" /* swap words */
|
||||||
|
@@ -166,7 +166,7 @@ typedef char* caddr_t;
|
||||||
|
return (x);
|
||||||
|
}
|
||||||
|
|
||||||
|
- extern __inline__ unsigned short __ntohs (unsigned short x)
|
||||||
|
+ static __inline__ unsigned short __ntohs (unsigned short x)
|
||||||
|
{
|
||||||
|
__asm__ ("xchgb %b0, %h0" /* swap bytes */
|
||||||
|
: "=q" (x) : "0" (x));
|
@ -6,7 +6,7 @@
|
|||||||
# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
|
# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
|
||||||
# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
|
# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
|
||||||
|
|
||||||
TCPDUMP_VER:=3.9.4
|
TCPDUMP_VER:=3.9.5
|
||||||
TCPDUMP_DIR:=$(BUILD_DIR)/tcpdump-$(TCPDUMP_VER)
|
TCPDUMP_DIR:=$(BUILD_DIR)/tcpdump-$(TCPDUMP_VER)
|
||||||
TCPDUMP_SITE:=http://www.tcpdump.org/release
|
TCPDUMP_SITE:=http://www.tcpdump.org/release
|
||||||
TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VER).tar.gz
|
TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VER).tar.gz
|
||||||
@ -19,7 +19,8 @@ tcpdump-source: $(DL_DIR)/$(TCPDUMP_SOURCE)
|
|||||||
|
|
||||||
$(TCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(TCPDUMP_SOURCE)
|
$(TCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(TCPDUMP_SOURCE)
|
||||||
$(TCPDUMP_CAT) $(DL_DIR)/$(TCPDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
$(TCPDUMP_CAT) $(DL_DIR)/$(TCPDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||||
touch $(TCPDUMP_DIR)/.unpacked
|
toolchain/patch-kernel.sh $(TCPDUMP_DIR) package/tcpdump tcpdump*\.patch
|
||||||
|
touch $@
|
||||||
|
|
||||||
$(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
|
$(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
|
||||||
( \
|
( \
|
||||||
@ -47,9 +48,10 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
|
|||||||
--infodir=/usr/info \
|
--infodir=/usr/info \
|
||||||
--with-build-cc="$(HOSTCC)" \
|
--with-build-cc="$(HOSTCC)" \
|
||||||
--without-crypto \
|
--without-crypto \
|
||||||
|
--disable-smb \
|
||||||
)
|
)
|
||||||
$(SED) '/HAVE_PCAP_DEBUG/d' $(TCPDUMP_DIR)/config.h
|
$(SED) '/HAVE_PCAP_DEBUG/d' $(TCPDUMP_DIR)/config.h
|
||||||
touch $(TCPDUMP_DIR)/.configured
|
touch $@
|
||||||
|
|
||||||
$(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
|
$(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
|
||||||
$(MAKE) CC="$(TARGET_CC)" \
|
$(MAKE) CC="$(TARGET_CC)" \
|
||||||
@ -59,7 +61,8 @@ $(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
|
|||||||
-C $(TCPDUMP_DIR)
|
-C $(TCPDUMP_DIR)
|
||||||
|
|
||||||
$(TARGET_DIR)/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
|
$(TARGET_DIR)/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
|
||||||
cp -af $< $@
|
cp -f $< $@
|
||||||
|
$(STRIP) -s $@
|
||||||
|
|
||||||
tcpdump: uclibc zlib libpcap $(TARGET_DIR)/sbin/tcpdump
|
tcpdump: uclibc zlib libpcap $(TARGET_DIR)/sbin/tcpdump
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user