Merge branch 'master' into packaging

* master: (31 commits)
  packaging: add Sparkle compilation
  sparkle: bump sparkle version
  autoupdate: add Sparkle framework
  preferences: always hide general stun/turn server
  animations: fix glitch after animations
  chat: add sender name and interline space
  call: add connecting animation
  cleanup: remove dead code
  cleanup: run XCode code analysis
  accounts: use account selection model
  muting: add UI for audio/video muting
  contacts: fix photo rendering
  osx: add chat support
  preference: enable auto startup by default
  lrc: adapt to API changes
  preference: add autostart feature
  security: add options for SIP accounts
  macosx: fix exit segfault
  bump to 0.4.0
  cleanup: remove unused imports
  ...

Change-Id: I922a2d3c10ff229957d2a7fe1a54001c038db6bb

.gitignore

@@ -26,6 +26,7 @@
 *.exe
 *.out
 *.app
+Sparkle.framework
 
 # Qt-es
 *.user

.gitmodules

+[submodule "sparkle/Sparkle"]
+	path = sparkle/Sparkle
+	url = https://github.com/sparkle-project/Sparkle.git

.packer.yml

@@ -39,6 +39,13 @@ osx:
         - echo "Client"
         - git clone https://gerrit-ring.savoirfairelinux.com/ring-client-macosx ring-client-macosx
         - cd ring-client-macosx
+        - git submodule init
+        - git submodule update
+        - cd sparkle/Sparkle
+        - export BUILDDIR=$(pwd)
+        - make release
+        - mv Build/Products/Release/Sparkle.framework ../
+        - cd ../../
         - mkdir build
         - cd build
         - export CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0

CMakeLists.txt

@@ -5,51 +5,129 @@ IF(POLICY CMP0022)
 ENDIF(POLICY CMP0022)
 
 SET(PROJ_NAME Ring)
-SET(RING_VERSION "0.1.0")
+
+# To build nighlies we need to update RING_VERSION with an optional command line arg
+IF("${RING_VERSION}" STREQUAL "")
+   SET(RING_VERSION "0.4.0")
+ENDIF("${RING_VERSION}" STREQUAL "")
+
+MESSAGE("Building Ring version - " ${RING_VERSION})
+
 SET(RING_VERSION_NAME "Samuel de Champlain")
-SET(BUNDLE_VERSION "Samuel de Champlain (0.1.0")
+SET(BUNDLE_VERSION "Samuel de Champlain - beta")
 
 SET(PROJ_COPYRIGHT " © 2015 Savoir-faire Linux \n GPLv3 https://www.gnu.org/copyleft/gpl.html")
 
-ADD_DEFINITIONS("-std=c++11")
+ADD_DEFINITIONS("-std=c++11 -fobjc-arc")
 
 PROJECT(${PROJ_NAME})
 
 FIND_PACKAGE(Qt5Core REQUIRED)
+FIND_PACKAGE(Qt5MacExtras REQUIRED)
 FIND_PACKAGE(Qt5Widgets REQUIRED)
 FIND_PACKAGE(LibRingClient REQUIRED)
 
+IF(NOT (${ENABLE_SPARKLE} MATCHES false))
+   MESSAGE("Sparkle auto-update enabled")
+
+   # find_library searches in /Library/Frameworks by default
+   # We add an hint to our custom location
+
+   FIND_LIBRARY(SPARKLE_FRAMEWORK
+                NAMES Sparkle
+                HINTS ${CMAKE_CURRENT_SOURCE_DIR}/sparkle)
+   IF(EXISTS ${SPARKLE_FRAMEWORK})
+      SET(ENABLE_SPARKLE 1 CACHE BOOLEAN "Enable Sparkle")
+      ADD_DEFINITIONS(-DENABLE_SPARKLE=1)
+      MESSAGE("Sparkle is here:" ${SPARKLE_FRAMEWORK})
+      FIND_PATH(SPARKLE_INCLUDE_DIR Sparkle.h HINTS ${SPARKLE_FRAMEWORK}/Headers)
+      MESSAGE("INCLUDE " ${SPARKLE_INCLUDE_DIR})
+      # we need to copy the public key to check the updates
+      SET(PUBLIC_KEY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/sparkle/dsa_pub.pem")
+      IF(EXISTS ${PUBLIC_KEY_PATH})
+         MESSAGE(STATUS "Looking for Public Key - found")
+         SET_SOURCE_FILES_PROPERTIES(${PUBLIC_KEY_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+         SET(PUBLIC_KEY ${PUBLIC_KEY_PATH})
+      ELSE(EXISTS ${PUBLIC_KEY_PATH})
+         MESSAGE(WARNING "Looking for Public Key - not found")
+         MESSAGE(WARNING "${PUBLIC_KEY_PATH} not found Sparkle Framework will NOT work and may even prevent application from launching. Please consider disabling Sparkle Framework, creating a keypair for testing purposes")
+      ENDIF(EXISTS ${PUBLIC_KEY_PATH})
+   ELSE()
+      MESSAGE(FATAL_ERROR "Sparkle framework not found, build it (see README) or disable Sparkle (-DENABLE_SPARKLE=false)")
+   ENDIF(EXISTS ${SPARKLE_FRAMEWORK})
+ENDIF(NOT (${ENABLE_SPARKLE} MATCHES false))
+
 INCLUDE_DIRECTORIES(SYSTEM ${Qt5Core_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${Qt5MacExtras_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${LIB_RING_CLIENT_INCLUDE_DIR})
 
-MESSAGE("LibRingClient is here:" ${LIB_RING_CLIENT_INCLUDE_DIR})
+MESSAGE("LRC is here:" ${LIB_RING_CLIENT_INCLUDE_DIR})
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
 
 #Files to compile
-SET(ringclient_SRCS
-   src/main.mm
-   src/AppDelegate.mm
-   src/RingWindowController.mm
-   src/ConversationsViewController.mm
-   src/PreferencesViewController.mm
+SET(ringclient_CONTROLLERS
    src/QNSTreeController.mm
+   src/QNSTreeController.h
+   src/CurrentCallVC.mm
+   src/CurrentCallVC.h
+   src/GeneralPrefsVC.mm
+   src/RingWizardWC.mm
+   src/RingWizardWC.h
+   src/RingWindowController.mm
+   src/RingWindowController.h
+   src/ConversationsVC.mm
+   src/ConversationsVC.h
+   src/PreferencesVC.mm
+   src/PreferencesVC.h
    src/AccGeneralVC.mm
-   src/AccAudioVC.mm
+   src/AccGeneralVC.h
    src/AccVideoVC.mm
+   src/AccVideoVC.h
+   src/AccAudioVC.mm
+   src/AccAudioVC.h
    src/AccRingVC.mm
+   src/AccRingVC.h
    src/AccAdvancedVC.mm
+   src/AccAdvancedVC.h
    src/AccSecurityVC.mm
-   src/AccountsVC.mm
-   src/CurrentCallVC.mm
+   src/AccSecurityVC.h
+   src/CertificateWC.mm
+   src/CertificateWC.h
    src/AudioPrefsVC.mm
+   src/AudioPrefsVC.h
+   src/AccountsVC.mm
+   src/AccountsVC.h
    src/VideoPrefsVC.mm
-   src/GeneralPrefsVC.mm
-   src/RingWizardWC.mm
-   src/HistoryViewController.mm
+   src/VideoPrefsVC.h
+   src/GeneralPrefsVC.h
+   src/HistoryVC.mm
+   src/HistoryVC.h
+   src/PersonsVC.mm
+   src/PersonsVC.h
+   src/ChatVC.mm
+   src/ChatVC.h)
+
+SET(ringclient_BACKENDS
+   src/backends/AddressBookBackend.mm
+   src/backends/AddressBookBackend.h)
+
+SET(ringclient_VIEWS
+   src/views/CallView.mm
+   src/views/CallView.h
+   src/views/ITProgressIndicator.mm
+   src/views/ITProgressIndicator.h
+   src/views/PersonCell.mm
+   src/views/PersonCell.h)
+
+SET(ringclient_OTHERS
+   src/main.mm
+   src/AppDelegate.mm
+   src/AppDelegate.h
+   src/delegates/ImageManipulationDelegate.mm
+   src/delegates/ImageManipulationDelegate.h)
 
-   src/backends/MinimalHistoryBackend.mm)
 
 SET(ringclient_XIBS
    MainMenu
@@ -66,32 +144,10 @@ SET(ringclient_XIBS
    AudioPrefs
    VideoPrefs
    PreferencesScreen
-   RingWizard)
-
-SET(ringclient_HDRS
-   src/AppDelegate.h
-   src/RingWindowController.h
-   src/CurrentCallVC.h
-   src/ConversationsViewController.h
-   src/PreferencesViewController.h
-   src/AccGeneralVC.h
-   src/AccVideoVC.h
-   src/AccAudioVC.h
-   src/AccRingVC.h
-   src/AccAdvancedVC.h
-   src/AccSecurityVC.h
-   src/AudioPrefsVC.h
-   src/AccountsVC.h
-   src/VideoPrefsVC.h
-   src/GeneralPrefsVC.h
-   src/HistoryViewController.h
-   src/RingWizardWC.h
-   src/QNSTreeController.h
-   
-   src/backends/MinimalHistoryBackend.h)
+   RingWizard
+   CertificateWindow)
 
 # Icons
-
 # This part tells CMake where to find and install the file itself
 SET(myApp_ICON ${CMAKE_CURRENT_SOURCE_DIR}/data/appicon.icns)
 SET_SOURCE_FILES_PROPERTIES(${myApp_ICON} PROPERTIES
@@ -100,8 +156,12 @@ SET_SOURCE_FILES_PROPERTIES(${myApp_ICON} PROPERTIES
 SET(ring_ICONS ${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_accept.png
 ${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_call.png
 ${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_cancel.png
-${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_email.png
-${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_new_email.png
+${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_hangup.png
+${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_hold.png
+${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_holdoff.png
+${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_mute_video.png
+${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_mute_audio.png
+${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_chat.png
 ${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_action_search.png
 ${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ancrage.png
 ${CMAKE_CURRENT_SOURCE_DIR}/data/dark/audio.png
@@ -119,20 +179,44 @@ FOREACH(xib ${ringclient_XIBS})
   SET(ringclient_XIBS_FOR_EXECUTABLE ${ringclient_XIBS_FOR_EXECUTABLE} ui/${xib}.xib)
 ENDFOREACH()
 
-ADD_EXECUTABLE(${PROJ_NAME} MACOSX_BUNDLE
-   ${ringclient_SRCS}
-   ${ringclient_HDRS}
+SET(TO_ADD 
+   ${ringclient_CONTROLLERS}
+   ${ringclient_BACKENDS}
+   ${ringclient_VIEWS}
+   ${ringclient_OTHERS}
    ${ringclient_XIBS_FOR_EXECUTABLE}
    ${myApp_ICON}
    Credits.rtf
    ${ring_ICONS})
 
+IF(ENABLE_SPARKLE)
+   SET( TO_ADD ${TO_ADD} ${PUBLIC_KEY} ${SPARKLE_FRAMEWORK})
+ENDIF(ENABLE_SPARKLE)
+
+ADD_EXECUTABLE(${PROJ_NAME} MACOSX_BUNDLE ${TO_ADD})
+
+# Follow Xcode hierarchy principles
+SOURCE_GROUP("Controllers" FILES ${ringclient_CONTROLLERS})
+SOURCE_GROUP("Backends" FILES ${ringclient_BACKENDS})
+SOURCE_GROUP("CustomViews" FILES ${ringclient_VIEWS})
+SOURCE_GROUP("Classes" FILES ${ringclient_OTHERS})
+SOURCE_GROUP("Resources\\Interface Builder" FILES ${ringclient_XIBS_FOR_EXECUTABLE})
+
+IF(ENABLE_SPARKLE)
+    SOURCE_GROUP("Frameworks" FILES ${SPARKLE_FRAMEWORK})
+ENDIF(ENABLE_SPARKLE)
+
 TARGET_LINK_LIBRARIES( ${PROJ_NAME}
    ${LIB_RING_CLIENT_LIBRARY}
    ${Qt5Core_LIBRARIES}
+   ${Qt5MacExtras_LIBRARIES}
    ${Qt5Widgets_LIBRARIES}
 )
 
+IF(ENABLE_SPARKLE)
+   TARGET_LINK_LIBRARIES(${PROJ_NAME} ${SPARKLE_FRAMEWORK})
+ENDIF(ENABLE_SPARKLE)
+
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AppKit")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Quartz")
@@ -140,15 +224,15 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AVFoundation")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AddressBook")
 
 # These variables are specific to our plist and are NOT standard CMake variables
-set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "MainMenu")
-set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication")
+SET(MACOSX_BUNDLE_NSMAIN_NIB_FILE "MainMenu")
+SET(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication")
 
 SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES
         MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in
         MACOSX_BUNDLE_GUI_IDENTIFIER "cx.ring"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING ${RING_VERSION_NAME}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${RING_VERSION}
         MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJ_NAME} ${RING_VERSION} Nightly"
-        MACOSX_BUNDLE_BUNDLE_VERSION ${RING_VERSION}
+        MACOSX_BUNDLE_BUNDLE_VERSION ${RING_VERSION_NAME}
         MACOSX_BUNDLE_COPYRIGHT "${PROJ_COPYRIGHT}"
         MACOSX_BUNDLE_INFO_STRING "Nightly build of ${PROJ_NAME} ${RING_VERSION} for testing and development"
         MACOSX_BUNDLE_BUNDLE_NAME ${PROJ_NAME}
@@ -163,10 +247,6 @@ IF(${IBTOOL} STREQUAL "IBTOOL-NOTFOUND")
                     the Apple developer tools. The default system paths were searched in addition to ${OSX_DEVELOPER_ROOT}/usr/bin")
 endif()
 
-# Make sure the 'Resources' Directory is correctly created before we build
-ADD_CUSTOM_COMMAND(TARGET ${PROJ_NAME} PRE_BUILD
-                      COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/${PROJ_NAME}.app/Contents/Resources)
-
 # Compile the .xib files using the 'ibtool' program with the destination being the app package
 FOREACH(xib ${ringclient_XIBS})
   ADD_CUSTOM_COMMAND(TARGET ${PROJ_NAME} POST_BUILD
@@ -177,26 +257,45 @@ FOREACH(xib ${ringclient_XIBS})
 
 ENDFOREACH()
 
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX})
+SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX})
 
 SET(APPS "\${CMAKE_INSTALL_PREFIX}/${PROJ_NAME}.app")
 
-#--------------------------------------------------------------------------------
-# Install the QtTest application, on Apple, the bundle is at the root of the
-# install tree
 INSTALL(TARGETS ${PROJ_NAME} BUNDLE DESTINATION . COMPONENT Runtime)
 
-SET(QT_PLUGINS_DESTDIR ${PROJ_NAME}.app/Contents/Plugins/platforms)
+SET(QT_PLUGINS_DESTDIR ${PROJ_NAME}.app/Contents/Plugins)
 #--------------------------------------------------------------------------------
 # Install needed Qt plugins by copying directories from the qt installation
-LIST(APPEND QT_PLUGINS Qt5::QTgaPlugin Qt5::QTiffPlugin Qt5::QCocoaIntegrationPlugin)
-FOREACH(plugin ${QT_PLUGINS})
+
+
+#MESSAGE("GUI====")
+#foreach(plugin ${Qt5Gui_PLUGINS})
+#  message("Plugin ${plugin} is at location ${_loc}")
+#endforeach()
+
+LIST(APPEND QT_PLUGINS_IMAGEFORMAT  Qt5::QTgaPlugin
+                                    Qt5::QGifPlugin
+                                    Qt5::QICNSPlugin
+                                    Qt5::QICOPlugin
+                                    Qt5::QJpegPlugin
+                                    Qt5::QJp2Plugin
+                                    Qt5::QMngPlugin
+                                    Qt5::QTiffPlugin
+                                    Qt5::QDDSPlugin)
+
+# we need two plugin directories platform and imageformats
+GET_TARGET_PROPERTY(_loc Qt5::QCocoaIntegrationPlugin LOCATION)
+INSTALL(FILES ${_loc} DESTINATION ${QT_PLUGINS_DESTDIR}/platforms COMPONENT Runtime)
+LIST(APPEND QT_PLUGINS Qt5::QCocoaIntegrationPlugin)
+
+FOREACH(plugin ${QT_PLUGINS_IMAGEFORMAT})
   GET_TARGET_PROPERTY(_loc ${plugin} LOCATION)
-  INSTALL(FILES ${_loc} DESTINATION ${QT_PLUGINS_DESTDIR} COMPONENT Runtime)
+  INSTALL(FILES ${_loc} DESTINATION ${QT_PLUGINS_DESTDIR}/imageformats COMPONENT Runtime)
+  LIST(APPEND QT_PLUGINS ${plugin})
 ENDFOREACH()
 
 # directories to look for dependencies
-SET(DIRS ${CMAKE_INSTALL_PREFIX}/lib ${QT_LIB_DIR})
+SET(DIRS ${CMAKE_INSTALL_PREFIX}/lib ${QT_LIB_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/sparkle)
 
 INSTALL(CODE "
     file(GLOB_RECURSE QTPLUGINS

README.md

@@ -14,21 +14,47 @@ Requirements
 Build instructions
 ==================
 
-2. mkdir build && cd build
+Build Sparkle framework (optional)
+----------------------------------
+Ring can ship with the Sparkle framework to allow automatic app updates.
+This can be disabled for your custom build by specifying -DENABLE_SPARKLE=false
+in the cmake phase.
 
-3. export CMAKE_PREFIX_PATH=<dir_to_qt5>
+1. cd sparkle/
+2. git submodule update
+3. cd Sparkle/
+4. make release
+5. A Finder window will popup in the directory where Sparkle has been built.
+Copy-paste the Sparkle.framework in sparkle/ in our project, or in
+/Library/Frameworks on your system.
+
+Build Client
+------------
+
+1. mkdir build && cd build
+
+2. export CMAKE_PREFIX_PATH=<dir_to_qt5>
 
 Now generate an Xcode project with CMake:
-4. cmake ../ -DCMAKE_INSTALL_PREFIX=<libringclient_install_path> -G Xcode
-5. open Ring.xcodeproj/
-6. Build and run it from Xcode. You can also generate the final Ring.app bundle.
+3. cmake ../ -DCMAKE_INSTALL_PREFIX=<libringclient_install_path> -G Xcode
+4. open Ring.xcodeproj/
+5. Build and run it from Xcode. You can also generate the final Ring.app bundle.
 
 You can also build it from the command line:
 
-4. cmake ../ -DCMAKE_INSTALL_PREFIX=<libringclient_install_path>
-5. make
-6. open Ring.app/
+3. cmake ../ -DCMAKE_INSTALL_PREFIX=<libringclient_install_path>
+4. make
+5. open Ring.app/
+
+If you want to create the final app (self-containing .dmg):
+
+4. make install
+5. cpack -G DragNDrop Ring
+
+Notes:
 
+By default the client version is specified in CMakeLists.txt but it can be
+overriden by specifying -DRING_VERSION=<num> in the cmake command line.
 
 Debugging
 ==================

cmake/MacOSXBundleInfo.plist.in

@@ -12,6 +12,10 @@
     <string>${MACOSX_BUNDLE_ICON_FILE}</string>
     <key>CFBundleIdentifier</key>
     <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+    <key>SUPublicDSAKeyFile</key>
+    <string>dsa_pub.pem</string>
+    <key>SUFeedURL</key>
+    <string>http://gpl.savoirfairelinux.net/ring-download/mac_osx/sparkle-ring.xml</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleLongVersionString</key>

sparkle/LICENSE

+Copyright (c) 2006-2013 Andy Matuschak.
+Copyright (c) 2009-2013 Elgato Systems GmbH.
+Copyright (c) 2011-2014 Kornel Lesiński.
+Copyright (c) 2014 C.W. Betts.
+Copyright (c) 2014 Petroules Corporation.
+Copyright (c) 2014 Big Nerd Ranch.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=================
+EXTERNAL LICENSES
+=================
+
+bspatch.c and bsdiff.c, from bsdiff 4.3 <http://www.daemonology.net/bsdiff/>:
+    Copyright (c) 2003-2005 Colin Percival.
+
+sais.c and sais.c, from sais-lite (2010/08/07) <https://sites.google.com/site/yuta256/sais>:
+    Copyright (c) 2008-2010 Yuta Mori.
+
+SUDSAVerifier.m:
+    Copyright (c) 2011 Mark Hamlin.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted providing that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

Sparkle @ 4e332850

+Subproject commit 4e332850686b2ac9f581a4779af4d4b442fdd5be

sparkle/dsa_pub.pem

+-----BEGIN PUBLIC KEY-----
+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
+ZnO5P9x/rPIJLCXY4xQYBryQCMu6JC5ibWzP
+-----END PUBLIC KEY-----

sparkle/sign_update.sh

+#!/bin/bash
+set -e
+set -o pipefail
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 update_archive private_key"
+  exit 1
+fi
+openssl=/usr/bin/openssl
+$openssl dgst -sha1 -binary < "$1" | $openssl dgst -dss1 -sign "$2" | base64 --wrap=0
+

sparkle/sparkle-xml-updater.sh

+#!/bin/bash
+
+# Take the package to add as argument ./sparkle-xml-updater.sh ring.dmg
+
+REPO_FOLDER=<dir>
+SPARKLE_FILE=<xml_filename>
+REPO_URL=<url>
+PACKAGE=$1
+DSA_KEY=<path_to_key_file>
+
+if [ ! -f ${PACKAGE} -o ! -f ${DSA_KEY} ]; then
+    echo "Can't find package or dsa key, aborting..."
+    exit 1
+fi
+
+if [ -f ${REPO_FOLDER}/${SPARKLE_FILE} ]; then
+    ITEMS=$(sed -n "/<item>/,/<\/item>/p" ${REPO_FOLDER}/${SPARKLE_FILE}) 
+fi
+
+cat << EOFILE > ${REPO_FOLDER}/${SPARKLE_FILE}
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <channel>
+        <title>Ring - nightly</title>
+        <link>${REPO_URL}/${SPARKLE_FILE}</link>
+        <description>Most recent changes with links to updates.</description>
+        <language>en</language>
+        <item>
+            <title>Ring nightly $(date "+%Y/%m/%d %H:%M")</title>
+            <pubDate>$(date -R)</pubDate>
+            <enclosure url="${REPO_URL}/$(basename ${PACKAGE})" sparkle:version="$(date +%Y%m%d%H%M)" sparkle:shortVersionString="nightly-$(date "+%Y%m%d")" length="$(stat -c %s ${PACKAGE})" type="application/octet-stream" sparkle:dsaSignature="$(/opt/joulupukki/mac_keys/sign_update.sh ${PACKAGE} ${DSA_KEY})" />
+            <sparkle:minimumSystemVersion>10.7</sparkle:minimumSystemVersion>
+        </item>
+$(echo -e "${ITEMS}")
+    </channel>
+</rss>
+EOFILE
+