accountsservice: Update to 0.6.42.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: accountsservice: Update to 0.6.42.
From: Youri Mouton <youri%netbsd.org@localhost>
Date: Sat, 18 Jun 2016 19:11:01 +0000
Module Name:	pkgsrc-wip
Committed By:	Youri Mouton <youri%netbsd.org@localhost>
Pushed By:	youri
Date:		Sat Jun 18 21:11:01 2016 +0200
Changeset:	1d201e78792b325a0a98cc036137788f130308b4

Modified Files:
	accountsservice/Makefile
	accountsservice/PLIST
	accountsservice/distinfo
	accountsservice/patches/patch-src_wtmp-helper.c
Added Files:
	accountsservice/TODO
Removed Files:
	accountsservice/patches/patch-configure.ac

Log Message:
accountsservice: Update to 0.6.42.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1d201e78792b325a0a98cc036137788f130308b4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 accountsservice/Makefile                        | 17 +++++-----
 accountsservice/PLIST                           |  3 +-
 accountsservice/TODO                            |  1 +
 accountsservice/distinfo                        | 10 +++---
 accountsservice/patches/patch-configure.ac      | 40 -----------------------
 accountsservice/patches/patch-src_wtmp-helper.c | 42 +++++++------------------
 6 files changed, 26 insertions(+), 87 deletions(-)

diffs:
diff --git a/accountsservice/Makefile b/accountsservice/Makefile
index f3eb922..9bd4804 100644
--- a/accountsservice/Makefile
+++ b/accountsservice/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
 
-DISTNAME=	accountsservice-0.6.40
+DISTNAME=	accountsservice-0.6.42
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.freedesktop.org/software/accountsservice/
 EXTRACT_SUFX=	.tar.xz
@@ -14,28 +14,25 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool gmake autoconf autoreconf automake
 
-CONFIGURE_ARGS+=	--disable-systemd
-# XXX: option?
-CONFIGURE_ARGS+=	--enable-introspection
+EGDIR=		${PREFIX}/share/examples/accountsservice
+
+CONFIGURE_ARGS+=	--disable-systemd \
+			--sysconfdir=${EGDIR}
 
 ALL_ENV+=	EGDIR=${EGDIR}
 
 PKGCONFIG_OVERRIDE+=	src/libaccountsservice/accountsservice.pc.in
 
-EGDIR=	${PREFIX}/share/examples/accountsservice
-
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/dbus-1/system.d
 
-CONF_FILES+=	${EGDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf
+CONF_FILES+=	${EGDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf \
+		${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf
 
 SUBST_CLASSES+=		gdm
 SUBST_FILES.gdm=	src/daemon.c
 SUBST_STAGE.gdm=	post-patch
 SUBST_SED.gdm=		-e 's,/etc/gdm/custom.conf,${PKG_SYSCONFDIR}/gdm/custom.conf,g'
 
-pre-configure:
-	${RUN} cd ${WRKSRC} && autoreconf -fiv
-
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/accountsservice/PLIST b/accountsservice/PLIST
index d8ef50b..8bb36c6 100644
--- a/accountsservice/PLIST
+++ b/accountsservice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
+@comment $NetBSD$
 include/accountsservice-1.0/act/act-user-enum-types.h
 include/accountsservice-1.0/act/act-user-manager.h
 include/accountsservice-1.0/act/act-user.h
@@ -19,7 +19,6 @@ share/gtk-doc/html/libaccountsservice/api-index-full.html
 share/gtk-doc/html/libaccountsservice/ch01.html
 share/gtk-doc/html/libaccountsservice/home.png
 share/gtk-doc/html/libaccountsservice/index.html
-share/gtk-doc/html/libaccountsservice/index.sgml
 share/gtk-doc/html/libaccountsservice/left-insensitive.png
 share/gtk-doc/html/libaccountsservice/left.png
 share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2
diff --git a/accountsservice/TODO b/accountsservice/TODO
new file mode 100644
index 0000000..9e50867
--- /dev/null
+++ b/accountsservice/TODO
@@ -0,0 +1 @@
+Implement NetBSD account management backend.
diff --git a/accountsservice/distinfo b/accountsservice/distinfo
index 1456754..7374112 100644
--- a/accountsservice/distinfo
+++ b/accountsservice/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
 
-SHA1 (accountsservice-0.6.40.tar.xz) = 2afbcddf6e1d1a97b4cc5c4c7897201f06378ec3
-RMD160 (accountsservice-0.6.40.tar.xz) = 83c148f750058039728397b5c8d058058557d519
-Size (accountsservice-0.6.40.tar.xz) = 367772 bytes
-SHA1 (patch-configure.ac) = 0bf7a0d574f1902a9e33cacb3da3d36bfd017b85
+SHA1 (accountsservice-0.6.42.tar.xz) = 4461347acf3878e100afcc2e3f960fb2c9fd87f4
+RMD160 (accountsservice-0.6.42.tar.xz) = 72b3025468b855d50517729530a92e5cb31ca82e
+SHA512 (accountsservice-0.6.42.tar.xz) = b31d77b88793a8264d32963a98ad446537292a134a3f80fabb4e2ce30f796e5f3066d02a27515c993133fa493b511a6abba6ff1a7827b5a54ea6a4f62a7b6fc9
+Size (accountsservice-0.6.42.tar.xz) = 380500 bytes
 SHA1 (patch-data_Makefile.am) = b059cd214a346adb371e4a006f497d652c9d9234
-SHA1 (patch-src_wtmp-helper.c) = c90e24ec7d1f1c99176e5ce6ab36c896f6dd06fb
+SHA1 (patch-src_wtmp-helper.c) = eb32d598784f31e9baac44bd63ab248f5873c9c3
diff --git a/accountsservice/patches/patch-configure.ac b/accountsservice/patches/patch-configure.ac
deleted file mode 100644
index 79ec00f..0000000
--- a/accountsservice/patches/patch-configure.ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- configure.ac.orig	2015-01-22 21:25:12.000000000 +0000
-+++ configure.ac
-@@ -185,9 +185,33 @@ fi
- 
- AC_SUBST(WARN_CFLAGS)
- 
--AC_CHECK_HEADERS([shadow.h utmpx.h])
-+AC_CHECK_HEADERS([paths.h shadow.h utmpx.h])
- 
--AC_CHECK_FUNCS([fgetpwent])
-+AC_CHECK_FUNCS([fgetpwent setutxdb])
-+
-+wtmpx_found="no"
-+AC_CHECK_DECLS([WTMPX_FILENAME], [wtmpx_found="WTMPX_FILENAME"],
-+               [], [AC_INCLUDES_DEFAULT
-+#include <utmpx.h>
-+               ])
-+if test "$wtmpx_found" = "no" ; then
-+  AC_CHECK_DECLS([_PATH_WTMPX], [wtmpx_found="_PATH_WTMPX"],
-+                 [], [AC_INCLUDES_DEFAULT
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#endif
-+                 ])
-+  if test "$wtmpx_found" = "no" ; then
-+    AC_CHECK_FILE([/var/log/utx.log], [wtmpx_found='"/var/log/utx.log"'])
-+    if test "$wtmpx_found" = "no" ; then
-+      AC_MSG_FAILURE([Do not know which filename to watch for wtmp changes])
-+    fi
-+  fi
-+fi
-+AC_DEFINE_UNQUOTED([PATH_WTMP], [$wtmpx_found], [Path to wtmpx file])
- 
- dnl ---------------------------------------------------------------------------
- dnl - gtk-doc Documentation
diff --git a/accountsservice/patches/patch-src_wtmp-helper.c b/accountsservice/patches/patch-src_wtmp-helper.c
index 161321b..ab44227 100644
--- a/accountsservice/patches/patch-src_wtmp-helper.c
+++ b/accountsservice/patches/patch-src_wtmp-helper.c
@@ -1,35 +1,17 @@
 $NetBSD$
 
---- src/wtmp-helper.c.orig	2014-11-04 03:46:00.000000000 +0000
+NetBSD call WTMPX_FILENAME _PATH_WTMPX.
+
+--- src/wtmp-helper.c.orig	2016-01-27 18:38:21.000000000 +0000
 +++ src/wtmp-helper.c
-@@ -56,12 +56,12 @@ user_previous_login_free (UserPreviousLo
- static gboolean
- wtmp_helper_start (void)
- {
--#if defined(UTXDB_LOG)
-+#if defined(HAVE_SETUTXDB)
-                 if (setutxdb (UTXDB_LOG, NULL) != 0) {
-                         return FALSE;
-                 }
--#elif defined(WTMPX_FILENAME)
--                if (utmpxname (WTMPX_FILENAME) != 0) {
-+#elif defined(PATH_WTMP)
-+                if (utmpxname (PATH_WTMP) != 0) {
-                         return FALSE;
-                 }
+@@ -27,6 +27,10 @@
+ 
+ #ifdef HAVE_UTMPX_H
  
-@@ -212,13 +212,7 @@ wtmp_helper_entry_generator (GHashTable 
- const gchar *
- wtmp_helper_get_path_for_monitor (void)
- {
--#if defined(WTMPX_FILENAME)
--        return WTMPX_FILENAME;
--#elif defined(__FreeBSD__)
--        return "/var/log/utx.log";
--#else
--#error Do not know which filename to watch for wtmp changes
--#endif
-+        return PATH_WTMP;
- }
++#ifdef __NetBSD__
++#define WTMPX_FILENAME	_PATH_WTMPX
++#endif
++
+ #include <utmpx.h>
  
- #else /* HAVE_UTMPX_H */
+ typedef struct {
Prev by Date: ardour: Fix RPATH
Next by Date: ardour: Fix no free disk space error
Previous by Thread: ardour: Fix RPATH
Next by Thread: ardour: Fix no free disk space error
Indexes:
Home | Main Index | Thread Index | Old Index