3f3db9f
diff -Nur opentracker-20160728.orig/Makefile opentracker-20160728/Makefile
3f3db9f
--- opentracker-20160728.orig/Makefile	2012-06-08 13:21:46.000000000 -0600
3f3db9f
+++ opentracker-20160728/Makefile	2016-07-28 14:53:43.570508693 -0600
Simon Wesp 4294686
@@ -1,6 +1,6 @@
3f3db9f
 # $Id: Makefile,v 1.73 2012/06/08 19:21:46 erdgeist Exp $
Simon Wesp 4294686
 
Simon Wesp 4294686
-CC?=gcc
Simon Wesp 4294686
+CC=gcc
Simon Wesp 4294686
 
Simon Wesp 4294686
 # Linux flavour
Simon Wesp 4294686
 # PREFIX?=/opt/diet
3f3db9f
@@ -13,39 +13,39 @@
Simon Wesp 4294686
 # LIBOWFAT_LIBRARY=$(PREFIX)/lib
Simon Wesp 4294686
 
Simon Wesp 4294686
 # Debug flavour
Simon Wesp 4294686
-PREFIX?=..
Simon Wesp 4294686
-LIBOWFAT_HEADERS=$(PREFIX)/libowfat
Simon Wesp 4294686
-LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
Simon Wesp 4294686
+PREFIX?=/usr
Simon Wesp 4294686
+LIBOWFAT_HEADERS=INPUTINCLUDEDIRHERE/libowfat
Simon Wesp 4294686
+LIBOWFAT_LIBRARY=INPUTINCLUDEDIRHERE/libowfat
Simon Wesp 4294686
 
Simon Wesp 4294686
 BINDIR?=$(PREFIX)/bin
Simon Wesp 4294686
 
3f3db9f
 #FEATURES+=-DWANT_V6
3f3db9f
 
3f3db9f
 #FEATURES+=-DWANT_ACCESSLIST_BLACK
3f3db9f
-#FEATURES+=-DWANT_ACCESSLIST_WHITE
3f3db9f
+FEATURES+=-DWANT_ACCESSLIST_WHITE
Simon Wesp 4294686
 
Simon Wesp 4294686
 #FEATURES+=-DWANT_SYNC_LIVE
Simon Wesp 4294686
 #FEATURES+=-DWANT_IP_FROM_QUERY_STRING
Simon Wesp 4294686
-#FEATURES+=-DWANT_COMPRESSION_GZIP
Simon Wesp 4294686
+FEATURES+=-DWANT_COMPRESSION_GZIP
3f3db9f
 #FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
Simon Wesp 4294686
 #FEATURES+=-DWANT_LOG_NETWORKS
Simon Wesp 4294686
-#FEATURES+=-DWANT_RESTRICT_STATS
Simon Wesp 4294686
+FEATURES+=-DWANT_RESTRICT_STATS
Simon Wesp 4294686
 #FEATURES+=-DWANT_IP_FROM_PROXY
Simon Wesp 4294686
 #FEATURES+=-DWANT_FULLLOG_NETWORKS
Simon Wesp 4294686
 #FEATURES+=-DWANT_LOG_NUMWANT
Simon Wesp 4294686
 #FEATURES+=-DWANT_MODEST_FULLSCRAPES
Simon Wesp 4294686
 #FEATURES+=-DWANT_SPOT_WOODPECKER
Simon Wesp 4294686
-#FEATURES+=-DWANT_SYSLOGS
Simon Wesp 4294686
+FEATURES+=-DWANT_SYSLOGS
3f3db9f
 #FEATURES+=-DWANT_DEV_RANDOM
Simon Wesp 4294686
 FEATURES+=-DWANT_FULLSCRAPE
Simon Wesp 4294686
 
Simon Wesp 4294686
 #FEATURES+=-D_DEBUG_HTTPERROR
Simon Wesp 4294686
 
Simon Wesp 4294686
-OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
Simon Wesp 4294686
+#OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
Simon Wesp 4294686
 OPTS_production=-O3
Simon Wesp 4294686
 
Simon Wesp 4294686
 CFLAGS+=-I$(LIBOWFAT_HEADERS) -Wall -pipe -Wextra #-ansi -pedantic
Simon Wesp 4294686
-LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lpthread -lz
Simon Wesp 4294686
+LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lpthread -lz -lc -lgcc
Simon Wesp 4294686
 
Simon Wesp 4294686
 BINARY =opentracker
3f3db9f
 HEADERS=trackerlogic.h scan_urlencoded_query.h ot_mutex.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
3f3db9f
@@ -59,14 +59,13 @@
Simon Wesp 4294686
 
Simon Wesp 4294686
 .SUFFIXES: .debug.o .o .c
Simon Wesp 4294686
 
Simon Wesp 4294686
-all: $(BINARY) $(BINARY).debug
Simon Wesp 4294686
+all: $(BINARY)
Simon Wesp 4294686
 
Simon Wesp 4294686
 CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
Simon Wesp 4294686
 CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
Simon Wesp 4294686
 
Simon Wesp 4294686
 $(BINARY): $(OBJECTS) $(HEADERS)
Simon Wesp 4294686
 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
Simon Wesp 4294686
-	strip $@
Simon Wesp 4294686
 $(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
Simon Wesp 4294686
 	$(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
Simon Wesp 4294686
 proxy: $(OBJECTS_proxy) $(HEADERS)
3f3db9f
@@ -84,4 +83,4 @@
Simon Wesp 4294686
 	rm -rf opentracker opentracker.debug *.o *~
Simon Wesp 4294686
 
Simon Wesp 4294686
 install:
Simon Wesp 4294686
-	install -m 755 opentracker $(BINDIR)
Simon Wesp 4294686
+	install -m 755 opentracker $(DESTDIR)$(BINDIR)