From 69589a5b0039ddc56d53690756bf84ceccc18408 Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 7 Mar 2012 10:07:14 +0100
Subject: [PATCH] Update to 1.1.3

---
 .gitignore             |  1 +
 freeipmi-systemd.patch | 81 ------------------------------------------
 freeipmi.spec          | 26 +++++++++++---
 sources                |  2 +-
 4 files changed, 24 insertions(+), 86 deletions(-)
 delete mode 100644 freeipmi-systemd.patch

diff --git a/.gitignore b/.gitignore
index 4ab2c95..1e79c8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ freeipmi-0.8.8.tar.gz
 /freeipmi-1.0.9.tar.gz
 /freeipmi-1.0.10.tar.gz
 /freeipmi-1.1.1.tar.gz
+/freeipmi-1.1.3.tar.gz
diff --git a/freeipmi-systemd.patch b/freeipmi-systemd.patch
deleted file mode 100644
index 2c273ba..0000000
--- a/freeipmi-systemd.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Fix daemon startup race.
-
-Accepted upstream as SVN rev. 8299
-diff -up freeipmi-1.1.1/bmc-watchdog/bmc-watchdog.c.systemd freeipmi-1.1.1/bmc-watchdog/bmc-watchdog.c
---- freeipmi-1.1.1/bmc-watchdog/bmc-watchdog.c.systemd	2012-01-02 20:26:09.000000000 +0100
-+++ freeipmi-1.1.1/bmc-watchdog/bmc-watchdog.c	2012-01-06 16:28:55.966295836 +0100
-@@ -1677,6 +1677,10 @@ _daemon_init ()
-       unsigned int i;
-       pid_t pid;
-       FILE *pidfile;
-+      int fds[2];
-+
-+      if ( pipe(fds) < 0 )
-+        _err_exit ("pipe: %s", strerror (errno));
- 
-       if ( (pidfile = fopen(BMC_WATCHDOG_PIDFILE, "w")) == NULL )
-         _err_exit ("fopen: %s", strerror (errno));
-@@ -1684,7 +1688,14 @@ _daemon_init ()
-       if ((pid = fork ()) < 0)
-         _err_exit ("fork: %s", strerror (errno));
-       if (pid)
--        exit (0);                   /* parent terminates */
-+        {
-+          /* parent terminates */
-+          char buf;
-+          read(fds[0], &buf, 1);
-+          close(fds[1]);
-+          close(fds[0]);
-+          exit (0);
-+        }
- 
-       setsid ();
- 
-@@ -1706,6 +1717,9 @@ _daemon_init ()
- 
-       umask (0);
- 
-+      write(fds[1], "a", 1);
-+      close(fds[1]);
-+      close(fds[0]);
-       for (i = 0; i < 64; i++)
-         close (i);
-     }
-diff -up freeipmi-1.1.1/ipmidetectd/ipmidetectd.c.systemd freeipmi-1.1.1/ipmidetectd/ipmidetectd.c
---- freeipmi-1.1.1/ipmidetectd/ipmidetectd.c.systemd	2012-01-02 20:26:13.000000000 +0100
-+++ freeipmi-1.1.1/ipmidetectd/ipmidetectd.c	2012-01-06 16:28:09.309420665 +0100
-@@ -58,12 +58,22 @@ _daemon_init (void)
-   /* Based on code in Unix network programming by R. Stevens */
-   pid_t pid;
-   unsigned int i;
-+  int fds[2];
- 
-+  if (pipe(fds) < 0)
-+    IPMIDETECTD_EXIT (("pipe: %s", strerror (errno)));
-   if ((pid = fork ()) < 0)
-     IPMIDETECTD_EXIT (("fork: %s", strerror (errno)));
- 
--  if (pid != 0)                 /* Terminate Parent */
--    exit (0);
-+  if (pid != 0)
-+    {
-+      /* Terminate Parent */
-+      char buf;
-+      read(fds[0], &buf, 1);
-+      close(fds[1]);
-+      close(fds[0]);
-+      exit (0);
-+    }
- 
-   setsid ();
- 
-@@ -79,6 +89,9 @@ _daemon_init (void)
-   chdir ("/");
- 
-   umask (0);
-+  write(fds[1], "a", 1);
-+  close(fds[1]);
-+  close(fds[0]);
- 
-   for (i = 0; i < 64; i++)
-     close (i);
diff --git a/freeipmi.spec b/freeipmi.spec
index 9856aaa..2c9042a 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -2,10 +2,10 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 Name: freeipmi
-Version: 1.1.1
+Version: 1.1.3
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -17,7 +17,6 @@ BuildRequires: libgcrypt-devel texinfo systemd-units
 Requires(preun): info systemd-units
 Requires(post): info systemd-units systemd-sysv
 Requires(postun): systemd-units
-Patch1: freeipmi-systemd.patch
 
 Summary: IPMI remote console and system management software
 %description
@@ -58,7 +57,6 @@ Provides a tool and a daemon for IPMI node detection.
 
 %prep
 %setup -q
-%patch1 -p1 -b .systemd
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -361,6 +359,26 @@ fi
 %{_unitdir}/ipmidetectd.service
 
 %changelog
+* Wed Mar  7 2012 Jan Safranek <jsafrane@redhat.com> - 1.1.3-1
+- Updated to freeipmi-1.1.3:
+  - Support Supermicro CPU temperature SEL events.
+  - In ipmi-oem, fix corner case with Dell C410x power control
+    calculation.
+  - In all tools, fix error messages to differentiate between invalid
+    and unsupported cipher suite IDs.
+  - In bmc-config, fix a Cipher Suite Privilege configuration
+    corner case in the workaround for an HP DL145 workaround.
+  - In bmc-config, add workaround for Cipher Suite Privilege
+    configuration on Intel S2600JF/Appro 512X.
+  - Various documentation updates.
+  - In libfreeipmi, fix incorrect packet layout for the Get Lan
+    Configuration Parameters RMCPplus Messaging Cipher Suite Entry Support
+    response.
+  - In libipmimonitoring, properly return connection timeout error on
+    connection timeout.
+  - Fix build when using --docdir. 
+  - Various documentation updates.
+
 * Fri Jan  6 2012 Jan Safranek <jsafrane@redhat.com> - 1.1.1-2
 - added systemd unit files (#767611)
 
diff --git a/sources b/sources
index c580c6f..6717d81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e69caa76be1bbe27215e42ab58ddbad  freeipmi-1.1.1.tar.gz
+c3d3f1cb796dfbea363258120001d34b  freeipmi-1.1.3.tar.gz