1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-12 01:20:14 +02:00

Merge branch 'master' of projects.qi-hardware.com:openwrt-xburst into xburst

This commit is contained in:
Xiangfu Liu 2010-06-15 18:08:55 +08:00
commit 806883a54d
4 changed files with 28 additions and 15 deletions

View File

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ipset
PKG_VERSION:=4.1
PKG_VERSION:=4.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ipset.netfilter.org
PKG_MD5SUM:=d104007fdf5ea64fef774c22b1c0a97b
PKG_MD5SUM:=9060d549a18c1c0794fa47a71343d627
include $(INCLUDE_DIR)/package.mk

View File

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables
PKG_VERSION:=1.4.6
PKG_RELEASE:=2
PKG_VERSION:=1.4.7
PKG_RELEASE:=1
PKG_MD5SUM:=c67cf30e281a924def6426be0973df56
PKG_MD5SUM:=645941dd1f9e0ec1f74c61918d70d52f
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \

View File

@ -1,10 +0,0 @@
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -1,6 +1,7 @@
#ifndef __LINUX_NETFILTER_H
#define __LINUX_NETFILTER_H
+#include <linux/types.h>
/* Responses from hook functions. */
#define NF_DROP 0

View File

@ -0,0 +1,23 @@
--- a/Makefile.org
+++ b/Makefile.org
@@ -179,7 +179,7 @@ WTARFILE= $(NAME)-win.tar
EXHEADER= e_os2.h
HEADER= e_os.h
-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
+all: build_all openssl.pc libssl.pc libcrypto.pc
# as we stick to -e, CLEARENV ensures that local variables in lower
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -474,11 +474,6 @@ openssl.pc: Makefile
echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
-Makefile: Makefile.org Configure config
- @echo "Makefile is older than Makefile.org, Configure or config."
- @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
- @false
-
libclean:
rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib