diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-29 16:46:28 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-29 16:46:28 +0800 |
| commit | ef5444c75c4786599129040631b8768915c22ffc (patch) | |
| tree | e5c3284397d3e2d6e14b60611aa7fb0b5a5a2c8a /sysutils/accountsservice | |
| parent | f20ef3941ec472fbe88896b216c741a05e867464 (diff) | |
| download | marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.tar marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.tar.gz marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.tar.bz2 marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.tar.lz marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.tar.xz marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.tar.zst marcuscom-ports-ef5444c75c4786599129040631b8768915c22ffc.zip | |
Update to 0.6.22.
This fixes CVE-2012-2737
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16973 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/accountsservice')
| -rw-r--r-- | sysutils/accountsservice/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/accountsservice/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-src_daemon.c | 31 |
3 files changed, 30 insertions, 7 deletions
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 5459c96af..c1a8f4a1a 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -6,7 +6,7 @@ # PORTNAME= accountsservice -PORTVERSION= 0.6.21 +PORTVERSION= 0.6.22 CATEGORIES= sysutils devel MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ diff --git a/sysutils/accountsservice/distinfo b/sysutils/accountsservice/distinfo index 81f74bc30..491f27e95 100644 --- a/sysutils/accountsservice/distinfo +++ b/sysutils/accountsservice/distinfo @@ -1,2 +1,2 @@ -SHA256 (accountsservice-0.6.21.tar.xz) = adf681cef68852b65d57de7102483ef0cf31175ea0bbc3bad59957259dc64192 -SIZE (accountsservice-0.6.21.tar.xz) = 329916 +SHA256 (accountsservice-0.6.22.tar.xz) = 851e05aa593cd8e3ed5c635a7fee3ffc0f418d3db2f28c5ebd6b7503294e3bdd +SIZE (accountsservice-0.6.22.tar.xz) = 331028 diff --git a/sysutils/accountsservice/files/patch-src_daemon.c b/sysutils/accountsservice/files/patch-src_daemon.c index 3f82ed385..ef24613ba 100644 --- a/sysutils/accountsservice/files/patch-src_daemon.c +++ b/sysutils/accountsservice/files/patch-src_daemon.c @@ -1,6 +1,15 @@ ---- src/daemon.c.orig 2012-05-08 17:14:59.000000000 +0200 -+++ src/daemon.c 2012-05-22 10:45:14.000000000 +0200 -@@ -70,6 +70,7 @@ +--- src/daemon.c.orig 2012-06-28 17:24:55.000000000 +0200 ++++ src/daemon.c 2012-06-29 10:44:09.000000000 +0200 +@@ -49,7 +49,7 @@ + #define PATH_SHADOW "/etc/shadow" + #define PATH_NOLOGIN "/sbin/nologin" + #define PATH_FALSE "/bin/false" +-#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf" ++#define PATH_GDM_CUSTOM "/usr/local/etc/gdm/custom.conf" + + static const char *default_excludes[] = { + "bin", +@@ -68,6 +68,7 @@ "nobody4", "noaccess", "postgres", @@ -8,7 +17,7 @@ "pvm", "rpm", "nfsnobody", -@@ -79,6 +80,7 @@ +@@ -77,6 +78,7 @@ "games", "man", "at", @@ -16,3 +25,17 @@ NULL }; +@@ -315,7 +317,13 @@ + g_hash_table_foreach (daemon->priv->users, listify_hash_values_hfunc, &old_users); + g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); + ++#ifdef HAVE_FGETPWENT + while ((pwent = fgetpwent (fp)) != NULL) { ++#else ++ setpwent(); ++ ++ while ((pwent = getpwent ()) != NULL) { ++#endif + /* Skip system users... */ + if (daemon_local_user_is_excluded (daemon, pwent->pw_name, pwent->pw_shell)) { + g_debug ("skipping user: %s", pwent->pw_name); |