Browse Source

package/*/patches: drop obvious cases of install parameter elimination

Due to an advanced wrapper, this should have become unnecessary.
Phil Sutter 10 years ago
parent
commit
60ac524e6f

+ 0 - 14
package/capi4k-utils/patches/patch-avmb1_Makefile_in

@@ -1,14 +0,0 @@
-	- do not set uid/gid while installing
---- capi4k-utils.orig/avmb1/Makefile.in	2002-10-26 21:27:40.000000000 +0200
-+++ capi4k-utils/avmb1/Makefile.in	2011-07-14 19:14:42.879001566 +0200
-@@ -15,8 +15,8 @@ SBINDIR			= @CONFIG_SBINDIR@
- MANDIR			= @CONFIG_MANDIR@
- MAN8DIR			= $(MANDIR)/man8
- INSTALL			= @INSTALL@
--INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
--INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
-+INSTALL_PROGRAM	= $(INSTALL) -m 0750
-+INSTALL_MAN		= $(INSTALL) -m 0644
- prefix			= @prefix@
- exec_prefix		= @exec_prefix@
- CC				= @CC@

+ 0 - 12
package/capi4k-utils/patches/patch-pppdcapiplugin_Makefile

@@ -1,12 +0,0 @@
-	- do not set uid when installing
---- capi4k-utils.orig/pppdcapiplugin/Makefile	2005-07-18 11:11:25.000000000 +0200
-+++ capi4k-utils/pppdcapiplugin/Makefile	2011-07-14 19:22:54.660001648 +0200
-@@ -12,7 +12,7 @@ export TOPDIR=$(shell pwd)
- export CAPIINC=$(TOPDIR)/../capi20
- export CAPILIB=$(TOPDIR)/../capi20
- export INSTALL=$(TOPDIR)/install-sh -c
--export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
-+export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
- export MKDIR=$(TOPDIR)/mkinstalldirs
- 
- PPPSRCDIRS=/src/isdn/pppd

+ 0 - 63
package/ebtables/patches/patch-Makefile

@@ -22,66 +22,3 @@
  
  
  ifeq ($(shell uname -m),sparc64)
  ifeq ($(shell uname -m),sparc64)
  CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
  CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
- scripts: ebtables-save ebtables.sysv ebtables-config
- 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
- 	mkdir -p $(DESTDIR)$(BINDIR)
--	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_
- 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
--	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
-+	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
- 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
- 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi
--	if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
-+	if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
- 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
- 
- tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g')
- $(MANDIR)/man8/ebtables.8: ebtables.8
- 	mkdir -p $(DESTDIR)$(@D)
- 	sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_
--	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
-+	install -m 0644 ebtables.8_ $(DESTDIR)$@
- 	rm -f ebtables.8_
- 
- $(DESTDIR)$(ETHERTYPESFILE): ethertypes
- 	mkdir -p $(@D)
--	install -m 0644 -o root -g root $< $@
-+	install -m 0644 $< $@
- 
- .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 $(DESTDIR)$(ETHERTYPESFILE) exec scripts
-@@ -205,18 +205,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 *

+ 0 - 60
package/kismet/patches/patch-Makefile_in

@@ -1,60 +0,0 @@
---- kismet-2011-01-R1.orig/Makefile.in	2010-12-19 15:20:16.000000000 +0100
-+++ kismet-2011-01-R1/Makefile.in	2011-02-04 23:14:39.000000000 +0100
-@@ -112,26 +112,26 @@ commoninstall:
- 
- 	if test -e $(NC); then \
- 		echo "Installing client"; \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet; \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC); \
-+		$(INSTALL) -m 555 scripts/kismet $(BIN)/kismet; \
-+		$(INSTALL) -m 555 $(NC) $(BIN)/$(NC); \
- 	fi;
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
-+	$(INSTALL) -m 555 $(PS) $(BIN)/$(PS); 
-+	$(INSTALL) -m 555 $(DRONE) $(BIN)/$(DRONE);
- 
- 	mkdir -p $(MAN)/man1
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
-+	$(INSTALL) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
-+	$(INSTALL) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
- 
- 	mkdir -p $(MAN)/man5
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
-+	$(INSTALL) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
-+	$(INSTALL) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
- 
- 	mkdir -p $(WAV)
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new.wav $(WAV)/new.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/packet.wav $(WAV)/packet.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
-+	$(INSTALL) -m 644 wav/new.wav $(WAV)/new.wav
-+	$(INSTALL) -m 644 wav/packet.wav $(WAV)/packet.wav
-+	$(INSTALL) -m 644 wav/alert.wav $(WAV)/alert.wav
-+	$(INSTALL) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
-+	$(INSTALL) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
- 
- suidinstall: $(CS)
- 	-groupadd -f $(SUIDGROUP)
-@@ -174,7 +174,7 @@ install: $(INSTBINS)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		$(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
- 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
- 		echo "Installed config into $(ETC)/kismet.conf."; \
- 	fi
-@@ -183,7 +183,7 @@ install: $(INSTBINS)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		$(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
- 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
- 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
- 	fi