[at/f14] 674426 testing droped patch for noexport of shell

Marcela Mašláňová mmaslano at fedoraproject.org
Fri Jun 10 12:25:59 UTC 2011


commit 8165d5f15bf05913ba453ce56f0a1ec5fbff8bf5
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Fri Jun 10 14:25:23 2011 +0200

    674426 testing droped patch for noexport of shell

 at-3.1.12-fix_no_export.patch |   15 +++++++++++++++
 at.spec                       |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/at-3.1.12-fix_no_export.patch b/at-3.1.12-fix_no_export.patch
new file mode 100644
index 0000000..10a967c
--- /dev/null
+++ b/at-3.1.12-fix_no_export.patch
@@ -0,0 +1,15 @@
+diff -up at-3.1.12/at.c.noexport at-3.1.12/at.c
+--- at-3.1.12/at.c.noexport	2011-06-10 14:21:04.000000000 +0200
++++ at-3.1.12/at.c	2011-06-10 14:22:54.247712577 +0200
+@@ -391,8 +391,9 @@ writefile(time_t runtimer, char queue)
+ 	    unsigned int i;
+ 	    for (i = 0; i < sizeof(no_export) / sizeof(no_export[0]); i++) {
+ 		export = export
+-		    && (strncmp(*atenv, no_export[i],
+-				(size_t) (eqp - *atenv)) != 0);
++		    && ((((size_t) (eqp - *atenv)) != strlen(no_export[i]))
++			||(strncmp(*atenv, no_export[i],(size_t) (eqp - *atenv)) != 0)
++			)
+ 	    }
+ 	    eqp++;
+ 	}
diff --git a/at.spec b/at.spec
index 105f5f0..8df1689 100644
--- a/at.spec
+++ b/at.spec
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: %{major_ver}
-Release: 5%{dist}
+Release: 6%{dist}.testcsh
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -25,6 +25,7 @@ Patch5: at-3.1.12-pam.patch
 Patch6: at-3.1.12-selinux.patch
 Patch7: at-3.1.12-fix.patch
 Patch8: at-3.1.12-nowrap.patch
+Patch9: at-3.1.12-fix_no_export.patch
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -62,6 +63,7 @@ cp %{SOURCE1} .
 %patch6 -p1 -b .selinux
 %patch7 -p1 -b .fix
 %patch8 -p1 -b .nowrap
+%patch9 -p1 -b .noexport
 
 %build
 # patch9 touches configure.in
@@ -163,6 +165,9 @@ fi
 %attr(0755,root,root)		%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Fri Jun 10 2011 Marcela Mašláňová <mmaslano at redhat.com> - 3.1.12-6.testcsh
+- 674426 testing droped patch for noexport of shell
+
 * Mon Mar 15 2010 Marcela Mašláňová <mmaslano at redhat.com> - 3.1.12-5
 - 568222 interrupted 'at' job creates empty job for non-root 
 


More information about the scm-commits mailing list