rpms/obexftp/FC-6 obexftp-segv.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 obexftp-norpath.patch, 1.1, 1.2 obexftp-perl.patch, 1.1, 1.2 obexftp.spec, 1.2, 1.3 sources, 1.2, 1.3
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Mon Apr 23 19:49:39 UTC 2007
Author: rathann
Update of /cvs/extras/rpms/obexftp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14773
Modified Files:
.cvsignore obexftp-norpath.patch obexftp-perl.patch
obexftp.spec sources
Added Files:
obexftp-segv.patch
Log Message:
- backport update to 0.22-pre4 from devel, fixes #237414
obexftp-segv.patch:
--- NEW FILE obexftp-segv.patch ---
diff -u -rup obexftp-0.22-orig/apps/obexftpd.c obexftp-0.22/apps/obexftpd.c
--- obexftp-0.22-orig/apps/obexftpd.c 2006-07-03 02:12:30.000000000 +0200
+++ obexftp-0.22/apps/obexftpd.c 2007-03-26 11:06:07.000000000 +0200
@@ -399,7 +402,7 @@ static uint8_t* easy_readfile(const char
return NULL;
}
- buf = malloc(sizeof(*file_size));
+ buf = malloc(*file_size);
if(buf == NULL)
{
return NULL;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obexftp/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 26 Jan 2007 02:13:45 -0000 1.2
+++ .cvsignore 23 Apr 2007 19:49:04 -0000 1.3
@@ -1 +1 @@
-obexftp-0.20.tar.bz2
+obexftp-0.22-pre4.tar.bz2
obexftp-norpath.patch:
Index: obexftp-norpath.patch
===================================================================
RCS file: /cvs/extras/rpms/obexftp/FC-6/obexftp-norpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obexftp-norpath.patch 26 Jan 2007 02:13:45 -0000 1.1
+++ obexftp-norpath.patch 23 Apr 2007 19:49:04 -0000 1.2
@@ -1,11 +1,11 @@
---- obexftp-0.20/swig/perl/Makefile.PL.in.norpath 2005-12-12 19:46:55.000000000 +0100
-+++ obexftp-0.20/swig/perl/Makefile.PL.in 2007-01-26 00:26:13.000000000 +0100
+--- obexftp-0.22/swig/perl/Makefile.PL.in.norpath 2006-05-28 23:44:56.000000000 +0200
++++ obexftp-0.22/swig/perl/Makefile.PL.in 2007-03-23 00:36:59.000000000 +0100
@@ -11,7 +11,7 @@
- 'INC' => q[-I at top_srcdir@/obexftp -I../.. @CPPFLAGS@],
+ 'INC' => q[-I at top_srcdir@ @CPPFLAGS@],
# Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib"
# but we want rpath to be @libdir@ or @exec_prefix@/lib
-- 'LDDLFLAGS' => q[-shared -Wl,-L at top_builddir@obexftp/.libs -Wl,-rpath=@prefix@/lib],
-+ 'LDDLFLAGS' => q[-shared -Wl,-L at top_builddir@obexftp/.libs],
- 'LIBS' => q[-L at top_builddir@obexftp/.libs -lobexftp -L at top_builddir@multicobex/.libs -lmulticobex -L at top_builddir@bfb/.libs -lbfb @OPENOBEX_LIBS@ @BLUETOOTH_LIBS@ @LIBS@],
- 'OBJECT' => 'perl_wrap.o',
- 'NAME' => 'OBEXFTP',
+- 'LDDLFLAGS' => q[-shared -Wl,-rpath=@prefix@/lib],
++ 'LDDLFLAGS' => q[-shared],
+ 'LIBS' => q[-L at top_builddir@obexftp/.libs -lobexftp
+ -L at top_builddir@multicobex/.libs -lmulticobex
+ -L at top_builddir@bfb/.libs -lbfb
obexftp-perl.patch:
Index: obexftp-perl.patch
===================================================================
RCS file: /cvs/extras/rpms/obexftp/FC-6/obexftp-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obexftp-perl.patch 26 Jan 2007 02:13:45 -0000 1.1
+++ obexftp-perl.patch 23 Apr 2007 19:49:04 -0000 1.2
@@ -1,11 +1,11 @@
---- obexftp-0.20/swig/perl/Makefile.am.p 2006-03-26 00:12:58.000000000 +0100
-+++ obexftp-0.20/swig/perl/Makefile.am 2007-01-26 02:26:26.000000000 +0100
-@@ -27,7 +27,7 @@
+--- obexftp-0.22/swig/perl/Makefile.am.p 2006-10-22 15:31:38.000000000 +0200
++++ obexftp-0.22/swig/perl/Makefile.am 2007-03-23 00:39:29.000000000 +0100
+@@ -9,7 +9,7 @@
endif
Makefile.perl: Makefile.PL
-- $(PERL) $< MAKEFILE=$@
-+ $(PERL) $< MAKEFILE=$@ INSTALLDIRS="vendor"
+- $(PERL) $< PREFIX=$(prefix) MAKEFILE=$@
++ $(PERL) $< PREFIX=$(prefix) MAKEFILE=$@ INSTALLDIRS="vendor"
OBEXFTP.so: perl_wrap.c Makefile.perl
- $(MAKE) -fMakefile.perl
+ if test ! -f perl_wrap.c; then cp $(srcdir)/perl_wrap.c . ; fi
Index: obexftp.spec
===================================================================
RCS file: /cvs/extras/rpms/obexftp/FC-6/obexftp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obexftp.spec 26 Jan 2007 20:31:51 -0000 1.2
+++ obexftp.spec 23 Apr 2007 19:49:04 -0000 1.3
@@ -1,16 +1,19 @@
%define python_sitelib %(%{__python} -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
+%define pre pre4
+
Name: obexftp
Summary: Tool to access devices via the OBEX protocol
Group: Applications/File
-Version: 0.20
-Release: 3%{?dist}
+Version: 0.22
+Release: 0.1.%{pre}%{?dist}
License: GPL
URL: http://openobex.triq.net/
-Source: http://dl.sf.net/openobex/obexftp-%{version}.tar.bz2
+Source: http://triq.net/obexftp/%{name}-%{version}-%{pre}.tar.bz2
Patch0: %{name}-norpath.patch
Patch1: %{name}-perl.patch
+Patch2: %{name}-segv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: bluez-libs-devel
BuildRequires: openobex-devel >= 1.2
@@ -65,10 +68,9 @@
%setup -q
%patch0 -p1 -b .norpath
%patch1 -p1 -b .p
+%patch2 -p1 -b .segv
%build
-# autoreconf bails out without config.rpath on fc7/devel
-touch config.rpath
autoreconf -f -i
%configure --disable-static --disable-dependency-tracking --disable-rpath
%{__make} %{?_smp_mflags}
@@ -80,6 +82,7 @@
%{__rm} %{buildroot}%{_libdir}/*.la
%{__rm} %{buildroot}%{python_sitearch}/obexftp/*.la
+%{__rm} %{buildroot}%{python_sitelib}/obexftp/python_wrap.c
%{__rm} %{buildroot}%{perl_archlib}/perllocal.pod
%{__rm} -f %{buildroot}%{perl_vendorarch}/*/OBEXFTP/{.packlist,OBEXFTP.bs}
@@ -119,6 +122,9 @@
%{perl_vendorarch}/*/OBEXFTP/OBEXFTP.so
%changelog
+* Mon Apr 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.22-0.1.pre4
+- backport update to 0.22-pre4 from devel, fixes #237414
+
* Fri Jan 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.20-3
- add missing disttag
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obexftp/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 26 Jan 2007 02:13:45 -0000 1.2
+++ sources 23 Apr 2007 19:49:04 -0000 1.3
@@ -1 +1 @@
-86224a7a1880c25e9ba0b8997a97d299 obexftp-0.20.tar.bz2
+9b56432cf365f30effbebfa74a2bfff3 obexftp-0.22-pre4.tar.bz2
More information about the scm-commits
mailing list