diff options
| -rw-r--r-- | sysutils/accountsservice/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/accountsservice/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-config.h.in | 32 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-configure | 34 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-src_daemon.c | 92 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c | 30 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-src_user.c | 48 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-src_util.c | 12 |
8 files changed, 6 insertions, 249 deletions
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 7b56f8f58..803ae19cd 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -6,8 +6,7 @@ # PORTNAME= accountsservice -PORTVERSION= 0.6.14 -PORTREVISION= 1 +PORTVERSION= 0.6.15 CATEGORIES= sysutils devel MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ diff --git a/sysutils/accountsservice/distinfo b/sysutils/accountsservice/distinfo index 27e32accf..8646c873b 100644 --- a/sysutils/accountsservice/distinfo +++ b/sysutils/accountsservice/distinfo @@ -1,2 +1,2 @@ -SHA256 (accountsservice-0.6.14.tar.xz) = fcf26f5198521392f11078a9177e430e0ca09bd6bc481b106fc0cbbc586bfd64 -SIZE (accountsservice-0.6.14.tar.xz) = 286220 +SHA256 (accountsservice-0.6.15.tar.xz) = 9feb3d58c5c739f2df4b5410404b29f16e3f4aa6739b685ceb12903f4d5ea867 +SIZE (accountsservice-0.6.15.tar.xz) = 286480 diff --git a/sysutils/accountsservice/files/patch-config.h.in b/sysutils/accountsservice/files/patch-config.h.in deleted file mode 100644 index 46497bd24..000000000 --- a/sysutils/accountsservice/files/patch-config.h.in +++ /dev/null @@ -1,32 +0,0 @@ ---- config.h.in.orig 2011-09-04 22:12:01.000000000 +0200 -+++ config.h.in 2011-10-16 20:44:20.000000000 +0200 -@@ -15,6 +15,9 @@ - /* Define to 1 if you have the <dlfcn.h> header file. */ - #undef HAVE_DLFCN_H - -+/* Define to 1 if you have the `fgetpwent' function. */ -+#undef HAVE_FGETPWENT -+ - /* Define if the GNU gettext() function is already present or preinstalled. */ - #undef HAVE_GETTEXT - -@@ -30,6 +33,9 @@ - /* Define to 1 if you have the <memory.h> header file. */ - #undef HAVE_MEMORY_H - -+/* Define to 1 if you have the <shadow.h> header file. */ -+#undef HAVE_SHADOW_H -+ - /* Define to 1 if you have the <stdint.h> header file. */ - #undef HAVE_STDINT_H - -@@ -51,6 +57,9 @@ - /* Define to 1 if you have the <unistd.h> header file. */ - #undef HAVE_UNISTD_H - -+/* Define to 1 if you have the <utmpx.h> header file. */ -+#undef HAVE_UTMPX_H -+ - /* Define to the sub-directory in which libtool stores uninstalled libraries. - */ - #undef LT_OBJDIR diff --git a/sysutils/accountsservice/files/patch-configure b/sysutils/accountsservice/files/patch-configure deleted file mode 100644 index 8459dd1e6..000000000 --- a/sysutils/accountsservice/files/patch-configure +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.orig 2011-10-16 20:43:57.000000000 +0200 -+++ configure 2011-10-16 20:44:20.000000000 +0200 -@@ -13448,6 +13448,31 @@ - WARN_CFLAGS="$accountsservice_cv_warn_cflags" - - -+for ac_header in shadow.h utmpx.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+for ac_func in fgetpwent -+do : -+ ac_fn_c_check_func "$LINENO" "fgetpwent" "ac_cv_func_fgetpwent" -+if test "x$ac_cv_func_fgetpwent" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_FGETPWENT 1 -+_ACEOF -+ -+fi -+done -+ -+ - - # Check whether --enable-docbook-docs was given. - if test "${enable_docbook_docs+set}" = set; then : diff --git a/sysutils/accountsservice/files/patch-src_daemon.c b/sysutils/accountsservice/files/patch-src_daemon.c index c8f73dfce..c7400ce07 100644 --- a/sysutils/accountsservice/files/patch-src_daemon.c +++ b/sysutils/accountsservice/files/patch-src_daemon.c @@ -1,16 +1,6 @@ ---- src/daemon.c.orig 2011-10-16 20:25:13.000000000 +0200 -+++ src/daemon.c 2011-10-16 20:28:05.000000000 +0200 -@@ -32,7 +32,9 @@ - #include <errno.h> - #include <unistd.h> - #include <sys/types.h> -+#ifdef HAVE_UTMPX_H - #include <utmpx.h> -+#endif - - #include <glib.h> - #include <glib/gi18n.h> -@@ -52,6 +54,9 @@ +--- src/daemon.c.orig 2011-10-17 21:30:22.000000000 +0200 ++++ src/daemon.c 2011-10-18 16:28:09.000000000 +0200 +@@ -54,6 +54,9 @@ #define PATH_LOGIN_DEFS "/etc/login.defs" #define PATH_GDM_CUSTOM "/etc/gdm/custom.conf" @@ -20,79 +10,3 @@ #ifndef FALLBACK_MINIMAL_UID #define FALLBACK_MINIMAL_UID 500 #endif -@@ -238,13 +243,19 @@ daemon_local_user_is_excluded (Daemon *d - static void - reload_wtmp_history (Daemon *daemon) - { -+#ifdef HAVE_UTMPX_H - struct utmpx *wtmp_entry; - GHashTable *login_frequency_hash; - GHashTableIter iter; - gpointer key, value; - -- utmpxname(_PATH_WTMPX); -+#ifdef UTXDB_LOG -+ if (setutxdb (UTXDB_LOG, NULL) != 0) -+ return; -+#else -+ utmpxname (_PATH_WTMPX); - setutxent (); -+#endif - - login_frequency_hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); - -@@ -298,6 +309,7 @@ reload_wtmp_history (Daemon *daemon) - - g_hash_table_foreach (login_frequency_hash, (GHFunc) g_free, NULL); - g_hash_table_unref (login_frequency_hash); -+#endif /* HAVE_UTMPX_H */ - } - - static void -@@ -326,22 +338,32 @@ reload_passwd (Daemon *daemon) - GSList *old_users; - GSList *new_users; - GSList *list; -+#ifdef HAVE_FGETPWENT - FILE *fp; -+#endif - User *user = NULL; - - old_users = NULL; - new_users = NULL; - -+#ifdef HAVE_FGETPWENT - errno = 0; - fp = fopen (PATH_PASSWD, "r"); - if (fp == NULL) { - g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno)); - goto out; - } -+#else -+ setpwent(); -+#endif - g_hash_table_foreach (daemon->priv->users, listify_hash_values_hfunc, &old_users); - g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); - -- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { -+#ifdef HAVE_FGETPWENT -+ while ((pwent = fgetpwent (fp)) != NULL) { -+#else -+ while ((pwent = getpwent ()) != NULL) { -+#endif - /* Skip users below MINIMAL_UID... */ - if (daemon_local_user_is_excluded (daemon, pwent->pw_name, pwent->pw_uid)) { - g_debug ("skipping user: %s", pwent->pw_name); -@@ -391,10 +413,12 @@ reload_passwd (Daemon *daemon) - } - } - -+#ifdef HAVE_FGETPWENT - out: - /* Cleanup */ - - fclose (fp); -+#endif - - g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL); - g_slist_foreach (new_users, (GFunc) g_object_unref, NULL); diff --git a/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c deleted file mode 100644 index d527371fa..000000000 --- a/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c +++ /dev/null @@ -1,30 +0,0 @@ -From fbf7d277d2ff7e69795a7880a67104811e0fd4a5 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Tue, 27 Sep 2011 23:55:43 +0000 -Subject: lib: Don't track non-graphical sessions - -If a user happens to be logged in at a VT, we don't -want to show them as "already logged in" or whatever. - -This commit filters out vt sessions in the same way it -filters out sessions associated with the login screen. ---- -diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c -index 2fd2394..3fea3dc 100644 ---- src/libaccountsservice/act-user-manager.c -+++ src/libaccountsservice/act-user-manager.c -@@ -1340,6 +1340,12 @@ maybe_add_new_session (ActUserManagerNewSession *new_session) - - manager = ACT_USER_MANAGER (new_session->manager); - -+ if (new_session->x11_display == NULL || new_session->x11_display[0] == '\0') { -+ g_debug ("AcUserManager: ignoring session '%s' since it's not graphical", -+ new_session->id); -+ goto done; -+ } -+ - if (session_is_login_window (manager, new_session->id)) { - goto done; - } --- -cgit v0.9.0.2-2-gbebe diff --git a/sysutils/accountsservice/files/patch-src_user.c b/sysutils/accountsservice/files/patch-src_user.c deleted file mode 100644 index eb5f15524..000000000 --- a/sysutils/accountsservice/files/patch-src_user.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/user.c.orig 2011-10-16 20:25:22.000000000 +0200 -+++ src/user.c 2011-10-16 20:24:29.000000000 +0200 -@@ -29,7 +29,9 @@ - #include <sys/wait.h> - #include <unistd.h> - #include <grp.h> -+#ifdef HAVE_SHADOW_H - #include <shadow.h> -+#endif - - #include <glib.h> - #include <glib/gi18n.h> -@@ -464,7 +466,9 @@ void - user_local_update_from_pwent (User *user, - struct passwd *pwent) - { -+#ifdef HAVE_SHADOW_H - struct spwd *spent; -+#endif - gchar *real_name; - gboolean changed; - const gchar *passwd; -@@ -555,9 +559,11 @@ user_local_update_from_pwent (User - } - - passwd = pwent->pw_passwd; -+#ifdef HAVE_SHADOW_H - spent = getspnam (pwent->pw_name); - if (spent) - passwd = spent->sp_pwdp; -+#endif - - if (passwd && passwd[0] == '!') { - locked = TRUE; -@@ -579,11 +585,13 @@ user_local_update_from_pwent (User - mode = PASSWORD_MODE_REGULAR; - } - -+#ifdef HAVE_SHADOW_H - if (spent) { - if (spent->sp_lstchg == 0) { - mode = PASSWORD_MODE_SET_AT_LOGIN; - } - } -+#endif - - if (user->password_mode != mode) { - user->password_mode = mode; diff --git a/sysutils/accountsservice/files/patch-src_util.c b/sysutils/accountsservice/files/patch-src_util.c deleted file mode 100644 index ab3b1310e..000000000 --- a/sysutils/accountsservice/files/patch-src_util.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/util.c.orig 2011-10-16 20:25:37.000000000 +0200 -+++ src/util.c 2011-10-16 20:24:33.000000000 +0200 -@@ -24,8 +24,8 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/wait.h> - #include <fcntl.h> --#include <wait.h> - #include <grp.h> - - #include <syslog.h> |