27e8fac5ca
Copy from network:utilities/ebtables based on submit request 29024 from user coolo OBS-URL: https://build.opensuse.org/request/show/29024 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ebtables?expand=0&rev=8
83 lines
3.3 KiB
Diff
83 lines
3.3 KiB
Diff
Index: Makefile
|
|
===================================================================
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -18,7 +18,7 @@ DESTDIR:=
|
|
CFLAGS:=-Wall -Wunused
|
|
CFLAGS_SH_LIB:=-fPIC
|
|
CC:=gcc
|
|
-LD:=ld
|
|
+LD:=gcc
|
|
|
|
ifeq ($(shell uname -m),sparc64)
|
|
CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
|
|
@@ -85,7 +85,7 @@ ebtables-standalone.o: ebtables-standalo
|
|
|
|
.PHONY: libebtc
|
|
libebtc: $(OBJECTS2)
|
|
- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
|
|
+ $(LD) -shared -Wl,-soname -Wl,libebtc.so -o libebtc.so -lc $(OBJECTS2)
|
|
|
|
ebtables: $(OBJECTS) ebtables-standalone.o libebtc
|
|
$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
|
|
@@ -154,28 +154,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
|
|
.PHONY: scripts
|
|
scripts: ebtables-save ebtables.sysv ebtables-config
|
|
cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
|
|
- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
|
|
+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
|
|
cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
|
|
- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
|
|
+ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
|
|
cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
|
|
- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
|
|
+ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
|
|
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
|
|
|
|
$(MANDIR)/man8/ebtables.8: ebtables.8
|
|
mkdir -p $(DESTDIR)$(@D)
|
|
sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
|
|
- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
|
|
+ install -m 0644 ebtables.8_ $(DESTDIR)$@
|
|
rm -f ebtables.8_
|
|
|
|
$(ETHERTYPESFILE): ethertypes
|
|
mkdir -p $(DESTDIR)$(@D)
|
|
- install -m 0644 -o root -g root $< $(DESTDIR)$@
|
|
+ install -m 0644 $< $(DESTDIR)$@
|
|
|
|
.PHONY: exec
|
|
exec: ebtables ebtables-restore
|
|
mkdir -p $(DESTDIR)$(BINDIR)
|
|
- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
|
|
- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
|
|
+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
|
|
+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
|
|
|
|
.PHONY: install
|
|
install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
|
|
@@ -199,18 +199,18 @@ release:
|
|
rm -f extensions/ebt_inat.c
|
|
rm -rf $(CVSDIRS)
|
|
mkdir -p include/linux/netfilter_bridge
|
|
- install -m 0644 -o root -g root \
|
|
+ install -m 0644 \
|
|
$(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
|
|
# To keep possible compile error complaints about undefined ETH_P_8021Q
|
|
# off my back
|
|
- install -m 0644 -o root -g root \
|
|
+ install -m 0644 \
|
|
$(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
|
|
- install -m 0644 -o root -g root \
|
|
+ install -m 0644 \
|
|
$(KERNEL_INCLUDES)/linux/types.h include/linux/
|
|
- install -m 0644 -o root -g root \
|
|
+ install -m 0644 \
|
|
$(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
|
|
include/linux/netfilter_bridge/
|
|
- install -m 0644 -o root -g root \
|
|
+ install -m 0644 \
|
|
include/ebtables.h include/linux/netfilter_bridge/
|
|
make clean
|
|
touch *
|