Update to 2.3.7 (#61)

* Change version to 2.3.6

* Update to 2.3.6

* Update to 2.3.6

* Update to 2.3.7

* Update to 2.3.7

* Change version to 2.3.7

* Change version to 2.3.7 - fix French version

* Update custom patches

README.md

@@ -10,7 +10,7 @@ This is a Wallabag v2 package for YunoHost.
 
 **NB: Since @jeromelebleu is no longer maintaining this package, I (@lapineige) take over this repository. But I have limited time and experience, so feel free to help !**
 
-**Shipped version:** 2.3.2
+**Shipped version:** 2.3.7
 
 [Wallabag](https://www.wallabag.org/) is a self hostable Read-It-Later application allowing
 you to not miss any content anymore. Click, save, read it when you can.
@@ -60,7 +60,7 @@ Paquet Wallabag v2 pour Yunohost.
 
 **NB: Depuis que @jeromelebleu ne maintiens plus ce paquet, je (@lapineige) reprends la charge de ce dépôt. Mais j'ai un temps et une expérience limitées, donc n'hésitez pas à donner un coup de main :) !**
 
-**Version actuelle:** 2.3.2
+**Version actuelle:** 2.3.7
 
 [Wallabag](https://www.wallabag.org/) est une application de lecture différée : elle  permet simplement d’archiver une page web en ne conservant que le contenu. Les éléments superflus (menus, publicités, etc.) sont supprimés.
 

conf/app.src

@@ -1,3 +1,3 @@
-SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.2.tar.gz
-SOURCE_SUM=047a49d48a1199bd1634cab76d4af3dba95096885d4f7814377210fa76fbcc9f
+SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.7.tar.gz
+SOURCE_SUM=e223de12d8ea9f889e8660df4555c37c965f5ae1ca77af3d3532ab76889762cf
 SOURCE_FORMAT=tar.gz

manifest.json

@@ -8,7 +8,7 @@
     },
     "url": "https://www.wallabag.org",
     "license": "MIT",
-    "version": "2.3.2-1",
+    "version": "2.3.7",
     "maintainer": {
         "name": "lapineige",
         "email": ""

sources/patches/app-00-ldap-auth.patch

@@ -1,22 +1,11 @@
---- a/app/config/services.yml	2016-05-25 18:09:56.374914445 +0200
-+++ b/app/config/services.yml	2016-05-25 18:07:38.775042951 +0200
-@@ -43,6 +43,10 @@
-         tags:
-             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
-
-+    yunohost.ldap:
-+        class: Symfony\Component\Ldap\LdapClient
-+        arguments: ["localhost"]
-+
-     craue_config_cache_provider:
-         class: Symfony\Component\Cache\Adapter\FilesystemAdapter
-         public: false
---- a/app/config/security.yml	2016-05-25 18:09:46.814645164 +0200
-+++ b/app/config/security.yml	2016-05-25 18:07:38.775042951 +0200
-@@ -13,6 +13,14 @@
+diff --git a/app/config/security.yml b/app/config/security.yml
+index 02afc9ea..5a3f7a34 100644
+--- a/app/config/security.yml
++++ b/app/config/security.yml
+@@ -13,6 +13,14 @@ security:
                  property: username
          fos_userbundle:
-             id: fos_user.user_provider.username
+             id: fos_user.user_provider.username_email
 +        yunohost_users:
 +            ldap:
 +                service: yunohost.ldap
@@ -28,7 +17,7 @@
 
      # the main part of the security, where you can set up firewalls
      # for specific sections of your app
-@@ -38,6 +46,9 @@
+@@ -38,6 +46,9 @@ security:
 
          secured_area:
              pattern: ^/
@@ -38,3 +27,20 @@
              form_login:
                  provider: fos_userbundle
                  csrf_token_generator: security.csrf.token_manager
+diff --git a/app/config/services.yml b/app/config/services.yml
+index 7b85d846..f23961c5 100644
+--- a/app/config/services.yml
++++ b/app/config/services.yml
+@@ -43,6 +43,10 @@ services:
+         tags:
+             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
+
++    yunohost.ldap:
++        class: Symfony\Component\Ldap\LdapClient
++        arguments: ["localhost"]
++
+     craue_config_cache_provider:
+         class: Symfony\Component\Cache\Adapter\FilesystemAdapter
+         public: false
+--
+2.17.1

sources/patches/app-01-logout-success-handler.patch

@@ -1,8 +1,8 @@
 diff --git a/app/config/security.yml b/app/config/security.yml
-index b07b509..62f2550 100644
+index 5a3f7a34..1720e741 100644
 --- a/app/config/security.yml
 +++ b/app/config/security.yml
-@@ -60,7 +60,7 @@ security:
+@@ -62,7 +62,7 @@ security:
 
              logout:
                  path:   /logout
@@ -12,10 +12,10 @@ index b07b509..62f2550 100644
      access_control:
          - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
 diff --git a/app/config/services.yml b/app/config/services.yml
-index 8a09fde..ee63e06 100644
+index f23961c5..f266e6d1 100644
 --- a/app/config/services.yml
 +++ b/app/config/services.yml
-@@ -43,6 +43,10 @@
+@@ -43,6 +43,10 @@ services:
          tags:
              - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
 
@@ -28,7 +28,7 @@ index 8a09fde..ee63e06 100644
          arguments: ["localhost"]
 diff --git a/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php
 new file mode 100644
-index 0000000..b326824
+index 00000000..b3268243
 --- /dev/null
 +++ b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php
 @@ -0,0 +1,27 @@
@@ -59,3 +59,5 @@ index 0000000..b326824
 +        return new RedirectResponse($url);
 +    }
 +}
+--
+2.17.1