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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
wertyi48 2013-07-03 23:19:31 -03:00
commit 8cd09c33af
11 changed files with 85 additions and 367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/ethtool/template
View file

@ -1,6 +1,6 @@
# Template file for 'ethtool' # Template file for 'ethtool'
pkgname=ethtool pkgname=ethtool
version=3.8 version=3.10
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
short_desc="Utility for controlling network drivers and hardware" short_desc="Utility for controlling network drivers and hardware"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org/pub/software/network/ethtool/" homepage="http://www.kernel.org/pub/software/network/ethtool/"
license="GPL-2" license="GPL-2"
distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=510df229ffb27bc030bf60d6181a021e9d3707a082d6565b6daae3d352ee2c95 checksum=f88d941b63a0e51613bde5498d42f4ee2eefa332064e7a8dd80069a341dc1c40
ethtool_package() { ethtool_package() {
pkg_install() { pkg_install() {

9
srcpkgs/kmod/template
View file

@ -1,7 +1,7 @@
# Template file for 'kmod' # Template file for 'kmod'
pkgname=kmod pkgname=kmod
version=13 version=14
revision=3 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-zlib --with-xz" configure_args="--with-zlib --with-xz"
hostmakedepends="pkg-config libxslt" hostmakedepends="pkg-config libxslt"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"
homepage="http://git.profusion.mobi/cgit.cgi/kmod.git" homepage="http://git.profusion.mobi/cgit.cgi/kmod.git"
distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz" distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
checksum=6c36d3abba2f98c84973ae275951c866f8bf304e7356c2fe60633800239d7956 checksum=1f54abb63ba3642277ae1af3626c0896b102a915c4d8b9eb5005ae0afe6e7174
long_desc=" long_desc="
kmod is a set of tools to handle common tasks with Linux kernel modules like kmod is a set of tools to handle common tasks with Linux kernel modules like
insert, remove, list, check properties, resolve dependencies and aliases." insert, remove, list, check properties, resolve dependencies and aliases."
@ -36,7 +36,7 @@ post_install() {
libkmod_package() { libkmod_package() {
short_desc+=" - runtime shared library" short_desc+=" - runtime shared library"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so*" vmove "usr/lib/*.so.*"
} }
} }
@ -46,6 +46,7 @@ libkmod-devel_package() {
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
} }
} }

12
srcpkgs/libudev/template
View file

@ -1,7 +1,7 @@
# Template file for 'libudev' # Template file for 'libudev'
pkgname=libudev pkgname=libudev
version=204 version=205
revision=5 revision=1
wrksrc="systemd-${version}" wrksrc="systemd-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --disable-selinux configure_args="--libexecdir=/usr/lib --disable-selinux
@ -20,7 +20,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/systemd" homepage="http://www.freedesktop.org/wiki/Software/systemd"
license="LGPL-2.1, GPL-2, MIT" license="LGPL-2.1, GPL-2, MIT"
distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz"
checksum=072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b checksum=54d6d3e1e9e66b6a484f68a3323cb489f0a8f50bdeb1d5465c3a48c6fc1e0058
hostmakedepends="pkg-config intltool gperf libxslt docbook-xsl hostmakedepends="pkg-config intltool gperf libxslt docbook-xsl
libtool automake gettext-devel" libtool automake gettext-devel"
@ -48,12 +48,13 @@ libudev-devel_package() {
pkg_install() { pkg_install() {
vmove usr/include/libudev.h vmove usr/include/libudev.h
vmove usr/lib/pkgconfig/libudev.pc vmove usr/lib/pkgconfig/libudev.pc
vmove "usr/lib/libudev*.so"
} }
} }
libudev_package() { libudev_package() {
pkg_install() { pkg_install() {
vmove "usr/lib/libudev.so*" vmove "usr/lib/libudev.so.*"
} }
} }
@ -63,6 +64,7 @@ systemd-devel_package() {
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vmove usr/share/man/man3 vmove usr/share/man/man3
vmove usr/share/pkgconfig vmove usr/share/pkgconfig
} }
@ -72,6 +74,6 @@ systemd-libs_package() {
short_desc="systemd runtime libraries" short_desc="systemd runtime libraries"
replaces="systemd<43_1" replaces="systemd<43_1"
pkg_install() { pkg_install() {
vmove "usr/lib/libsystemd*.so*" vmove "usr/lib/libsystemd*.so.*"
} }
} }

4
srcpkgs/linux3.9/template
View file

@ -1,7 +1,7 @@
# Template file for 'linux3.9' # Template file for 'linux3.9'
# #
pkgname=linux3.9 pkgname=linux3.9
version=3.9.8 version=3.9.9
revision=1 revision=1
wrksrc="linux-${version}" wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
license="GPL-2" license="GPL-2"
short_desc="The Linux kernel and modules (3.9 series)" short_desc="The Linux kernel and modules (3.9 series)"
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
checksum=1e03df56535fc062d18aba5061eb2108a00aa2a726c8fc24f78f4dc3b21fd335 checksum=33a0a4a87545ab2f98c91554d915e807d58651201a81231d9eb2ef896a313cff
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
makedepends="bc perl kmod>=11_2 openssl which elfutils" makedepends="bc perl kmod>=11_2 openssl which elfutils"

9
srcpkgs/pingus/files/pingus.desktop Normal file
View file

@ -0,0 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Pingus
Comment=A free Lemmings[tm] clone
Exec=pingus
Terminal=false
Type=Application
Categories=Application;Game;LogicGame
Icon=/usr/share/pingus/images/core/editor/actions.png

22
srcpkgs/pingus/patches/pingus-0.7.6-gcc470-udl.patch Normal file
View file

@ -0,0 +1,22 @@
--- src/pingus/pingus_main.cpp~ 2011-12-24 15:46:47.000000000 -0600
+++ src/pingus/pingus_main.cpp 2012-01-03 13:13:03.034195720 -0600
@@ -465,7 +465,7 @@
void
PingusMain::print_greeting_message()
{
- std::string greeting = "Welcome to Pingus "VERSION;
+ std::string greeting = "Welcome to Pingus " VERSION;
greeting += "!";
std::cout << greeting << std::endl;
for (unsigned int i = 0; i < greeting.length(); ++i)
--- src/pingus/screens/pingus_menu.cpp~ 2011-12-24 15:46:47.000000000 -0600
+++ src/pingus/screens/pingus_menu.cpp 2012-01-03 13:30:28.967700554 -0600
@@ -153,7 +153,7 @@
gc.get_height()/2 - 280));
gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
+ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
"See the file AUTHORS for a complete list of contributors.\n"
"Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
"welcome to redistribute it under certain conditions; see the file COPYING for details.\n");

27
srcpkgs/pingus/template Normal file
View file

@ -0,0 +1,27 @@
# Template file for 'pingus'
pkgname=pingus
version=0.7.6
revision=1
hostmakedepends="scons pkg-config"
makedepends="SDL_image-devel SDL_mixer-devel boost-devel libpng-devel libXi-devel zlib-devel"
short_desc="Free Lemmings-like puzzle game"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://pingus.seul.org/welcome.html"
distfiles="http://pingus.googlecode.com/files/pingus-${version}.tar.bz2"
checksum=759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460
do_build() {
scons prefix=/usr
}
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
vinstall ${FILESDIR}/pingus.desktop 644 usr/share/applications
}
pingus_package() {
pkg_install() {
vmove all
}
}

87
srcpkgs/systemd/patches/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
View file

@ -1,87 +0,0 @@
From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 28 May 2013 20:45:34 +0200
Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't
exist
Since 11ec7ce, journald isn't setting the ACLs properly anymore if
the files had no ACLs to begin with: acl_set_fd fails with EINVAL.
An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is
invalid, so make sure a mask exists before trying to set the ACL.
---
src/journal/journald-server.c | 6 ++++--
src/shared/acl-util.c | 28 ++++++++++++++++++++++++++++
src/shared/acl-util.h | 1 +
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index b717b92..da5b725 100644
--- src/journal/journald-server.c
+++ src/journal/journald-server.c
@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
}
}
- /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */
+ /* We do not recalculate the mask unconditionally here,
+ * so that the fchmod() mask above stays intact. */
if (acl_get_permset(entry, &permset) < 0 ||
- acl_add_perm(permset, ACL_READ) < 0) {
+ acl_add_perm(permset, ACL_READ) < 0 ||
+ calc_acl_mask_if_needed(&acl) < 0) {
log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
goto finish;
}
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 48bb12f..fb04e49 100644
--- src/shared/acl-util.c
+++ src/shared/acl-util.c
@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
return 0;
}
+int calc_acl_mask_if_needed(acl_t *acl_p) {
+ acl_entry_t i;
+ int found;
+
+ assert(acl_p);
+
+ for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i);
+ found > 0;
+ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) {
+
+ acl_tag_t tag;
+
+ if (acl_get_tag_type(i, &tag) < 0)
+ return -errno;
+
+ if (tag == ACL_MASK)
+ return 0;
+ }
+
+ if (found < 0)
+ return -errno;
+
+ if (acl_calc_mask(acl_p) < 0)
+ return -errno;
+
+ return 0;
+}
+
int search_acl_groups(char*** dst, const char* path, bool* belong) {
acl_t acl;
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index 23090d9..36ef490 100644
--- src/shared/acl-util.h
+++ src/shared/acl-util.h
@@ -24,4 +24,5 @@
#include <stdbool.h>
int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
+int calc_acl_mask_if_needed(acl_t *acl_p);
int search_acl_groups(char*** dst, const char* path, bool* belong);
--
1.8.3

255
srcpkgs/systemd/patches/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
View file

@ -1,255 +0,0 @@
From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 16 May 2013 00:19:03 +0200
Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal
runtime service
With this change systemd-update-utmp-shutdown.service is replaced by
systemd-update-utmp.service which is started at boot and stays around
until shutdown. This allows us to properly order the unit against both
/var/log and auditd.
https://bugzilla.redhat.com/show_bug.cgi?id=853104
https://bugs.freedesktop.org/show_bug.cgi?id=64365
---
Makefile-man.am | 12 ++++++------
Makefile.am | 8 ++++----
....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++--------
src/update-utmp/update-utmp.c | 2 +-
units/.gitignore | 2 +-
units/systemd-update-utmp-runlevel.service.in | 8 +++++---
units/systemd-update-utmp-shutdown.service.in | 19 -------------------
units/systemd-update-utmp.service.in | 21 +++++++++++++++++++++
8 files changed, 46 insertions(+), 42 deletions(-)
rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%)
delete mode 100644 units/systemd-update-utmp-shutdown.service.in
create mode 100644 units/systemd-update-utmp.service.in
diff --git a/Makefile-man.am b/Makefile-man.am
index 7d62094..5888158 100644
--- Makefile-man.am
+++ Makefile-man.am
@@ -72,7 +72,7 @@ MANPAGES += \
man/systemd-tmpfiles.8 \
man/systemd-tty-ask-password-agent.1 \
man/systemd-udevd.service.8 \
- man/systemd-update-utmp-runlevel.service.8 \
+ man/systemd-update-utmp.service.8 \
man/systemd.1 \
man/systemd.automount.5 \
man/systemd.device.5 \
@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \
man/systemd-udevd-control.socket.8 \
man/systemd-udevd-kernel.socket.8 \
man/systemd-udevd.8 \
- man/systemd-update-utmp-shutdown.service.8 \
+ man/systemd-update-utmp-runlevel.service.8 \
man/systemd-update-utmp.8 \
man/systemd-user.conf.5
man/SD_ALERT.3: man/sd-daemon.3
@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
man/systemd-udevd.8: man/systemd-udevd.service.8
-man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
-man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8
+man/systemd-update-utmp.8: man/systemd-update-utmp.service.8
man/systemd-user.conf.5: man/systemd-system.conf.5
man/SD_ALERT.html: man/sd-daemon.html
$(html-alias)
@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
man/systemd-udevd.html: man/systemd-udevd.service.html
$(html-alias)
-man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html
+man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html
$(html-alias)
-man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html
+man/systemd-update-utmp.html: man/systemd-update-utmp.service.html
$(html-alias)
man/systemd-user.conf.html: man/systemd-system.conf.html
diff --git a/Makefile.am b/Makefile.am
index 8d8139c..4c5e6fc 100644
--- Makefile.am
+++ Makefile.am
@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
units/systemd-initctl.service \
units/systemd-shutdownd.service \
units/systemd-remount-fs.service \
+ units/systemd-update-utmp.service \
units/systemd-update-utmp-runlevel.service \
- units/systemd-update-utmp-shutdown.service \
units/systemd-tmpfiles-setup-dev.service \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
@@ -463,8 +463,8 @@ EXTRA_DIST += \
units/systemd-initctl.service.in \
units/systemd-shutdownd.service.in \
units/systemd-remount-fs.service.in \
+ units/systemd-update-utmp.service.in \
units/systemd-update-utmp-runlevel.service.in \
- units/systemd-update-utmp-shutdown.service.in \
units/systemd-tmpfiles-setup-dev.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \
RUNLEVEL5_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
endif
-SHUTDOWN_TARGET_WANTS += \
- systemd-update-utmp-shutdown.service
+SYSINIT_TARGET_WANTS += \
+ systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
systemd-fsck-root.service \
diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml
similarity index 82%
rename from man/systemd-update-utmp-runlevel.service.xml
rename to man/systemd-update-utmp.service.xml
index 867b958..846fc95 100644
--- man/systemd-update-utmp-runlevel.service.xml
+++ man/systemd-update-utmp.service.xml
@@ -19,10 +19,10 @@
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd-update-utmp-runlevel.service">
+<refentry id="systemd-update-utmp.service">
<refentryinfo>
- <title>systemd-update-utmp-runlevel.service</title>
+ <title>systemd-update-utmp.service</title>
<productname>systemd</productname>
<authorgroup>
@@ -36,21 +36,21 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle>
+ <refentrytitle>systemd-update-utmp.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
<refnamediv>
+ <refname>systemd-update-utmp.service</refname>
<refname>systemd-update-utmp-runlevel.service</refname>
- <refname>systemd-update-utmp-shutdown.service</refname>
<refname>systemd-update-utmp</refname>
- <refpurpose>Write audit and utmp updates at runlevel
+ <refpurpose>Write audit and utmp updates at bootup, runlevel
changes and shutdown</refpurpose>
</refnamediv>
<refsynopsisdiv>
+ <para><filename>systemd-update-utmp.service</filename></para>
<para><filename>systemd-update-utmp-runlevel.service</filename></para>
- <para><filename>systemd-update-utmp-shutdown.service</filename></para>
<para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
</refsynopsisdiv>
@@ -60,8 +60,8 @@
<para><filename>systemd-update-utmp-runlevel.service</filename>
is a service that writes SysV runlevel changes to utmp
and wtmp, as well as the audit logs, as they
- occur. <filename>systemd-update-utmp-shutdown.service</filename>
- does the same for shut-down requests.</para>
+ occur. <filename>systemd-update-utmp.service</filename>
+ does the same for system reboots and shut-down requests.</para>
</refsect1>
<refsect1>
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 9184025..202aa98 100644
--- src/update-utmp/update-utmp.c
+++ src/update-utmp/update-utmp.c
@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) {
{ '3', SPECIAL_RUNLEVEL3_TARGET },
{ '4', SPECIAL_RUNLEVEL4_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
- { 'S', SPECIAL_RESCUE_TARGET },
+ { '1', SPECIAL_RESCUE_TARGET },
};
const char
*interface = "org.freedesktop.systemd1.Unit",
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 27fae2c..99783e2 100644
--- units/systemd-update-utmp-runlevel.service.in
+++ units/systemd-update-utmp-runlevel.service.in
@@ -7,12 +7,14 @@
[Unit]
Description=Update UTMP about System Runlevel Changes
-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
+Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
DefaultDependencies=no
RequiresMountsFor=/var/log/wtmp
-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
+Conflicts=shutdown.target
+Requisite=systemd-update-utmp.service
+After=systemd-update-utmp.service
After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
-Before=final.target
+Before=shutdown.target
[Service]
Type=oneshot
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
deleted file mode 100644
index aa93562..0000000
--- units/systemd-update-utmp-shutdown.service.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Update UTMP about System Shutdown
-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
-DefaultDependencies=no
-RequiresMountsFor=/var/log/wtmp
-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
-After=systemd-update-utmp-runlevel.service
-Before=final.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown
diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
new file mode 100644
index 0000000..e7c20a5
--- /dev/null
+++ units/systemd-update-utmp.service.in
@@ -0,0 +1,21 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Update UTMP about System Reboot/Shutdown
+Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
+DefaultDependencies=no
+RequiresMountsFor=/var/log/wtmp
+Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
+Before=sysinit.target shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@rootlibexecdir@/systemd-update-utmp reboot
+ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown
--
1.8.2.3

9
srcpkgs/systemd/template
View file

@ -1,13 +1,13 @@
# Template file for 'systemd' # Template file for 'systemd'
pkgname=systemd pkgname=systemd
version=204 version=205
revision=5 revision=1
short_desc="A system and service manager for Linux" short_desc="A system and service manager for Linux"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/systemd" homepage="http://www.freedesktop.org/wiki/Software/systemd"
license="LGPL-2.1, GPL-2, MIT" license="LGPL-2.1, GPL-2, MIT"
distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
checksum=072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b checksum=54d6d3e1e9e66b6a484f68a3323cb489f0a8f50bdeb1d5465c3a48c6fc1e0058
build_style=gnu-configure build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-rootprefix=/usr configure_args="--libexecdir=/usr/lib --with-rootprefix=/usr
@ -130,7 +130,7 @@ libgudev_package() {
short_desc="GObject-based wrapper library for libudev" short_desc="GObject-based wrapper library for libudev"
depends="libudev>=${version}" depends="libudev>=${version}"
pkg_install() { pkg_install() {
vmove "usr/lib/libgudev*.so*" vmove "usr/lib/libgudev*.so.*"
vmove usr/lib/girepository-1.0 vmove usr/lib/girepository-1.0
} }
} }
@ -140,6 +140,7 @@ libgudev-devel_package() {
short_desc="GObject-based wrapper library for libudev - development files" short_desc="GObject-based wrapper library for libudev - development files"
pkg_install() { pkg_install() {
vmove usr/include/gudev-1.0 vmove usr/include/gudev-1.0
vmove "usr/lib/libgudev*.so"
vmove "usr/lib/pkgconfig/gudev*" vmove "usr/lib/pkgconfig/gudev*"
vmove usr/share/gir-1.0 vmove usr/share/gir-1.0
} }

14
srcpkgs/xbps-git/template
View file

@ -1,10 +1,9 @@
# Template file for 'xbps-git' # Template file for 'xbps-git'
pkgname=xbps-git pkgname=xbps-git
version=20130610 version=20130704
revision=1 revision=1
build_style=configure build_style=configure
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests"
--enable-static --enable-debug --enable-tests"
short_desc="The XBPS package system (development branch)" short_desc="The XBPS package system (development branch)"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps" homepage="http://code.google.com/p/xbps"
@ -20,27 +19,26 @@ do_fetch() {
} }
hostmakedepends="which pkg-config" hostmakedepends="which pkg-config"
makedepends="zlib-devel proplib-devel openssl-devel libfetch-devel makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
libarchive-devel>=3.1.2 confuse-devel atf-devel"
libxbps-git_package() { libxbps-git_package() {
short_desc+=" - runtime library" short_desc+=" - runtime library"
provides="libxbps-${version}" provides="libxbps-${version}"
replaces="libxbps>=0 xbps-devel>=0" replaces="libxbps>=0 xbps-devel>=0"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so*" vmove "usr/lib/*.so.*"
} }
} }
libxbps-devel-git_package() { libxbps-devel-git_package() {
short_desc+=" - runtime library (development files)" short_desc+=" - runtime library (development files)"
depends="zlib-devel proplib-devel confuse-devel libfetch-devel depends="zlib-devel libarchive-devel libxbps>=${version}"
libarchive-devel libxbps>=${version}"
provides="libxbps-devel-${version}" provides="libxbps-devel-${version}"
replaces="libxbps-devel>=0" replaces="libxbps-devel>=0"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove "usr/lib/*.a" vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
} }
} }