rpms/file/devel file-4.23-ELF.patch, NONE, 1.1 file-4.23-fsdump.patch, NONE, 1.1 file-4.23-msoffice.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 file.spec, 1.66, 1.67 sources, 1.19, 1.20 file-4.13-fsdump.patch, 1.1, NONE file-4.17-bash.patch, 1.2, NONE file-4.17-powerpoint.patch, 1.1, NONE file-4.19-ELF.patch, 1.1, NONE file-4.20-unused.patch, 1.1, NONE file-4.21-core_from.patch, 1.1, NONE file-4.21-msoffice.patch, 1.1, NONE
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Tue Jan 29 08:08:10 UTC 2008
Author: tsmetana
Update of /cvs/pkgs/rpms/file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20310
Modified Files:
.cvsignore file.spec sources
Added Files:
file-4.23-ELF.patch file-4.23-fsdump.patch
file-4.23-msoffice.patch
Removed Files:
file-4.13-fsdump.patch file-4.17-bash.patch
file-4.17-powerpoint.patch file-4.19-ELF.patch
file-4.20-unused.patch file-4.21-core_from.patch
file-4.21-msoffice.patch
Log Message:
* Tue Jan 29 2008 Tomas Smetana <tsmetana at redhat.com> - 4.23-1
- new upstream version; update patches; drop unused patches
file-4.23-ELF.patch:
--- NEW FILE file-4.23-ELF.patch ---
diff -up file-4.23/src/readelf.c.ELF file-4.23/src/readelf.c
--- file-4.23/src/readelf.c.ELF 2007-12-27 17:30:52.000000000 +0100
+++ file-4.23/src/readelf.c 2008-01-28 13:28:23.000000000 +0100
@@ -45,7 +45,7 @@ private int dophn_core(struct magic_set
off_t, int *);
#endif
private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t,
- off_t, int *);
+ off_t, int *, int);
private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, int *);
private size_t donote(struct magic_set *, unsigned char *, size_t, size_t, int,
int, size_t, int *);
@@ -795,7 +795,7 @@ doshn(struct magic_set *ms, int class, i
*/
private int
dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off,
- int num, size_t size, off_t fsize, int *flags)
+ int num, size_t size, off_t fsize, int *flags, int sh_num)
{
Elf32_Phdr ph32;
Elf64_Phdr ph64;
@@ -864,6 +864,19 @@ dophn_exec(struct magic_set *ms, int cla
return -1;
align = 4;
}
+ /* If we have a section header table, handle note
+ sections just in doshn. Handling them also here
+ means that for executables we print the note content
+ twice and, more importantly, don't handle
+ strip -o created debuginfo files correctly.
+ They have PT_NOTE header, but the actual note
+ content is not present in the debuginfo file,
+ only in the original stripped executable or library.
+ The corresponding .note.* section is SHT_NOBITS
+ rather than SHT_NOTE, so doshn will not look
+ at it. */
+ if (sh_num)
+ break;
/*
* This is a PT_NOTE section; loop through all the notes
* in the section.
@@ -975,7 +988,8 @@ file_tryelf(struct magic_set *ms, int fd
fd, (off_t)getu32(swap, elfhdr.e_phoff),
getu16(swap, elfhdr.e_phnum),
(size_t)getu16(swap, elfhdr.e_phentsize),
- fsize, &flags) == -1)
+ fsize, &flags, getu16(swap, elfhdr.e_shnum))
+ == -1)
return -1;
if (doshn(ms, class, swap, fd,
(off_t)getu32(swap, elfhdr.e_shoff),
@@ -1018,7 +1032,8 @@ file_tryelf(struct magic_set *ms, int fd
(off_t)elf_getu64(swap, elfhdr.e_phoff),
getu16(swap, elfhdr.e_phnum),
(size_t)getu16(swap, elfhdr.e_phentsize),
- fsize, &flags) == -1)
+ fsize, &flags,
+ getu16(swap, elfhdr.e_shnum)) == -1)
return -1;
}
if (doshn(ms, class, swap, fd,
file-4.23-fsdump.patch:
--- NEW FILE file-4.23-fsdump.patch ---
diff -up file-4.23/magic/Makefile.in.fsdump file-4.23/magic/Makefile.in
--- file-4.23/magic/Makefile.in.fsdump 2008-01-28 11:23:20.000000000 +0100
+++ file-4.23/magic/Makefile.in 2008-01-28 11:23:35.000000000 +0100
@@ -215,10 +215,10 @@ Magdir/diamond \
Magdir/diff \
Magdir/digital \
Magdir/dolby \
-Magdir/dump \
Magdir/editors \
Magdir/efi \
Magdir/elf \
+Magdir/dump \
Magdir/encore \
Magdir/epoc \
Magdir/esri \
file-4.23-msoffice.patch:
--- NEW FILE file-4.23-msoffice.patch ---
diff -up file-4.23/magic/magic.mime.msoffice file-4.23/magic/magic.mime
--- file-4.23/magic/magic.mime.msoffice 2008-01-28 13:04:11.000000000 +0100
+++ file-4.23/magic/magic.mime 2008-01-28 13:04:11.000000000 +0100
@@ -883,6 +883,7 @@
0 string \320\317\021\340\241\261\032\341
>546 string bjbj application/msword
>546 string jbjb application/msword
+>546 default x application/msword
512 string R\0o\0o\0t\0\ \0E\0n\0t\0r\0y application/msword
@@ -891,7 +892,6 @@
2112 string MSWordDoc application/msword
#0 string \320\317\021\340\241\261\032\341 application/powerpoint
-0 string \320\317\021\340\241\261\032\341 application/msword
0 string #\ PaCkAgE\ DaTaStReAm application/x-svr4-package
diff -up file-4.23/magic/Magdir/msdos.msoffice file-4.23/magic/Magdir/msdos
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 29 May 2007 10:46:38 -0000 1.19
+++ .cvsignore 29 Jan 2008 08:07:33 -0000 1.20
@@ -1 +1 @@
-file-4.21.tar.gz
+file-4.23.tar.gz
Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/file.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- file.spec 24 Jan 2008 09:27:31 -0000 1.66
+++ file.spec 29 Jan 2008 08:07:33 -0000 1.67
@@ -4,8 +4,8 @@
Summary: A utility for determining file types
Name: file
-Version: 4.21
-Release: 5%{?dist}
+Version: 4.23
+Release: 1%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -13,19 +13,17 @@
Patch1: file-4.19-debian.patch
Patch2: file-selinux.patch
Patch3: file-4.21-magic.patch
-Patch5: file-4.13-fsdump.patch
-Patch6: file-4.13-quick.patch
-Patch8: file-4.15-berkeley.patch
-Patch12: file-4.16-xen.patch
-Patch16: file-4.21-oracle.patch
-Patch17: file-4.17-clamav.patch
-Patch20: file-4.17-bash.patch
-Patch21: file-4.19-ELF.patch
-Patch22: file-4.19-ooffice.patch
-patch23: file-4.21-core_from.patch
-patch24: file-4.21-msoffice.patch
-patch25: file-4.21-efi.patch
-patch26: file-4.21-pybuild.patch
+Patch4: file-4.23-fsdump.patch
+Patch5: file-4.13-quick.patch
+Patch6: file-4.15-berkeley.patch
+Patch7: file-4.16-xen.patch
+Patch8: file-4.21-oracle.patch
+Patch9: file-4.17-clamav.patch
+Patch10: file-4.23-ELF.patch
+Patch11: file-4.19-ooffice.patch
+patch12: file-4.23-msoffice.patch
+patch13: file-4.21-efi.patch
+patch14: file-4.21-pybuild.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,19 +71,17 @@
%patch1 -p1 -b .debian
%patch2 -p1 -b .selinux
%patch3 -p1 -b .magic
-%patch5 -p1 -b .fsdump
-%patch6 -p1 -b .quick
-%patch8 -p1 -b .berkeley
-%patch12 -p1 -b .xen
-%patch16 -p1 -b .oracle
-%patch17 -p1 -b .clamav
-%patch20 -p1 -b .bash
-%patch21 -p1 -b .ELF
-%patch22 -p1 -b .ooffice
-%patch23 -p1 -b .core_from
-%patch24 -p1 -b .msoffice
-%patch25 -p1 -b .efi
-%patch26 -p1 -b .pybuild
+%patch4 -p1 -b .fsdump
+%patch5 -p1 -b .quick
+%patch6 -p1 -b .berkeley
+%patch7 -p1 -b .xen
+%patch8 -p1 -b .oracle
+%patch9 -p1 -b .clamav
+%patch10 -p1 -b .ELF
+%patch11 -p1 -b .ooffice
+%patch12 -p1 -b .msoffice
+%patch13 -p1 -b .efi
+%patch14 -p1 -b .pybuild
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@@ -97,6 +93,7 @@
# remove hardcoded library paths from local libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/src/.libs
make
cd python
CFLAGS="%{optflags}" %{__python} setup.py build
@@ -157,6 +154,9 @@
%endif
%changelog
+* Tue Jan 29 2008 Tomas Smetana <tsmetana at redhat.com> - 4.23-1
+- new upstream version; update patches; drop unused patches
+
* Thu Jan 24 2008 Tomas Smetana <tsmetana at redhat.com> - 4.21-5
- build a separate python-magic package; thanks to Terje Rosten
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 29 May 2007 10:46:38 -0000 1.19
+++ sources 29 Jan 2008 08:07:33 -0000 1.20
@@ -1 +1 @@
-9e3503116f4269a1be70220ee2234b0e file-4.21.tar.gz
+014a69979a8d5225a6ca2bcc4d7e967e file-4.23.tar.gz
--- file-4.13-fsdump.patch DELETED ---
--- file-4.17-bash.patch DELETED ---
--- file-4.17-powerpoint.patch DELETED ---
--- file-4.19-ELF.patch DELETED ---
--- file-4.20-unused.patch DELETED ---
--- file-4.21-core_from.patch DELETED ---
--- file-4.21-msoffice.patch DELETED ---
More information about the fedora-extras-commits
mailing list