From 1a7174e7a96e09dda981e8e601e876e13297827d Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Wed, 5 Sep 2018 11:42:47 +0000 Subject: [PATCH] mail/roundcube-carddav: update to 3.0.2 --- mail/roundcube-carddav/Makefile | 3 +- mail/roundcube-carddav/distinfo | 6 +- .../files/patch-carddav__backend.php | 4 +- .../files/patch-rcube-input-post | 65 ------------------- mail/roundcube-carddav/pkg-plist | 4 ++ 5 files changed, 10 insertions(+), 72 deletions(-) delete mode 100644 mail/roundcube-carddav/files/patch-rcube-input-post diff --git a/mail/roundcube-carddav/Makefile b/mail/roundcube-carddav/Makefile index e91c987527bf..6311d2cd7bb7 100644 --- a/mail/roundcube-carddav/Makefile +++ b/mail/roundcube-carddav/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= carddav -PORTVERSION= 2.0.4 -PORTREVISION= 2 +PORTVERSION= 3.0.2 CATEGORIES= mail MASTER_SITES= https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= roundcube- diff --git a/mail/roundcube-carddav/distinfo b/mail/roundcube-carddav/distinfo index 2cb7dbaf67ed..475c879fec1e 100644 --- a/mail/roundcube-carddav/distinfo +++ b/mail/roundcube-carddav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509360656 -SHA256 (carddav-2.0.4.tar.bz2) = d24da18a9c8f1058be3468e74daf8ead14a1ed755c4cdf42b40d4fbbeeadf0ba -SIZE (carddav-2.0.4.tar.bz2) = 298144 +TIMESTAMP = 1536140344 +SHA256 (carddav-3.0.2.tar.bz2) = c591609c707e10a18e90a59fd3d9bf11cb24365703a3219639c4df1d9ba38adb +SIZE (carddav-3.0.2.tar.bz2) = 300259 diff --git a/mail/roundcube-carddav/files/patch-carddav__backend.php b/mail/roundcube-carddav/files/patch-carddav__backend.php index 4c0641b3a39a..de0692939fff 100644 --- a/mail/roundcube-carddav/files/patch-carddav__backend.php +++ b/mail/roundcube-carddav/files/patch-carddav__backend.php @@ -1,6 +1,6 @@ ---- carddav_backend.php.orig 2017-06-12 12:21:39 UTC +--- carddav_backend.php.orig 2018-05-28 06:30:30 UTC +++ carddav_backend.php -@@ -694,9 +694,7 @@ EOF +@@ -716,9 +716,7 @@ EOF diff --git a/mail/roundcube-carddav/files/patch-rcube-input-post b/mail/roundcube-carddav/files/patch-rcube-input-post deleted file mode 100644 index 40d2de8fa640..000000000000 --- a/mail/roundcube-carddav/files/patch-rcube-input-post +++ /dev/null @@ -1,65 +0,0 @@ -From c14c32af9fd1ff363e9be0c237ffa1a0ccc1514d Mon Sep 17 00:00:00 2001 -From: Benjamin 'blindCoder' Schieder -Date: Thu, 27 Apr 2017 09:19:04 +0200 -Subject: [PATCH] use correct namespace for RCUBE_INPUT_POST, fixes #186 - ---- - carddav.php | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/carddav.php b/carddav.php -index 998272e..7034ab5 100644 ---- carddav.php.orig -+++ carddav.php -@@ -499,16 +499,16 @@ function cd_save($args) - - } else { - $newset = array ( -- 'name' => rcube_utils::get_input_value($abookid."_cd_name", RCUBE_INPUT_POST), -- 'username' => rcube_utils::get_input_value($abookid."_cd_username", RCUBE_INPUT_POST, true), -- 'url' => rcube_utils::get_input_value($abookid."_cd_url", RCUBE_INPUT_POST), -+ 'name' => rcube_utils::get_input_value($abookid."_cd_name", rcube_utils::INPUT_POST), -+ 'username' => rcube_utils::get_input_value($abookid."_cd_username", rcube_utils::INPUT_POST, true), -+ 'url' => rcube_utils::get_input_value($abookid."_cd_url", rcube_utils::INPUT_POST), - 'active' => isset($_POST[$abookid.'_cd_active']) ? 1 : 0, - 'use_categories' => isset($_POST[$abookid.'_cd_use_categories']) ? 1 : 0, -- 'refresh_time' => rcube_utils::get_input_value($abookid."_cd_refresh_time", RCUBE_INPUT_POST), -+ 'refresh_time' => rcube_utils::get_input_value($abookid."_cd_refresh_time", rcube_utils::INPUT_POST), - ); - - // only set the password if the user entered a new one -- $password = rcube_utils::get_input_value($abookid."_cd_password", RCUBE_INPUT_POST, true); -+ $password = rcube_utils::get_input_value($abookid."_cd_password", rcube_utils::INPUT_POST, true); - if(strlen($password) > 0) { - $newset['password'] = $password; - } -@@ -525,14 +525,14 @@ function cd_save($args) - } - - // add a new address book? -- $new = rcube_utils::get_input_value('new_cd_name', RCUBE_INPUT_POST); -+ $new = rcube_utils::get_input_value('new_cd_name', rcube_utils::INPUT_POST); - if ( (!array_key_exists('_GLOBAL', $prefs) || !$prefs['_GLOBAL']['fixed']) && strlen($new) > 0) { -- $srv = rcube_utils::get_input_value('new_cd_url', RCUBE_INPUT_POST); -- $usr = rcube_utils::get_input_value('new_cd_username', RCUBE_INPUT_POST, true); -- $pass = rcube_utils::get_input_value('new_cd_password', RCUBE_INPUT_POST, true); -+ $srv = rcube_utils::get_input_value('new_cd_url', rcube_utils::INPUT_POST); -+ $usr = rcube_utils::get_input_value('new_cd_username', rcube_utils::INPUT_POST, true); -+ $pass = rcube_utils::get_input_value('new_cd_password', rcube_utils::INPUT_POST, true); - $pass = self::$helper->encrypt_password($pass); -- $abname = rcube_utils::get_input_value('new_cd_name', RCUBE_INPUT_POST); -- $use_categories = intval(rcube_utils::get_input_value('new_cd_use_categories', RCUBE_INPUT_POST, true), 0); -+ $abname = rcube_utils::get_input_value('new_cd_name', rcube_utils::INPUT_POST); -+ $use_categories = intval(rcube_utils::get_input_value('new_cd_use_categories', rcube_utils::INPUT_POST, true), 0); - - $discovery = new carddav_discovery(); - $srvs = $discovery->find_addressbooks($srv, $usr, $pass); -@@ -550,7 +550,7 @@ function cd_save($args) - 'password' => $pass, - 'use_categories' => $use_categories, - 'url' => $srv['href'], -- 'refresh_time' => rcube_utils::get_input_value('new_cd_refresh_time', RCUBE_INPUT_POST) -+ 'refresh_time' => rcube_utils::get_input_value('new_cd_refresh_time', rcube_utils::INPUT_POST) - )); - } - } else { diff --git a/mail/roundcube-carddav/pkg-plist b/mail/roundcube-carddav/pkg-plist index dfd34e55e915..828b7cd1e572 100644 --- a/mail/roundcube-carddav/pkg-plist +++ b/mail/roundcube-carddav/pkg-plist @@ -1,6 +1,7 @@ %%WWWDIR%%/.gitignore %%WWWDIR%%/ChangeLog %%WWWDIR%%/INSTALL +%%WWWDIR%%/INSTALLFROMGIT.md %%WWWDIR%%/LICENSE %%WWWDIR%%/README.md %%WWWDIR%%/carddav.php @@ -29,6 +30,9 @@ %%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/mysql.sql %%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/postgres.sql %%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/sqlite3.sql +%%WWWDIR%%/dbmigrations/0005-changemysqlut8toutf8mb4/mysql.sql +%%WWWDIR%%/dbmigrations/0005-changemysqlut8toutf8mb4/postgres.sql +%%WWWDIR%%/dbmigrations/0005-changemysqlut8toutf8mb4/sqlite3.sql %%WWWDIR%%/localization/cs_CZ.inc %%WWWDIR%%/localization/de_DE.inc %%WWWDIR%%/localization/en_US.inc