rpms/ksh/devel ksh-20070111-uname.patch, NONE, 1.1 ksh-20070111-useex.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 ksh.spec, 1.27, 1.28 sources, 1.7, 1.8 ksh-2004-02-29-ppc64.patch, 1.1, NONE ksh-20050202-path.patch, 1.1, NONE ksh-20050202-uname.patch, 1.1, NONE ksh-20060124-syntax.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Feb 21 12:36:14 UTC 2007 

Author: karsten

Update of /cvs/dist/rpms/ksh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4974

Modified Files:
	.cvsignore ksh.spec sources 
Added Files:
	ksh-20070111-uname.patch ksh-20070111-useex.patch 
Removed Files:
	ksh-2004-02-29-ppc64.patch ksh-20050202-path.patch 
	ksh-20050202-uname.patch ksh-20060124-syntax.patch 
Log Message:
- new upstream version
- fix invalid write in uname function


ksh-20070111-uname.patch:
 uname.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE ksh-20070111-uname.patch ---
--- ksh-20070111/src/lib/libcmd/uname.c.unamefix	2007-02-21 13:27:03.000000000 +0100
+++ ksh-20070111/src/lib/libcmd/uname.c	2007-02-21 13:27:12.000000000 +0100
@@ -431,7 +431,7 @@
 		{
 			if (!*(s = astconf("HW_SERIAL", NiL, NiL)))
 #if _lib_gethostid
-				sfsprintf(s, sizeof(buf), "%08x", gethostid());
+				sfsprintf(s = buf, sizeof(buf), "%08x", gethostid());
 #else
 				/*NOP*/;
 #endif
@@ -448,11 +448,7 @@
 		if (flags & OPT_domain)
 		{
 			if (!*(s = astconf("SRPC_DOMAIN", NiL, NiL)))
-#if _lib_getdomainname
-				getdomainname(s, sizeof(buf));
-#else
-				/*NOP*/;
-#endif
+				s = ut.__domainname;
 			output(OPT_domain, s, "domain");
 		}
 #if _mem_m_type_utsname

ksh-20070111-useex.patch:
 bin/mamprobe             |    9 +++++----
 src/cmd/INIT/mamprobe.sh |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

--- NEW FILE ksh-20070111-useex.patch ---
--- ksh-20070111/bin/mamprobe.use_ex	2005-06-07 11:09:42.000000000 -0400
+++ ksh-20070111/bin/mamprobe	2007-01-22 07:48:02.000000000 -0500
@@ -200,10 +200,11 @@
 
 # STD* are standard commands/flags with possible execrate(1)
 
-if	( ed ) < /dev/null > /dev/null 2>&1
-then	STDED=ed
-else	STDED=ex
-fi
+#if	( ed ) < /dev/null > /dev/null 2>&1
+#then	STDED=ed
+#else	STDED=ex
+#fi
+STDED=ex
 STDEDFLAGS=-
 set STDCAT cat STDCHMOD chmod STDCMP cmp STDCP cp STDLN ln STDMV mv STDRM rm
 while	:
--- ksh-20070111/src/cmd/INIT/mamprobe.sh.use_ex	2007-01-22 07:50:39.000000000 -0500
+++ ksh-20070111/src/cmd/INIT/mamprobe.sh	2007-01-22 07:50:27.000000000 -0500
@@ -219,10 +219,11 @@
 
 # STD* are standard commands/flags with possible execrate(1)
 
-if	( ed ) < /dev/null > /dev/null 2>&1
-then	STDED=ed
-else	STDED=ex
-fi
+#if	( ed ) < /dev/null > /dev/null 2>&1
+#then	STDED=ed
+#else	STDED=ex
+#fi
+STDED=ex
 STDEDFLAGS=-
 set STDCAT cat STDCHMOD chmod STDCMP cmp STDCP cp STDLN ln STDMV mv STDRM rm
 while	:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jun 2006 11:47:03 -0000	1.7
+++ .cvsignore	21 Feb 2007 12:36:12 -0000	1.8
@@ -1,3 +1,3 @@
-ast-ksh.2006-02-14.tgz
-ast-base-locale.2006-02-14.tgz
-INIT.2006-02-14.tgz
+ast-base-locale.2007-01-11.tgz
+ast-ksh.2007-01-11.tgz
+INIT.2007-01-11.tar


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ksh.spec	12 Jul 2006 06:43:32 -0000	1.27
+++ ksh.spec	21 Feb 2007 12:36:12 -0000	1.28
@@ -1,5 +1,5 @@
 #ExclusiveArch:  x86_64
-%define       releasedate   2006-02-14
+%define       releasedate   2007-01-11
 #ExcludeArch:  ia64
 
 Name:         ksh
@@ -7,24 +7,25 @@
 URL:          http://www.kornshell.com/
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
-Version:      20060214
-Release:      1.1
+Version:      20070111
+Release:      1
+#Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.linux.i386.tgz
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
-Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
+Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tar
 Source2:      http://www.research.att.com/~gsf/download/tgz/ast-base-locale.%{releasedate}.tgz
-Patch0:       ksh-2004-02-29-ppc64.patch
-Patch1:       ksh-20041225-gcc4.patch
-Patch2:       ksh-20050202-path.patch
-Patch3:       ksh-20050202-uname.patch
-Patch4:       ksh-20060124-syntax.patch
-Patch5:       ksh-20060124-iffedebug.patch
+Patch0:       ksh-20041225-gcc4.patch
+Patch1:       ksh-20070111-uname.patch
+Patch2:       ksh-20070111-useex.patch
+# for debugging only:
+#Patch100:     ksh-20060124-iffedebug.patch
 
 #   build information
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:     ksh93
 Obsoletes:    ksh93
 Conflicts:    pdksh
-PreReq:       grep, coreutils
+Requires(post): grep, coreutils
+Requires(preun): grep, coreutils
 
 %description
 KSH-93 is the most recent version of the KornShell by David Korn of 
@@ -36,19 +37,17 @@
 %setup -q -c
 %setup -q -T -D -a 1
 %setup -q -T -D -a 2
-#%patch0 -p1 -b .ppc64
-%patch1 -p1 -b .gcc4
-#patch2 -p1 -b .path
-%patch3 -p1 -b .uname
-%patch4 -p1 -b .syntax
-#%patch5 -p1 -b .iffedebug
+%patch0 -p1 -b .gcc4
+%patch1 -p1 -b .uname
+%patch2 -p1 -b .use_ex
+#patch100 -p1 -b .iffedebug
 
 %build
 ./bin/package "read" ||:
 # Use this for debugging:
 #export CCFLAGS="-O0 -ggdb"
 #./bin/package DEBUG "make"
-./bin/package "make"
+./bin/package "make" %{?_smp_mflags}
 cp lib/package/LICENSES/ast LICENSE
 
 %install
@@ -89,7 +88,7 @@
 fi
 
 %files 
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc README LICENSE
 /bin/*
 /usr//bin/ksh
@@ -100,6 +99,10 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 21 2007 Karsten Hopp <karsten at redhat.com> 20070111-1
+- new upstream version
+- fix invalid write in uname function
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 20060214-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jun 2006 11:47:03 -0000	1.7
+++ sources	21 Feb 2007 12:36:12 -0000	1.8
@@ -1,3 +1,3 @@
-76a13bdb10a35b5ff67208cf9042a8bf  ast-ksh.2006-02-14.tgz
-f16ea2de409871633c797d4e4f401177  ast-base-locale.2006-02-14.tgz
-375ede1f75db451f645a140ec41b9216  INIT.2006-02-14.tgz
+727f240f8e56b555aa884de4a032519d  ast-base-locale.2007-01-11.tgz
+a24a0b8d8dc81600d624e3c0f2159e38  ast-ksh.2007-01-11.tgz
+4cf6a21b17748b4f586235fa289586c6  INIT.2007-01-11.tar


--- ksh-2004-02-29-ppc64.patch DELETED ---


--- ksh-20050202-path.patch DELETED ---


--- ksh-20050202-uname.patch DELETED ---


--- ksh-20060124-syntax.patch DELETED ---

More information about the fedora-cvs-commits mailing list