[packages/obexftp] - updated to 0.24.2

qboosh qboosh at pld-linux.org
Sat Sep 6 16:41:42 CEST 2025 

commit 5f133351a7b597e61c08c3c98556812869cf89bb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 6 16:44:30 2025 +0200

    - updated to 0.24.2

 am.patch                |  11 ----
 format-security.patch   |  22 --------
 includes.patch          |  30 ----------
 obexftp-no_server.patch |  12 ----
 obexftp-nostress.patch  |  10 ----
 obexftp-perl.patch      |  19 -------
 obexftp-python.patch    |  19 +++++++
 obexftp-ruby1.9.patch   |  34 ------------
 obexftp.spec            | 145 ++++++++++++++++++++++++++----------------------
 types.patch             |  11 ----
 10 files changed, 99 insertions(+), 214 deletions(-)
---
diff --git a/obexftp.spec b/obexftp.spec
index b92d128..c687fa8 100644
--- a/obexftp.spec
+++ b/obexftp.spec
@@ -1,26 +1,22 @@
+#
+# Conditional build:
+%bcond_without	static_libs	# static libraries
+
 Summary:	File copying over the Object Exchange (OBEX) protocol
 Summary(pl.UTF-8):	Kopiowanie plików z wykorzystaniem protokołu Object Exchange (OBEX)
 Name:		obexftp
-Version:	0.23
-Release:	31
+Version:	0.24.2
+Release:	1
 License:	GPL v2+ (server, bindings), LGPL v2+ (libraries)
 Group:		Applications/Communications
-Source0:	http://dl.sourceforge.net/openobex/%{name}-%{version}.tar.bz2
-# Source0-md5:	f20762061b68bc921e80be4aebc349eb
-Patch0:		%{name}-no_server.patch
+Source0:	https://downloads.sourceforge.net/openobex/%{name}-%{version}-Source.tar.gz
+# Source0-md5:	157a9d1b2ed220203f7084db906de73c
+Patch0:		%{name}-python.patch
 Patch1:		%{name}-perl.patch
-Patch2:		%{name}-nostress.patch
-Patch3:		%{name}-ruby1.9.patch
-Patch4:		am.patch
-Patch5:		format-security.patch
-Patch6:		includes.patch
-Patch7:		types.patch
-URL:		http://triq.net/obex/
-BuildRequires:	autoconf
-BuildRequires:	automake
+URL:		http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp/
+BuildRequires:	asciidoc
 BuildRequires:	bluez-libs-devel
 BuildRequires:	gettext-tools
-BuildRequires:	libtool
 BuildRequires:	openobex-devel
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	pkgconfig
@@ -30,11 +26,10 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby-devel
 BuildRequires:	tcl-devel
+BuildRequires:	xmlto
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		skip_post_check_so	obexftp.so.0.0.0
-
 %description
 Free open source application for file copying over the Object Exchange
 (OBEX) protocol.
@@ -43,22 +38,33 @@ Free open source application for file copying over the Object Exchange
 Wolnodostępna aplikacja służąca do kopiowania plików z wykorzystaniem
 protokołu Object Exchange (OBEX).
 
+%package -n obexfs
+Summary:	ObexFTP filesystem
+Summary(pl.UTF-8):	System plików ObexFTP
+Group:		Applications/System
+
+%description -n obexfs
+FUSE based filesystem using ObexFTP.
+
+%description -n obexfs -l pl.UTF-8
+System plików używający ObexFTP oparty na FUSE.
+
 %package libs
-Summary:	ObexFTP libraries
-Summary(pl.UTF-8):	Biblioteki ObexFTP
+Summary:	OBEX file transfer libraries
+Summary(pl.UTF-8):	Biblioteki transmisji plików OBEX
 License:	LGPL v2+
 Group:		Libraries
 
 %description libs
-ObexFTP libraries.
+OBEX file transfer libraries.
 
 %description libs -l pl.UTF-8
-Biblioteki ObexFTP.
+Biblioteki transmisji plików OBEX.
 
 %package devel
-Summary:	Header files for ObexFTP
+Summary:	Header files for OBEX file transfer libraries
 Summary(es.UTF-8):	Ficheros de cabecera para ObexFTP
-Summary(pl.UTF-8):	Pliki nagłówkowe ObexFTP
+Summary(pl.UTF-8):	Pliki nagłówkowe transmisji plików OBEX
 License:	LGPL v2+
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
@@ -74,18 +80,18 @@ W pakiecie tym znajdują się pliki nagłówkowe, przeznaczone do
 rozwijania programów bazujących na bibliotekach ObexFTP.
 
 %package static
-Summary:	Static ObexFTP library
+Summary:	Static OBEX file transfer libraries
 Summary(es.UTF-8):	Biblioteca estática de ObexFTP
-Summary(pl.UTF-8):	Biblioteka statyczna ObexFTP
+Summary(pl.UTF-8):	Statyczne biblioteki transmisji plików OBEX
 License:	LGPL v2+
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static ObexFTP library.
+Static OBEX file transfer libraries.
 
 %description static -l pl.UTF-8
-Biblioteka statyczna ObexFTP.
+Statyczne biblioteki transmisji plików OBEX.
 
 %package -n perl-obexftp
 Summary:	Perl binding for ObexFTP library
@@ -143,39 +149,51 @@ Tcl binding for ObexFTP library.
 Wiązanie Tcl-a dla biblioteki ObexFTP.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-Source
 %patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
-%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-
-# hack for -L/usr/%{_lib} before -L../../obexftp/.libs
-ln -sf ../../obexftp/.libs/libobexftp.so swig/ruby
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	PYTHON="%{__python}"
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DENABLE_PERL=OFF \
+	-DENABLE_PYTHON=OFF \
+	-DENABLE_RUBY=OFF
+
+for dir in bfb multicobex obexftp ; do
+	%{__make} -C $dir
+done
+cd ..
+%endif
+
+install -d build
+cd build
+%cmake .. \
+	-DCMAKE_INSTALL_INCLUDEDIR=include \
+	-DCMAKE_INSTALL_LIBDIR=%{_lib} \
+	-DENABLE_TCL=ON \
+	-DPYTHON_EXECUTABLE=%{__python}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	RUBYARCHDIR=$RPM_BUILD_ROOT%{ruby_vendorarchdir} \
+%if %{with static_libs}
+for dir in bfb multicobex obexftp ; do
+	%{__make} -C build-static/$dir install \
+		DESTDIR=$RPM_BUILD_ROOT
+done
+%endif
+
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/obexftp.{la,a}
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/OBEXFTP/.packlist
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
 %clean
@@ -189,29 +207,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/obexftp*.html README* NEWS THANKS TODO AUTHORS ChangeLog
+%doc AUTHORS ChangeLog License.txt NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/obexftp
 %attr(755,root,root) %{_bindir}/obexftpd
 %{_mandir}/man1/obexftp.1*
 %{_mandir}/man1/obexftpd.1*
 
+%files -n obexfs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/obexautofs
+%attr(755,root,root) %{_bindir}/obexfs
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbfb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbfb.so.0
+%ghost %{_libdir}/libbfb.so.1
 %attr(755,root,root) %{_libdir}/libmulticobex.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmulticobex.so.1
+%ghost %{_libdir}/libmulticobex.so.1
 %attr(755,root,root) %{_libdir}/libobexftp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libobexftp.so.0
+%ghost %{_libdir}/libobexftp.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libbfb.so
-%attr(755,root,root) %{_libdir}/libmulticobex.so
-%attr(755,root,root) %{_libdir}/libobexftp.so
-%{_libdir}/libbfb.la
-%{_libdir}/libmulticobex.la
-%{_libdir}/libobexftp.la
+%{_libdir}/libbfb.so
+%{_libdir}/libmulticobex.so
+%{_libdir}/libobexftp.so
 %{_includedir}/bfb
 %{_includedir}/multicobex
 %{_includedir}/obexftp
@@ -231,10 +251,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-obexftp
 %defattr(644,root,root,755)
-%dir %{py_sitedir}/obexftp
-%attr(755,root,root) %{py_sitedir}/obexftp/_obexftp.so
-%{py_sitedir}/obexftp/__init__.py[co]
-%{py_sitedir}/obexftp-*.egg-info
+%attr(755,root,root) %{py_sitedir}/_obexftp.so
+%{py_sitedir}/obexftp.py[co]
 
 %files -n ruby-obexftp
 %defattr(644,root,root,755)
@@ -242,7 +260,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n tcl-obexftp
 %defattr(644,root,root,755)
-# -avoid-version missing
-%attr(755,root,root) %{_libdir}/obexftp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/obexftp.so.0
 %attr(755,root,root) %{_libdir}/obexftp.so
diff --git a/am.patch b/am.patch
deleted file mode 100644
index bc4f208..0000000
--- a/am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.23/configure.in~	2009-02-17 19:27:48.000000000 +0100
-+++ obexftp-0.23/configure.in	2013-06-11 14:04:59.540638730 +0200
-@@ -3,7 +3,7 @@
- AC_INIT(ObexFTP, 0.23, zany at triq.net)
- #AC_CONFIG_SRCDIR(src/foo.c)
- AM_INIT_AUTOMAKE(dist-bzip2)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # note: AC_HELP_STRING is deprecated in autoconf 2.59 and later but
- # AS_HELP_STRING is not available in autoconf 2.57 or earlier.
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 84fc80d..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- obexftp-0.23/swig/python/python_wrap.c~	2009-02-17 19:30:39.000000000 +0100
-+++ obexftp-0.23/swig/python/python_wrap.c	2013-06-11 14:09:21.223422870 +0200
-@@ -856,7 +856,7 @@
-     Py_DECREF(old_str);
-     Py_DECREF(value);
-   } else {
--    PyErr_Format(PyExc_RuntimeError, mesg);
-+    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
-   }
- }
- 
---- obexftp-0.23/swig/ruby/ruby_wrap.c~	2013-06-11 14:12:06.515179342 +0200
-+++ obexftp-0.23/swig/ruby/ruby_wrap.c	2013-06-11 14:13:37.342810517 +0200
-@@ -1309,7 +1309,7 @@
- /* Error manipulation */
- 
- #define SWIG_ErrorType(code)                            SWIG_Ruby_ErrorType(code)               
--#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), msg)
-+#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), "%s", msg)
- #define SWIG_fail                        		goto fail				 
- 
- 
diff --git a/includes.patch b/includes.patch
deleted file mode 100644
index 6a96f39..0000000
--- a/includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- obexftp-0.23/apps/obexftp.c.orig	2009-02-17 19:27:48.000000000 +0100
-+++ obexftp-0.23/apps/obexftp.c	2025-07-30 00:46:18.286246386 +0200
-@@ -29,6 +29,8 @@
- 
- #include <sys/types.h>
- 
-+#include <common.h>
-+
- #ifdef HAVE_SYS_TIMES_H
- #include <sys/times.h>
- #endif
-@@ -45,8 +49,6 @@
- #define EINPROGRESS	WSAEINPROGRESS
- #endif /* _WIN32 */
- 
--#include <common.h>
--
- // perhaps this scheme would be better?
- // IRDA		irda://[nick?]
- // CABLE	tty://path
---- obexftp-0.23/apps/obexftpd.c.orig	2025-07-30 00:46:56.685477113 +0200
-+++ obexftp-0.23/apps/obexftpd.c	2025-07-30 00:52:51.008951056 +0200
-@@ -56,6 +56,7 @@
- #include <netdb.h>
- #endif
- 
-+#include <bluetooth/bluetooth.h>
- /* just until there is a server layer in obexftp */
- #include <openobex/obex.h>
- 
diff --git a/obexftp-no_server.patch b/obexftp-no_server.patch
deleted file mode 100644
index 65b2fdf..0000000
--- a/obexftp-no_server.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp -x '*.orig' obexftp-0.23.org/apps/obexftpd.c obexftp-0.23/apps/obexftpd.c
---- obexftp-0.23.org/apps/obexftpd.c	2009-02-17 19:27:48.000000000 +0100
-+++ obexftp-0.23/apps/obexftpd.c	2021-05-07 23:03:16.308834002 +0200
-@@ -901,7 +901,7 @@ reset:
- 	}
- 	printf("Waiting for connection...\n");
- 
--	(void) OBEX_ServerAccept(handle, obex_event, NULL);
-+	//(void) OBEX_ServerAccept(handle, obex_event, NULL);
- 
- 	while (!finished) {
- 		//printf("Handling connection...\n");
diff --git a/obexftp-nostress.patch b/obexftp-nostress.patch
deleted file mode 100644
index 56e4bd0..0000000
--- a/obexftp-nostress.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- obexftp-0.22/apps/Makefile.am.orig	2008-06-15 21:18:58.000000000 +0200
-+++ obexftp-0.22/apps/Makefile.am	2008-09-01 07:59:12.471844124 +0200
-@@ -13,7 +13,6 @@
- obexftp_SOURCES =		obexftp.c
- 
- obexftpd_SOURCES =		obexftpd.c
--stress_SOURCES =		stress.c
- discovery_SOURCES =		discovery.c
- 
- bin_PROGRAMS =			obexftp obexftpd
diff --git a/obexftp-perl.patch b/obexftp-perl.patch
index 5c6e381..969151b 100644
--- a/obexftp-perl.patch
+++ b/obexftp-perl.patch
@@ -1,22 +1,3 @@
---- obexftp-0.22/swig/perl/Makefile.am.orig	2008-06-15 21:18:58.000000000 +0200
-+++ obexftp-0.22/swig/perl/Makefile.am	2008-09-01 07:51:10.659840771 +0200
-@@ -9,14 +9,14 @@
- endif
- 
- Makefile.perl: Makefile.PL
--	$(PERL) $< PREFIX=$(prefix) MAKEFILE=$@
-+	$(PERL) $< PREFIX=$(prefix) MAKEFILE=$@ INSTALLDIRS=vendor
- 
- OBEXFTP.so: perl_wrap.c Makefile.perl
- 	if test ! -f perl_wrap.c; then cp $(srcdir)/perl_wrap.c . ; fi
- 	$(MAKE) -fMakefile.perl
- 
- install-data-local: Makefile.perl
--	$(MAKE) -fMakefile.perl install
-+	$(MAKE) -fMakefile.perl pure_install
- 
- # sadly there is no make uninstall for perl
- #uninstall-local: Makefile.perl
 --- obexftp-0.22/swig/perl/Makefile.PL.in.orig	2008-06-15 21:18:58.000000000 +0200
 +++ obexftp-0.22/swig/perl/Makefile.PL.in	2008-09-01 07:50:12.971839933 +0200
 @@ -11,7 +11,7 @@
diff --git a/obexftp-python.patch b/obexftp-python.patch
new file mode 100644
index 0000000..55403a5
--- /dev/null
+++ b/obexftp-python.patch
@@ -0,0 +1,19 @@
+--- obexftp-0.24.2-Source/swig/python/CMakeLists.txt.orig	2013-08-11 20:26:37.000000000 +0200
++++ obexftp-0.24.2-Source/swig/python/CMakeLists.txt	2025-09-06 12:03:39.202218402 +0200
+@@ -1,6 +1,6 @@
+ 
+-find_package ( PythonLibs REQUIRED )
+ find_package ( PythonInterp REQUIRED )
++find_package ( PythonLibs REQUIRED )
+ 
+ if ( PYTHON_VERSION_STRING AND PYTHONLIBS_VERSION_STRING )
+   if ( NOT PYTHON_VERSION_STRING VERSION_EQUAL PYTHONLIBS_VERSION_STRING )
+@@ -43,7 +43,7 @@ execute_process (
+ file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
+ execute_process (
+   COMMAND ${PYTHON_EXECUTABLE} -c
+-  	"import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
++  	"import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_lib(1,0,prefix='/usr'))"
+   OUTPUT_VARIABLE PYTHON_SITE_DIR
+ )
+ file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
diff --git a/obexftp-ruby1.9.patch b/obexftp-ruby1.9.patch
deleted file mode 100644
index 6a012fd..0000000
--- a/obexftp-ruby1.9.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- obexftp-0.23/swig/ruby/ruby_wrap.c~	2009-02-17 19:30:40.000000000 +0100
-+++ obexftp-0.23/swig/ruby/ruby_wrap.c	2010-03-02 14:42:43.359124637 +0100
-@@ -2580,7 +2580,7 @@
-     
-     /* VALUE str = StringValue(argv[0]); // perhaps better? */
-     arg2 = STR2CSTR(argv[0]);
--    arg3 = (int) RSTRING(argv[0])->len;
-+    arg3 = (int) RSTRING_LEN(argv[0]);
-     
-     
-     
---- obexftp-0.23/swig/ruby/ruby_wrap.c.orig	2025-07-30 00:53:47.459228395 +0200
-+++ obexftp-0.23/swig/ruby/ruby_wrap.c	2025-07-30 01:10:12.116355514 +0200
-@@ -2106,7 +2106,7 @@
-   arg1 = (obexftp_client_t *)(argp1);
-   {
-     arg2 = proxy_info_cb;
--    arg3 = argv[0];
-+    arg3 = (void*) argv[0];
-   }
-   obexftp_client_t_callback(arg1,arg2,arg3);
-   return Qnil;
-@@ -2579,7 +2579,11 @@
-     
-     
-     /* VALUE str = StringValue(argv[0]); // perhaps better? */
-+    #if defined(StringValuePtr)
-+    arg2 = StringValuePtr(argv[0]);
-+    #else
-     arg2 = STR2CSTR(argv[0]);
-+    #endif
-     arg3 = (int) RSTRING_LEN(argv[0]);
-     
-     
diff --git a/types.patch b/types.patch
deleted file mode 100644
index 4387472..0000000
--- a/types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.23/swig/tcl/tcl_wrap.c.orig	2009-02-17 19:30:40.000000000 +0100
-+++ obexftp-0.23/swig/tcl/tcl_wrap.c	2025-07-30 20:15:35.292978909 +0200
-@@ -2488,7 +2488,7 @@
- _wrap_client_put_data(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-   obexftp_client_t *arg1 = (obexftp_client_t *) 0 ;
-   char *arg2 = (char *) 0 ;
--  size_t arg3 ;
-+  int arg3 ;
-   char *arg4 = (char *) NULL ;
-   int result;
-   void *argp1 = 0 ;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/obexftp.git/commitdiff/5f133351a7b597e61c08c3c98556812869cf89bb

More information about the pld-cvs-commit mailing list