aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/configure-snippets/configure_case_lines6
-rw-r--r--package/configure-snippets/configure_expand_dirs1
-rw-r--r--package/configure-snippets/configure_generate_configh2
-rw-r--r--package/configure-snippets/configure_generate_make12
-rw-r--r--package/configure-snippets/configure_help_dependencies1
-rw-r--r--package/configure-snippets/configure_help_install1
-rw-r--r--package/configure-snippets/configure_help_options6
-rw-r--r--package/configure-snippets/configure_init_vars4
-rw-r--r--package/configure-snippets/configure_slashpackage_other1
-rw-r--r--package/deps-build4
-rw-r--r--package/deps.mak18
-rw-r--r--package/info2
-rw-r--r--package/targets.mak1
13 files changed, 48 insertions, 11 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..f3c9708
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,6 @@
+ --enable-libc-includes|--enable-libc-includes=yes) libcincludes=true ;;
+ --disable-libc-includes|--enable-libc-includes=no) libcincludes=false ;;
+ --enable-nsss|--enable-nsss=yes) usensss=true ;;
+ --disable-nsss|--enable-nsss=no) usensss=false ;;
+ --with-utmpd-socket=*) utmpdpath=${arg#*=} ;;
+ --with-wtmpd-socket=*) wtmpdpath=${arg#*=} ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_expand_dirs
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
new file mode 100644
index 0000000..2e0d84c
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1,2 @@
+echo "#define ${package_macro_name}_UTMPD_PATH \"$utmpdpath\""
+echo "#define ${package_macro_name}_WTMPD_PATH \"$wtmpdpath\""
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..e361a46
--- /dev/null
+++ b/package/configure-snippets/configure_generate_make
@@ -0,0 +1,12 @@
+if $libcincludes ; then
+ echo "DO_LIBC_INCLUDES := 1"
+else
+ echo "DO_LIBC_INCLUDES :="
+fi
+if $usensss ; then
+ echo "LIBNSSS := -lnsss"
+ echo "MAYBEPTHREAD_LIB := -lpthread"
+else
+ echo "LIBNSSS :="
+ echo "MAYBEPTHREAD_LIB :="
+fi
diff --git a/package/configure-snippets/configure_help_dependencies b/package/configure-snippets/configure_help_dependencies
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_dependencies
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_install
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
new file mode 100644
index 0000000..c0f8c1a
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,6 @@
+ --enable-nsss use the nsss library for user information [disabled]
+ --enable-libc-includes overwrite utmpx.h in includedir [disabled]
+
+ --with-utmpd-socket=PATH assume the utmpd socket is at PATH [/run/utmps/.utmpd-socket]
+ --with-wtmpd-socket=PATH assume the wtmpd socket is at PATH [/run/utmps/.wtmpd-socket]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..edb8ad3
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1,4 @@
+usensss=false
+libcincludes=false
+utmpdpath=/run/utmps/.utmpd-socket
+wtmpdpath=/run/utmps/.wtmpd-socket
diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_slashpackage_other
@@ -0,0 +1 @@
+
diff --git a/package/deps-build b/package/deps-build
index eb4384b..fb4d1da 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,2 +1,2 @@
-/package/prog/skalibs
-/package/admin/nsss $usensss
+true true /package/prog/skalibs 2.14.4.0 libskarnet
+$usensss false /package/admin/nsss 0.2.1.0 libnsss
diff --git a/package/deps.mak b/package/deps.mak
index fa85734..0169948 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -33,13 +33,15 @@ src/utmps/utmpxname.o src/utmps/utmpxname.lo: src/utmps/utmpxname.c src/include/
ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
libutmps.a.xyzzy: src/utmps/endutxent.o src/utmps/getutxent.o src/utmps/getutxid.o src/utmps/getutxline.o src/utmps/logwtmp.o src/utmps/pututxline.o src/utmps/setutxent.o src/utmps/updwtmpx.o src/utmps/utmpxname.o src/utmps/utmps_end.o src/utmps/utmps_getent.o src/utmps/utmps_getid.o src/utmps/utmps_getline.o src/utmps/utmps_here.o src/utmps/utmps_here_maybe_init.o src/utmps/utmps_putline.o src/utmps/utmps_rewind.o src/utmps/utmps_start.o src/utmps/utmps_updwtmpx.o src/utmps/utmps_utmpx_pack.o src/utmps/utmps_utmpx_unpack.o
else
-libutmps.a.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo
+libutmps.a.xyzzy:src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo
endif
+libutmps.pc: EXTRA_LIBS := -lskarnet
libutmps.so.xyzzy: EXTRA_LIBS := -lskarnet
-libutmps.so.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo
-utmps-utmpd: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
-utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS}
-utmps-write: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${MAYBEPTHREAD_LIB}
-utmps-write: src/utmps/utmps-write.o libutmps.a.xyzzy ${LIBNSSS} #{SYSCLOCK_LIB}
-utmps-wtmpd: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
-utmps-wtmpd: src/utmps/utmps-wtmpd.o libutmps.a.xyzzy ${LIBNSSS}
+libutmps.so.xyzzy:src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo
+utmps-utmpd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet
+utmps-write: EXTRA_LIBS := ${SOCKET_LIB} ${MAYBEPTHREAD_LIB}
+utmps-write: src/utmps/utmps-write.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet #{SYSCLOCK_LIB}
+utmps-wtmpd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+utmps-wtmpd: src/utmps/utmps-wtmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet
+INTERNAL_LIBS :=
diff --git a/package/info b/package/info
index b82f88c..b839159 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=utmps
-version=0.1.2.4
+version=0.1.3.0
category=admin
package_macro_name=UTMPS
diff --git a/package/targets.mak b/package/targets.mak
index 1d68e83..13b1e4d 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -6,6 +6,7 @@ utmps-write
LIBEXEC_TARGETS :=
LIB_DEFS := UTMPS=utmps
+UTMPS_DESCRIPTION := The utmps library, a secure utmp implementation
ifneq ($(DO_LIBC_INCLUDES),)
EXTRA_INCLUDES := src/include/utmpx.h