From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 23 Aug 2011 23:32:21 +0000 (+0000)
Subject: Merge branch 'master' of git.rot13.org:/git/cloudstore
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=122d026378885b60b17d24d03497664a54a84995;hp=3d1940923072e35e3a1c25da759e2797958c0b15;p=cloudstore.git

Merge branch 'master' of git.rot13.org:/git/cloudstore
---

diff --git a/bin/rsync b/bin/rsync
new file mode 100755
index 0000000..7bf6cd3
Binary files /dev/null and b/bin/rsync differ
diff --git a/rsync-piper.pl b/rsync-piper.pl
index 12574eb..5751e96 100755
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -120,12 +120,13 @@ if ( -e $pid_file ) {
 	my $pid = read_file $pid_file;
 	chomp($pid);
 	if ( kill 0, $pid ) {
-		warn "found rsync pid $pid";
+		warn "found rsync pid $pid\n";
 		kill 2, $pid;
 		while ( -e $pid_file ) {
-			warn "waiting for rsync to die...";
+			warn "waiting for rsync to die...\n";
 			sleep 1;
 		}
+		kill 0, $pid && die "can't kill it!";
 	} else {
 		unlink $pid_file;
 	}
diff --git a/torrent/opentracker/Makefile b/torrent/opentracker/Makefile
new file mode 100644
index 0000000..ce246a7
--- /dev/null
+++ b/torrent/opentracker/Makefile
@@ -0,0 +1,85 @@
+# $Id: Makefile,v 1.68 2010/08/14 01:08:13 erdgeist Exp $
+
+CC?=gcc
+
+# Linux flavour
+# PREFIX?=/opt/diet
+# LIBOWFAT_HEADERS=$(PREFIX)/include
+# LIBOWFAT_LIBRARY=$(PREFIX)/lib
+
+# BSD flavour
+# PREFIX?=/usr/local
+# LIBOWFAT_HEADERS=$(PREFIX)/include/libowfat
+# LIBOWFAT_LIBRARY=$(PREFIX)/lib
+
+# Debug flavour
+PREFIX?=..
+LIBOWFAT_HEADERS=$(PREFIX)/libowfat
+LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
+
+BINDIR?=$(PREFIX)/bin
+
+#FEATURES+=-DWANT_V6
+
+#FEATURES+=-DWANT_ACCESSLIST_BLACK
+#FEATURES+=-DWANT_ACCESSLIST_WHITE
+
+FEATURES+=-DWANT_SYNC_LIVE
+#FEATURES+=-DWANT_IP_FROM_QUERY_STRING
+FEATURES+=-DWANT_COMPRESSION_GZIP
+#FEATURES+=-DWANT_LOG_NETWORKS
+#FEATURES+=-DWANT_RESTRICT_STATS
+#FEATURES+=-DWANT_IP_FROM_PROXY
+FEATURES+=-DWANT_FULLLOG_NETWORKS
+FEATURES+=-DWANT_LOG_NUMWANT
+#FEATURES+=-DWANT_MODEST_FULLSCRAPES
+FEATURES+=-DWANT_SPOT_WOODPECKER
+FEATURES+=-DWANT_SYSLOGS
+FEATURES+=-DWANT_FULLSCRAPE
+
+#FEATURES+=-D_DEBUG_HTTPERROR
+
+OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
+OPTS_production=-O3
+
+CFLAGS+=-I$(LIBOWFAT_HEADERS) -Wall -pipe -Wextra #-ansi -pedantic
+LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lpthread -lz
+
+BINARY =opentracker
+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
+SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_mutex.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c
+SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c
+
+OBJECTS = $(SOURCES:%.c=%.o)
+OBJECTS_debug = $(SOURCES:%.c=%.debug.o)
+OBJECTS_proxy = $(SOURCES_proxy:%.c=%.o)
+OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.debug.o)
+
+.SUFFIXES: .debug.o .o .c
+
+all: $(BINARY) $(BINARY).debug
+
+CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
+CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
+
+$(BINARY): $(OBJECTS) $(HEADERS)
+	$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
+	strip $@
+$(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
+	$(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
+proxy: $(OBJECTS_proxy) $(HEADERS)
+	$(CC) -o $@ $(OBJECTS_proxy) $(CFLAGS_production) $(LDFLAGS)
+proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
+	$(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS)
+
+.c.debug.o : $(HEADERS)
+	$(CC) -c -o $@ $(CFLAGS_debug) $(<:.debug.o=.c)
+
+.c.o : $(HEADERS)
+	$(CC) -c -o $@ $(CFLAGS_production) $<
+
+clean:
+	rm -rf opentracker opentracker.debug *.o *~
+
+install:
+	install -m 755 opentracker $(BINDIR)