rpms/smartmontools/F-8 smartmontools-5.38-cloexec.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 smartmontools.spec, 1.40, 1.41 sources, 1.4, 1.5 smartmontools-5.36-cciss.patch, 1.1, NONE smartmontools-5.36-cloexec.patch, 1.1, NONE smartmontools-5.36-sata.patch, 1.1, NONE smartmontools-5.36.tar.gz.asc, 1.1, NONE smartmontools-5.37-3ware.patch, 1.1, NONE smartmontools-5.37-buildfix.patch, 1.1, NONE smartmontools-5.37-cloexec.patch, 1.1, NONE

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17530

Modified Files:
	.cvsignore smartmontools.spec sources 
Added Files:
	smartmontools-5.38-cloexec.patch 
Removed Files:
	smartmontools-5.36-cciss.patch 
	smartmontools-5.36-cloexec.patch smartmontools-5.36-sata.patch 
	smartmontools-5.36.tar.gz.asc smartmontools-5.37-3ware.patch 
	smartmontools-5.37-buildfix.patch 
	smartmontools-5.37-cloexec.patch 
Log Message:
new upstream version; drop unused patches

smartmontools-5.38-cloexec.patch:

--- NEW FILE smartmontools-5.38-cloexec.patch ---
diff -up smartmontools-5.38/os_linux.cpp.cloexec smartmontools-5.38/os_linux.cpp
--- smartmontools-5.38/os_linux.cpp.cloexec	2008-03-04 23:09:47.000000000 +0100
+++ smartmontools-5.38/os_linux.cpp	2008-03-18 08:28:20.000000000 +0100
@@ -171,14 +171,13 @@ static char prev_scsi_dev[128];
 
 // equivalent to open(path, flags)
 int deviceopen(const char *pathname, char *type){
-  int fd;
+  int fd = -1;
 
   if (0 == strcmp(type,"SCSI")) {
     strncpy(prev_scsi_dev, pathname, sizeof(prev_scsi_dev) - 1);
     fd = open(pathname, O_RDWR | O_NONBLOCK);
     if (fd < 0 && errno == EROFS)
       fd = open(pathname, O_RDONLY | O_NONBLOCK);
-    return fd;
   } else if (0 == strcmp(type,"ATA")) {
     // smartd re-opens SCSI devices with "type"==ATA for some reason.
     // If that was a SCSI generic device (e.g. /dev/sg0) then the
@@ -186,9 +185,9 @@ int deviceopen(const char *pathname, cha
     // The purpose of the next code line is to limit the scope of
     // this change as a release is pending (and smartd needs a rewrite).
     if (0 == strncmp(pathname, prev_scsi_dev, sizeof(prev_scsi_dev)))
-      return open(pathname, O_RDWR | O_NONBLOCK);
+      fd = open(pathname, O_RDWR | O_NONBLOCK);
     else
-      return open(pathname, O_RDONLY | O_NONBLOCK);
+      fd = open(pathname, O_RDONLY | O_NONBLOCK);
   } else if (0 == strcmp(type,"ATA_3WARE_9000")) {
     // the device nodes for this controller are dynamically assigned,
     // so we need to check that they exist with the correct major
@@ -198,7 +197,7 @@ int deviceopen(const char *pathname, cha
         errno=ENXIO;
       return -1;
     }
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   }
   else if (0 == strcmp(type,"ATA_3WARE_678K")) {
     // the device nodes for this controller are dynamically assigned,
@@ -209,15 +208,17 @@ int deviceopen(const char *pathname, cha
         errno=ENXIO;
       return -1;
     }
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   }
   else if(0 == strcmp(type, "CCISS")) {
     // the device is a cciss smart array device.
-    return open(pathname, O_RDWR | O_NONBLOCK);
+    fd = open(pathname, O_RDWR | O_NONBLOCK);
   }
-  else
-    return -1;
 
+  if (fd != -1) {
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
+  }
+  return fd;
 }
 
 // equivalent to close(file descriptor)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2006 07:54:10 -0000	1.4
+++ .cvsignore	18 Mar 2008 13:23:35 -0000	1.5
@@ -1 +1 @@
-smartmontools-5.36.tar.gz
+smartmontools-5.38.tar.gz


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-8/smartmontools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- smartmontools.spec	15 Jan 2008 14:26:45 -0000	1.40
+++ smartmontools.spec	18 Mar 2008 13:23:35 -0000	1.41
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.37
-Release: 	7.3%{?dist}
+Version:	5.38
+Release: 	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -10,10 +10,8 @@
 Source1:	smartd.initd
 Source2:	smartd-conf.py
 Source3:	smartmontools.sysconf
-Patch1:		smartmontools-5.37-cloexec.patch
-Patch2:		smartmontools-5.37-3ware.patch
-Patch3:     smartmontools-5.37-addrinfo.patch
-Patch4:     smartmontools-5.37-buildfix.patch
+Patch1:		smartmontools-5.38-cloexec.patch
+Patch2:     smartmontools-5.37-addrinfo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 PreReq:		/sbin/chkconfig /sbin/service
@@ -42,9 +40,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .cloexec
-%patch2 -p1 -b .3ware
-%patch3 -p1 -b .addrinfo
-%patch4 -p1 -b .buildfix
+%patch2 -p1 -b .addrinfo
 
 %build
 %configure
@@ -107,6 +103,9 @@
 %exclude %{_sbindir}/smartd-conf.py[co]
 
 %changelog
+* Tue Mar 18 2008 Tomas Smetana <tsmetana at redhat.com> - 1:5.38-1
+- update to 5.38
+
 * Tue Jan 15 2008 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-7.3
 - change '-d ata' to '-d sat' in the config script for SATA drives
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Feb 2007 08:57:04 -0000	1.4
+++ sources	18 Mar 2008 13:23:35 -0000	1.5
@@ -1 +1 @@
-4ab3668b7d1362ce923f64a211e0e568  smartmontools-5.37.tar.gz
+a282846532ecbd6b4a28072373b3a70b  smartmontools-5.38.tar.gz


--- smartmontools-5.36-cciss.patch DELETED ---


--- smartmontools-5.36-cloexec.patch DELETED ---


--- smartmontools-5.36-sata.patch DELETED ---


--- smartmontools-5.36.tar.gz.asc DELETED ---


--- smartmontools-5.37-3ware.patch DELETED ---


--- smartmontools-5.37-buildfix.patch DELETED ---


--- smartmontools-5.37-cloexec.patch DELETED ---