public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gnome-user-share] wip/oholy/f45-update: - Update to 0.20
@ 2026-06-24 11:34 Bastien Nocera
0 siblings, 0 replies; only message in thread
From: Bastien Nocera @ 2026-06-24 11:34 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : e68790e88acef76ee5e5dbd835762f4f7dfa8dee
Author : Bastien Nocera <hadess@fedoraproject.org>
Date : 2008-01-22T13:10:54+00:00
Stats : +13/-262 in 9 file(s)
URL : https://src.fedoraproject.org/rpms/gnome-user-share/c/e68790e88acef76ee5e5dbd835762f4f7dfa8dee?branch=wip/oholy/f45-update
Log:
- Update to 0.20
- Remove obsolete patches
---
diff --git a/.cvsignore b/.cvsignore
index 3244e6b..ad0420f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-user-share-0.11.tar.bz2
+gnome-user-share-0.20.tar.gz
diff --git a/gnome-user-share-0.11-export-session-id.patch b/gnome-user-share-0.11-export-session-id.patch
deleted file mode 100644
index 4729a04..0000000
--- a/gnome-user-share-0.11-export-session-id.patch
+++ /dev/null
@@ -1,176 +0,0 @@
---- gnome-user-share-0.11/user_share.c.export-session-id 2007-03-06 05:30:27.000000000 -0500
-+++ gnome-user-share-0.11/user_share.c 2007-07-12 09:22:35.000000000 -0400
-@@ -27,6 +27,10 @@
- #include <glib/gi18n.h>
- #include <X11/Xlib.h>
-
-+#ifdef HAVE_DBUS_1_1
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef HAVE_AVAHI
- #include <avahi-client/client.h>
- #include <avahi-client/publish.h>
-@@ -45,6 +49,7 @@
-
- #include <gconf/gconf-client.h>
-
-+#include <stdarg.h>
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -63,6 +68,10 @@
- #define FILE_SHARING_ENABLED "/desktop/gnome/file_sharing/enabled"
- #define FILE_SHARING_REQUIRE_PASSWORD "/desktop/gnome/file_sharing/require_password"
-
-+#ifdef HAVE_DBUS_1_1
-+static char *dbus_session_id;
-+#endif
-+
- static GMainLoop *loop = NULL;
- static pid_t httpd_pid = 0;
- static guint disabled_timeout_tag = 0;
-@@ -220,6 +229,42 @@ get_share_name (void)
- return name;
- }
-
-+#ifdef HAVE_DBUS_1_1
-+static void
-+init_dbus() {
-+ /* The only use we make of D-BUS is to fetch the session BUS ID so we can export
-+ * it via mDNS, so we connect and then immediately disconnect. If we were using
-+ * the D-BUS session BUS for something persistent, the following code should use
-+ * dbus_bus_get() and skip the shutdown. (Avahi uses the D-BUS _system_ bus
-+ * internally.)
-+ */
-+
-+ DBusError derror;
-+ DBusConnection *connection;
-+
-+ dbus_error_init(&derror);
-+
-+ connection = dbus_bus_get_private(DBUS_BUS_SESSION, &derror);
-+ if (connection == NULL) {
-+ g_printerr("Failed to connect to session bus: %s", derror.message);
-+ dbus_error_free(&derror);
-+ return;
-+ }
-+
-+ dbus_session_id = dbus_bus_get_id(connection, &derror);
-+ if (dbus_session_id == NULL) {
-+ /* This can happen if the D-BUS library has been upgraded to 1.1, but the
-+ * user's session hasn't yet been restarted
-+ */
-+ g_printerr("Failed to get session BUS ID: %s", derror.message);
-+ dbus_error_free(&derror);
-+ }
-+
-+ dbus_connection_set_exit_on_disconnect(connection, FALSE);
-+ dbus_connection_close(connection);
-+ dbus_connection_unref(connection);
-+}
-+#endif
-
- #ifdef HAVE_AVAHI
-
-@@ -230,19 +275,64 @@ static int avahi_port = 0;
- static AvahiEntryGroup *entry_group = NULL;
- static char *avahi_name = NULL;
-
-+static AvahiStringList*
-+new_text_record_list (const char *first_key,
-+ const char *first_value,
-+ ...)
-+{
-+ va_list args;
-+ const char *k;
-+ const char *v;
-+ AvahiStringList *list;
-+
-+ if (first_key == NULL)
-+ return NULL;
-+
-+ list = NULL;
-+
-+ list = avahi_string_list_add_pair (list, first_key, first_value);
-+
-+ va_start (args, first_value);
-+ k = va_arg (args, const char*);
-+ if (k)
-+ v = va_arg (args, const char*);
-+ while (k != NULL) {
-+ list = avahi_string_list_add_pair (list, k, v);
-+
-+ k = va_arg (args, const char*);
-+ if (k)
-+ v = va_arg (args, const char*);
-+ }
-+
-+ va_end(args);
-+
-+ return list;
-+}
-
- static gboolean
- create_service (void) {
- int ret;
-+ AvahiStringList *txt_records;
-
- if (avahi_name == NULL) {
- avahi_name = g_strdup (get_share_name ());
- }
-
-- ret = avahi_entry_group_add_service (entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-- AVAHI_PUBLISH_USE_MULTICAST,
-- avahi_name, "_webdav._tcp", NULL, NULL,
-- avahi_port, "u=guest", NULL);
-+ txt_records = new_text_record_list ("u", "guest",
-+#ifdef HAVE_DBUS_1_1
-+ /* This must be last */
-+ dbus_session_id != NULL ? "org.freedesktop.od.session" : NULL, dbus_session_id,
-+#endif
-+ NULL);
-+
-+ ret = avahi_entry_group_add_service_strlst (entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-+ AVAHI_PUBLISH_USE_MULTICAST,
-+ avahi_name, "_webdav._tcp", NULL, NULL,
-+ avahi_port,
-+ txt_records);
-+
-+ avahi_string_list_free(txt_records);
-+
- if (ret < 0) {
- return FALSE;
- }
-@@ -735,6 +825,10 @@ main (int argc, char **argv)
- G_IO_IN,
- x_input, xdisplay);
- g_io_channel_unref (channel);
-+
-+#ifdef HAVE_DBUS_1_1
-+ init_dbus();
-+#endif
-
- #ifdef HAVE_AVAHI
- if (!init_avahi ()) {
---- gnome-user-share-0.11/configure.in.export-session-id 2007-03-06 04:56:32.000000000 -0500
-+++ gnome-user-share-0.11/configure.in 2007-07-12 09:22:35.000000000 -0400
-@@ -59,11 +59,17 @@ if test "x$msg_avahi" = "xno" -a "x$enab
- AC_SUBST(HOWL_LIBS)
- fi
-
-+PKG_CHECK_EXISTS(dbus-1 >= 1.1.1, have_dbus_1_1=true, have_dbus_1_1=false)
-+if $have_dbus_1_1 ; then
-+ DBUS_MODULES=dbus-1
-+ AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
-+fi
-+
- if test "x$msg_avahi" = "xno" -a "x$msg_howl" = "xno"; then
- AC_MSG_ERROR([Neither avahi nor howl detected. Gnome-user-share needs a mDNS implementation.])
- fi
-
--PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.2.0 gconf-2.0)
-+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.2.0 gconf-2.0 $DBUS_MODULES)
- AC_SUBST(USER_SHARE_CFLAGS)
- AC_SUBST(USER_SHARE_LIBS)
-
diff --git a/gnome-user-share-0.11-invisible-char.patch b/gnome-user-share-0.11-invisible-char.patch
deleted file mode 100644
index 21ff90c..0000000
--- a/gnome-user-share-0.11-invisible-char.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-user-share-0.11/file-share-properties.glade.invisible-char 2007-03-23 17:49:34.000000000 -0400
-+++ gnome-user-share-0.11/file-share-properties.glade 2007-03-23 17:49:40.000000000 -0400
-@@ -151,7 +151,6 @@
- <property name="max_length">0</property>
- <property name="text"></property>
- <property name="has_frame">True</property>
-- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
diff --git a/gnome-user-share-category.patch b/gnome-user-share-category.patch
deleted file mode 100644
index ebf7ff3..0000000
--- a/gnome-user-share-category.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-user-share-0.10/gnome-user-share-properties.desktop.in.category 2007-01-24 09:46:29.000000000 -0500
-+++ gnome-user-share-0.10/gnome-user-share-properties.desktop.in 2007-01-24 09:46:45.000000000 -0500
-@@ -7,7 +7,7 @@
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Settings;X-GNOME-NetworkSettings;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-user-share
diff --git a/gnome-user-share-httpd-2.2.patch b/gnome-user-share-httpd-2.2.patch
deleted file mode 100644
index 3e4d1a0..0000000
--- a/gnome-user-share-httpd-2.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Migrate to httpd 2.2 configuration.
-
---- dav_user.conf 2005-12-11 05:01:41.000000000 -0500
-+++ dav_user.conf 2006-01-27 17:49:27.000000000 -0500
-@@ -10,6 +10,7 @@
-
- LoadModule dav_module /etc/httpd/modules/mod_dav.so
- LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
-+LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so
- LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
-
- DocumentRoot ${HOME}/Public
-@@ -20,7 +21,9 @@
- AuthType Digest
- AuthName "Please log in as the user guest"
- AuthDigestDomain /
-- AuthDigestFile ${HOME}/.gnome2/user-share/passwd
-+
-+ AuthDigestProvider file
-+ AuthUserFile ${HOME}/.gnome2/user-share/passwd
-
-
- <IfDefine RequirePasswordAlways>
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 4543021..4427251 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,22 +1,15 @@
Summary: Gnome user file sharing
Name: gnome-user-share
-Version: 0.11
-Release: 9%{?dist}
+Version: 0.20
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.gnome.org
-Source0: %{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=422047
-Patch0: gnome-user-share-0.11-invisible-char.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=455307
-Patch1: gnome-user-share-0.11-export-session-id.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=456390
-Patch2: password-edit.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=475994
-Patch3: str-leak.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/0.20/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: httpd >= 2.2.0
+Requires: obex-data-server
BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: httpd >= 2.2.0
@@ -25,7 +18,6 @@ BuildRequires: desktop-file-utils
BuildRequires: libselinux-devel
BuildRequires: gettext
BuildRequires: perl(XML::Parser)
-BuildRequires: autoconf
Requires(post): GConf2
Requires(pre): GConf2
Requires(preun): GConf2
@@ -42,15 +34,12 @@ 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.
+
%prep
%setup -q
-%patch0 -p1 -b .invisible-char
-%patch1 -p1 -b .export-session-id
-%patch2 -p1 -b .password-edit
-%patch3 -p1 -b .str-leak
%build
-autoheader ; autoconf # for patch1
%configure
make %{?_smp_mflags}
@@ -95,9 +84,14 @@ fi
%{_libexecdir}/*
%{_datadir}/gnome-user-share
%{_datadir}/applications/*
+%{_datadir}/gnome/autostart/gnome-user-share.desktop
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Tue Jan 22 2008 - Bastien Nocera <bnocera@redhat.com> - 0.20-1
+- Update to 0.20
+- Remove obsolete patches
+
* Tue Sep 11 2007 Matthias Clasen <mclasen@redhat.com> - 0.11-9
- Fix a memory leak
diff --git a/password-edit.patch b/password-edit.patch
deleted file mode 100644
index c75428c..0000000
--- a/password-edit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-user-share-0.11/file-share-properties.c.password-edit gnome-user-share-0.11/file-share-properties.c
---- gnome-user-share-0.11/file-share-properties.c.password-edit 2007-03-06 04:56:32.000000000 -0500
-+++ gnome-user-share-0.11/file-share-properties.c 2007-07-12 16:41:05.000000000 -0400
-@@ -158,7 +158,7 @@ update_ui (void)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- enabled);
- gtk_widget_set_sensitive (password_combo, enabled);
-- gtk_widget_set_sensitive (password_entry, enabled);
-+ gtk_widget_set_sensitive (password_entry, enabled && password_setting != PASSWORD_NEVER);
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (password_combo),
- password_setting);
diff --git a/sources b/sources
index 3689586..6467fa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4961e49c858fbb7d6050c62a73286d74 gnome-user-share-0.11.tar.bz2
+a27a7dfa11da59ce6fa64e9dd7e95d9b gnome-user-share-0.20.tar.gz
diff --git a/str-leak.patch b/str-leak.patch
deleted file mode 100644
index 3fb0b8f..0000000
--- a/str-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gnome-user-share-0.11/user_share.c.str-leak gnome-user-share-0.11/user_share.c
---- gnome-user-share-0.11/user_share.c.str-leak 2007-09-11 16:00:18.000000000 -0400
-+++ gnome-user-share-0.11/user_share.c 2007-09-11 16:00:40.000000000 -0400
-@@ -594,6 +594,7 @@ spawn_httpd (int port, pid_t *pid_out)
- argv[i++] = "RequirePasswordAlways";
- }
-
-+ g_free (str);
- g_object_unref (client);
-
- argv[i] = NULL;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-24 11:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-24 11:34 [rpms/gnome-user-share] wip/oholy/f45-update: - Update to 0.20 Bastien Nocera
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox