[packages/libmikmod] - updated to 3.1.17 (fixes CVE-2007-6720 CVE-2009-0179 CVE-2009-3995 CVE-2010-2546) - removed obsole
qboosh
qboosh at pld-linux.org
Sun May 18 17:15:11 CEST 2014
commit fc467a49dc6fd4d79664fab826efa3dfdb3e9aab
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 18 17:18:02 2014 +0200
- updated to 3.1.17 (fixes CVE-2007-6720 CVE-2009-0179 CVE-2009-3995 CVE-2010-2546)
- removed obsolete AC_LIBOBJ,install-exec,lib64 patches
- introduced .pc file
install-exec.patch | 11 ----------
libmikmod-AC_LIBOBJ.patch | 31 --------------------------
libmikmod-lib64.patch | 11 ----------
libmikmod.spec | 55 +++++++++++++++++++++--------------------------
4 files changed, 24 insertions(+), 84 deletions(-)
---
diff --git a/libmikmod.spec b/libmikmod.spec
index 119af82..90a0d3d 100644
--- a/libmikmod.spec
+++ b/libmikmod.spec
@@ -1,7 +1,7 @@
#
# Conditional build:
%bcond_with alsa # ALSA support; warning: SIGSEGV while using oss
-%bcond_with esd # EsounD support
+%bcond_with esd # EsounD support
Summary: libmikmod - a portable sound library for Unix
Summary(es.UTF-8): Biblioteca de sonidos libmikmod
@@ -11,22 +11,18 @@ Summary(pt_BR.UTF-8): Biblioteca de som libmikmod
Summary(ru.UTF-8): Звуковая библиотека libmikmod
Summary(uk.UTF-8): Звукова бібліотека libmikmod
Name: libmikmod
-Version: 3.1.12
-Release: 4
+Version: 3.1.17
+Release: 1
License: LGPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/mikmod/%{name}-%{version}.tar.gz
-# Source0-md5: 9f3c740298260d5f88981fc0d51f6f16
+# Source0-md5: 89b4f370ea1771c99e607cc6d7aff435
Patch0: %{name}-info.patch
-Patch1: %{name}-AC_LIBOBJ.patch
-Patch2: install-exec.patch
-Patch3: %{name}-lib64.patch
URL: http://mikmod.raphnet.net/
%{?with_alsa:BuildRequires: alsa-lib-devel}
-BuildRequires: audiofile-devel
-BuildRequires: autoconf >= 2.53
-BuildRequires: automake
-%{?with_esd:BuildRequires: esound-devel}
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.10
+%{?with_esd:BuildRequires: esound-devel >= 0.2.18}
BuildRequires: gettext-devel >= 0.10.35-9
BuildRequires: libtool
BuildRequires: pkgconfig
@@ -76,11 +72,11 @@ Переносима звукова бібліотека для *nix, здатн
"модулі" на великій кількості звукових пристроїв.
%package devel
-Summary: Libraries and include files to develop libmikmod applications
-Summary(es.UTF-8): Archivos de inclusión y bibliotecas para desarrollar aplicaciones libmikmod
-Summary(fr.UTF-8): Bibliothèques et includes pour programmer pour libmikmod
-Summary(pl.UTF-8): Biblioteki i pliki nagłówkowe dla libmikmod
-Summary(pt_BR.UTF-8): Arquivos de inclusão e bibliotecas para desenvolver aplicações libmikmod
+Summary: Include files to develop libmikmod applications
+Summary(es.UTF-8): Archivos de inclusión para desarrollar aplicaciones libmikmod
+Summary(fr.UTF-8): Includes pour programmer pour libmikmod
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libmikmod
+Summary(pt_BR.UTF-8): Arquivos de inclusão para desenvolver aplicações libmikmod
Summary(ru.UTF-8): .h-файлы для разработки libmikmod-приложений
Summary(uk.UTF-8): .h-файли для розробки програм, що користуються libmikmod
Group: Development/Libraries
@@ -88,21 +84,20 @@ Requires: %{name} = %{version}-%{release}
Obsoletes: libmikmod2-devel
%description devel
-Libraries and include files to develop libmikmod applications.
+Include files to develop libmikmod applications.
%description devel -l es.UTF-8
-Archivos de inclusión y bibliotecas para desarrollar aplicaciones
-libmikmod.
+Archivos de inclusión para desarrollar aplicaciones libmikmod.
%description devel -l fr.UTF-8
-Bibliothèques et includes pour programmer pour libmikmod.
+Includes pour programmer pour libmikmod.
%description devel -l pl.UTF-8
-Biblioteki i pliki nagłówkowe do tworzenia aplikacji dla libmikmod.
+Pliki nagłówkowe do tworzenia aplikacji wykorzystujących bibliotekę
+libmikmod.
%description devel -l pt_BR.UTF-8
-Arquivos de inclusão e bibliotecas para desenvolver aplicações
-libmikmod.
+Arquivos de inclusão para desenvolver aplicações libmikmod.
%description devel -l ru.UTF-8
.h-файлы для разработки libmikmod-приложений.
@@ -111,9 +106,9 @@ libmikmod.
.h-файли для розробки програм, що користуються libmikmod.
%package static
-Summary: Static libmikmod libraries
+Summary: Static libmikmod library
Summary(fr.UTF-8): Bibliothèques statiques libmikmod
-Summary(pl.UTF-8): Biblioteki statyczne libmikmod
+Summary(pl.UTF-8): Biblioteka statyczna libmikmod
Summary(pt_BR.UTF-8): Bibliotecas estáticas para desenvolvimento com libmikmod
Summary(ru.UTF-8): Статические библиотеки для разработки libmikmod-приложений
Summary(uk.UTF-8): Статичні бібліотеки для розробки програм, що користуються libmikmod
@@ -121,13 +116,13 @@ Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
-Static libmikmod libraries.
+Static libmikmod library.
%description static -l fr.UTF-8
Bibliothèques statiques libmikmod.
%description static -l pl.UTF-8
-Biblioteki statyczne libmikmod.
+Biblioteka statyczna libmikmod.
%description static -l pt_BR.UTF-8
Bibliotecas estáticas para desenvolvimento com libmikmod.
@@ -141,21 +136,18 @@ Статичні бібліотеки для розробки програм, щ
%prep
%setup -q
%patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p0
%if %{without esd}
echo 'AC_DEFUN([AM_PATH_ESD],[$3])' >> acinclude.m4
%endif
%build
-#cp -f /usr/share/automake/{config.*,missing} .
%{__libtoolize}
%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
+# note: audiofile (af) driver is for DEC AudioFile server (libAF), not libaudiofile library
%configure \
%{!?with_alsa:--disable-alsa} \
%{!?with_esound:--disable-esd} \
@@ -193,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libmikmod.so
%{_libdir}/libmikmod.la
%{_includedir}/mikmod.h
+%{_pkgconfigdir}/libmikmod.pc
%{_aclocaldir}/libmikmod.m4
%{_mandir}/man1/libmikmod-config.1*
%{_infodir}/mikmod.info*
diff --git a/install-exec.patch b/install-exec.patch
deleted file mode 100644
index 3d230b4..0000000
--- a/install-exec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmikmod-3.1.12/libmikmod/Makefile.in~ 2011-07-10 19:03:26.000000000 +0300
-+++ libmikmod-3.1.12/libmikmod/Makefile.in 2011-07-10 19:07:18.167133434 +0300
-@@ -51,7 +51,7 @@
-
- install: $(LIB)
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-- $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
-
- uninstall: $(LIB)
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)
diff --git a/libmikmod-AC_LIBOBJ.patch b/libmikmod-AC_LIBOBJ.patch
deleted file mode 100644
index b4ab35c..0000000
--- a/libmikmod-AC_LIBOBJ.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libmikmod-3.1.10/libmikmod/Makefile.in.orig 2002-01-23 23:15:14.000000000 +0100
-+++ libmikmod-3.1.10/libmikmod/Makefile.in 2003-12-21 18:06:09.358750392 +0100
-@@ -20,7 +20,7 @@
- VPATH = @srcdir@
-
- DLOBJS=@DLOBJS@
--LIBOBJS=@LIBOBJS@
-+LTLIBOBJS=@LTLIBOBJS@
- LIBRARY_LIB=@LIBRARY_LIB@
-
- CC=@CC@
-@@ -33,7 +33,7 @@
- COMPILE=$(LIBTOOL) --silent --mode=compile $(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h
-
- LIB = libmikmod.la
--OBJ = $(LIBOBJS) $(DLOBJS) \
-+OBJ = $(LTLIBOBJS) $(DLOBJS) \
- drv_AF.lo drv_aix.lo drv_alsa.lo drv_esd.lo drv_hp.lo drv_nos.lo \
- drv_oss.lo drv_pipe.lo drv_raw.lo drv_sam9407.lo drv_sgi.lo \
- drv_stdout.lo drv_sun.lo drv_ultra.lo drv_wav.lo \
---- libmikmod-3.1.10/configure.in.orig 2002-01-22 02:29:27.000000000 +0100
-+++ libmikmod-3.1.10/configure.in 2003-12-21 18:06:27.654968944 +0100
-@@ -376,8 +376,6 @@
-
- AC_CHECK_FUNCS(setenv snprintf srandom)
- AC_REPLACE_FUNCS(strcasecmp strdup strstr)
--# Change extension, as we use libtool
--LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
-
- AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H))
-
diff --git a/libmikmod-lib64.patch b/libmikmod-lib64.patch
deleted file mode 100644
index cdc381c..0000000
--- a/libmikmod-lib64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmikmod-config.in.orig 2011-07-28 20:56:19.206272199 +0200
-+++ libmikmod-config.in 2011-07-28 20:56:30.306288452 +0200
-@@ -49,7 +49,7 @@
- echo @LIB_LDADD@
- ;;
- --libs)
-- libdir=-L${exec_prefix}/lib
-+ libdir=-L at libdir@
- echo $libdir -lmikmod @LIBRARY_LIB@
- ;;
- *)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmikmod.git/commitdiff/fc467a49dc6fd4d79664fab826efa3dfdb3e9aab
More information about the pld-cvs-commit
mailing list