From 38c37c0f60daca9cc5f3b74a3dda2687f9a217e7 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Jan 09 2008 14:03:48 +0000
Subject: new upstream version


---

diff --git a/.cvsignore b/.cvsignore
index 747d82c..d02e008 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nut-2.2.0.tar.gz
+nut-2.2.1.tar.gz
diff --git a/nut-2.2.0-conf.patch b/nut-2.2.0-conf.patch
deleted file mode 100644
index 78839b0..0000000
--- a/nut-2.2.0-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nut-2.2.0/conf/upssched.conf.sample.schconf	2007-07-12 15:14:33.000000000 +0200
-+++ nut-2.2.0/conf/upssched.conf.sample	2007-07-12 15:16:45.000000000 +0200
-@@ -14,7 +14,7 @@
- # A shell script with a big case..esac construct should work nicely for this.
- # An example has been provided to help you get started.
- 
--CMDSCRIPT /usr/local/ups/bin/upssched-cmd
-+CMDSCRIPT /usr/bin/upssched-cmd
- 
- # ============================================================================
- #
diff --git a/nut-2.2.0-glibcopen.patch b/nut-2.2.0-glibcopen.patch
deleted file mode 100644
index 90cfa21..0000000
--- a/nut-2.2.0-glibcopen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- nut-2.2.0/drivers/megatec_usb.c.open	2007-08-16 09:32:03.000000000 +0200
-+++ nut-2.2.0/drivers/megatec_usb.c	2007-08-16 09:32:24.000000000 +0200
-@@ -209,7 +209,7 @@
- 	/* link the matchers */
- 	regex_matcher->next = &subdriver_matcher;
- 
--	ret = usb->open(&udev, &hiddevice, regex_matcher, NULL, MODE_NOHID);
-+	ret = (usb->open)(&udev, &hiddevice, regex_matcher, NULL, MODE_NOHID);
- 	if (ret < 0)
- 		usb_open_error(port);
- 
---- nut-2.2.0/drivers/libhid.c.open	2007-08-16 09:28:05.000000000 +0200
-+++ nut-2.2.0/drivers/libhid.c	2007-08-16 09:28:23.000000000 +0200
-@@ -589,7 +589,7 @@
- 	}
- 
- 	/* get and parse descriptors (dev, cfg and report) */
--	ReportSize = comm_driver->open(udevp, hd, matcher, ReportDesc, mode);
-+	ReportSize = (comm_driver->open)(udevp, hd, matcher, ReportDesc, mode);
- 
- 	if (ReportSize == -1)
- 		return NULL;
diff --git a/nut-2.2.0-multilib.patch b/nut-2.2.0-multilib.patch
deleted file mode 100644
index e865892..0000000
--- a/nut-2.2.0-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- nut-2.2.0/lib/libupsclient-config.in.multilib	2006-11-08 03:47:35.000000000 +0100
-+++ nut-2.2.0/lib/libupsclient-config.in	2007-07-12 13:16:21.000000000 +0200
-@@ -10,9 +10,17 @@
- Version="@PACKAGE_VERSION@"
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--Libs="-L@libdir@ -lupsclient @SSL_LDFLAGS@"
- Cflags="-I@includedir@ @SSL_CFLAGS@"
- 
-+arch=$(/bin/arch)
-+if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
-+	libdir="/usr/lib64"
-+else
-+	libdir="/usr/lib"
-+fi
-+Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
-+
-+
- case "$1" in
- 
-   --cflags)
diff --git a/nut-2.2.0-udevusb.patch b/nut-2.2.0-udevusb.patch
deleted file mode 100644
index 15c3d3a..0000000
--- a/nut-2.2.0-udevusb.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -up nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb nut-2.2.0/scripts/udev/nut-usbups.rules.in
---- nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb	2007-05-14 18:16:22.000000000 +0200
-+++ nut-2.2.0/scripts/udev/nut-usbups.rules.in	2007-11-27 14:37:33.000000000 +0100
-@@ -1,61 +1,61 @@
- # udev rules for the NUT USB drivers
- 
--SUBSYSTEM!="usb_device", GOTO="nut-usbups_rules_end"
-+SUBSYSTEM!="usb", GOTO="nut-usbups_rules_end"
- ACTION!="add", GOTO="nut-usbups_rules_end"
- 
- # MGE UPS SYSTEMS - usbhid-ups
--SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # APC - usbhid-ups
--SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # CyberPower - usbhid-ups
--SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Mustek Powermust 600USB (OMRON/87XXUPS)
--SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Cypress Semiconductor USB to Serial
--SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Powercom - unknown driver
--SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Agiler - megatec_usb
--SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Krauler - megatec_usb
--SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Ablerex - megatec_usb
--SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Powerware - bcmxcp_usb
--SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Tripp Lite - tripplite_usb
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Tripp Lite - usbhid-ups
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Belkin - usbhid-ups
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- # Kebo - unsupported
--SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
- 
- LABEL="nut-usbups_rules_end"
- 
diff --git a/nut-2.2.0-wrongssl.patch b/nut-2.2.0-wrongssl.patch
deleted file mode 100644
index e916097..0000000
--- a/nut-2.2.0-wrongssl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
-+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
-@@ -10,7 +10,7 @@
- Version="@PACKAGE_VERSION@"
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--Cflags="-I@includedir@ @SSL_CFLAGS@"
-+Cflags="-I@includedir@ @LIBSSL_CFLAGS@"
- 
- arch=$(/bin/arch)
- if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
-@@ -18,7 +18,7 @@
- else
- 	libdir="/usr/lib"
- fi
--Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
-+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
- 
- 
- case "$1" in
---- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
-+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
-@@ -9,5 +9,5 @@
- Name: libupsclient
- Description: UPS monitoring with Network UPS Tools
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
--Cflags: -I${includedir} @SSL_CFLAGS@
-+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
-+Cflags: -I${includedir} @LIBSSL_CFLAGS@
diff --git a/nut-2.2.1-conf.patch b/nut-2.2.1-conf.patch
new file mode 100644
index 0000000..7082c78
--- /dev/null
+++ b/nut-2.2.1-conf.patch
@@ -0,0 +1,12 @@
+diff -up nut-2.2.1/conf/upssched.conf.sample.in.conf nut-2.2.1/conf/upssched.conf.sample.in
+--- nut-2.2.1/conf/upssched.conf.sample.in.conf	2008-01-09 13:46:29.000000000 +0100
++++ nut-2.2.1/conf/upssched.conf.sample.in	2008-01-09 13:46:43.000000000 +0100
+@@ -14,7 +14,7 @@
+ # A shell script with a big case..esac construct should work nicely for this.
+ # An example has been provided to help you get started.
+ 
+-CMDSCRIPT /usr/local/ups/bin/upssched-cmd
++CMDSCRIPT /usr/bin/upssched-cmd
+ 
+ # ============================================================================
+ #
diff --git a/nut-2.2.1-glibcopen.patch b/nut-2.2.1-glibcopen.patch
new file mode 100644
index 0000000..ed8db0b
--- /dev/null
+++ b/nut-2.2.1-glibcopen.patch
@@ -0,0 +1,12 @@
+diff -up nut-2.2.1/drivers/megatec_usb.c.open nut-2.2.1/drivers/megatec_usb.c
+--- nut-2.2.1/drivers/megatec_usb.c.open	2008-01-09 14:22:27.000000000 +0100
++++ nut-2.2.1/drivers/megatec_usb.c	2008-01-09 14:23:00.000000000 +0100
+@@ -207,7 +207,7 @@ int ser_open(const char *port)
+ 	/* link the matchers */
+ 	regex_matcher->next = &subdriver_matcher;
+ 
+-	ret = usb->open(&udev, &usbdevice, regex_matcher, NULL);
++	ret = (usb->open)(&udev, &usbdevice, regex_matcher, NULL);
+ 	if (ret < 0)
+ 		usb_open_error(port);
+ 
diff --git a/nut-2.2.1-multilib.patch b/nut-2.2.1-multilib.patch
new file mode 100644
index 0000000..ffd8996
--- /dev/null
+++ b/nut-2.2.1-multilib.patch
@@ -0,0 +1,23 @@
+diff -up nut-2.2.1/lib/libupsclient-config.in.multilib nut-2.2.1/lib/libupsclient-config.in
+--- nut-2.2.1/lib/libupsclient-config.in.multilib	2007-07-10 15:44:32.000000000 +0200
++++ nut-2.2.1/lib/libupsclient-config.in	2008-01-09 14:45:06.000000000 +0100
+@@ -10,9 +10,18 @@
+ Version="@PACKAGE_VERSION@"
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-Libs="-L@libdir@ -lupsclient @LIBSSL_LDFLAGS@"
+ Cflags="-I@includedir@ @LIBSSL_CFLAGS@"
+ 
++arch=$(/bin/arch)
++if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ]; then
++	libdir="/usr/lib64"
++else
++	libdir="/usr/lib"
++fi
++Libs="-L$libdir -lupsclient @LIBSSL_LDFLAGS@"
++
++
++
+ case "$1" in
+ 
+   --cflags)
diff --git a/nut-2.2.1-udevusb.patch b/nut-2.2.1-udevusb.patch
new file mode 100644
index 0000000..68aacd8
--- /dev/null
+++ b/nut-2.2.1-udevusb.patch
@@ -0,0 +1,98 @@
+diff -up nut-2.2.1/scripts/udev/nut-usbups.rules.in.udevusb nut-2.2.1/scripts/udev/nut-usbups.rules.in
+--- nut-2.2.1/scripts/udev/nut-usbups.rules.in.udevusb	2008-01-09 13:58:41.000000000 +0100
++++ nut-2.2.1/scripts/udev/nut-usbups.rules.in	2008-01-09 13:59:33.000000000 +0100
+@@ -8,64 +8,64 @@ BUS!="usb", GOTO="nut-usbups_rules_end"
+ LABEL="nut-usbups_rules_real"
+ 
+ # MGE UPS SYSTEMS - usbhid-ups
+-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # APC - usbhid-ups
+-SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # CyberPower - usbhid-ups
+-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Mustek Powermust 600USB (OMRON/87XXUPS)
+-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # LIEBERT/PowerSure Personal XT
+-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="06da", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Cypress Semiconductor USB to Serial
+-SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Powercom - unknown driver
+-SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Agiler - megatec_usb
+-SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Krauler - megatec_usb
+-SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Ablerex - megatec_usb
+-SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Powerware - bcmxcp_usb
+-SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Tripp Lite - tripplite_usb
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Tripp Lite - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2007", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="2007", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Belkin - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0375", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0375", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ # Kebo - unsupported
+-SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
+ 
+ LABEL="nut-usbups_rules_end"
+ 
diff --git a/nut.spec b/nut.spec
index 7670034..14be2df 100644
--- a/nut.spec
+++ b/nut.spec
@@ -8,8 +8,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.2.0
-Release: 6.2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,11 +18,10 @@ Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
-Patch0: nut-2.2.0-conf.patch
-Patch1: nut-2.2.0-multilib.patch
-Patch2: nut-2.2.0-udevusb.patch
-Patch3: nut-2.2.0-glibcopen.patch
-Patch4: nut-2.2.0-wrongssl.patch
+Patch0: nut-2.2.1-conf.patch
+Patch1: nut-2.2.1-multilib.patch
+Patch2: nut-2.2.1-udevusb.patch
+Patch3: nut-2.2.1-glibcopen.patch
 Patch5: nut-2.2.0-usbhal.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib
@@ -92,7 +91,6 @@ necessary to develop NUT client applications.
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
-%patch4 -p1 -b .wrongssl
 %patch5 -p1 -b .usbhal
 
 %build
@@ -301,6 +299,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Jan 09 2008 Tomas Smetana <tsmetana@redhat.com> 2.2.1-1
+- new upstream version
+
 * Wed Dec 05 2007 Tomas Smetana <tsmetana@redhat.com> 2.2.0-6.2
 - rebuild
 
diff --git a/sources b/sources
index 0b2d346..25c1be0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3570515d80804051d4e7631e8a3eb12  nut-2.2.0.tar.gz
+c7ae871961a7dbe12b22d504267dc132  nut-2.2.1.tar.gz