rpms/silo/F-9 silo-1.4.14-__sprintf_chk.patch, NONE, 1.1 silo-1.4.14-gcc43.patch, NONE, 1.1 silo-1.4.14-kernelheaders.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 silo.spec, 1.3, 1.4 sources, 1.2, 1.3 silo-1.2.4-ext3.patch, 1.1, NONE silo-1.4.13-localheaders.patch, 1.1, NONE silo-1.4.13-modernkernheaders.patch, 1.1, NONE silo-big-kernel.patch, 1.1, NONE silo_degraded_raid1.patch, 1.1, NONE
Tom Callaway
spot at fedoraproject.org
Wed Oct 15 14:28:22 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/silo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10077
Modified Files:
.cvsignore silo.spec sources
Added Files:
silo-1.4.14-__sprintf_chk.patch silo-1.4.14-gcc43.patch
silo-1.4.14-kernelheaders.patch
Removed Files:
silo-1.2.4-ext3.patch silo-1.4.13-localheaders.patch
silo-1.4.13-modernkernheaders.patch silo-big-kernel.patch
silo_degraded_raid1.patch
Log Message:
update to 1.4.14
silo-1.4.14-__sprintf_chk.patch:
--- NEW FILE silo-1.4.14-__sprintf_chk.patch ---
diff -up silo-1.4.14/common/printf.c.BAD silo-1.4.14/common/printf.c
--- silo-1.4.14/common/printf.c.BAD 2008-10-15 08:58:01.000000000 -0500
+++ silo-1.4.14/common/printf.c 2008-10-15 08:59:34.000000000 -0500
@@ -236,3 +236,8 @@ int sprintf (char *s, char *format, ...)
return done;
}
+
+int __sprintf_chk (char *s, int flag, size_t slen, const char *format, ...)
+{
+ return sprintf(s, format);
+}
diff -up silo-1.4.14/include/stringops.h.BAD silo-1.4.14/include/stringops.h
--- silo-1.4.14/include/stringops.h.BAD 2008-10-15 09:05:38.000000000 -0500
+++ silo-1.4.14/include/stringops.h 2008-10-15 09:06:08.000000000 -0500
@@ -32,4 +32,7 @@ int strncasecmp(const char *, const char
char *strstr(const char *, const char *);
int memcmp(const void *, const void *, size_t);
+/* This isn't really a string op, but we need to put it here for size_t. */
+int __sprintf_chk (char *s, int flag, size_t slen, const char *format, ...);
+
#endif /* __STRINGOPS_H */
silo-1.4.14-gcc43.patch:
--- NEW FILE silo-1.4.14-gcc43.patch ---
diff -up silo-1.4.14/common/printf.c.BAD silo-1.4.14/common/printf.c
--- silo-1.4.14/common/printf.c.BAD 2008-10-14 10:55:39.000000000 -0500
+++ silo-1.4.14/common/printf.c 2008-10-14 10:56:47.000000000 -0500
@@ -21,6 +21,7 @@
USA. */
#include "promlib.h"
+#include <stringops.h>
/*
* This part is rewritten by Igor Timkin <ivt at msu.su>. Than I
@@ -147,3 +148,91 @@ void prom_printf (char *fmt,...)
vprintf (fmt, x1);
va_end (x1);
}
+
+static int sprintn (char *str, long long n, int b)
+{
+ static char prbuf[33];
+ register char *cp;
+ int count = 0;
+
+ if (b == 10 && n < 0) {
+ memset (str + count, '-', 1);
+ count++;
+ n = -n;
+ }
+ cp = prbuf;
+ do
+ *cp++ = "0123456789ABCDEF"[(unsigned int) (((unsigned long)n) % b)];
+ while ((n = ((unsigned long long)n) / b & 0x0FFFFFFFFFFFFFFFULL));
+ do {
+ memset (str + count, *--cp, 1);
+ count++;
+ } while (cp > prbuf);
+
+ return count;
+}
+
+int vsprintf (char *str, char *fmt, va_list adx)
+{
+ register int c;
+ char *s;
+ int count = 0;
+
+ for (;;) {
+ while ((c = *fmt++) != '%') {
+ memset (str + count, c, 1);
+ if (c == '\0') {
+ return count;
+ }
+ }
+ c = *fmt++;
+ if (c == 'd' || c == 'o' || c == 'x' || c == 'X') {
+ count += sprintn (str + count, (long long) va_arg (adx, unsigned),
+ c == 'o' ? 8 : (c == 'd' ? 10 : 16));
+ } else if (c == 'c') {
+ memset (str + count, va_arg (adx, unsigned), 1);
+ count++;
+ } else if (c == 's') {
+ if ((s = va_arg (adx, char *)) == NULL)
+ s = (char *)"(null)";
+ while ((c = *s++)) {
+ memset (str + count, c, 1);
+ count++;
+ }
+ } else if (c == 'l' || c == 'O') {
+ count += sprintn (str + count, (long long) va_arg (adx, long), c == 'l' ? 10 : 8);
+ } else if (c == 'L') {
+ int hex = 0;
+ if (*fmt == 'x') {
+ fmt++;
+ hex = 1;
+ }
+ count += sprintn (str + count, (long long) va_arg (adx, long long), hex ? 16 : 10);
+ } else {
+ /* This is basically what libc's printf does */
+ memset (str + count, '%', 1);
+ count++;
+ memset (str + count, c, 1);
+ count++;
+ }
+ }
+
+ return count;
+}
+
+/*
+ * Scaled down version of C Library sprintf.
+ * Only %c %s %d (==%u) %o %x %X %l %O are recognized.
+ */
+
+int sprintf (char *s, char *format, ...)
+{
+ va_list arg;
+ int done;
+
+ va_start (arg, format);
+ done = vsprintf (s, format, arg);
+ va_end (arg);
+
+ return done;
+}
diff -up silo-1.4.14/include/silo.h.BAD silo-1.4.14/include/silo.h
--- silo-1.4.14/include/silo.h.BAD 2008-10-14 10:56:52.000000000 -0500
+++ silo-1.4.14/include/silo.h 2008-10-14 10:57:15.000000000 -0500
@@ -87,6 +87,8 @@ int silo_disk_partitionable(void);
void silo_disk_close(void);
/* printf.c */
int vprintf (char *, va_list);
+int vsprintf (char *str, char *fmt, va_list adx);
+int sprintf (char *s, char *format, ...);
int putchar (int);
/* malloc.c */
void *malloc (int);
diff -up silo-1.4.14/second/Makefile.BAD silo-1.4.14/second/Makefile
--- silo-1.4.14/second/Makefile.BAD 2008-10-14 10:57:20.000000000 -0500
+++ silo-1.4.14/second/Makefile 2008-10-14 10:58:08.000000000 -0500
@@ -58,13 +58,13 @@ fs/libfs.a: $(FS_OBJS)
$(AR) rc $@ $(FS_OBJS)
second: $(OBJS) mark.o
- $(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o
- $(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o
+ $(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
+ $(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
$(NM) second | grep -v '*ABS*' | sort > second.map
silotftp: $(OBJSNET) mark.o
- $(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o
- $(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o
+ $(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
+ $(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
$(NM) silotftp | grep -v '*ABS*' | sort > silotftp.map
second.l: second
silo-1.4.14-kernelheaders.patch:
--- NEW FILE silo-1.4.14-kernelheaders.patch ---
diff -up silo-1.4.14/include/ext2fs/ext2fs.h.BAD silo-1.4.14/include/ext2fs/ext2fs.h
--- silo-1.4.14/include/ext2fs/ext2fs.h.BAD 2008-10-14 10:53:52.000000000 -0500
+++ silo-1.4.14/include/ext2fs/ext2fs.h 2008-10-14 10:54:08.000000000 -0500
@@ -39,7 +39,7 @@ extern "C" {
*/
#define EXT2_LIB_CURRENT_REV 0
-#ifdef HAVE_SYS_TYPES_H
+#if defined(HAVE_SYS_TYPES_H) && !defined(_LINUX_TYPES_H)
#include <sys/types.h>
#endif
diff -up silo-1.4.14/second/main.c.BAD silo-1.4.14/second/main.c
--- silo-1.4.14/second/main.c.BAD 2008-10-14 10:54:17.000000000 -0500
+++ silo-1.4.14/second/main.c 2008-10-14 10:54:38.000000000 -0500
@@ -25,8 +25,7 @@
/* TODO: This file is a good candidate for rewrite from scratch. */
#include <silo.h>
-#include <asm/page.h>
-#include <linux/elf.h>
+#include <elf.h>
#include <stringops.h>
#ifndef NULL
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/silo/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Oct 2007 03:01:40 -0000 1.2
+++ .cvsignore 15 Oct 2008 14:27:51 -0000 1.3
@@ -1 +1 @@
-silo-1.4.13.tar.bz2
+silo-1.4.14.tar.bz2
Index: silo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/silo/F-9/silo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- silo.spec 14 Oct 2008 17:01:20 -0000 1.3
+++ silo.spec 15 Oct 2008 14:27:52 -0000 1.4
@@ -1,7 +1,7 @@
Summary: The SILO boot loader for SPARCs
Name: silo
-Version: 1.4.13
-Release: 9%{?dist}
+Version: 1.4.14
+Release: 1%{?dist}
License: GPLv2+
ExclusiveArch: sparcv9
Group: System Environment/Base
@@ -11,12 +11,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: silo-1.2.4-ext3.patch
-Patch2: silo-1.4.13-modernkernheaders.patch
-Patch3: silo_degraded_raid1.patch
-Patch4: silo-big-kernel.patch
-Patch5: silo-1.4.13-localheaders.patch
-Patch6: silo-1.4.14-preventoverlap.patch
+Patch0: silo-1.4.14-kernelheaders.patch
+Patch1: silo-1.4.14-gcc43.patch
+Patch2: silo-1.4.14-__sprintf_chk.patch
+Patch3: silo-1.4.14-preventoverlap.patch
%description
The silo package installs the SILO (Sparc Improved LOader) boot
@@ -26,12 +24,10 @@
%prep
%setup -q -n silo-%{version}
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
make %{?_smp_mflags}
@@ -69,8 +65,11 @@
%{_mandir}/man8/silo.8*
%changelog
-* Tue Oct 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.13-9
-- patch from pjones to prevent overflow between kernel and initrd
+* Tue Oct 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.14-1
+- update to 1.4.14
+- pick up kernelheaders and gcc43 patches from gentoo
+- fix issue with __sprintf_chk in e2fsprogs
+- add patch from Peter to prevent overlap issues btw kernel and initrd
* Sat Mar 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.13-8
- fix for no linux/elf.h
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/silo/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Oct 2007 03:01:40 -0000 1.2
+++ sources 15 Oct 2008 14:27:52 -0000 1.3
@@ -1 +1 @@
-7039aabf3c1b3858ae8d0ccdde21343e silo-1.4.13.tar.bz2
+168182dfa0025914ceecac9591a6674c silo-1.4.14.tar.bz2
--- silo-1.2.4-ext3.patch DELETED ---
--- silo-1.4.13-localheaders.patch DELETED ---
--- silo-1.4.13-modernkernheaders.patch DELETED ---
--- silo-big-kernel.patch DELETED ---
--- silo_degraded_raid1.patch DELETED ---
More information about the scm-commits
mailing list