summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-22 14:00:05 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-22 14:00:05 +0800
commit2429f5af05b590736308c32b54a485f76b449304 (patch)
tree22b3982ea3b382fab5067ad85145c6c6a72c9e54
parent63afb1bdd541f61d6720d3e174671330f71363f9 (diff)
downloadmarcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.tar
marcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.tar.gz
marcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.tar.bz2
marcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.tar.lz
marcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.tar.xz
marcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.tar.zst
marcuscom-ports-2429f5af05b590736308c32b54a485f76b449304.zip
Re-add the missing patches from the FreeBSD ports tree.
Reported by: Yasuda Keisuke <kysd@po.harenet.ne.jp> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12672 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/liboobs/files/patch-src_oobs-group.c25
-rw-r--r--devel/liboobs/files/patch-src_oobs-user.c35
2 files changed, 60 insertions, 0 deletions
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c
new file mode 100644
index 000000000..6abd8b711
--- /dev/null
+++ b/devel/liboobs/files/patch-src_oobs-group.c
@@ -0,0 +1,25 @@
+--- oobs/oobs-group.c.orig Fri Sep 15 18:41:04 2006
++++ oobs/oobs-group.c Tue Oct 31 23:12:40 2006
+@@ -18,7 +18,12 @@
+ * Authors: Carlos Garnacho Parro <carlosg@gnome.org>
+ */
+
++#if defined(HAVE_CONFIG_H)
++#include <config.h>
++#endif
++
+ #include <glib-object.h>
++#include <unistd.h>
+ #include "oobs-session.h"
+ #include "oobs-group.h"
+ #include "oobs-user.h"
+@@ -27,7 +32,9 @@
+ #include "oobs-groupsconfig-private.h"
+ #include "oobs-defines.h"
+ #include "utils.h"
++#ifdef HAVE_CRYPT_H
+ #include <crypt.h>
++#endif
+
+ #define OOBS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_GROUP, OobsGroupPrivate))
+
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
new file mode 100644
index 000000000..484b86f32
--- /dev/null
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -0,0 +1,35 @@
+--- oobs/oobs-user.c.orig 2007-10-30 09:16:53.406333206 -0400
++++ oobs/oobs-user.c 2007-10-30 09:40:02.560797530 -0400
+@@ -18,12 +18,18 @@
+ * Authors: Carlos Garnacho Parro <carlosg@gnome.org>
+ */
+
++#if defined(HAVE_CONFIG_H)
++#include <config.h>
++#endif
++
+ #include <glib-object.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_CRYPT_H
+ #include <crypt.h>
++#endif
+ #include <utmp.h>
+
+ #include "oobs-usersconfig.h"
+@@ -852,6 +858,7 @@
+
+ login = oobs_user_get_login_name (user);
+
++#if 0 /* FreeBSD does not have ut_type in utmp */
+ while (!match && (entry = getutent ()) != NULL)
+ {
+ match = (entry->ut_type == USER_PROCESS &&
+@@ -862,4 +869,5 @@
+ endutent ();
+
+ return match;
++#endif
+ }