From b2c9649823a97fd5e55fcc147eaac800ce121375 Mon Sep 17 00:00:00 2001
From: Laurent Bigonville <bigon@debian.org>
Date: Sat, 27 Jul 2019 14:06:44 +0200
Subject: [PATCH] debian/patches/0012-add-AEG-PROTECT-NAS-support.patch: Add
 support for recent AEG PROTECT NAS UPS, from upstream (Closes: #919112)

---
 debian/changelog                              |  4 +-
 .../0012-add-AEG-PROTECT-NAS-support.patch    | 42 +++++++++++++++++++
 debian/patches/series                         |  3 ++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0012-add-AEG-PROTECT-NAS-support.patch

diff --git a/debian/changelog b/debian/changelog
index 8cd74df..4d39a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,10 @@ nut (2.7.4-9) UNRELEASED; urgency=medium
     names instead of listing the libraries, to please lintian
   * Move pidfiles from /var/run/nut to /run/nut, there is nothing else to do
     since /var/run is a symlink to /run for some times now (policy 3.9.3)
+  * debian/patches/0012-add-AEG-PROTECT-NAS-support.patch: Add support for
+    recent AEG PROTECT NAS UPS, from upstream (Closes: #919112)
 
- -- Laurent Bigonville <bigon@debian.org>  Sat, 27 Jul 2019 13:18:34 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 27 Jul 2019 14:06:01 +0200
 
 nut (2.7.4-8) unstable; urgency=medium
 
diff --git a/debian/patches/0012-add-AEG-PROTECT-NAS-support.patch b/debian/patches/0012-add-AEG-PROTECT-NAS-support.patch
new file mode 100644
index 0000000..0283f48
--- /dev/null
+++ b/debian/patches/0012-add-AEG-PROTECT-NAS-support.patch
@@ -0,0 +1,42 @@
+From a08a2292afc559d6dfb9eede014a941d8f6b511d Mon Sep 17 00:00:00 2001
+From: Arnaud Quette <arnaud.quette@free.fr>
+Date: Tue, 17 May 2016 09:26:04 +0200
+Subject: [PATCH] mge-shut/usbhid-ups: list AEG PROTECT NAS vendor 06da
+
+AEG PROTECT NAS were previously using VendorID / ProductID 0x2b2d / 0xffff, and
+are now using 0x06da / 0xffff. Also bump the mge-hid subdriver version to 1.40
+---
+ drivers/mge-hid.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mge-hid.c b/drivers/mge-hid.c
+index a3f10afa8..26486c994 100644
+--- a/drivers/mge-hid.c
++++ b/drivers/mge-hid.c
+@@ -37,7 +37,7 @@
+ #include "usbhid-ups.h"
+ #include "mge-hid.h"
+ 
+-#define MGE_HID_VERSION		"MGE HID 1.39"
++#define MGE_HID_VERSION		"MGE HID 1.40"
+ 
+ /* (prev. MGE Office Protection Systems, prev. MGE UPS SYSTEMS) */
+ /* Eaton */
+@@ -55,6 +55,9 @@
+ /* AEG */
+ #define AEG_VENDORID 0x2b2d
+ 
++/* Phoenixtec Power Co., Ltd */
++#define PHOENIXTEC 0x06da
++
+ #ifndef SHUT_MODE
+ #include "usb-common.h"
+ 
+@@ -80,6 +83,7 @@ static usb_device_id_t mge_usb_device_table[] = {
+ 
+ 	/* PROTECT B / NAS */
+ 	{ USB_DEVICE(AEG_VENDORID, 0xffff), NULL },
++	{ USB_DEVICE(PHOENIXTEC, 0xffff), NULL },
+ 
+ 	/* Terminating entry */
+ 	{ -1, -1, NULL }
diff --git a/debian/patches/series b/debian/patches/series
index cb3ca37..32b2ede 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,8 @@
 0006-ups-conf-maxretry.patch
 0008-drop-w3c-icons.patch
 0009-fix-nutshutdown-install.patch
+
+# Upstream patches
 0010-fix-nutscanner-ftbfs.patch
 0011-use-pkgconfig-module.patch
+0012-add-AEG-PROTECT-NAS-support.patch