summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTING5
-rw-r--r--DCO37
-rw-r--r--INSTALL4
-rw-r--r--NEWS6
-rw-r--r--doc/index.html8
-rw-r--r--doc/upgrade.html9
-rw-r--r--package/info2
-rw-r--r--src/include/utmps/utmps.h14
-rw-r--r--src/utmps/logwtmp.c2
-rw-r--r--src/utmps/utmps-utmpd.c6
-rw-r--r--src/utmps/utmps-wtmpd.c2
-rw-r--r--src/utmps/utmps_getent.c2
-rw-r--r--src/utmps/utmps_getid.c2
-rw-r--r--src/utmps/utmps_getline.c2
-rw-r--r--src/utmps/utmps_putline.c2
-rw-r--r--src/utmps/utmps_rewind.c2
-rw-r--r--src/utmps/utmps_start.c2
-rw-r--r--src/utmps/utmps_updwtmpx.c2
18 files changed, 84 insertions, 25 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..6279422
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,5 @@
+ Please add a Signed-Off-By: line at the end of your commit,
+which certifies that you have the right and authority to pass
+it on as an open-source patch, as explicited in the Developer's
+Certificate of Origin available in this project's DCO file,
+or at https://developercertificate.org/
diff --git a/DCO b/DCO
new file mode 100644
index 0000000..8201f99
--- /dev/null
+++ b/DCO
@@ -0,0 +1,37 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+(c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+(d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
diff --git a/INSTALL b/INSTALL
index 7d0ff68..f420c6e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,9 @@ Build Instructions
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
- - skalibs version 2.10.0.3 or later: https://skarnet.org/software/skalibs/
+ - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/
+ - s6 version 2.11.0.0 or later: https://skarnet.org/software/s6/
+ (this is only a run-time requirement, not a build-time one)
This software will run on any operating system that implements
POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index e5e27a9..ef36809 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for utmps.
+In 0.1.0.3
+----------
+
+ - Adaptation to skalibs-2.11.0.0
+
+
In 0.1.0.2
----------
diff --git a/doc/index.html b/doc/index.html
index 794115e..a451655 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -56,11 +56,11 @@ running utmp functions are just clients to this daemon.
<li> A POSIX-compliant system with a standard C development environment </li>
<li> GNU make, version 3.81 or later </li>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.10.0.3 or later. It's a build-time requirement. It's also a run-time
+2.11.0.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs
library. </li>
<li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.10.0.3 or later. It's a <em>run-time</em> requirement only, to run
+2.11.0.0 or later. It's a <em>run-time</em> requirement only, to run
the utmpd and wtmpd services (and can be done without if you have a
suitable replacement for
<a href="//skarnet.org/software/s6/s6-ipcserver.html">s6-ipcserver</a>). </li>
@@ -76,7 +76,7 @@ suitable replacement for
<h3> Download </h3>
<ul>
- <li> The current released version of utmps is <a href="utmps-0.1.0.2.tar.gz">0.1.0.2</a>. </li>
+ <li> The current released version of utmps is <a href="utmps-0.1.0.3.tar.gz">0.1.0.3</a>. </li>
<li> Alternatively, you can checkout a copy of the
<a href="//git.skarnet.org/cgi-bin/cgit.cgi/utmps/">utmps
git repository</a>:
@@ -130,7 +130,7 @@ and <tt>updwtmpx()</tt> functions</a> are also implemented. </li>
<ul>
<li> <tt>utmps</tt> is discussed on the
-<a href="//skarnet.org/lists.html#skaware">skaware</a> mailing-list. </li>
+<a href="//skarnet.org/lists/#skaware">skaware</a> mailing-list. </li>
</ul>
</body>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index a124263..0153439 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
<h1> What has changed in utmps </h1>
+<h2> in 0.1.0.3 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.11.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a> run-time
+dependency bumped to 2.11.0.0. </li>
+</ul>
+
<h2> in 0.1.0.2 </h2>
<ul>
diff --git a/package/info b/package/info
index 5a5337f..8c31b77 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=utmps
-version=0.1.0.2
+version=0.1.0.3
category=admin
package_macro_name=UTMPS
diff --git a/src/include/utmps/utmps.h b/src/include/utmps/utmps.h
index e4760f9..9894276 100644
--- a/src/include/utmps/utmps.h
+++ b/src/include/utmps/utmps.h
@@ -13,23 +13,23 @@ struct utmps_s
} ;
#define UTMPS_ZERO { .fd = -1 }
-extern int utmps_start (utmps *, char const *, tain_t const *, tain_t *) ;
+extern int utmps_start (utmps *, char const *, tain const *, tain *) ;
#define utmps_start_g(a, s, deadline) utmps_start(a, s, (deadline), &STAMP)
extern void utmps_end (utmps *) ;
-extern int utmps_rewind (utmps *, tain_t const *, tain_t *) ;
+extern int utmps_rewind (utmps *, tain const *, tain *) ;
#define utmps_rewind_g (a, deadline) utmps_rewind(a, (deadline), &STAMP)
-extern int utmps_getent (utmps *, struct utmpx *, tain_t const *, tain_t *) ;
+extern int utmps_getent (utmps *, struct utmpx *, tain const *, tain *) ;
#define utmps_getent_g (a, b, deadline) utmps_getent(a, b, (deadline), &STAMP)
-extern int utmps_getid (utmps *, unsigned short, char const *, struct utmpx *, tain_t const *, tain_t *) ;
+extern int utmps_getid (utmps *, unsigned short, char const *, struct utmpx *, tain const *, tain *) ;
#define utmps_getid_g(a, type, id, b, deadline) utmps_getid(a, type, id, b, (deadline), &STAMP)
-extern int utmps_getline (utmps *, char const *, struct utmpx *, tain_t const *, tain_t *) ;
+extern int utmps_getline (utmps *, char const *, struct utmpx *, tain const *, tain *) ;
#define utmps_getline_g(a, line, b, deadline) utmps_getline(a, line, b, (deadline), &STAMP)
-extern int utmps_putline (utmps *, struct utmpx const *, tain_t const *, tain_t *) ;
+extern int utmps_putline (utmps *, struct utmpx const *, tain const *, tain *) ;
#define utmps_putline_g(a, entry, deadline) utmps_putline(a, entry, (deadine), &STAMP)
-extern int utmps_updwtmpx (char const *, struct utmpx const *, tain_t const *, tain_t *) ;
+extern int utmps_updwtmpx (char const *, struct utmpx const *, tain const *, tain *) ;
#define utmps_updwtmpx_g(file, b, deadline) utmps_updwtmpx(file, b, (deadline), &STAMP)
#endif
diff --git a/src/utmps/logwtmp.c b/src/utmps/logwtmp.c
index 83cd177..7294a7d 100644
--- a/src/utmps/logwtmp.c
+++ b/src/utmps/logwtmp.c
@@ -14,7 +14,7 @@ void logwtmp (char const *line, char const *name, char const *host)
strncpy(b.ut_host, host, UTMPS_UT_HOSTSIZE - 1) ;
b.ut_pid = getpid() ;
{
- tain_t now ;
+ tain now ;
tain_wallclock_read(&now) ;
timeval_from_tain(&b.ut_tv, &now) ;
}
diff --git a/src/utmps/utmps-utmpd.c b/src/utmps/utmps-utmpd.c
index e40d244..ec82f2e 100644
--- a/src/utmps/utmps-utmpd.c
+++ b/src/utmps/utmps-utmpd.c
@@ -24,7 +24,7 @@ static int fd = -1 ;
static void get0 (char *s, size_t n)
{
- tain_t deadline ;
+ tain deadline ;
tain_ulong(&deadline, 30) ;
tain_add_g(&deadline, &deadline) ;
if (buffer_timed_get_g(buffer_0small, s, n, &deadline) < n)
@@ -33,7 +33,7 @@ static void get0 (char *s, size_t n)
static void flush1 (void)
{
- tain_t deadline ;
+ tain deadline ;
tain_ulong(&deadline, 30) ;
tain_add_g(&deadline, &deadline) ;
if (!buffer_timed_flush_g(buffer_1small, &deadline))
@@ -246,7 +246,7 @@ int main (void)
for (;;)
{
- tain_t deadline ;
+ tain deadline ;
char c ;
tain_add_g(&deadline, &tain_infinite_relative) ;
if (!buffer_timed_get_g(buffer_0small, &c, 1, &deadline)) break ;
diff --git a/src/utmps/utmps-wtmpd.c b/src/utmps/utmps-wtmpd.c
index b8639f8..7ca3eff 100644
--- a/src/utmps/utmps-wtmpd.c
+++ b/src/utmps/utmps-wtmpd.c
@@ -29,7 +29,7 @@ int main (void)
{
struct utmpx b ;
char const *x ;
- tain_t deadline ;
+ tain deadline ;
size_t w ;
uid_t uid ;
int fd ;
diff --git a/src/utmps/utmps_getent.c b/src/utmps/utmps_getent.c
index 2b21b04..7b98c34 100644
--- a/src/utmps/utmps_getent.c
+++ b/src/utmps/utmps_getent.c
@@ -7,7 +7,7 @@
#include <utmps/utmps.h>
#include "utmps-internal.h"
-int utmps_getent (utmps *a, struct utmpx *b, tain_t const *deadline, tain_t *stamp)
+int utmps_getent (utmps *a, struct utmpx *b, tain const *deadline, tain *stamp)
{
ssize_t r ;
char buf[1 + sizeof(struct utmpx)] ;
diff --git a/src/utmps/utmps_getid.c b/src/utmps/utmps_getid.c
index f347b3e..b07b989 100644
--- a/src/utmps/utmps_getid.c
+++ b/src/utmps/utmps_getid.c
@@ -9,7 +9,7 @@
#include <utmps/utmps.h>
#include "utmps-internal.h"
-int utmps_getid (utmps *a, unsigned short type, char const *id, struct utmpx *b, tain_t const *deadline, tain_t *stamp)
+int utmps_getid (utmps *a, unsigned short type, char const *id, struct utmpx *b, tain const *deadline, tain *stamp)
{
ssize_t r ;
char sbuf[1 + USHORT_PACK + UTMPS_UT_IDSIZE] __attribute__ ((nonstring)) ;
diff --git a/src/utmps/utmps_getline.c b/src/utmps/utmps_getline.c
index 686782a..cb7c984 100644
--- a/src/utmps/utmps_getline.c
+++ b/src/utmps/utmps_getline.c
@@ -8,7 +8,7 @@
#include <utmps/utmps.h>
#include "utmps-internal.h"
-int utmps_getline (utmps *a, char const *line, struct utmpx *b, tain_t const *deadline, tain_t *stamp)
+int utmps_getline (utmps *a, char const *line, struct utmpx *b, tain const *deadline, tain *stamp)
{
ssize_t r ;
char sbuf[1 + UTMPS_UT_LINESIZE] __attribute__ ((nonstring)) ;
diff --git a/src/utmps/utmps_putline.c b/src/utmps/utmps_putline.c
index 306fa1b..04ed540 100644
--- a/src/utmps/utmps_putline.c
+++ b/src/utmps/utmps_putline.c
@@ -8,7 +8,7 @@
#include <utmps/utmps.h>
#include "utmps-internal.h"
-int utmps_putline (utmps *a, struct utmpx const *b, tain_t const *deadline, tain_t *stamp)
+int utmps_putline (utmps *a, struct utmpx const *b, tain const *deadline, tain *stamp)
{
ssize_t r ;
char buf[1 + sizeof(struct utmpx)] = "E" ;
diff --git a/src/utmps/utmps_rewind.c b/src/utmps/utmps_rewind.c
index 371cb0d..fe3c8ed 100644
--- a/src/utmps/utmps_rewind.c
+++ b/src/utmps/utmps_rewind.c
@@ -6,7 +6,7 @@
#include <utmps/utmps.h>
#include "utmps-internal.h"
-int utmps_rewind (utmps *a, tain_t const *deadline, tain_t *stamp)
+int utmps_rewind (utmps *a, tain const *deadline, tain *stamp)
{
ssize_t r ;
char c ;
diff --git a/src/utmps/utmps_start.c b/src/utmps/utmps_start.c
index 1284821..3f2d8a1 100644
--- a/src/utmps/utmps_start.c
+++ b/src/utmps/utmps_start.c
@@ -4,7 +4,7 @@
#include <skalibs/socket.h>
#include <utmps/utmps.h>
-int utmps_start (utmps *a, char const *path, tain_t const *deadline, tain_t *stamp)
+int utmps_start (utmps *a, char const *path, tain const *deadline, tain *stamp)
{
int fd = ipc_stream_nbcoe() ;
if (fd < 0) return 0 ;
diff --git a/src/utmps/utmps_updwtmpx.c b/src/utmps/utmps_updwtmpx.c
index 55811c4..5b0557e 100644
--- a/src/utmps/utmps_updwtmpx.c
+++ b/src/utmps/utmps_updwtmpx.c
@@ -7,7 +7,7 @@
#include <utmps/utmps.h>
#include "utmps-internal.h"
-int utmps_updwtmpx (char const *path, struct utmpx const *b, tain_t const *deadline, tain_t *stamp)
+int utmps_updwtmpx (char const *path, struct utmpx const *b, tain const *deadline, tain *stamp)
{
utmps a = UTMPS_ZERO ;
ssize_t r ;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:25:37 +0000