OBS User unknown 2008-11-24 03:35:01 +00:00 committed by Git OBS Bridge
commit ced0c5c6da
9 changed files with 309 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92d5cbdfa612eda62e66b5d6558166015c2ab0b3368ad266c8bbeaf1ad1da6bb
size 368898

View File

@ -0,0 +1,119 @@
Index: src/obexpush.c
===================================================================
--- src/obexpush.c (revision 259)
+++ src/obexpush.c (working copy)
@@ -184,7 +184,7 @@
DBusGConnection *connection;
DBusGProxy *manager;
GError *error = NULL;
- char **adapters;
+ GPtrArray *adapters;
gboolean retval = FALSE;
guint i;
@@ -193,52 +193,74 @@
return FALSE;
manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
- "/org/bluez", "org.bluez.Manager");
+ "/", "org.bluez.Manager");
if (manager == NULL) {
dbus_g_connection_unref (connection);
return FALSE;
}
- if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE) {
+ if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE) {
g_object_unref (manager);
dbus_g_connection_unref (connection);
return FALSE;
}
- for (i = 0; adapters[i] != NULL; i++) {
- DBusGProxy *adapter;
- gboolean bonded, trusted;
+ for (i = 0; i < adapters->len; i++) {
+ DBusGProxy *adapter, *device;
+ char *device_path;
+ GHashTable *props;
- g_message ("checking adapter %s", adapters[i]);
+ g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
- adapters[i], "org.bluez.Adapter");
- if (dbus_g_proxy_call (adapter, "HasBonding", NULL,
- G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
- G_TYPE_BOOLEAN, &bonded, G_TYPE_INVALID) != FALSE) {
+ g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+
+ if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+ G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
+ DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) == FALSE)
+ {
+ g_object_unref (adapter);
+ continue;
+ }
+
+ device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
+
+ if (dbus_g_proxy_call (device, "GetProperties", NULL,
+ G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+ &props, G_TYPE_INVALID) != FALSE)
+ {
+ GValue *value;
+ gboolean bonded, trusted;
+
+ value = g_hash_table_lookup (props, "Paired");
+ bonded = g_value_get_boolean (value);
g_message ("%s is %s", bdaddr, bonded ? "bonded" : "not bonded");
- if (bonded != FALSE) {
+
+ if (bonded) {
+ g_hash_table_destroy (props);
+ g_object_unref (device);
+ g_object_unref (adapter);
retval = TRUE;
- g_object_unref (adapter);
break;
}
- }
- if (accept_setting == ACCEPT_BONDED_AND_TRUSTED &&
- dbus_g_proxy_call (adapter, "IsTrusted", NULL,
- G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
- G_TYPE_BOOLEAN, &trusted, G_TYPE_INVALID) != FALSE) {
+ value = g_hash_table_lookup (props, "Trusted");
+ trusted = g_value_get_boolean (value);
g_message ("%s is %s", bdaddr, trusted ? "trusted" : "not trusted");
- if (trusted != FALSE) {
+
+ if (accept_setting == ACCEPT_BONDED_AND_TRUSTED
+ && trusted) {
+ g_hash_table_destroy (props);
+ g_object_unref (device);
+ g_object_unref (adapter);
retval = TRUE;
- g_object_unref (adapter);
break;
}
}
-
g_object_unref(adapter);
}
- g_strfreev(adapters);
+ g_ptr_array_free (adapters, TRUE);
+
g_object_unref(manager);
dbus_g_connection_unref(connection);
@@ -351,7 +373,7 @@
cancelled_cb (DBusGProxy *session,
gpointer user_data)
{
- //FIXME implement properly
+ //FIXME implement properly, we never actually finished the transfer
g_message ("transfered was cancelled by the sender");
transfer_completed_cb (session, user_data);
}

View File

@ -0,0 +1,17 @@
Index: gnome-user-share-0.40/configure.in
===================================================================
--- gnome-user-share-0.40.orig/configure.in
+++ gnome-user-share-0.40/configure.in
@@ -31,10 +31,10 @@ AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_UID_T
-AC_PATH_PROG([HTTPD], [httpd],,
+AC_PATH_PROG([HTTPD], [httpd2],,
[$PATH:/usr/sbin])
-default_httpd_version=`$HTTPD -v | head -1 | sed "s#.*/##" | cut -f 1-2 -d .`
+default_httpd_version=`$HTTPD -v | head -1 | sed "s#^.*Apache/\([^ ]*\).*#\1#" | cut -f 1-2 -d .`
AC_ARG_WITH(httpd-version, [ --with-httpd-version=VERSION Httpd version used.],
HTTPD_VERSION="$withval", HTTPD_VERSION="$default_httpd_version")

View File

@ -0,0 +1,14 @@
Index: gnome-user-share-0.40/src/file-share-properties.c
===================================================================
--- gnome-user-share-0.40.orig/src/file-share-properties.c
+++ gnome-user-share-0.40/src/file-share-properties.c
@@ -468,6 +468,9 @@ main (int argc, char *argv[])
GCONF_CLIENT_PRELOAD_RECURSIVE,
NULL);
+ if (!g_file_test (HTTPD_PROGRAM, G_FILE_TEST_EXISTS))
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "frame2")));
+
check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check"));
password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo"));
password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry"));

11
gnome-user-share.changes Normal file
View File

@ -0,0 +1,11 @@
-------------------------------------------------------------------
Sat Nov 22 16:35:57 CET 2008 - aj@suse.de
- Fix package list to fix build.
- gnome-user-share helper is a binary, put it into libexecdir.
-------------------------------------------------------------------
Thu Nov 20 00:08:16 CET 2008 - vuntz@novell.com
- Import package, based on the one from Fedora. Required to fix
bnc#402048.

121
gnome-user-share.spec Normal file
View File

@ -0,0 +1,121 @@
#
# spec file for package gnome-user-share (Version 0.40)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: gnome-user-share
Summary: GNOME user file sharing
Version: 0.40
Release: 3
License: GPL v2 or later
Group: Productivity/Networking/File-Sharing
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gnome-user-share-bluez4.patch -- Port to bluez4 API, taken from Fedora.
Patch1: gnome-user-share-bluez4.patch
# PATCH-FIX-OPENSUSE gnome-user-share-httpd-detection.patch vuntz@novell.com -- Detect the right binary for apache
Patch2: gnome-user-share-httpd-detection.patch
# PATCH-FIX-OPENSUSE gnome-user-share-soft-dep-apache.patch vuntz@novell.com -- Hide apache option in the UI if it's not available
Patch3: gnome-user-share-soft-dep-apache.patch
Url: http://www.gnome.org/
BuildRequires: gconf2-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: gtk2-devel
# We need some apache2 binary during the build. Let's use the prefork one,
# although which one doesn't really matter.
BuildRequires: apache2-prefork
BuildRequires: intltool
BuildRequires: libavahi-glib-devel
BuildRequires: libnotify-devel
BuildRequires: update-desktop-files
Requires: obex-data-server
Suggests: apache2-prefork
Suggests: apache2-worker
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%description
gnome-user-share is a small package that binds together various free
software projects to bring easy to use user-level file sharing to the
masses.
The program is meant to run in the background when the user is logged
in, and when file sharing is enabled a webdav server is started that
shares the $HOME/Public folder. The share is then published to all
computers on the local network using mDNS/rendezvous, so that it shows
up in the Network location in GNOME.
The program also allows to share files using ObexFTP over Bluetooth.
Authors:
--------
Alexander Larsson <alexl@redhat.com>
Bastien Nocera <hadess@hadess.net>
%lang_package
%prep
%setup -q
%patch1 -p0
%patch2 -p1
%patch3 -p1
%build
autoreconf -f -i
%configure \
--with-modules-path=/usr/lib/apache2/ \
--disable-schemas-install \
--libexecdir=%{_libexecdir}/gnome-user-share
make %{?jobs:-j%jobs}
%install
%makeinstall
%suse_update_desktop_file gnome-user-share-properties GTK System X-SuSE-ControlCenter-System
%suse_update_desktop_file gnome-user-share
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
%clean
rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%files -f %{name}.lst
%defattr(-,root,root,-)
%doc README COPYING NEWS
%{_bindir}/*
%dir %{_libexecdir}/gnome-user-share
%{_libexecdir}/gnome-user-share/gnome-user-share
%{_datadir}/applications/*
%{_datadir}/gnome-user-share
%{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
#%{_sysconfdir}/gconf/schemas/*
%{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
%files lang -f %{name}.lang
%changelog
* Sat Nov 22 2008 aj@suse.de
- Fix package list to fix build.
- gnome-user-share helper is a binary, put it into libexecdir.
* Thu Nov 20 2008 vuntz@novell.com
- Import package, based on the one from Fedora. Required to fix
bnc#402048.

0
ready Normal file
View File