From 4c53e251439f42135fc80fe000174f7accdb048c Mon Sep 17 00:00:00 2001
From: Karel Heyse <karel.heyse@gmail.com>
Date: Fri, 31 Jan 2014 23:55:05 +0100
Subject: [PATCH 1/4] typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89314cb..d18eb90 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ The main features are:
 * Interactive command-line-interfae mode where aircrafts currently detected
   are shown as a list refreshing as more data arrives.
 * CPR coordinates decoding and track calculation from velocity.
-* TCP server streaming and recceiving raw data to/from connected clients
+* TCP server streaming and receiving raw data to/from connected clients
   (using --net).
 
 While from time to time I still add / fix stuff in my fork, I target

From 0fe347c8f3c7438dbdb049553fb31d52d247609b Mon Sep 17 00:00:00 2001
From: Frederik De Bleser <frederik@debleser.be>
Date: Tue, 3 Mar 2015 14:43:35 +0100
Subject: [PATCH 2/4] Allow cross-site HTTP requests to data.json.

---
 dump1090.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dump1090.c b/dump1090.c
index 4160251..7fa5327 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -2260,6 +2260,7 @@ int handleHTTPRequest(struct client *c) {
         "Content-Type: %s\r\n"
         "Connection: %s\r\n"
         "Content-Length: %d\r\n"
+        "Access-Control-Allow-Origin: *\r\n"
         "\r\n",
         ctype,
         keepalive ? "keep-alive" : "close",

From 36cec38231eada02386dabec85355eba195352c5 Mon Sep 17 00:00:00 2001
From: Steven Kreuzer <skreuzer@FreeBSD.org>
Date: Wed, 4 Mar 2015 14:16:43 +0000
Subject: [PATCH 3/4] Rename the LIBS variable to LDFLAGS Change the assignment
 operator of CFLAGS and CC to be '?='

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c6084a0..8eb363e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
-LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
-CC=gcc
+CFLAGS?=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
+LDFLAGS?=`pkg-config --libs librtlsdr` -lpthread -lm
+CC?=gcc
 PROGNAME=dump1090
 
 all: dump1090
@@ -9,7 +9,7 @@ all: dump1090
 	$(CC) $(CFLAGS) -c $<
 
 dump1090: dump1090.o anet.o
-	$(CC) -g -o dump1090 dump1090.o anet.o $(LIBS)
+	$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS)
 
 clean:
 	rm -f *.o dump1090

From 45856db3eed7c7388a9a7267e4966ffe518240c3 Mon Sep 17 00:00:00 2001
From: Michael Weber <michael@xmw.de>
Date: Tue, 10 Mar 2015 14:49:14 +0100
Subject: [PATCH 4/4] Add libs to LDLIBS and leave LDFLAGS untouched. $(shell )
 only evaluates once.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8eb363e..f9637b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CFLAGS?=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
-LDFLAGS?=`pkg-config --libs librtlsdr` -lpthread -lm
+CFLAGS?=-O2 -g -Wall -W $(shell pkg-config --cflags librtlsdr)
+LDLIBS+=$(shell pkg-config --libs librtlsdr) -lpthread -lm
 CC?=gcc
 PROGNAME=dump1090
 
@@ -9,7 +9,7 @@ all: dump1090
 	$(CC) $(CFLAGS) -c $<
 
 dump1090: dump1090.o anet.o
-	$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS)
+	$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS) $(LDLIBS)
 
 clean:
 	rm -f *.o dump1090