[packages/libelf: 2/2] - updated to current version (0.8.13); note that it's currently not used in PLD
qboosh
qboosh at pld-linux.org
Tue Mar 26 17:25:28 CET 2013
commit 2a88245a78a6983fda2ea15ffb1d0dd014baac63
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Mar 26 17:24:22 2013 +0100
- updated to current version (0.8.13); note that it's currently not used in PLD
libelf-DESTDIR.patch | 114 ---------------------------------------------------
libelf-hash.patch | 24 +++++------
libelf-symver.patch | 30 --------------
libelf.spec | 36 ++++++++--------
4 files changed, 30 insertions(+), 174 deletions(-)
---
diff --git a/libelf.spec b/libelf.spec
index a2c838b..0918886 100644
--- a/libelf.spec
+++ b/libelf.spec
@@ -1,3 +1,4 @@
+# NOTE: PLD uses elfutils currently
Summary: ELF object file access library
Summary(de): Objektdateizugriffs-Library ELF
Summary(pt_BR): Biblioteca para acesso a arquivos objeto ELF
@@ -9,19 +10,18 @@ Summary(ru): âÉÂĚÉĎÔĹËÁ ÄĎÓÔŐĐÁ Ë ĎÂßĹËÔÎŮÍ ĆÁĘĚ
Summary(tr): ELF ara kod eriţim kitaplýđý
Summary(uk): âŚÂĚŚĎÔĹËÁ ÄĎÓÔŐĐŐ ÄĎ ĎÂ'¤ËÔÎÉČ ĆÁĘĚŚ× ĆĎŇÍÁÔŐ ELF
Name: libelf
-Version: 0.8.2
-Release: 4
-License: LGPL
+Version: 0.8.13
+Release: 0.1
+License: LGPL v2+
Group: Libraries
-Source0: http://www.stud.uni-hannover.de/~michael/software/%{name}-%{version}.tar.gz
-Patch0: %{name}-DESTDIR.patch
-Patch1: %{name}-hash.patch
-Patch2: %{name}-symver.patch
-URL: http://www.stud.uni-hannover.de/~michael/software/
-BuildRequires: autoconf
+Source0: http://www.mr511.de/software/%{name}-%{version}.tar.gz
+# Source0-md5: 4136d7b4c04df68b686570afa26988ac
+Patch0: %{name}-hash.patch
+URL: http://www.mr511.de/software/english.html
+BuildRequires: autoconf >= 2.13
BuildRequires: automake
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: libelf0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
The libelf package contains a library for accessing ELF object files.
@@ -79,7 +79,7 @@ Summary(pl): Pliki dla programistów libelf
Summary(ru): ćÁĘĚŮ ÄĚŃ ŇÁÚŇÁÂĎÔËÉ Ó ÉÓĐĎĚŘÚĎ×ÁÎÉĹÍ ÂÉÂĚÉĎÔĹËÉ libelf
Summary(uk): ćÁĘĚÉ ÄĚŃ ŇĎÚŇĎÂËÉ Ú ×ÉËĎŇÉÓÔÁÎÎŃÍ ÂŚÂĚŚĎÔĹËÉ libelf
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
Obsoletes: libelf0-devel
%description devel
@@ -102,7 +102,7 @@ Summary(pl): Statyczna biblioteka libelf
Summary(ru): óÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ŇÁÚŇÁÂĎÔËÉ Ó ÉÓĐĎĚŘÚĎ×ÁÎÉĹÍ libelf
Summary(uk): óÔÁÔÉŢÎŚ ÂŚÂĚŚĎÔĹËÉ ÄĚŃ ŇĎÚŇĎÂËÉ Ú ×ÉËĎŇÉÓÔÁÎÎŃÍ libelf
Group: Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{version}-%{release}
%description static
Static libelf library.
@@ -119,8 +119,6 @@ Statyczna biblioteka libelf.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
install -m755 /usr/share/automake/config.{sub,guess} .
@@ -134,7 +132,7 @@ install -m755 /usr/share/automake/config.{sub,guess} .
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ instroot=$RPM_BUILD_ROOT
%find_lang %{name}
@@ -146,13 +144,15 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc ChangeLog README
+%attr(755,root,root) %{_libdir}/libelf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libelf.so.0
%files devel
%defattr(644,root,root,755)
-%doc README
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libelf.so
%{_includedir}/libelf
+%{_pkgconfigdir}/libelf.pc
%files static
%defattr(644,root,root,755)
diff --git a/libelf-DESTDIR.patch b/libelf-DESTDIR.patch
deleted file mode 100644
index bc929b5..0000000
--- a/libelf-DESTDIR.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- libelf-0.8.2/lib/Makefile.in.orig Sat Oct 13 23:35:22 2001
-+++ libelf-0.8.2/lib/Makefile.in Fri Jul 26 01:16:42 2002
-@@ -21,7 +21,6 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- includedir = @includedir@
--installdirs = $(libdir) $(includedir) $(includedir)/libelf
-
- CC = @CC@
- LD = @LD@
-@@ -164,20 +163,18 @@
- @$(RM) -r $(picdir)
- mkdir $(picdir)
-
--install: all installdirs install-data \
-+install: all install-data \
- install-shared-$(DO_SHLIB) install-compat-$(DO_COMPAT)
-
--installdirs: $(top_srcdir)/mkinstalldirs
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(installdirs)
--
- install-data:
-- $(INSTALL_DATA) libelf.a $(libdir)
-+ $(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/libelf
-+ $(INSTALL_DATA) libelf.a $(DESTDIR)$(libdir)
- -cd $(libdir) && $(RANLIB) libelf.a
- files="$(HDRS) $(AUXHDRS) elf_repl.h"; for file in $$files; do \
- if test -r $$file; then \
-- $(INSTALL_DATA) $$file $(includedir)/libelf; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/libelf; \
- else \
-- $(INSTALL_DATA) $(srcdir)/$$file $(includedir)/libelf; \
-+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(includedir)/libelf; \
- fi; \
- done
-
-@@ -185,31 +182,33 @@
- uninstall-shared-$(DO_SHLIB) uninstall-compat-$(DO_COMPAT)
-
- uninstall-data:
-- $(RM) $(libdir)/libelf.a
-- $(RM) -r $(includedir)/libelf
-+ $(RM) $(DESTDIR)$(libdir)/libelf.a
-+ $(RM) -r $(DESTDIR)$(includedir)/libelf
-
- install-shared-yes: install-shared
- install-shared-no:
- install-shared: $(SHLIB)
-- $(INSTALL_SHLIB) $(SHLIB) $(libdir)
-+ $(INSTALL) -d $(DESTDIR)$(libdir)
-+ $(INSTALL_SHLIB) $(SHLIB) $(DESTDIR)$(libdir)
- if test "$(SONAME)" = "$(SHLIB)"; then true; else \
-- cd $(libdir) && $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \
-+ cd $(DESTDIR)$(libdir) && $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \
- fi
- if test "$(SHLINK)" = "$(SHLIB)"; then true; else \
-- cd $(libdir) && $(RM) $(SHLINK) && $(LN_S) $(SHLIB) $(SHLINK); \
-+ cd $(DESTDIR)$(libdir) && $(RM) $(SHLINK) && $(LN_S) $(SHLIB) $(SHLINK); \
- fi
-
- uninstall-shared-yes: uninstall-shared
- uninstall-shared-no:
- uninstall-shared:
-- cd $(libdir) && $(RM) $(SHLIB) $(SONAME) $(SHLINK)
-+ cd $(DESTDIR)$(libdir) && $(RM) $(SHLIB) $(SONAME) $(SHLINK)
-
- install-compat-yes: install-compat
- install-compat-no:
- install-compat:
-+ $(INSTALL) -d $(DESTDIR)$(includedir)
- files="$(HDRS)"; for file in $$files; do \
-- if test -f $(includedir)/$$file; then true; else \
-- echo "#include <libelf/$$file>" > $(includedir)/$$file; \
-+ if test -f $(DESTDIR)$(includedir)/$$file; then true; else \
-+ echo "#include <libelf/$$file>" > $(DESTDIR)$(includedir)/$$file; \
- fi; \
- done
-
-@@ -217,8 +216,8 @@
- uninstall-compat-no:
- uninstall-compat:
- files="$(HDRS)"; for file in $$files; do \
-- if grep "^#include <libelf/$$file>$" $(includedir)/$$file >/dev/null 2>&1; then \
-- $(RM) $(includedir)/$$file; \
-+ if grep "^#include <libelf/$$file>$" $(DESTDIR)$(includedir)/$$file >/dev/null 2>&1; then \
-+ $(RM) $(DESTDIR)$(includedir)/$$file; \
- else true; fi; \
- done
-
---- libelf-0.8.2/po/Makefile.in~ Fri Jul 26 01:29:01 2002
-+++ libelf-0.8.2/po/Makefile.in Fri Jul 26 01:27:42 2002
-@@ -91,18 +91,18 @@
- catalogs="$(CATALOGS)"; for cat in $$catalogs; do \
- lang=`echo $$cat | sed 's,$(CATOBJEXT)$$,,'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
- if test -r $$cat; then \
-- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
- else \
-- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+ $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
- fi; \
- done
-
- uninstall:
- catalogs="$(CATALOGS)"; for cat in $$catalogs; do \
- lang=`echo $$cat | sed 's,$(CATOBJEXT)$$,,'`; \
-- $(RM) $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+ $(RM) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- done
-
- mostlyclean:
diff --git a/libelf-hash.patch b/libelf-hash.patch
index 7fcf7f3..376bd31 100644
--- a/libelf-hash.patch
+++ b/libelf-hash.patch
@@ -4,17 +4,17 @@
unconditionally for ELF64 - some platforms use
64 bit DT_HASH entries.
---- libelf-0.7.0/lib/update.c.jj Fri Jun 12 15:42:39 1998
-+++ libelf-0.7.0/lib/update.c Fri Jun 14 10:22:19 2002
-@@ -317,7 +317,10 @@ _elf64_layout(Elf *elf, unsigned *flag)
-
- entsize = scn_entsize(elf, version, shdr->sh_type);
- if (entsize > 1) {
-- rewrite(shdr->sh_entsize, entsize, scn->s_shdr_flags);
-+ /* Some architectures use 64-bit hash entries. */
-+ if (shdr->sh_type != SHT_HASH
-+ || shdr->sh_entsize != _fsize(elf->e_class, version, ELF_T_ADDR))
-+ rewrite(shdr->sh_entsize, entsize, scn->s_shdr_flags);
+--- libelf-0.8.13/lib/update.c.orig 2013-03-26 17:10:01.534549234 +0100
++++ libelf-0.8.13/lib/update.c 2013-03-26 17:12:06.191210669 +0100
+@@ -224,7 +224,10 @@ _elf64_layout(Elf *elf, unsigned *flag)
+ if (shdr->sh_entsize == 0) {
+ entsize = scn_entsize(elf, version, shdr->sh_type);
+ if (entsize > 1) {
+- rewrite(shdr->sh_entsize, entsize, scn->s_shdr_flags);
++ /* Some architectures use 64-bit hash entries. */
++ if (shdr->sh_type != SHT_HASH
++ || shdr->sh_entsize != _fsize(elf->e_class, version, ELF_T_ADDR))
++ rewrite(shdr->sh_entsize, entsize, scn->s_shdr_flags);
+ }
}
- if (layout) {
diff --git a/libelf-symver.patch b/libelf-symver.patch
deleted file mode 100644
index 09f01ce..0000000
--- a/libelf-symver.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-2002-08-26 Jakub Jelinek <jakub at redhat.com>
-
- * lib/verdef.h (xlt_verdef): Don't crash if calculating size of
- section which hasn't been loaded yet.
- * lib/verneed.h (xlt_verneed): Likewise.
-
---- libelf-0.8.2/lib/verdef.h.jj 2001-10-07 22:03:02.000000000 +0200
-+++ libelf-0.8.2/lib/verdef.h 2002-08-26 19:04:54.000000000 +0200
-@@ -138,6 +138,9 @@ xlt_verdef(unsigned char *dst, const uns
- if (n < sizeof(verdef_stype)) {
- return 0;
- }
-+ if (dst == NULL && src == NULL) {
-+ return n;
-+ }
- soff = doff = 0;
- for (;;) {
- const verdef_stype *svd;
---- libelf-0.8.2/lib/verneed.h.jj 2001-10-07 22:03:02.000000000 +0200
-+++ libelf-0.8.2/lib/verneed.h 2002-08-26 19:05:18.000000000 +0200
-@@ -142,6 +142,9 @@ xlt_verneed(unsigned char *dst, const un
- if (n < sizeof(verneed_stype)) {
- return 0;
- }
-+ if (dst == NULL && src == NULL) {
-+ return n;
-+ }
- soff = doff = 0;
- for (;;) {
- const verneed_stype *svn;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libelf.git/commitdiff/2a88245a78a6983fda2ea15ffb1d0dd014baac63
More information about the pld-cvs-commit
mailing list