From 1e212e3cec13248d9d4cfdfb80363ebd7d5fa339 Mon Sep 17 00:00:00 2001
From: Greg Alexander <gitgreg@galexander.org>
Date: Mon, 22 Dec 2014 07:52:17 -0500
Subject: [PATCH] switch rsync over to using its own internal zlib

---
 jni/Android.mk               | 15 +++++++++---
 rsync/config.h               |  1 -
 rsync/rsync-3.1.1/.gitignore | 46 ------------------------------------
 3 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 rsync/rsync-3.1.1/.gitignore

diff --git a/jni/Android.mk b/jni/Android.mk
index 4fe69d8..e29b682 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -608,9 +608,18 @@ LOCAL_SRC_FILES := $(RSYNC_PATH)/flist.c \
 	$(RSYNC_PATH)/popt/popt.c \
 	$(RSYNC_PATH)/popt/poptconfig.c \
 	$(RSYNC_PATH)/popt/popthelp.c \
-	$(RSYNC_PATH)/popt/poptparse.c
+	$(RSYNC_PATH)/popt/poptparse.c \
+	$(RSYNC_PATH)/zlib/deflate.c \
+	$(RSYNC_PATH)/zlib/inffast.c \
+	$(RSYNC_PATH)/zlib/inflate.c \
+	$(RSYNC_PATH)/zlib/inftrees.c \
+	$(RSYNC_PATH)/zlib/trees.c \
+	$(RSYNC_PATH)/zlib/zutil.c \
+	$(RSYNC_PATH)/zlib/adler32.c \
+	$(RSYNC_PATH)/zlib/compress.c \
+	$(RSYNC_PATH)/zlib/crc32.c
 
-LOCAL_C_INCLUDES:= rsync rsync/popt
-LOCAL_LDLIBS    := -lz
+LOCAL_C_INCLUDES:= rsync rsync/popt rsync/zlib
+LOCAL_LDLIBS    :=
 
 include $(BUILD_EXECUTABLE)
diff --git a/rsync/config.h b/rsync/config.h
index 12ae7a1..af7ff14 100644
--- a/rsync/config.h
+++ b/rsync/config.h
@@ -31,7 +31,6 @@
 #define RSYNC_VERSION "3.1.1"
 #define RSYNC_PATH "rsync"
 #define SIZEOF_OFF_T 4
-#define EXTERNAL_ZLIB 1
 #define RSYNCD_SYSCONF "/sdcard/ssh/rsyncd.conf"
 #define HAVE_NETDB_H 1
 #define HAVE_STRUCT_ADDRINFO 1
diff --git a/rsync/rsync-3.1.1/.gitignore b/rsync/rsync-3.1.1/.gitignore
deleted file mode 100644
index 948d3f7..0000000
--- a/rsync/rsync-3.1.1/.gitignore
+++ /dev/null
@@ -1,46 +0,0 @@
-*.[oa]
-*~
-dummy
-ID
-Makefile
-Makefile.old
-configure.sh
-configure.sh.old
-config.cache
-config.h
-config.h.in
-config.h.in.old
-config.log
-config.status
-/proto.h
-/proto.h-tstamp
-/rsync.1
-/rsyncd.conf.5
-/autom4te*.cache
-/confdefs.h
-/conftest*
-/dox
-/getgroups
-/gmon.out
-/rsync
-/rsync-ssl
-/stunnel-rsync
-/stunnel-rsyncd.conf
-/shconfig
-/testdir
-/tests-dont-exist
-/testtmp
-/tls
-/testrun
-/trimslash
-/t_unsafe
-/wildtest
-/getfsdev
-/rounding.h
-/doc/rsync.pdf
-/doc/rsync.ps
-/support/savetransfer
-/testsuite/chown-fake.test
-/testsuite/devices-fake.test
-/testsuite/xattrs-hlink.test
-/patches