libcdio:moved into main for pisi 2.0
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
autotools.autoreconf("-vif")
|
||||
autotools.configure("--disable-static \
|
||||
--with-cd-paranoia-name=libcdio-paranoia \
|
||||
--disable-vcd-info \
|
||||
--enable-cpp-progs \
|
||||
--disable-rpath")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % (get.installDIR()))
|
||||
|
||||
pisitools.dosed("%s/usr/include/cdio/version.h" % get.installDIR(), '%s[^"]+' % get.srcVERSION(), get.srcVERSION())
|
||||
pisitools.dosed("%s/usr/include/cdio/cdio_config.h" % get.installDIR(), "#define\s(CDIO_LIBCDIO_SOURCE_PATH).*", r"#undef \1")
|
||||
|
||||
pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "THANKS")
|
||||
@@ -0,0 +1,22 @@
|
||||
diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
|
||||
--- libcdio-0.83-orig/example/C++/OO/Makefile.in 2011-10-27 18:02:31.000000000 +1000
|
||||
+++ libcdio-0.83/example/C++/OO/Makefile.in 2012-02-18 11:10:07.369277231 +1000
|
||||
@@ -315,15 +315,15 @@
|
||||
|
||||
isofile2_SOURCES = isofile2.cpp
|
||||
isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
|
||||
- $(LIBCDIOPP_LIBS) $(LTLIBICONV)
|
||||
+ $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
isolist_SOURCES = isolist.cpp
|
||||
isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
|
||||
- $(LIBCDIOPP_LIBS) $(LTLIBICONV)
|
||||
+ $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
iso4_SOURCES = iso4.cpp
|
||||
iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
|
||||
- $(LIBCDIOPP_LIBS) $(LTLIBICONV)
|
||||
+ $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
mmc1_SOURCES = mmc1.cpp
|
||||
mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)
|
||||
@@ -0,0 +1,33 @@
|
||||
From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Fergeau <cfergeau@redhat.com>
|
||||
Date: Thu, 22 Nov 2012 13:53:15 +0100
|
||||
Subject: [PATCH] udf: Don't return freed memory from udf_fopen
|
||||
|
||||
When trying to open a file located in the root directory of the
|
||||
UDF filesystem, we call udf_ff_open with the dirent corresponding
|
||||
to the root dir and the filename. In this case, udf_ff_open will
|
||||
return the same dirent as the one that was passed as argument, so
|
||||
we must not free it as we'll be returning it.
|
||||
This causes a crash with iso-read when trying to read a file located
|
||||
at the root of the image.
|
||||
---
|
||||
lib/udf/udf_fs.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c
|
||||
index 5f5add7..1e0601e 100644
|
||||
--- a/lib/udf/udf_fs.c
|
||||
+++ b/lib/udf/udf_fs.c
|
||||
@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name)
|
||||
p_udf_root->psz_name, p_udf_root->b_dir,
|
||||
p_udf_root->b_parent);
|
||||
p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token);
|
||||
- udf_dirent_free(p_udf_dirent);
|
||||
+ if (p_udf_file != p_udf_dirent)
|
||||
+ udf_dirent_free(p_udf_dirent);
|
||||
}
|
||||
else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) {
|
||||
return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf,
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libcdio</Name>
|
||||
<Homepage>http://www.gnu.org/software/libcdio/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>A library to encapsulate CD-ROM reading and control</Summary>
|
||||
<Description>This library provides an interface for CD-ROM access. It can be used by applications that need OS- and device-independent access to CD-ROM devices.</Description>
|
||||
<Archive sha1sum="530031897955729ddb7c850c183f234f7a6516b7" type="targz">mirrors://gnu/libcdio/libcdio-0.92.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libgcc</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">libcdio-0.83-linking.patch</Patch>
|
||||
<!-- <Patch level="1">udf-Dont-return-freed-memory-from-udf_fopen.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>libcdio</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libgcc</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="info">/usr/share/info</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libcdio-devel</Name>
|
||||
<Summary>Development files for libcdio</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libcdio</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2014-05-20</Date>
|
||||
<Version>0.92</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvarice@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2014-03-08</Date>
|
||||
<Version>0.90</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-07-06</Date>
|
||||
<Version>0.90</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2011-05-27</Date>
|
||||
<Version>0.82</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Pisi Linux Admins</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libcdio</Name>
|
||||
<Summary xml:lang="tr">CD-ROM okuma ve kontrol kitaplığının küçültülmüş sürümü</Summary>
|
||||
<Summary xml:lang="fr">Un librairie encapsulant la lecture et le controle du lecteur CD-ROM.</Summary>
|
||||
<Description xml:lang="tr">GNU kompakt disk girdi ve kontrol kitaplığı (libcdio) CD-ROM ve CD kalıplarına ulaşım için gerekli bir kitaplıktır.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>libcdio-devel</Name>
|
||||
<Summary xml:lang="tr">libcdio için geliştirme dosyaları</Summary>
|
||||
</Package>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user