SHA256
1
0
forked from pool/file

Accepting request 52279 from home:elvigia:branches:Base:System

Patch is OK but please also try to get it upstream

OBS-URL: https://build.opensuse.org/request/show/52279
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=19
This commit is contained in:
Philipp Thomas 2010-11-08 12:55:33 +00:00 committed by Git OBS Bridge
parent 4b544c9fac
commit 0df72c03e9
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,31 @@
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -11,7 +11,7 @@ libmagic_la_SOURCES = magic.c apprentice
encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c \
file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h
-libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libmagic_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmagic.map -no-undefined -version-info 1:0:0
libmagic_la_LIBADD = $(LTLIBOBJS)
file_SOURCES = file.c
--- /dev/null
+++ src/libmagic.map
@@ -0,0 +1,16 @@
+{
+global:
+ magic_buffer;
+ magic_check;
+ magic_close;
+ magic_compile;
+ magic_descriptor;
+ magic_errno;
+ magic_error;
+ magic_file;
+ magic_getpath;
+ magic_load;
+ magic_open;
+ magic_setflags;
+local: *;
+};
\ No newline at end of file

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 5 22:41:23 UTC 2010 - cristian.rodriguez@opensuse.org
- libmagic: export only public interface symbols listed
in magic.h, this also avoids exporting interesting stuff
like strlcat, strlcpy...
-------------------------------------------------------------------
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

View File

@ -59,6 +59,7 @@ Patch26: file-4.24-solv.dif
Patch27: file-5.04-zip2.0.dif
Patch28: file-5.03-iso9660.dif
Patch29: file-5.04-llvm.dif
Patch30: file-5.04-visibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -125,7 +126,7 @@ Authors:
%patch28 -p0 -b .iso9600
%patch29 -p0 -b .llvm
%patch
%patch30
%build
export LANG=POSIX
export LC_ALL=POSIX