Merge branch 'stable'

diff --combined Makefile
index 0a5055b1a6617abd8382ec283095b355c183e1d2,1dc44d5ce4ee512becaa9d2e4fbf1762466b30e8..3a4d974949f3a48ca339bdc4f2984733e25c9049
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,19 -1,16 +1,19 @@@
- CGIT_VERSION = v0.8.3.1
+ CGIT_VERSION = v0.8.3.2
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
  CGIT_CONFIG = /etc/cgitrc
  CACHE_ROOT = /var/cache/cgit
  SHA1_HEADER = <openssl/sha.h>
 -GIT_VER = 1.6.4.3
 +GIT_VER = 1.7.0
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
  INSTALL = install
  
  # Define NO_STRCASESTR if you don't have strcasestr.
  #
 +# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
 +# implementation (slower).
 +#
  # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
  #
  
@@@ -71,7 -68,7 +71,7 @@@ endi
        $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
  
  
 -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz
  OBJECTS =
  OBJECTS += cache.o
  OBJECTS += cgit.o
@@@ -93,7 -90,6 +93,7 @@@ OBJECTS += ui-refs.
  OBJECTS += ui-repolist.o
  OBJECTS += ui-shared.o
  OBJECTS += ui-snapshot.o
 +OBJECTS += ui-ssdiff.o
  OBJECTS += ui-stats.o
  OBJECTS += ui-summary.o
  OBJECTS += ui-tag.o
@@@ -127,12 -123,6 +127,12 @@@ endi
  ifdef NO_STRCASESTR
        CFLAGS += -DNO_STRCASESTR
  endif
 +ifdef NO_OPENSSL
 +      CFLAGS += -DNO_OPENSSL
 +      GIT_OPTIONS += NO_OPENSSL=1
 +else
 +      EXTLIBS += -lcrypto
 +endif
  
  cgit: $(OBJECTS) libgit
        $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
@@@ -142,8 -132,8 +142,8 @@@ cgit.o: VERSIO
  -include $(OBJECTS:.o=.d)
  
  libgit:
 -      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
 -      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 +      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
 +      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
  
  test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all