upgrade to sabre32

4 files changed, 410 insertions, 4 deletions

diff --git a/vendor/bin/generate_vcards b/vendor/bin/generate_vcards
index cb76da13a..4663c3c16 120000..100755
--- a/vendor/bin/generate_vcards
+++ b/vendor/bin/generate_vcards
@@ -1 +1,241 @@
-../sabre/vobject/bin/generate_vcards
\ No newline at end of file
+#!/usr/bin/env php
+<?php
+
+namespace Sabre\VObject;
+
+// This sucks.. we have to try to find the composer autoloader. But chances
+// are, we can't find it this way. So we'll do our bestest
+$paths = [
+    __DIR__ . '/../vendor/autoload.php',  // In case vobject is cloned directly
+    __DIR__ . '/../../../autoload.php',   // In case vobject is a composer dependency.
+];
+
+foreach($paths as $path) {
+    if (file_exists($path)) {
+        include $path;
+        break;
+    }
+}
+
+if (!class_exists('Sabre\\VObject\\Version')) {
+    fwrite(STDERR, "Composer autoloader could not be properly loaded.\n");
+    die(1);
+}
+
+if ($argc < 2) {
+
+    $version = Version::VERSION;
+
+    $help = <<<HI
+sabre/vobject $version
+Usage:
+    generate_vcards [count]
+
+Options:
+    count   The number of random vcards to generate
+
+Examples:
+    generate_vcards 1000 > testdata.vcf
+
+HI;
+
+    fwrite(STDERR, $help);
+    exit(2);
+}
+
+$count = (int)$argv[1];
+if ($count < 1) {
+    fwrite(STDERR, "Count must be at least 1\n");
+    exit(2);
+}
+
+fwrite(STDERR, "sabre/vobject " . Version::VERSION . "\n");
+fwrite(STDERR, "Generating " . $count . " vcards in vCard 4.0 format\n");
+
+/**
+ * The following list is just some random data we compiled from various
+ * sources online.
+ *
+ * Very little thought went into compiling this list, and certainly nothing
+ * political or ethical.
+ *
+ * We would _love_ more additions to this to add more variation to this list.
+ *
+ * Send us PR's and don't be shy adding your own first and last name for fun.
+ */
+
+$sets = array(
+    "nl" => array(
+        "country" => "Netherlands",
+        "boys" => array(
+            "Anno",
+            "Bram",
+            "Daan",
+            "Evert",
+            "Finn",
+            "Jayden",
+            "Jens",
+            "Jesse",
+            "Levi",
+            "Lucas",
+            "Luuk",
+            "Milan",
+            "René",
+            "Sem",
+            "Sibrand",
+            "Willem",
+        ),
+        "girls" => array(
+            "Celia",
+            "Emma",
+            "Fenna",
+            "Geke",
+            "Inge",
+            "Julia",
+            "Lisa",
+            "Lotte",
+            "Mila",
+            "Sara",
+            "Sophie",
+            "Tess",
+            "Zoë",
+        ),
+        "last" => array(
+            "Bakker",
+            "Bos",
+            "De Boer",
+            "De Groot",
+            "De Jong",
+            "De Vries",
+            "Jansen",
+            "Janssen",
+            "Meyer",
+            "Mulder",
+            "Peters",
+            "Smit",
+            "Van Dijk",
+            "Van den Berg",
+            "Visser",
+            "Vos",
+        ),
+    ),
+    "us" => array(
+        "country" => "United States",
+        "boys" => array(
+            "Aiden",
+            "Alexander",
+            "Charles",
+            "David",
+            "Ethan",
+            "Jacob",
+            "James",
+            "Jayden",
+            "John",
+            "Joseph",
+            "Liam",
+            "Mason",
+            "Michael",
+            "Noah",
+            "Richard",
+            "Robert",
+            "Thomas",
+            "William",
+        ),
+        "girls" => array(
+            "Ava",
+            "Barbara",
+            "Chloe",
+            "Dorothy",
+            "Elizabeth",
+            "Emily",
+            "Emma",
+            "Isabella",
+            "Jennifer",
+            "Lily",
+            "Linda",
+            "Margaret",
+            "Maria",
+            "Mary",
+            "Mia",
+            "Olivia",
+            "Patricia",
+            "Roxy",
+            "Sophia",
+            "Susan",
+            "Zoe",
+        ),
+        "last" => array(
+            "Smith",
+            "Johnson",
+            "Williams",
+            "Jones",
+            "Brown",
+            "Davis",
+            "Miller",
+            "Wilson",
+            "Moore",
+            "Taylor",
+            "Anderson",
+            "Thomas",
+            "Jackson",
+            "White",
+            "Harris",
+            "Martin",
+            "Thompson",
+            "Garcia",
+            "Martinez",
+            "Robinson",
+        ),
+    ),
+);
+
+$current = 0;
+
+$r = function($arr) {
+
+    return $arr[mt_rand(0,count($arr)-1)];
+
+};
+
+$bdayStart = strtotime('-85 years');
+$bdayEnd = strtotime('-20 years');
+
+while($current < $count) {
+
+    $current++;
+    fwrite(STDERR, "\033[100D$current/$count");
+
+    $country = array_rand($sets);
+    $gender = mt_rand(0,1)?'girls':'boys';
+
+    $vcard = new Component\VCard(array(
+        'VERSION' => '4.0',
+        'FN' => $r($sets[$country][$gender]) . ' ' . $r($sets[$country]['last']),
+        'UID' => UUIDUtil::getUUID(),
+    ));
+
+    $bdayRatio = mt_rand(0,9);
+
+    if($bdayRatio < 2) {
+        // 20% has a birthday property with a full date
+        $dt = new \DateTime('@' . mt_rand($bdayStart, $bdayEnd));
+        $vcard->add('BDAY', $dt->format('Ymd'));
+
+    } elseif ($bdayRatio < 3) {
+        // 10% we only know the month and date of
+        $dt = new \DateTime('@' . mt_rand($bdayStart, $bdayEnd));
+        $vcard->add('BDAY', '--' . $dt->format('md'));
+    }
+    if ($result = $vcard->validate()) {
+        ob_start();
+        echo "\nWe produced an invalid vcard somehow!\n";
+        foreach($result as $message) {
+            echo "  " . $message['message'] . "\n";
+        }
+        fwrite(STDERR, ob_get_clean());
+    }
+    echo $vcard->serialize();
+
+}
+
+fwrite(STDERR,"\nDone.\n");
diff --git a/vendor/bin/naturalselection b/vendor/bin/naturalselection
index e6f1b3a2a..7e20439c1 120000..100755
--- a/vendor/bin/naturalselection
+++ b/vendor/bin/naturalselection
@@ -1 +1,140 @@
-../sabre/dav/bin/naturalselection
\ No newline at end of file
+#!/usr/bin/env python
+
+#
+# Copyright (c) 2009-2010 Evert Pot
+# All rights reserved.
+# http://www.rooftopsolutions.nl/
+#
+# This utility is distributed along with SabreDAV
+# license: http://sabre.io/license/ Modified BSD License
+
+import os
+from optparse import OptionParser
+import time
+
+def getfreespace(path):
+    stat = os.statvfs(path)
+    return stat.f_frsize * stat.f_bavail
+
+def getbytesleft(path,threshold):
+    return getfreespace(path)-threshold
+
+def run(cacheDir, threshold, sleep=5, simulate=False, min_erase = 0):
+
+    bytes = getbytesleft(cacheDir,threshold)
+    if (bytes>0):
+        print "Bytes to go before we hit threshold:", bytes
+    else:
+        print "Threshold exceeded with:", -bytes, "bytes"
+        dir = os.listdir(cacheDir)
+        dir2 = []
+        for file in dir:
+            path = cacheDir + '/' + file
+            dir2.append({
+                "path" : path,
+                "atime": os.stat(path).st_atime,
+                "size" : os.stat(path).st_size
+            })
+
+        dir2.sort(lambda x,y: int(x["atime"]-y["atime"]))
+
+        filesunlinked = 0
+        gainedspace = 0
+
+        # Left is the amount of bytes that need to be freed up
+        # The default is the 'min_erase setting'
+        left = min_erase
+
+        # If the min_erase setting is lower than the amount of bytes over
+        # the threshold, we use that number instead.
+        if left < -bytes :
+            left = -bytes
+
+        print "Need to delete at least:", left;
+
+        for file in dir2:
+
+            # Only deleting files if we're not simulating
+            if not simulate: os.unlink(file["path"])
+            left = int(left - file["size"])
+            gainedspace = gainedspace + file["size"]
+            filesunlinked = filesunlinked + 1
+
+            if(left<0):
+                break
+
+        print "%d files deleted (%d bytes)" % (filesunlinked, gainedspace)
+
+
+    time.sleep(sleep)
+
+
+
+def main():
+    parser = OptionParser(
+        version="naturalselection v0.3",
+        description="Cache directory manager. Deletes cache entries based on accesstime and free space thresholds.\n" +
+            "This utility is distributed alongside SabreDAV.",
+        usage="usage: %prog [options] cacheDirectory",
+    )
+    parser.add_option(
+        '-s',
+        dest="simulate",
+        action="store_true",
+        help="Don't actually make changes, but just simulate the behaviour",
+    )
+    parser.add_option(
+        '-r','--runs',
+        help="How many times to check before exiting. -1 is infinite, which is the default",
+        type="int",
+        dest="runs",
+        default=-1
+    )
+    parser.add_option(
+        '-n','--interval',
+        help="Sleep time in seconds (default = 5)",
+        type="int",
+        dest="sleep",
+        default=5
+    )
+    parser.add_option(
+        '-l','--threshold',
+        help="Threshold in bytes (default = 10737418240, which is 10GB)",
+        type="int",
+        dest="threshold",
+        default=10737418240
+    )
+    parser.add_option(
+        '-m', '--min-erase',
+        help="Minimum number of bytes to erase when the threshold is reached. " +
+            "Setting this option higher will reduce the number of times the cache directory will need to be scanned. " +
+            "(the default is 1073741824, which is 1GB.)",
+        type="int",
+        dest="min_erase",
+        default=1073741824
+    )
+
+    options,args = parser.parse_args()
+    if len(args)<1:
+        parser.error("This utility requires at least 1 argument")
+    cacheDir = args[0]
+
+    print "Natural Selection"
+    print "Cache directory:", cacheDir
+    free = getfreespace(cacheDir);
+    print "Current free disk space:", free
+
+    runs = options.runs;
+    while runs!=0 :
+        run(
+            cacheDir,
+            sleep=options.sleep,
+            simulate=options.simulate,
+            threshold=options.threshold,
+            min_erase=options.min_erase
+        )
+        if runs>0:
+            runs = runs - 1
+
+if __name__ == '__main__' :
+    main()
diff --git a/vendor/bin/sabredav b/vendor/bin/sabredav
index 3b5e4511d..032371ba8 120000..100755
--- a/vendor/bin/sabredav
+++ b/vendor/bin/sabredav
@@ -1 +1,2 @@
-../sabre/dav/bin/sabredav
\ No newline at end of file
+#!/bin/sh
+php -S 0.0.0.0:8080 `dirname $0`/sabredav.php
diff --git a/vendor/bin/vobject b/vendor/bin/vobject
index f5b111eac..2aca7e729 120000..100755
--- a/vendor/bin/vobject
+++ b/vendor/bin/vobject
@@ -1 +1,27 @@
-../sabre/vobject/bin/vobject
\ No newline at end of file
+#!/usr/bin/env php
+<?php
+
+namespace Sabre\VObject;
+
+// This sucks.. we have to try to find the composer autoloader. But chances
+// are, we can't find it this way. So we'll do our bestest
+$paths = [
+    __DIR__ . '/../vendor/autoload.php',  // In case vobject is cloned directly
+    __DIR__ . '/../../../autoload.php',   // In case vobject is a composer dependency.
+];
+
+foreach($paths as $path) {
+    if (file_exists($path)) {
+        include $path;
+        break;
+    }
+}
+
+if (!class_exists('Sabre\\VObject\\Version')) {
+    fwrite(STDERR, "Composer autoloader could not be loaded.\n");
+    die(1);
+}
+
+$cli = new Cli();
+exit($cli->main($argv));
+