wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util-linux: login.pam: make pam_systemd optional; remove obsolete patch.

Browse source
This commit is contained in:
Juan RP 2014-06-20 10:01:53 +02:00
parent 71c662548c
commit 418d1bae99
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/util-linux/files/login.pam
View file

@ -12,7 +12,7 @@ session optional pam_mail.so dir=/var/mail standard
session optional pam_lastlog.so session optional pam_lastlog.so
session required pam_unix.so session required pam_unix.so
session required pam_loginuid.so session required pam_loginuid.so
session required pam_systemd.so -session required pam_systemd.so
session required pam_limits.so session required pam_limits.so
password required pam_unix.so sha512 shadow nullok try_first_pass use_authtok password required pam_unix.so sha512 shadow nullok try_first_pass use_authtok

17
srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch
View file

@ -1,17 +0,0 @@
TIMESPEC_TO_TIMEVAL is a macro defined by glibc... remove this for musl-0.9.16.
--- sys-utils/dmesg.c.orig 2014-01-07 21:40:23.490421172 +0100
+++ sys-utils/dmesg.c 2014-01-07 21:41:22.419080539 +0100
@@ -35,6 +35,12 @@
#include "mangle.h"
#include "pager.h"
+#ifndef TIMESPEC_TO_TIMEVAL
+#define TIMESPEC_TO_TIMEVAL(tv, ts) { \
+ (tv)->tv_sec = (ts)->tv_sec; \
+ (tv)->tv_usec = (ts)->tv_nsec / 1000; \
+}
+#endif
/* Close the log. Currently a NOP. */
#define SYSLOG_ACTION_CLOSE 0
/* Open the log. Currently a NOP. */

8
srcpkgs/util-linux/template
View file

@ -1,7 +1,7 @@
# Template file for 'util-linux' # Template file for 'util-linux'
pkgname=util-linux pkgname=util-linux
version=2.24.2 version=2.24.2
revision=1 revision=2
short_desc="Miscellaneous linux utilities" short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng" homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@ -26,9 +26,9 @@ replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
provides="eject-${version}_1" provides="eject-${version}_1"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool" hostmakedepends+=" automake gettext-devel libtool"
pre_configure() { pre_configure() {
libtoolize -f NOCONFIGURE=1 ./autogen.sh
} }
fi fi
@ -45,11 +45,9 @@ do_configure() {
--enable-socket-activation --localstatedir=/run \ --enable-socket-activation --localstatedir=/run \
SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie" SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
} }
do_build() { do_build() {
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install