OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

revert trailing spaces in patches.

pull/195/head
Paul Philippov 2022-02-28 13:55:23 -05:00
parent 681a6e271a
commit d7724afcd1
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
general/package/rtl8188eus-openipc/0001-apmode.patch
View File

@ -2,9 +2,9 @@
+++ b/Makefile 2021-12-18 12:07:01.433235328 +0200 +++ b/Makefile 2021-12-18 12:07:01.433235328 +0200
@@ -2055,6 +2056,7 @@ @@ -2055,6 +2056,7 @@
else else
export CONFIG_RTL8188EU = m export CONFIG_RTL8188EU = m
+EXTRA_CFLAGS += -DCONFIG_AP_MODE -DCONFIG_RTW_HOSTAPD_ACS -DCONFIG_RTW_MESH +EXTRA_CFLAGS += -DCONFIG_AP_MODE -DCONFIG_RTW_HOSTAPD_ACS -DCONFIG_RTW_MESH
all: modules all: modules

6
general/package/rtl8812au-openipc/0001-disable_8814_8821.patch
View File

@ -1,7 +1,7 @@
--- a/Makefile 2022-01-23 16:37:12.818897741 +0300 --- a/Makefile 2022-01-23 16:37:12.818897741 +0300
+++ b/Makefile 2022-01-23 16:37:49.374948068 +0300 +++ b/Makefile 2022-01-23 16:37:49.374948068 +0300
@@ -22,8 +22,8 @@ @@ -22,8 +22,8 @@
########################## WIFI IC ############################ ########################## WIFI IC ############################
CONFIG_RTL8812A = y CONFIG_RTL8812A = y
-CONFIG_RTL8821A = y -CONFIG_RTL8821A = y
@ -14,9 +14,9 @@
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
HCI_NAME = usb HCI_NAME = usb
endif endif
-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) -ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n) +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n)
EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\"
ifeq ($(CONFIG_USB_HCI), y) ifeq ($(CONFIG_USB_HCI), y)

4
general/package/uacme-openipc/0001-uacme.sh.patch
View File

@ -3,12 +3,12 @@
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
-CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/var/www/.well-known/acme-challenge}" -CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/var/www/.well-known/acme-challenge}"
+CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/tmp/.well-known/acme-challenge}" +CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/tmp/.well-known/acme-challenge}"
ARGS=5 ARGS=5
E_BADARGS=85 E_BADARGS=85
@@ -36,6 +36,7 @@ case "$METHOD" in @@ -36,6 +36,7 @@ case "$METHOD" in
"begin") "begin")
case "$TYPE" in case "$TYPE" in

20
general/package/vtund-openipc/0001-vtund-3.0.2-fix-makefile.patch
View File

@ -1,13 +1,13 @@
--- a/Makefile.in 2008-01-08 01:35:55.000000000 +0300 --- a/Makefile.in 2008-01-08 01:35:55.000000000 +0300
+++ b/Makefile.in 2021-05-07 22:18:22.310801557 +0300 +++ b/Makefile.in 2021-05-07 22:18:22.310801557 +0300
@@ -74,27 +74,27 @@ @@ -74,27 +74,27 @@
distclean: clean distclean: clean
rm -f $(CONFIGURE_FILES) rm -f $(CONFIGURE_FILES)
- rm -f `cat vtun.drivers` - rm -f `cat vtun.drivers`
+ rm -f `cat vtun.drivers` + rm -f `cat vtun.drivers`
install_man: install_man:
- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8 - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
- $(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8 - $(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5 - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
@ -16,17 +16,17 @@
+ $(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8 + $(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
+ $(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5 + $(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
+ $(INSTALL) -m 644 $vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5 + $(INSTALL) -m 644 $vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8
ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8
install_config: install_config:
- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
if [ ! -f $(ETC_DIR)/vtund.conf ]; then \ if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \ - $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+ $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \ + $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \
fi fi
-install: vtund install_config install_man -install: vtund install_config install_man
- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
@ -39,5 +39,5 @@
+ $(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
+ $(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR) + $(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.

2
general/package/vtund-openipc/0091-vtund-3.0.2-keepalive-syslog.patch
View File

@ -1,7 +1,7 @@
--- a/linkfd.c 2008-01-08 00:35:43.000000000 +0200 --- a/linkfd.c 2008-01-08 00:35:43.000000000 +0200
+++ b/linkfd.c 2021-12-21 20:08:27.197338347 +0300 +++ b/linkfd.c 2021-12-21 20:08:27.197338347 +0300
@@ -264,6 +264,7 @@ @@ -264,6 +264,7 @@
break; break;
} }
/* Send ECHO request */ /* Send ECHO request */
+ vtun_syslog(LOG_INFO,"Session %s sending ping", lfd_host->host); + vtun_syslog(LOG_INFO,"Session %s sending ping", lfd_host->host);

16
general/package/wifibroadcast/0001-makefile.patch
View File

@ -6,11 +6,11 @@
-COMMIT ?= $(shell git rev-parse HEAD) -COMMIT ?= $(shell git rev-parse HEAD)
-VERSION ?= $(shell $(PYTHON) ./version.py $(shell git show -s --format="%ct" $(shell git rev-parse HEAD)) $(shell git rev-parse --abbrev-ref HEAD)) -VERSION ?= $(shell $(PYTHON) ./version.py $(shell git show -s --format="%ct" $(shell git rev-parse HEAD)) $(shell git rev-parse --abbrev-ref HEAD))
+VERSION ?= $(shell git rev-parse HEAD) +VERSION ?= $(shell git rev-parse HEAD)
-export VERSION COMMIT -export VERSION COMMIT
+LDFLAGS := -lrt -lpcap -lsodium +LDFLAGS := -lrt -lpcap -lsodium
+CFLAGS := -Wall -O2 -DWFB_VERSION='"$(VERSION)"' +CFLAGS := -Wall -O2 -DWFB_VERSION='"$(VERSION)"'
-_LDFLAGS := $(LDFLAGS) -lrt -lpcap -lsodium -_LDFLAGS := $(LDFLAGS) -lrt -lpcap -lsodium
-_CFLAGS := $(CFLAGS) -Wall -O2 -DWFB_VERSION='"$(VERSION)-$(shell /bin/bash -c '_tmp=$(COMMIT); echo $${_tmp::8}')"' -_CFLAGS := $(CFLAGS) -Wall -O2 -DWFB_VERSION='"$(VERSION)-$(shell /bin/bash -c '_tmp=$(COMMIT); echo $${_tmp::8}')"'
- -
@ -25,23 +25,23 @@
-gs.key: wfb_keygen -gs.key: wfb_keygen
- @if ! [ -f gs.key ]; then ./wfb_keygen; fi - @if ! [ -f gs.key ]; then ./wfb_keygen; fi
+all: wfb_rx wfb_tx wfb_keygen +all: wfb_rx wfb_tx wfb_keygen
src/%.o: src/%.c src/*.h src/%.o: src/%.c src/*.h
- $(CC) $(_CFLAGS) -std=gnu99 -c -o $@ $< - $(CC) $(_CFLAGS) -std=gnu99 -c -o $@ $<
+ $(CC) $(CFLAGS) -std=gnu99 -c -o $@ $< + $(CC) $(CFLAGS) -std=gnu99 -c -o $@ $<
src/%.o: src/%.cpp src/*.hpp src/*.h src/%.o: src/%.cpp src/*.hpp src/*.h
- $(CXX) $(_CFLAGS) -std=gnu++11 -c -o $@ $< - $(CXX) $(_CFLAGS) -std=gnu++11 -c -o $@ $<
+ $(CXX) $(CFLAGS) -std=gnu++11 -c -o $@ $< + $(CXX) $(CFLAGS) -std=gnu++11 -c -o $@ $<
wfb_rx: src/rx.o src/radiotap.o src/fec.o src/wifibroadcast.o wfb_rx: src/rx.o src/radiotap.o src/fec.o src/wifibroadcast.o
- $(CXX) -o $@ $^ $(_LDFLAGS) - $(CXX) -o $@ $^ $(_LDFLAGS)
+ $(CXX) -o $@ $^ $(LDFLAGS) + $(CXX) -o $@ $^ $(LDFLAGS)
wfb_tx: src/tx.o src/fec.o src/wifibroadcast.o wfb_tx: src/tx.o src/fec.o src/wifibroadcast.o
- $(CXX) -o $@ $^ $(_LDFLAGS) - $(CXX) -o $@ $^ $(_LDFLAGS)
+ $(CXX) -o $@ $^ $(LDFLAGS) + $(CXX) -o $@ $^ $(LDFLAGS)
wfb_keygen: src/keygen.o wfb_keygen: src/keygen.o
- $(CC) -o $@ $^ $(_LDFLAGS) - $(CC) -o $@ $^ $(_LDFLAGS)
- -
@ -63,7 +63,7 @@
- $(PYTHON) ./setup.py bdist --plat-name linux-$(ARCH) - $(PYTHON) ./setup.py bdist --plat-name linux-$(ARCH)
- rm -rf wifibroadcast.egg-info/ - rm -rf wifibroadcast.egg-info/
+ $(CC) -o $@ $^ $(LDFLAGS) + $(CC) -o $@ $^ $(LDFLAGS)
clean: clean:
- rm -rf env wfb_rx wfb_tx wfb_keygen dist deb_dist build wifibroadcast.egg-info _trial_temp *~ src/*.o - rm -rf env wfb_rx wfb_tx wfb_keygen dist deb_dist build wifibroadcast.egg-info _trial_temp *~ src/*.o
- -