mail/roundcube-carddav: update to 2.0.4 + patch

For the rationale of the patch please see:
https://github.com/blind-coder/rcmcarddav/issues/188#issuecomment-292920647

5 files changed, 34 insertions, 53 deletions

diff --git a/mail/roundcube-carddav/Makefile b/mail/roundcube-carddav/Makefile
index 58c959a19863..0b3a9ebd0e17 100644
--- a/mail/roundcube-carddav/Makefile
+++ b/mail/roundcube-carddav/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	carddav
-PORTVERSION=	2.0.0
-DISTVERSIONPREFIX=${PORTNAME}_
+PORTVERSION=	2.0.4
 CATEGORIES=	mail
-MASTER_SITES=	https://github.com/blind-coder/rcmcarddav/releases/download/${PORTNAME}_${PORTVERSION}/
+MASTER_SITES=	https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	roundcube-
-DISTNAME=	rcm${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Roundcube CardDAV plugin
@@ -17,6 +15,8 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	roundcube>=1.0:mail/roundcube
 RUN_DEPENDS=	roundcube>=1.0:mail/roundcube
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/mail/roundcube-carddav/distinfo b/mail/roundcube-carddav/distinfo
index 90ff5934f2b3..31e6536888ee 100644
--- a/mail/roundcube-carddav/distinfo
+++ b/mail/roundcube-carddav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475577895
-SHA256 (rcmcarddav-2.0.0.tar.bz2) = 4de82d5f24b52af211e62dad63f4e9871b2ccf69d6faaf4468ca05ef8ed66fb9
-SIZE (rcmcarddav-2.0.0.tar.bz2) = 294308
+TIMESTAMP = 1497267572
+SHA256 (carddav-2.0.4.tar.bz2) = d24da18a9c8f1058be3468e74daf8ead14a1ed755c4cdf42b40d4fbbeeadf0ba
+SIZE (carddav-2.0.4.tar.bz2) = 298144
diff --git a/mail/roundcube-carddav/files/patch-c651d93 b/mail/roundcube-carddav/files/patch-c651d93
deleted file mode 100644
index db4e0372183e..000000000000
--- a/mail/roundcube-carddav/files/patch-c651d93
+++ /dev/null
@@ -1,43 +0,0 @@
---- carddav.php.orig	2016-10-02 08:48:52 UTC
-+++ carddav.php
-@@ -420,14 +420,16 @@ class carddav extends rcube_plugin
- 		$this->add_texts('localization/', false);
- 		$prefs = carddav_common::get_adminsettings();
- 
--		if (version_compare(PHP_VERSION, '7.0.0') < 0) {
--			$args['blocks']['cd_preferences'] = array(
--				'options' => array(
--					array('title'=> self::$helper->Q($this->gettext('cd_php_too_old')), 'content' => PHP_VERSION)
--				),
--				'name' => self::$helper->Q($this->gettext('cd_title'))
--			);
--			return $args;
-+		if (!$prefs['_GLOBAL']['suppress_version_warning']){
-+			if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-+				$args['blocks']['cd_preferences'] = array(
-+					'options' => array(
-+						array('title'=> self::$helper->Q($this->gettext('cd_php_too_old')), 'content' => PHP_VERSION)
-+					),
-+					'name' => self::$helper->Q($this->gettext('cd_title'))
-+				);
-+				return $args;
-+			}
- 		}
- 
- 		$abooks = carddav_backend::get_dbrecord($_SESSION['user_id'],'*','addressbooks',false,'user_id');
---- config.inc.php.dist.orig	2016-10-02 08:48:52 UTC
-+++ config.inc.php.dist
-@@ -27,6 +27,13 @@
- //             needs to reenter them.
- // $prefs['_GLOBAL']['pwstore_scheme'] = 'base64';
- 
-+// Allow suppression of the warning that PHP is too old.
-+//
-+// If true, the PHP version is not checked. Use at own risk.
-+// If false, the PHP version is checked and RCMCardDAV will not run if it is
-+// too old.
-+$prefs['_GLOBAL']['suppress_version_warning'] = false;
-+
- //// ** ADDRESSBOOK PRESETS
- 
- // Each addressbook preset takes the following form:
diff --git a/mail/roundcube-carddav/files/patch-carddav__backend.php b/mail/roundcube-carddav/files/patch-carddav__backend.php
new file mode 100644
index 000000000000..4c0641b3a39a
--- /dev/null
+++ b/mail/roundcube-carddav/files/patch-carddav__backend.php
@@ -0,0 +1,13 @@
+--- carddav_backend.php.orig	2017-06-12 12:21:39 UTC
++++ carddav_backend.php
+@@ -694,9 +694,7 @@ EOF
+ <C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+ <D:prop>
+     <D:getetag/>
+-    <C:address-data>
+-        <C:allprop/>
+-    </C:address-data>
++    <C:address-data/>
+ </D:prop>
+ $hrefstr
+ </C:addressbook-multiget>
diff --git a/mail/roundcube-carddav/pkg-plist b/mail/roundcube-carddav/pkg-plist
index f9df40c46c1e..dfd34e55e915 100644
--- a/mail/roundcube-carddav/pkg-plist
+++ b/mail/roundcube-carddav/pkg-plist
@@ -1,3 +1,4 @@
+%%WWWDIR%%/.gitignore
 %%WWWDIR%%/ChangeLog
 %%WWWDIR%%/INSTALL
 %%WWWDIR%%/LICENSE
@@ -7,6 +8,7 @@
 %%WWWDIR%%/carddav_common.php
 %%WWWDIR%%/carddav_discovery.php
 %%WWWDIR%%/composer.json
+%%WWWDIR%%/composer.lock
 %%WWWDIR%%/config.inc.php.dist
 %%WWWDIR%%/dbmigrations/0000-dbinit/mysql.sql
 %%WWWDIR%%/dbmigrations/0000-dbinit/postgres.sql
@@ -20,7 +22,13 @@
 %%WWWDIR%%/dbmigrations/0002-increasetextfieldlengths/mysql.sql
 %%WWWDIR%%/dbmigrations/0002-increasetextfieldlengths/postgres.sql
 %%WWWDIR%%/dbmigrations/0002-increasetextfieldlengths/sqlite3.sql
-%%WWWDIR%%/foo.php
+%%WWWDIR%%/dbmigrations/0003-fixtimestampdefaultvalue/README.md
+%%WWWDIR%%/dbmigrations/0003-fixtimestampdefaultvalue/mysql.sql
+%%WWWDIR%%/dbmigrations/0003-fixtimestampdefaultvalue/postgres.sql
+%%WWWDIR%%/dbmigrations/0003-fixtimestampdefaultvalue/sqlite3.sql
+%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/mysql.sql
+%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/postgres.sql
+%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/sqlite3.sql
 %%WWWDIR%%/localization/cs_CZ.inc
 %%WWWDIR%%/localization/de_DE.inc
 %%WWWDIR%%/localization/en_US.inc
@@ -123,14 +131,14 @@
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/Binary.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/Boolean.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/FlatText.php
-%%WWWDIR%%/vendor/sabre/vobject/lib/Property/Float.php
+%%WWWDIR%%/vendor/sabre/vobject/lib/Property/FloatValue.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/ICalendar/CalAddress.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/ICalendar/Date.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/ICalendar/DateTime.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/ICalendar/Duration.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/ICalendar/Period.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/ICalendar/Recur.php
-%%WWWDIR%%/vendor/sabre/vobject/lib/Property/Integer.php
+%%WWWDIR%%/vendor/sabre/vobject/lib/Property/IntegerValue.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/Text.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/Time.php
 %%WWWDIR%%/vendor/sabre/vobject/lib/Property/Unknown.php
@@ -187,6 +195,7 @@
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/BrokerProcessMessageTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/BrokerProcessReplyTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/BrokerTester.php
+%%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/BrokerTimezoneInParseEventInfoWithoutMasterTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/BrokerUpdateEventTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/EvolutionTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ITip/MessageTest.php
@@ -217,6 +226,7 @@
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/PropertyTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/ReaderTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
+%%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php
@@ -227,6 +237,7 @@
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/NoInstancesTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php
+%%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/EventIterator/SameDateForRecurringEventsTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/RDateIteratorTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/Recur/RRuleIteratorTest.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/VObject/RecurrenceIterator/UntilRespectsTimezoneTest.ics