From 52abe20ca17f0208127110975357f84620d47142 Mon Sep 17 00:00:00 2001
From: Ilia Sotnikov <hostcc@gmail.com>
Date: Wed, 18 Oct 2023 08:52:25 +0300
Subject: [PATCH 1/3] ESPHome version update

* `2023.10.0` is now minimally required version, to avoid crashing at
   startup when winter mode enabled and address Pillow security
   vulnerability
* Updated icon for winter mode switch
---
 controllers.yaml | 6 ++++--
 main.yaml        | 9 ++-------
 requirements.txt | 3 +--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/controllers.yaml b/controllers.yaml
index be07a9e..7917e03 100644
--- a/controllers.yaml
+++ b/controllers.yaml
@@ -2,8 +2,9 @@
 # Copyright (c) 2023 Ilia Sotnikov
 ---
 esphome:
-  # Required for proper resume handling
-  min_version: '2023.7.0'
+  # Required for proper resume handling and avoiding crash at startup when
+  # winter mode enabled
+  min_version: '2023.10.0'
 
 sprinkler:
   - id: lawn_sprinklers
@@ -194,6 +195,7 @@ switch:
   - platform: template
     id: winter_mode
     name: "Winter mode"
+    icon: "mdi:snowflake"
     optimistic: true
     restore_mode: RESTORE_DEFAULT_OFF
     entity_category: config
diff --git a/main.yaml b/main.yaml
index df0320d..f2d7c94 100644
--- a/main.yaml
+++ b/main.yaml
@@ -35,11 +35,6 @@ packages:
   time: !include time.yaml  # Optional
   rtc: !include rtc.yaml  # Optional
 
-# Both recent ESPHome version and PR below are needed to avoid crashing at
-# startup when winter mode enabled
+# 2023.10.0 addresses Pillow security vulnerability
 esphome:
-  min_version: 2023.9.3
-
-external_components:
-  - source: github://pr#5499
-    components: [sprinkler]
+  min_version: '2023.10.0'
diff --git a/requirements.txt b/requirements.txt
index d27ae91..0cfe400 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-esphome>=2023.7.0
-pillow~=9.5
+esphome>=2023.10.0

From bd4fdbb7448b8df719bd7d4608e1205c90b554f2 Mon Sep 17 00:00:00 2001
From: Ilia Sotnikov <hostcc@gmail.com>
Date: Wed, 18 Oct 2023 08:56:25 +0300
Subject: [PATCH 2/3] * `requirements.txt`: Added `pillow` package back as a
 dependency

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 0cfe400..57d792d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 esphome>=2023.10.0
+pillow>=10.0.1

From 355cc3a83cd382a7e49dd24d8d9980d31ba22e49 Mon Sep 17 00:00:00 2001
From: Ilia Sotnikov <hostcc@gmail.com>
Date: Wed, 18 Oct 2023 08:58:34 +0300
Subject: [PATCH 3/3] * `requirements.txt`: Pinned `pillow` package to the
 version ESPHome   requires

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 57d792d..1d4dfdb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 esphome>=2023.10.0
-pillow>=10.0.1
+pillow==10.0.1