mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 14:59:55 +00:00
arptables: upgrade 0.0.4 -> 0.0.5
arptables-init-busybox.patch arptables-remove-bashism.patch removed since they are not available in 0.0.5 refresh 0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
Khem Raj
+12
-30
@@ -8,24 +8,17 @@ which OE uses to pass tweaks
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Makefile | 15 +++++++--------
|
||||
extensions/Makefile | 5 ++++-
|
||||
2 files changed, 11 insertions(+), 9 deletions(-)
|
||||
Makefile | 10 ++++------
|
||||
extensions/Makefile | 4 ++++
|
||||
2 files changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7bead0d..336db6b 100644
|
||||
index 62ebdf2..cd06813 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib
|
||||
BINDIR:=$(PREFIX)/sbin
|
||||
MANDIR:=$(PREFIX)/man
|
||||
man8dir=$(MANDIR)/man8
|
||||
-INITDIR:=/etc/rc.d/init.d
|
||||
+INITDIR:=/etc/init.d
|
||||
SYSCONFIGDIR:=/etc/sysconfig
|
||||
DESTDIR:=
|
||||
@@ -12,9 +12,7 @@ DESTDIR:=
|
||||
|
||||
MANS = arptables.8 arptables-save.8 arptables-restore.8
|
||||
MANS = arptables-legacy.8 arptables-save.8 arptables-restore.8
|
||||
|
||||
-COPT_FLAGS:=-O2
|
||||
-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
|
||||
@@ -34,8 +27,8 @@ index 7bead0d..336db6b 100644
|
||||
ifndef ARPT_LIBDIR
|
||||
ARPT_LIBDIR:=$(LIBDIR)/arptables
|
||||
endif
|
||||
@@ -25,13 +23,13 @@ include extensions/Makefile
|
||||
all: arptables libarptc/libarptc.a
|
||||
@@ -24,13 +22,13 @@ include extensions/Makefile
|
||||
all: arptables-legacy libarptc/libarptc.a
|
||||
|
||||
arptables.o: arptables.c
|
||||
- $(CC) $(CFLAGS) -c -o $@ $<
|
||||
@@ -51,29 +44,18 @@ index 7bead0d..336db6b 100644
|
||||
|
||||
libarptc/libarptc.a: libarptc/libarptc.o
|
||||
$(AR) rcs $@ $<
|
||||
@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv
|
||||
install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
|
||||
cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_
|
||||
if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
|
||||
- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
|
||||
+ install -d $(DESTDIR)$(INITDIR)
|
||||
+ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables
|
||||
rm -f arptables-save_ arptables-restore_ arptables.sysv_
|
||||
|
||||
.PHONY: install-man
|
||||
diff --git a/extensions/Makefile b/extensions/Makefile
|
||||
index 0189cc9..b046425 100644
|
||||
index 0189cc9..e8af782 100644
|
||||
--- a/extensions/Makefile
|
||||
+++ b/extensions/Makefile
|
||||
@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK
|
||||
EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
|
||||
@@ -5,3 +5,7 @@ EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
|
||||
|
||||
extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
|
||||
- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
|
||||
$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
|
||||
+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
|
||||
+
|
||||
+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
|
||||
+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
|
||||
--
|
||||
2.12.1
|
||||
2.17.1
|
||||
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
Index: arptables-v0.0.3-4/arptables.sysv
|
||||
===================================================================
|
||||
--- arptables-v0.0.3-4.orig/arptables.sysv 2010-03-22 16:28:03.000000000 +0300
|
||||
+++ arptables-v0.0.3-4/arptables.sysv 2010-03-22 16:27:51.000000000 +0300
|
||||
@@ -12,10 +12,10 @@
|
||||
# config: __SYSCONFIG__/arptables
|
||||
|
||||
source /etc/init.d/functions
|
||||
-source /etc/sysconfig/network
|
||||
+# source /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
-[ ${NETWORKING} = "no" ] && exit 0
|
||||
+# [ ${NETWORKING} = "no" ] && exit 0
|
||||
|
||||
[ -x __EXEC_PATH__/arptables ] || exit 1
|
||||
[ -x __EXEC_PATH__/arptables-save ] || exit 1
|
||||
@@ -28,32 +28,30 @@
|
||||
desc="Arp filtering"
|
||||
|
||||
start() {
|
||||
- echo -n $"Starting $desc ($prog): "
|
||||
+ echo -n "Starting $desc ($prog): "
|
||||
__EXEC_PATH__/arptables-restore < __SYSCONFIG__/arptables || RETVAL=1
|
||||
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
- success "$prog startup"
|
||||
- rm -f /var/lock/subsys/$prog
|
||||
+ echo "$prog ok"
|
||||
+ touch /var/lock/subsys/$prog
|
||||
else
|
||||
- failure "$prog startup"
|
||||
+ echo "$prog failed"
|
||||
fi
|
||||
|
||||
- echo
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
stop() {
|
||||
- echo -n $"Stopping $desc ($prog): "
|
||||
+ echo -n "Stopping $desc ($prog): "
|
||||
__EXEC_PATH__/arptables-restore < /dev/null || RETVAL=1
|
||||
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
- success "$prog shutdown"
|
||||
- rm -f %{_localstatedir}/lock/subsys/$prog
|
||||
+ echo "$prog stopped"
|
||||
+ rm -f /var/lock/subsys/$prog
|
||||
else
|
||||
- failure "$prog shutdown"
|
||||
+ echo "$prog failed to stop"
|
||||
fi
|
||||
|
||||
- echo
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
@@ -63,15 +61,14 @@
|
||||
}
|
||||
|
||||
save() {
|
||||
- echo -n $"Saving $desc ($prog): "
|
||||
+ echo -n "Saving $desc ($prog): "
|
||||
__EXEC_PATH__/arptables-save > __SYSCONFIG__/arptables || RETVAL=1
|
||||
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
- success "$prog saved"
|
||||
+ echo "$prog saved"
|
||||
else
|
||||
- failure "$prog saved"
|
||||
+ echo "$prog is not saved"
|
||||
fi
|
||||
- echo
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
@@ -1,37 +0,0 @@
|
||||
From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Thu, 18 Sep 2014 19:46:58 -0700
|
||||
Subject: [PATCH] arptables.sysv: remove bashism
|
||||
|
||||
Use "." to replace of "source", and change /bin/bash to /bin/sh, the
|
||||
echo $"foo" works well in busybox.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
arptables.sysv | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arptables.sysv b/arptables.sysv
|
||||
index 7a90bd2..7710376 100644
|
||||
--- a/arptables.sysv
|
||||
+++ b/arptables.sysv
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/bin/sh
|
||||
#
|
||||
# init script for arptables
|
||||
#
|
||||
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# config: __SYSCONFIG__/arptables
|
||||
|
||||
-source /etc/init.d/functions
|
||||
+. /etc/init.d/functions
|
||||
# source /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -2,15 +2,13 @@ SUMMARY = "Administration tool for arp packet filtering"
|
||||
SECTION = "net"
|
||||
LICENSE = "GPL-2.0"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
|
||||
SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
|
||||
PV = "0.0.4+git${SRCPV}"
|
||||
SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
|
||||
PV = "0.0.5+git${SRCPV}"
|
||||
|
||||
SRC_URI = " \
|
||||
git://git.netfilter.org/arptables \
|
||||
file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \
|
||||
file://arptables-init-busybox.patch \
|
||||
file://arptables-arpt-get-target-fix.patch \
|
||||
file://arptables-remove-bashism.patch \
|
||||
file://arptables.service \
|
||||
"
|
||||
SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
|
||||
|
||||
Reference in New Issue
Block a user