Merge branch 'master' of github.com:voidlinux/void-packages
This commit is contained in:
commit
ab7f7e068e
69 changed files with 949 additions and 609 deletions
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'Adapta'
|
||||
pkgname=Adapta
|
||||
version=3.89.4.47
|
||||
version=3.89.4.92
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
wrksrc="adapta-gtk-theme-$version"
|
||||
|
@ -11,7 +11,7 @@ maintainer="demiaster <marta.celeste.feriani@gmail.com>"
|
|||
license="GPL-2"
|
||||
homepage="https://github.com/tista500/$pkgname"
|
||||
distfiles="$homepage/archive/$version.tar.gz"
|
||||
checksum=8262daa5557f4030610ac7e9a51e380eb538dc39461dd35594981db956990fca
|
||||
checksum=720a7c2f8950225b3785fe6bd557074cf54a0a455ebcef50195542abb9c72172
|
||||
|
||||
noarch=y
|
||||
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
# Template file for 'LoginKit'
|
||||
pkgname=LoginKit
|
||||
version=0.1
|
||||
revision=3
|
||||
_gitrev=f3635476546233be0c19a155b1ceb986650501d4
|
||||
wrksrc="${pkgname}-${_gitrev}"
|
||||
build_style=gnu-makefile
|
||||
make_build_args="SBIN_DIR=/usr/bin"
|
||||
make_install_args="SBIN_DIR=/usr/bin"
|
||||
hostmakedepends="pkg-config glib-devel"
|
||||
makedepends="pam-devel libglib-devel"
|
||||
depends="ConsoleKit2"
|
||||
short_desc="Glue layer between ConsoleKit2 and logind's dbus interfaces"
|
||||
maintainer="Enno Boland <g@s01.de>"
|
||||
license="MIT"
|
||||
homepage="https://github.com/dimkr/LoginKit"
|
||||
distfiles="https://github.com/dimkr/LoginKit/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
|
||||
checksum=55a5f510d78e4fc8e92bc8b970251529cb396fcbcca76fda6f91b9da38e59795
|
|
@ -1,2 +0,0 @@
|
|||
site="https://git.devuan.org/pkgs-utopia-substitution/loginkit/tags"
|
||||
pattern='upstream/\K[\d.]+'
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'NetworkManager-openconnect'.
|
||||
pkgname=NetworkManager-openconnect
|
||||
version=1.0.8
|
||||
revision=2
|
||||
version=1.2.4
|
||||
revision=1
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static"
|
||||
|
@ -14,4 +14,4 @@ homepage="https://wiki.gnome.org/Projects/NetworkManager"
|
|||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
license="GPL-2"
|
||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||
checksum=c1bf2884ffaccae327e98d8e6c8caeb16f57993d1321ce43f99ef8312406d7e6
|
||||
checksum=a177e0cf683b63e225ecc08049a1d57f05868b5660f0907c65d5ecab39474996
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template build file for 'NetworkManager-openvpn'.
|
||||
pkgname=NetworkManager-openvpn
|
||||
version=1.0.8
|
||||
version=1.2.8
|
||||
revision=1
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
|
@ -13,4 +13,5 @@ homepage="https://wiki.gnome.org/Projects/NetworkManager"
|
|||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
license="GPL-2"
|
||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||
checksum=1b979519d72ba4d78e729d4856c5b53fad914ca7ee3ca91209ce489ba78912ac
|
||||
checksum=3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654
|
||||
LDFLAGS="-ldl"
|
||||
|
|
40
srcpkgs/NetworkManager/files/musl_defines.h
Normal file
40
srcpkgs/NetworkManager/files/musl_defines.h
Normal file
|
@ -0,0 +1,40 @@
|
|||
#ifndef MUSL_DEFINES_H
|
||||
#define MUSL_DEFINES_H
|
||||
|
||||
#define IFF_TUN 0x0001
|
||||
#define IFF_TAP 0x0002
|
||||
#define IFF_NO_PI 0x1000
|
||||
#define IFF_VNET_HDR 0x4000
|
||||
#define IFF_TUN_EXCL 0x8000
|
||||
#define TUNSETIFF _IOW('T', 202, int)
|
||||
#define TUNSETPERSIST _IOW('T', 203, int)
|
||||
#define TUNSETOWNER _IOW('T', 204, int)
|
||||
#define TUNSETGROUP _IOW('T', 206, int)
|
||||
|
||||
enum {
|
||||
IFLA_GRE_UNSPEC,
|
||||
IFLA_GRE_LINK,
|
||||
IFLA_GRE_IFLAGS,
|
||||
IFLA_GRE_OFLAGS,
|
||||
IFLA_GRE_IKEY,
|
||||
IFLA_GRE_OKEY,
|
||||
IFLA_GRE_LOCAL,
|
||||
IFLA_GRE_REMOTE,
|
||||
IFLA_GRE_TTL,
|
||||
IFLA_GRE_TOS,
|
||||
IFLA_GRE_PMTUDISC,
|
||||
IFLA_GRE_ENCAP_LIMIT,
|
||||
IFLA_GRE_FLOWINFO,
|
||||
IFLA_GRE_FLAGS,
|
||||
IFLA_GRE_ENCAP_TYPE,
|
||||
IFLA_GRE_ENCAP_FLAGS,
|
||||
IFLA_GRE_ENCAP_SPORT,
|
||||
IFLA_GRE_ENCAP_DPORT,
|
||||
IFLA_GRE_COLLECT_METADATA,
|
||||
IFLA_GRE_IGNORE_DF,
|
||||
__IFLA_GRE_MAX,
|
||||
};
|
||||
|
||||
#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)
|
||||
|
||||
#endif /* !MUSL_DEFINES_H */
|
103
srcpkgs/NetworkManager/patches/fix-musl.patch
Normal file
103
srcpkgs/NetworkManager/patches/fix-musl.patch
Normal file
|
@ -0,0 +1,103 @@
|
|||
--- libnm-core/nm-utils.h.orig 2017-01-14 13:13:15.458590816 +0100
|
||||
+++ libnm-core/nm-utils.h 2017-01-14 13:14:38.569521150 +0100
|
||||
@@ -30,8 +30,13 @@
|
||||
#include <netinet/in.h>
|
||||
|
||||
/* For ETH_ALEN and INFINIBAND_ALEN */
|
||||
+#ifdef __GLIBC__
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_infiniband.h>
|
||||
+#else
|
||||
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
|
||||
+#define INFINIBAND_ALEN 20 /* Octets in IPoIB HW addr */
|
||||
+#endif
|
||||
|
||||
#include "nm-core-enum-types.h"
|
||||
#include "nm-setting-wireless-security.h"
|
||||
--- src/platform/nm-linux-platform.c.orig 2016-12-15 20:39:00.000000000 +0100
|
||||
+++ src/platform/nm-linux-platform.c 2017-01-14 13:34:51.509504441 +0100
|
||||
@@ -30,10 +30,15 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/icmp6.h>
|
||||
#include <netinet/in.h>
|
||||
+#ifdef __GLIBC__
|
||||
#include <linux/ip.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/if_link.h>
|
||||
#include <linux/if_tun.h>
|
||||
#include <linux/if_tunnel.h>
|
||||
+#else
|
||||
+#include <netinet/ip.h>
|
||||
+#include "../../musl_defines.h"
|
||||
+#endif
|
||||
#include <netlink/netlink.h>
|
||||
#include <netlink/msg.h>
|
||||
--- src/systemd/src/basic/util.h.orig 2017-01-14 14:11:23.719666887 +0100
|
||||
+++ src/systemd/src/basic/util.h 2017-01-14 14:11:39.890653333 +0100
|
||||
@@ -46,6 +46,11 @@
|
||||
#include "missing.h"
|
||||
#include "time-util.h"
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+typedef int (*__compar_fn_t) (const void*, const void*);
|
||||
+typedef __compar_fn_t comparison_fn_t;
|
||||
+#endif
|
||||
+
|
||||
size_t page_size(void) _pure_;
|
||||
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
|
||||
|
||||
--- src/systemd/src/basic/stdio-util.h.orig 2017-01-14 14:17:08.268378080 +0100
|
||||
+++ src/systemd/src/basic/stdio-util.h 2017-01-14 14:17:48.499344359 +0100
|
||||
@@ -19,7 +19,9 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
#include <printf.h>
|
||||
+#endif
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
--- src/systemd/src/basic/in-addr-util.c.orig 2017-01-14 14:22:17.147119172 +0100
|
||||
+++ src/systemd/src/basic/in-addr-util.c 2017-01-14 14:22:49.402092135 +0100
|
||||
@@ -32,6 +32,15 @@
|
||||
#include "parse-util.h"
|
||||
#include "util.h"
|
||||
|
||||
+#ifndef strndupa
|
||||
+#define strndupa(s, n) \
|
||||
+ (__extension__ ({const char *__in = (s); \
|
||||
+ size_t __len = strnlen (__in, (n)) + 1; \
|
||||
+ char *__out = (char *) alloca (__len); \
|
||||
+ __out[__len-1] = '\0'; \
|
||||
+ (char *) memcpy (__out, __in, __len-1);}))
|
||||
+#endif
|
||||
+
|
||||
bool in4_addr_is_null(const struct in_addr *a) {
|
||||
return a->s_addr == 0;
|
||||
}
|
||||
|
||||
--- src/systemd/src/basic/parse-util.c.orig 2017-01-14 14:25:54.270937174 +0100
|
||||
+++ src/systemd/src/basic/parse-util.c 2017-01-14 14:26:08.422925312 +0100
|
||||
@@ -25,7 +25,9 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
+#ifdef __GLIBC__
|
||||
#include <xlocale.h>
|
||||
+#endif
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "extract-word.h"
|
||||
|
||||
--- src/systemd/src/libsystemd-network/sd-lldp.c.orig 2017-03-03 17:19:32.513074615 +0100
|
||||
+++ src/systemd/src/libsystemd-network/sd-lldp.c 2017-03-03 17:21:21.668728717 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "nm-sd-adapt.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
+#include <linux/sockios.h>
|
||||
|
||||
#include "sd-lldp.h"
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
For musl libc instead of including <linux/if_ether.h> or <net/ethernet.h>
|
||||
just define the required constant ETH_ALEN locally.
|
||||
|
||||
--- libnm-core/nm-utils.h 2016-04-01 23:27:51.000000000 +0200
|
||||
+++ libnm-core/nm-utils.h 2016-11-01 02:37:51.933498880 +0100
|
||||
@@ -29,8 +29,14 @@
|
||||
|
||||
#include <netinet/in.h>
|
||||
|
||||
-/* For ETH_ALEN and INFINIBAND_ALEN */
|
||||
+#if defined(__GLIBC__)
|
||||
+/* For ETH_ALEN */
|
||||
#include <linux/if_ether.h>
|
||||
+#else
|
||||
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
|
||||
+#endif
|
||||
+
|
||||
+/* For INFINIBAND_ALEN */
|
||||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "nm-core-enum-types.h"
|
||||
--- src/platform/wifi/wifi-utils.h
|
||||
+++ src/platform/wifi/wifi-utils.h.new
|
||||
@@ -22,10 +22,14 @@
|
||||
#ifndef __WIFI_UTILS_H__
|
||||
#define __WIFI_UTILS_H__
|
||||
|
||||
+#if defined(__GLIBC__)
|
||||
#include <net/ethernet.h>
|
||||
+#else
|
||||
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
|
||||
+#endif
|
||||
#include <glib.h>
|
||||
|
||||
#include "nm-dbus-interface.h"
|
||||
|
||||
typedef struct WifiData WifiData;
|
||||
|
||||
--- src/settings/nm-settings-connection.h
|
||||
+++ src/settings/nm-settings-connection.h.new
|
||||
@@ -22,10 +22,14 @@
|
||||
#ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__
|
||||
#define __NETWORKMANAGER_SETTINGS_CONNECTION_H__
|
||||
|
||||
+#if defined(__GLIBC__)
|
||||
#include <net/ethernet.h>
|
||||
+#else
|
||||
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
|
||||
+#endif
|
||||
|
||||
#include <nm-connection.h>
|
||||
#include "nm-types.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'NetworkManager'
|
||||
pkgname=NetworkManager
|
||||
version=1.0.12
|
||||
revision=8
|
||||
version=1.4.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
|
||||
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
|
||||
|
@ -21,7 +21,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="https://wiki.gnome.org/Projects/NetworkManager"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e
|
||||
checksum=829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309
|
||||
|
||||
hostmakedepends="
|
||||
automake libtool pkg-config intltool gnutls-devel glib-devel dbus-glib-devel
|
||||
|
@ -29,7 +29,8 @@ hostmakedepends="
|
|||
$(vopt_if gir gobject-introspection)"
|
||||
makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
|
||||
libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel
|
||||
ModemManager-devel readline-devel libndp-devel newt-devel"
|
||||
ModemManager-devel readline-devel libndp-devel newt-devel
|
||||
$(vopt_if gir libgirepository-devel)"
|
||||
|
||||
lib32disabled=yes
|
||||
depends="dbus iproute2 dhclient wpa_supplicant openresolv"
|
||||
|
@ -39,6 +40,10 @@ make_dirs="
|
|||
/etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root
|
||||
/etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
|
||||
"
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl) CFLAGS+=" -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv -D__USE_POSIX199309"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Package build options
|
||||
build_options="gir"
|
||||
|
@ -48,6 +53,7 @@ fi
|
|||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
cp $FILESDIR/musl_defines.h .
|
||||
|
||||
# Full switch to /run to not depend on /var/run being a symlink.
|
||||
sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'bdf2psf'
|
||||
pkgname=bdf2psf
|
||||
version=1.162
|
||||
version=1.163
|
||||
revision=1
|
||||
wrksrc="console-setup-${version}"
|
||||
depends="perl"
|
||||
|
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="GPL-2"
|
||||
homepage="https://packages.debian.org/sid/bdf2psf"
|
||||
distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
|
||||
checksum=4817ee3ac460ce69a34cd82f56320d3aecfa76803eed9ff42048f55515e5e42a
|
||||
checksum=3c268222617e0db2c8b1d6377c286d7649dcdc5c2c5e7651cc5951f46870c562
|
||||
noarch=yes
|
||||
|
||||
post_extract() {
|
||||
|
|
11
srcpkgs/ccsm/patches/prefix.patch
Normal file
11
srcpkgs/ccsm/patches/prefix.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- setup.py 2017-03-02 11:35:41.688884000 -0800
|
||||
+++ setup.py 2017-03-02 11:36:07.745885086 -0800
|
||||
@@ -103,7 +103,7 @@
|
||||
if not prefix and "PREFIX" in os.environ:
|
||||
prefix = os.environ["PREFIX"]
|
||||
if not prefix or not len (prefix):
|
||||
- prefix = "/usr/local"
|
||||
+ prefix = "/usr"
|
||||
|
||||
if sys.argv[1] in ("install", "uninstall") and len (prefix):
|
||||
sys.argv += ["--prefix", prefix]
|
|
@ -1,11 +1,11 @@
|
|||
# Template file for 'ccsm' of Compiz Reloaded
|
||||
pkgname=ccsm
|
||||
version=0.8.12.4
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=python2-module
|
||||
|
||||
hostmakedepends="automake intltool libtool pkg-config python"
|
||||
makedepends="compiz-core-devel compizconfig-python python-cairo-devel"
|
||||
makedepends="compiz-core-devel compizconfig-python python-cairo-devel pygtk-devel"
|
||||
depends="compizconfig-python python-cairo"
|
||||
|
||||
short_desc="Compiz Configuration Seetings Manager for Compiz Reloaded"
|
||||
|
|
33
srcpkgs/cpufrequtils/patches/pic-i386.patch
Normal file
33
srcpkgs/cpufrequtils/patches/pic-i386.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
--- utils/cpuid.h 2010-07-05 17:43:17.000000000 +0200
|
||||
+++ utils/cpuid.h 2016-10-13 22:31:26.988374329 +0200
|
||||
@@ -1,6 +1,21 @@
|
||||
#ifndef _CPUFREQ_CPUID_H
|
||||
#define _CPUFREQ_CPUID_H
|
||||
|
||||
+#if defined(__i386__) && defined(__PIC__)
|
||||
+static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
|
||||
+ unsigned int *ecx, unsigned int *edx)
|
||||
+{
|
||||
+ /* ecx is often an input as well as an output. */
|
||||
+ asm volatile("xchgl\t%%ebx, %1\n\t" \
|
||||
+ "cpuid\n\t" \
|
||||
+ "xchgl\t%%ebx, %1"
|
||||
+ : "=a" (*eax),
|
||||
+ "=r" (*ebx),
|
||||
+ "=c" (*ecx),
|
||||
+ "=d" (*edx)
|
||||
+ : "0" (*eax), "2" (*ecx));
|
||||
+}
|
||||
+#else
|
||||
static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
|
||||
unsigned int *ecx, unsigned int *edx)
|
||||
{
|
||||
@@ -12,6 +27,8 @@
|
||||
"=d" (*edx)
|
||||
: "0" (*eax), "2" (*ecx));
|
||||
}
|
||||
+#endif
|
||||
+
|
||||
static inline void cpuid(unsigned int op,
|
||||
unsigned int *eax, unsigned int *ebx,
|
||||
unsigned int *ecx, unsigned int *edx)
|
|
@ -1,14 +1,13 @@
|
|||
# Template file for 'cpufrequtils'
|
||||
pkgname=cpufrequtils
|
||||
version=008
|
||||
revision=10
|
||||
revision=11
|
||||
short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
|
||||
homepage="ftp://ftp.archlinux.org/other/cpufrequtils/"
|
||||
license="GPL-2"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
distfiles="https://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${version}.tar.xz"
|
||||
distfiles="${KERNEL_SITE}/utils/kernel/cpufreq/${pkgname}-${version}.tar.xz"
|
||||
checksum=a2149db551f83112209b1a8e79bd50d386979bbf64edbc69126f4e0b4f0a4cab
|
||||
nopie=yes
|
||||
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
|
||||
|
||||
|
@ -29,7 +28,7 @@ libcpufreq_package() {
|
|||
libcpufreq-devel_package() {
|
||||
conflicts="libcpupower-devel>=0"
|
||||
depends="libcpufreq>=${version}_${revision}"
|
||||
short_desc="libcpufreq - development tools"
|
||||
short_desc="Library for the kernel cpufreq subsystem - development tools"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.so"
|
||||
|
|
1
srcpkgs/elogind-devel
Symbolic link
1
srcpkgs/elogind-devel
Symbolic link
|
@ -0,0 +1 @@
|
|||
elogind
|
15
srcpkgs/elogind/files/elogind.wrapper
Normal file
15
srcpkgs/elogind/files/elogind.wrapper
Normal file
|
@ -0,0 +1,15 @@
|
|||
#!/bin/sh
|
||||
cgroup=/sys/fs/cgroup/elogind
|
||||
|
||||
mkdir -p "$cgroup"
|
||||
if ! mountpoint "$cgroup" > /dev/null; then
|
||||
mount -t cgroup -o none,name=elogind cgroup $cgroup || exit 1
|
||||
fi
|
||||
|
||||
for tmpfs in /run/systemd /run/user; do
|
||||
mountpoint "$tmpfs" > /dev/null && continue
|
||||
mkdir -p "$tmpfs"
|
||||
mount -t tmpfs -o nosuid,nodev,noexec,mode=0755 none "$tmpfs" || exit 1
|
||||
done
|
||||
|
||||
exec /usr/libexec/elogind/elogind
|
129
srcpkgs/elogind/patches/allow-unprivileged-calls.patch
Normal file
129
srcpkgs/elogind/patches/allow-unprivileged-calls.patch
Normal file
|
@ -0,0 +1,129 @@
|
|||
From 1ca40c077cd9a08f96a559ba51e8dba230298c4d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Palimaka <kensington@gentoo.org>
|
||||
Date: Sun, 19 Jun 2016 01:56:56 +1000
|
||||
Subject: [PATCH] Update org.freedesktop.login1.conf
|
||||
|
||||
This mirrors an upstream change opening up all of logind's bus calls to
|
||||
unprivileged users via polkit.
|
||||
|
||||
See systemd/systemd/issues/471.
|
||||
Closes #3.
|
||||
---
|
||||
src/login/org.freedesktop.login1.conf | 68 +++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 68 insertions(+)
|
||||
|
||||
diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
|
||||
index 1318328..2e67e3d 100644
|
||||
--- src/login/org.freedesktop.login1.conf
|
||||
+++ src/login/org.freedesktop.login1.conf
|
||||
@@ -90,6 +90,42 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="LockSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="UnlockSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="LockSessions"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="UnlockSessions"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="KillSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="KillUser"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="TerminateSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="TerminateUser"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="TerminateSeat"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
send_member="PowerOff"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -130,6 +166,10 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="SetWallMessage"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
send_member="AttachDevice"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -138,6 +178,10 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Seat"
|
||||
+ send_member="Terminate"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Seat"
|
||||
send_member="ActivateSession"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -154,14 +198,30 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Terminate"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
send_member="Activate"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Lock"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Unlock"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
send_member="SetIdleHint"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Kill"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
send_member="TakeControl"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -180,6 +240,14 @@
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
send_member="PauseDeviceComplete"/>
|
||||
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.User"
|
||||
+ send_member="Terminate"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.User"
|
||||
+ send_member="Kill"/>
|
||||
+
|
||||
<allow receive_sender="org.freedesktop.login1"/>
|
||||
</policy>
|
||||
|
55
srcpkgs/elogind/patches/fix-gcc6.patch
Normal file
55
srcpkgs/elogind/patches/fix-gcc6.patch
Normal file
|
@ -0,0 +1,55 @@
|
|||
--- src/shared/errno-list.c.orig 2017-01-13 21:53:06.171441950 +0100
|
||||
+++ src/shared/errno-list.c 2017-01-13 21:53:44.491417473 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "errno-list.h"
|
||||
|
||||
static const struct errno_name* lookup_errno(register const char *str,
|
||||
- register unsigned int len);
|
||||
+ register size_t len);
|
||||
|
||||
#include "errno-to-name.h"
|
||||
#include "errno-from-name.h"
|
||||
--- src/shared/af-list.c.orig 2017-01-13 21:55:14.941359697 +0100
|
||||
+++ src/shared/af-list.c 2017-01-13 21:56:15.967320716 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "util.h"
|
||||
#include "af-list.h"
|
||||
|
||||
-static const struct af_name* lookup_af(register const char *str, register unsigned int len);
|
||||
+static const struct af_name* lookup_af(register const char *str, register size_t len);
|
||||
|
||||
#include "af-to-name.h"
|
||||
#include "af-from-name.h"
|
||||
--- src/shared/cap-list.c.orig 2017-01-13 21:59:05.416212480 +0100
|
||||
+++ src/shared/cap-list.c 2017-01-13 21:59:22.154201788 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "cap-list.h"
|
||||
#include "missing.h"
|
||||
|
||||
-static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
|
||||
+static const struct capability_name* lookup_capability(register const char *str, register size_t len);
|
||||
|
||||
#include "cap-to-name.h"
|
||||
#include "cap-from-name.h"
|
||||
--- src/shared/arphrd-list.c.orig 2017-01-13 22:01:38.040114990 +0100
|
||||
+++ src/shared/arphrd-list.c 2017-01-13 22:01:53.482105126 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "util.h"
|
||||
#include "arphrd-list.h"
|
||||
|
||||
-static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
|
||||
+static const struct arphrd_name* lookup_arphrd(register const char *str, register size_t len);
|
||||
|
||||
#include "arphrd-to-name.h"
|
||||
#include "arphrd-from-name.h"
|
||||
--- src/login/logind.h.orig 2017-01-13 22:11:22.760741496 +0100
|
||||
+++ src/login/logind.h 2017-01-13 22:11:32.259735429 +0100
|
||||
@@ -163,7 +163,7 @@ int manager_send_changed(Manager *manage
|
||||
int manager_dispatch_delayed(Manager *manager);
|
||||
|
||||
/* gperf lookup function */
|
||||
-const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
|
||||
+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, size_t length);
|
||||
|
||||
int manager_watch_busname(Manager *manager, const char *name);
|
||||
void manager_drop_busname(Manager *manager, const char *name);
|
47
srcpkgs/elogind/template
Normal file
47
srcpkgs/elogind/template
Normal file
|
@ -0,0 +1,47 @@
|
|||
# Template file for 'elogind'
|
||||
pkgname=elogind
|
||||
version=219.14
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake libxslt intltool libtool pkg-config gperf"
|
||||
makedepends="libcap-devel libmount-devel libseccomp-devel libblkid-devel pam-devel gettext-devel eudev-libudev-devel glib-devel"
|
||||
depends="dbus"
|
||||
short_desc="standalone logind fork"
|
||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||
license="GPL-2, LGPL-2, MIT"
|
||||
homepage="https://github.com/andywingo/elogind"
|
||||
distfiles="https://wingolog.org/pub/elogind/elogind-$version.tar.xz"
|
||||
checksum=9dc150071a3f4c1ad1c989a7a143c2d41a2d571c643b92090e36a5d0396193c9
|
||||
LDFLAGS="-lrt"
|
||||
conf_files="/etc/elogind/logind.conf"
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl)
|
||||
broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/1110/steps/shell_3/logs/stdio"
|
||||
;;
|
||||
esac
|
||||
|
||||
pre_configure() {
|
||||
vinstall $FILESDIR/elogind.wrapper 755 usr/libexec/elogind
|
||||
sed -i -e "s#^Exec=/bin/false#Exec=/usr/libexec/elogind/elogind.wrapper#" \
|
||||
src/login/org.freedesktop.login1.service
|
||||
}
|
||||
|
||||
post_install() {
|
||||
ln -s libelogind.pc $DESTDIR/usr/lib/pkgconfig/libsystemd.pc
|
||||
ln -s libelogind.pc $DESTDIR/usr/lib/pkgconfig/libsystemd-logind.pc
|
||||
ln -sr $DESTDIR/usr/include/elogind $DESTDIR/usr/include/systemd
|
||||
vinstall ./src/systemd/sd-id128.h 644 usr/include
|
||||
vinstall ./src/systemd/_sd-common.h 644 usr/include
|
||||
}
|
||||
|
||||
elogind-devel_package() {
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/*.la
|
||||
vmove usr/lib/*.so
|
||||
vmove usr/share/man/man3
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
2
srcpkgs/gdm/files/Xsession
Executable file
2
srcpkgs/gdm/files/Xsession
Executable file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
exec $@
|
|
@ -1,200 +0,0 @@
|
|||
From 0ec12ab21edeffbb58b2cb49081abeb8e2ac0cb1 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Thu, 9 Oct 2014 00:55:31 +0200
|
||||
Subject: [PATCH] Add Arch Linux PAM config files
|
||||
|
||||
---
|
||||
configure.ac | 6 ++++--
|
||||
data/Makefile.am | 12 ++++++++++++
|
||||
data/pam-arch/gdm-autologin.pam | 10 ++++++++++
|
||||
data/pam-arch/gdm-fingerprint.pam | 14 ++++++++++++++
|
||||
data/pam-arch/gdm-launch-environment.pam | 10 ++++++++++
|
||||
data/pam-arch/gdm-password.pam | 11 +++++++++++
|
||||
data/pam-arch/gdm-pin.pam | 13 +++++++++++++
|
||||
data/pam-arch/gdm-smartcard.pam | 14 ++++++++++++++
|
||||
8 files changed, 88 insertions(+), 2 deletions(-)
|
||||
create mode 100644 data/pam-arch/gdm-autologin.pam
|
||||
create mode 100644 data/pam-arch/gdm-fingerprint.pam
|
||||
create mode 100644 data/pam-arch/gdm-launch-environment.pam
|
||||
create mode 100644 data/pam-arch/gdm-password.pam
|
||||
create mode 100644 data/pam-arch/gdm-pin.pam
|
||||
create mode 100644 data/pam-arch/gdm-smartcard.pam
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9cac4de..f4aeaeb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -189,12 +189,13 @@ if test x$enable_split_authentication = xyes; then
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(default-pam-config,
|
||||
- AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, none @<:@default=auto@:>@]))
|
||||
+ AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none @<:@default=auto@:>@]))
|
||||
dnl If not given, try autodetecting from release files (see NetworkManager source)
|
||||
if test x$with_default_pam_config = x; then
|
||||
AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat")
|
||||
AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat")
|
||||
AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo")
|
||||
+ AC_CHECK_FILE(/etc/arch-release,with_default_pam_config="arch")
|
||||
AC_CHECK_FILE(/etc/lfs-release,with_default_pam_config="lfs")
|
||||
dnl If not autodetected, default to none
|
||||
if test x$with_default_pam_config = x; then
|
||||
@@ -202,7 +203,7 @@ if test x$with_default_pam_config = x; then
|
||||
fi
|
||||
fi
|
||||
case x$with_default_pam_config in
|
||||
- xredhat|xopenembedded|xexherbo|xlfs|xnone) ;;
|
||||
+ xredhat|xopenembedded|xexherbo|xlfs|xarch|xnone) ;;
|
||||
*)
|
||||
AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}])
|
||||
exit 1
|
||||
@@ -212,6 +213,7 @@ AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredha
|
||||
AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded)
|
||||
AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo)
|
||||
AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs)
|
||||
+AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch)
|
||||
|
||||
AC_ARG_ENABLE(console-helper,
|
||||
AS_HELP_STRING([--enable-console-helper],
|
||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
||||
index 1b79bc3..341b779 100644
|
||||
--- a/data/Makefile.am
|
||||
+++ b/data/Makefile.am
|
||||
@@ -140,6 +140,15 @@ pam_lfs_files = pam-lfs/gdm.pam \
|
||||
$(NULL)
|
||||
EXTRA_DIST += $(pam_lfs_files)
|
||||
|
||||
+pam_arch_files = pam-arch/gdm-autologin.pam \
|
||||
+ pam-arch/gdm-launch-environment.pam \
|
||||
+ pam-arch/gdm-fingerprint.pam \
|
||||
+ pam-arch/gdm-smartcard.pam \
|
||||
+ pam-arch/gdm-password.pam \
|
||||
+ pam-arch/gdm-pin.pam \
|
||||
+ $(NULL)
|
||||
+EXTRA_DIST += $(pam_arch_files)
|
||||
+
|
||||
if ENABLE_REDHAT_PAM_CONFIG
|
||||
pam_files = $(pam_redhat_files)
|
||||
endif
|
||||
@@ -152,6 +161,9 @@ endif
|
||||
if ENABLE_LFS_PAM_CONFIG
|
||||
pam_files = $(pam_lfs_files)
|
||||
endif
|
||||
+if ENABLE_ARCH_PAM_CONFIG
|
||||
+pam_files = $(pam_arch_files)
|
||||
+endif
|
||||
|
||||
EXTRA_DIST += \
|
||||
$(dconf_db_files) \
|
||||
diff --git a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam
|
||||
new file mode 100644
|
||||
index 0000000..9f45c65
|
||||
--- /dev/null
|
||||
+++ b/data/pam-arch/gdm-autologin.pam
|
||||
@@ -0,0 +1,10 @@
|
||||
+auth requisite pam_nologin.so
|
||||
+auth required pam_env.so
|
||||
+auth optional pam_permit.so
|
||||
+
|
||||
+account include system-local-login
|
||||
+
|
||||
+password include system-local-login
|
||||
+
|
||||
+session optional pam_keyinit.so force revoke
|
||||
+session include system-local-login
|
||||
diff --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam
|
||||
new file mode 100644
|
||||
index 0000000..a480861
|
||||
--- /dev/null
|
||||
+++ b/data/pam-arch/gdm-fingerprint.pam
|
||||
@@ -0,0 +1,14 @@
|
||||
+auth required pam_tally.so onerr=succeed file=/var/log/faillog
|
||||
+auth required pam_shells.so
|
||||
+auth requisite pam_nologin.so
|
||||
+auth required pam_env.so
|
||||
+auth required pam_fprintd.so
|
||||
+auth optional pam_permit.so
|
||||
+
|
||||
+account include system-local-login
|
||||
+
|
||||
+password required pam_fprintd.so
|
||||
+password optional pam_permit.so
|
||||
+
|
||||
+session optional pam_keyinit.so force revoke
|
||||
+session include system-local-login
|
||||
diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
|
||||
new file mode 100644
|
||||
index 0000000..618a7d3
|
||||
--- /dev/null
|
||||
+++ b/data/pam-arch/gdm-launch-environment.pam
|
||||
@@ -0,0 +1,11 @@
|
||||
+auth required pam_env.so
|
||||
+auth optional pam_permit.so
|
||||
+
|
||||
+account include system-local-login
|
||||
+
|
||||
+password required pam_deny.so
|
||||
+
|
||||
+session optional pam_keyinit.so force revoke
|
||||
+-session optional pam_systemd.so
|
||||
+-session optional pam_ck_connector_so nox11
|
||||
+session optional pam_permit.so
|
||||
diff --git a/data/pam-arch/gdm-password.pam b/data/pam-arch/gdm-password.pam
|
||||
new file mode 100644
|
||||
index 0000000..8d34794
|
||||
--- /dev/null
|
||||
+++ b/data/pam-arch/gdm-password.pam
|
||||
@@ -0,0 +1,11 @@
|
||||
+auth include system-local-login
|
||||
+auth optional pam_gnome_keyring.so
|
||||
+
|
||||
+account include system-local-login
|
||||
+
|
||||
+password include system-local-login
|
||||
+password optional pam_gnome_keyring.so use_authtok
|
||||
+
|
||||
+session optional pam_keyinit.so force revoke
|
||||
+session include system-local-login
|
||||
+session optional pam_gnome_keyring.so auto_start
|
||||
diff --git a/data/pam-arch/gdm-pin.pam b/data/pam-arch/gdm-pin.pam
|
||||
new file mode 100644
|
||||
index 0000000..135e205
|
||||
--- /dev/null
|
||||
+++ b/data/pam-arch/gdm-pin.pam
|
||||
@@ -0,0 +1,13 @@
|
||||
+auth requisite pam_pin.so
|
||||
+auth include system-local-login
|
||||
+auth optional pam_gnome_keyring.so
|
||||
+
|
||||
+account include system-local-login
|
||||
+
|
||||
+password include system-local-login
|
||||
+password optional pam_pin.so
|
||||
+password optional pam_gnome_keyring.so use_authtok
|
||||
+
|
||||
+session optional pam_keyinit.so force revoke
|
||||
+session include system-local-login
|
||||
+session optional pam_gnome_keyring.so auto_start
|
||||
diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam
|
||||
new file mode 100644
|
||||
index 0000000..ec6f75d
|
||||
--- /dev/null
|
||||
+++ b/data/pam-arch/gdm-smartcard.pam
|
||||
@@ -0,0 +1,14 @@
|
||||
+auth required pam_tally.so onerr=succeed file=/var/log/faillog
|
||||
+auth required pam_shells.so
|
||||
+auth requisite pam_nologin.so
|
||||
+auth required pam_env.so
|
||||
+auth required pam_pkcs11.so wait_for_card card_only
|
||||
+auth optional pam_permit.so
|
||||
+
|
||||
+account include system-local-login
|
||||
+
|
||||
+password required pam_pkcs11.so
|
||||
+password optional pam_permit.so
|
||||
+
|
||||
+session optional pam_keyinit.so force revoke
|
||||
+session include system-local-login
|
||||
--
|
||||
2.1.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gdm'
|
||||
pkgname=gdm
|
||||
version=3.16.4
|
||||
revision=5
|
||||
version=3.22.1
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
build_style=gnu-configure
|
||||
configure_args="$(vopt_enable gir introspection)
|
||||
|
@ -9,12 +9,12 @@ configure_args="$(vopt_enable gir introspection)
|
|||
--with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
|
||||
--with-screenshot-dir=/var/lib/gdm/greeter --sbindir=/usr/bin --without-plymouth
|
||||
--with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid
|
||||
--with-console-kit --without-systemd --disable-systemd-journal --with-initial-vt=7"
|
||||
--disable-systemd-journal --with-initial-vt=7"
|
||||
hostmakedepends="automake libtool pkg-config itstool intltool gnome-doc-utils
|
||||
$(vopt_if gir gobject-introspection)"
|
||||
makedepends="glib-devel iso-codes gettext-devel
|
||||
pam-devel nss-devel accountsservice-devel gtk+3-devel upower-devel
|
||||
libSM-devel libcanberra-devel dconf"
|
||||
libSM-devel libcanberra-devel dconf elogind-devel"
|
||||
conf_files="
|
||||
/etc/gdm/custom.conf
|
||||
/etc/pam.d/gdm-autologin
|
||||
|
@ -27,13 +27,20 @@ conf_files="
|
|||
system_accounts="gdm"
|
||||
gdm_homedir="/var/lib/gdm"
|
||||
depends="iso-codes xrdb xorg-server hicolor-icon-theme
|
||||
dconf>=0.20 gnome-session>=3.14 gnome-settings-daemon>=3.14 gnome-shell>=3.14"
|
||||
dconf>=0.20 gnome-session>=3.22 gnome-settings-daemon>=3.14 gnome-shell>=3.14"
|
||||
short_desc="GNOME Display Manager"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=281dd28d729eaab2f67e450b5b162299dec537b6f7e81fa1124e35c89d3942fd
|
||||
checksum=6a43e623f563c2e366297c2ee8d160526a285e102c73936e27a1d79076d6969f
|
||||
# Due to elogind
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl)
|
||||
broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/1121/steps/shell_3/logs/stdio"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# Package build options
|
||||
build_options="gir"
|
||||
|
@ -43,9 +50,20 @@ if [ -z "$CROSS_BUILD" ]; then
|
|||
fi
|
||||
|
||||
pre_configure() {
|
||||
# elogind does not provide sd-daemon.h. It does provide all
|
||||
# used symbols though.
|
||||
sed -i "/#include <.*sd-daemon.h>/d" $(find . -name '*.[ch]')
|
||||
|
||||
AUTOPOINT='intltoolize --automake -c' NOCONFIGURE=1 autoreconf -fi
|
||||
}
|
||||
post_install() {
|
||||
vinstall $FILESDIR/Xsession 755 etc/gdm
|
||||
|
||||
sed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/*
|
||||
|
||||
# Disable Wayland by default.
|
||||
sed -i "s/#WaylandEnable=.*/WaylandEnable=false/" $DESTDIR/etc/gdm/custom.conf
|
||||
|
||||
# runit service
|
||||
vsv gdm
|
||||
}
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
Don't fail the build if the test-timezone-gfx or test-endianess checks fail
|
||||
The former fails because it expects /usr/share/gnome-control-center/datetime/backward
|
||||
to be installed, which isn't the case when the check is run.
|
||||
|
||||
--- panels/datetime/Makefile.am
|
||||
+++ panels/datetime/Makefile.am
|
||||
@@ -43,8 +43,8 @@
|
||||
all-local: check-local
|
||||
|
||||
check-local: test-timezone-gfx test-endianess test-timezone
|
||||
- $(builddir)/test-timezone-gfx $(srcdir)/data
|
||||
- $(builddir)/test-endianess
|
||||
+ -$(builddir)/test-timezone-gfx $(srcdir)/data
|
||||
+ -$(builddir)/test-endianess
|
||||
# $(builddir)/test-timezone
|
||||
|
||||
noinst_LTLIBRARIES = libdate_time.la
|
||||
--- panels/datetime/Makefile.in
|
||||
+++ panels/datetime/Makefile.in
|
||||
@@ -1324,8 +1324,8 @@
|
||||
all-local: check-local
|
||||
|
||||
check-local: test-timezone-gfx test-endianess test-timezone
|
||||
- $(builddir)/test-timezone-gfx $(srcdir)/data
|
||||
- $(builddir)/test-endianess
|
||||
+ -$(builddir)/test-timezone-gfx $(srcdir)/data
|
||||
+ -$(builddir)/test-endianess
|
||||
timedated.c: timedated.h
|
||||
timedated.h: Makefile.am timedated1-interface.xml
|
||||
gdbus-codegen \
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-control-center'
|
||||
pkgname=gnome-control-center
|
||||
version=3.18.2
|
||||
version=3.22.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --with-cheese"
|
||||
|
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="GPL-2"
|
||||
homepage="http://www.gnome.org"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad
|
||||
checksum=5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a
|
||||
|
||||
hostmakedepends="pkg-config intltool glib-devel gnome-doc-utils gobject-introspection"
|
||||
makedepends="
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-desktop'
|
||||
pkgname=gnome-desktop
|
||||
version=3.18.2
|
||||
version=3.22.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-gnome-distributor=void"
|
||||
|
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="GPL-2, LGPL-2.1"
|
||||
homepage="http://www.gnome.org"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56
|
||||
checksum=51d7ebf7a6c359be14c3dd7a022213e931484653815eb10b0131bef4c8979e1c
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-gettings-stated-docs'
|
||||
pkgname=gnome-getting-started-docs
|
||||
version=3.18.2
|
||||
version=3.22.0
|
||||
revision=1
|
||||
noarch="yes"
|
||||
build_style=gnu-configure
|
||||
|
@ -10,4 +10,4 @@ short_desc="Getting Started documentation for GNOME"
|
|||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=5f4a39d51aba3669d84ce2cb06619a09a92103f58d4bc6728db448398b1f308b
|
||||
checksum=22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-initial-setup'.
|
||||
pkgname=gnome-initial-setup
|
||||
version=3.18.0
|
||||
version=3.22.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
|
||||
|
@ -8,14 +8,14 @@ makedepends="NetworkManager-devel accountsservice-devel glib-devel
|
|||
gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
|
||||
gnome-online-accounts-devel gdm-devel libpwquality-devel
|
||||
mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
|
||||
rest-devel libsecret-devel ibus-devel iso-codes geoclue2"
|
||||
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel"
|
||||
depends="iso-codes"
|
||||
short_desc="The GNOME initial setup"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=8fee9de41677c44318bb1c3bade2b6c9156698ad1a06e63aa1c15e3ab1bee729
|
||||
checksum=56a663d84ab16854afbdd5ea852f0b76bb5e30829f14f3a224ea130c14825468
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-online-accounts'
|
||||
pkgname=gnome-online-accounts
|
||||
version=3.18.4
|
||||
version=3.22.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="$(vopt_enable gir introspection)
|
||||
|
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=9f23460aa6b1d8a63a8f3e979cba791cc88b5e07116f07da59fdcea09d79c74d
|
||||
checksum=5415d6dd7babf1371f79ba4f6c031003c7d991aaaa784d58f42fd9b4792b09b9
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gnome-online-miners'
|
||||
pkgname=gnome-online-miners
|
||||
version=3.14.3
|
||||
revision=4
|
||||
version=3.22.0
|
||||
revision=1
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static"
|
||||
|
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=907f0c1d2f4fcb762be9e3992d05bcc39d292d9c1246c2aca2b293b04c59ba7d
|
||||
checksum=bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gnome-power-manager'
|
||||
pkgname=gnome-power-manager
|
||||
version=3.18.0
|
||||
revision=2
|
||||
version=3.22.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-compile"
|
||||
hostmakedepends="pkg-config intltool gnome-doc-utils glib"
|
||||
|
@ -12,4 +12,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://www.gnome.org/projects/gnome-power-manager/"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=afe5921a4313d15757f39f6ff4ec6f7c9e9cbb9b2aaa0b8a290e1cd7557e28f0
|
||||
checksum=4f02d101d768fc4da52b7a294b233f7e4e1fbc09515d144bf2040bab9e0724e0
|
||||
|
|
|
@ -1,18 +1,31 @@
|
|||
# Template file for 'gnome-session'
|
||||
pkgname=gnome-session
|
||||
version=3.18.1.2
|
||||
revision=3
|
||||
version=3.22.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-compile --enable-consolekit"
|
||||
configure_args="--disable-schemas-compile"
|
||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
|
||||
makedepends="upower-devel json-glib-devel gtk+3-devel libSM-devel
|
||||
startup-notification-devel libXtst-devel dbus-glib-devel
|
||||
startup-notification-devel libXtst-devel dbus-glib-devel elogind-devel
|
||||
gsettings-desktop-schemas-devel gnome-desktop-devel"
|
||||
depends="gsettings-desktop-schemas>=3.14 dconf>=0.20 alsa-plugins-pulseaudio
|
||||
hicolor-icon-theme desktop-file-utils"
|
||||
hicolor-icon-theme desktop-file-utils polkit-elogind"
|
||||
short_desc="GNOME session management utilities"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org"
|
||||
license="GPL-2, LGPL-2.1"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz"
|
||||
checksum=b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=361a31edb4f8c6d410f1029eee089422e25a2da6c287ead40fccdea5bda450f5
|
||||
# Due to elogind
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl)
|
||||
broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/1121/steps/shell_3/logs/stdio"
|
||||
;;
|
||||
esac
|
||||
|
||||
pre_configure() {
|
||||
sed -i "s/^#ifdef HAVE_SYSTEMD/#if 0/" \
|
||||
gnome-session/main.c \
|
||||
gnome-session/gsm-manager.c \
|
||||
gnome-session/gsm-autostart-app.c
|
||||
}
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
# Template file for 'gnome-settings-daemon'
|
||||
pkgname=gnome-settings-daemon
|
||||
version=3.18.2
|
||||
version=3.22.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --disable-schemas-compile --enable-cups"
|
||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
|
||||
makedepends="geocode-glib-devel colord-devel libxklavier-devel
|
||||
makedepends="colord-devel libxklavier-devel
|
||||
gtk+3-devel libcanberra-devel pulseaudio-devel nss-devel libnotify-devel
|
||||
startup-notification-devel gnome-desktop-devel libgnomekbd-devel
|
||||
xf86-input-wacom-devel libwacom-devel librsvg-devel
|
||||
ibus-devel cups-devel libgudev-devel upower-devel polkit-devel
|
||||
libgweather-devel geoclue2 NetworkManager-devel"
|
||||
depends="geoclue2>=2.1 pulseaudio hicolor-icon-theme $(vopt_if systemd upower)"
|
||||
libgweather-devel geoclue2-devel NetworkManager-devel"
|
||||
depends="pulseaudio hicolor-icon-theme $(vopt_if systemd upower)"
|
||||
short_desc="GNOME settings daemon"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org"
|
||||
license="GPL-3"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f
|
||||
checksum=b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba
|
||||
|
||||
pre_configure() {
|
||||
# XXX workaround wrong paths for build
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-shell-extensions'
|
||||
pkgname=gnome-shell-extensions
|
||||
version=3.18.4
|
||||
version=3.22.2
|
||||
revision=1
|
||||
noarch="yes"
|
||||
build_style=gnu-configure
|
||||
|
@ -13,4 +13,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://live.gnome.org/GnomeShell/Extensions"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=8ae470f894aad914a56d447e3b07dc99e2f36c30ef3ec386f6f03f619599b73a
|
||||
checksum=df7c22c69e29162bc1a7018b25b9a2fc37546451746b8b3c5109e5ac92238a87
|
||||
|
|
|
@ -1,118 +0,0 @@
|
|||
$OpenBSD: patch-js_misc_loginManager_js,v 1.1 2014/10/21 13:11:03 ajacoutot Exp $
|
||||
|
||||
REVERT:
|
||||
From a244c1e987502e359c45c0a9bc0012b5bc635553 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Thu, 24 Apr 2014 17:55:56 +0200
|
||||
Subject: loginManager: Kill ConsoleKit support
|
||||
|
||||
--- js/misc/loginManager.js.orig Tue Oct 21 14:59:33 2014
|
||||
+++ js/misc/loginManager.js Tue Oct 21 15:02:21 2014
|
||||
@@ -46,6 +46,32 @@ const SystemdLoginSessionIface = '<node> \
|
||||
const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
|
||||
const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
|
||||
|
||||
+const ConsoleKitManagerIface = '<node> \
|
||||
+<interface name="org.freedesktop.ConsoleKit.Manager"> \
|
||||
+<method name="CanRestart"> \
|
||||
+ <arg type="b" direction="out"/> \
|
||||
+</method> \
|
||||
+<method name="CanStop"> \
|
||||
+ <arg type="b" direction="out"/> \
|
||||
+</method> \
|
||||
+<method name="Restart" /> \
|
||||
+<method name="Stop" /> \
|
||||
+<method name="GetCurrentSession"> \
|
||||
+ <arg type="o" direction="out" /> \
|
||||
+</method> \
|
||||
+</interface> \
|
||||
+</node>';
|
||||
+
|
||||
+const ConsoleKitSessionIface = '<node> \
|
||||
+<interface name="org.freedesktop.ConsoleKit.Session"> \
|
||||
+<signal name="Lock" /> \
|
||||
+<signal name="Unlock" /> \
|
||||
+</interface> \
|
||||
+</node>';
|
||||
+
|
||||
+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
|
||||
+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
|
||||
+
|
||||
function haveSystemd() {
|
||||
return GLib.access("/run/systemd/seats", 0) >= 0;
|
||||
}
|
||||
@@ -75,7 +101,7 @@ function canLock() {
|
||||
-1, null);
|
||||
|
||||
let version = result.deep_unpack()[0].deep_unpack();
|
||||
- return haveSystemd() && versionCompare('3.5.91', version);
|
||||
+ return versionCompare('3.5.91', version);
|
||||
} catch(e) {
|
||||
return false;
|
||||
}
|
||||
@@ -93,7 +119,7 @@ function getLoginManager() {
|
||||
if (haveSystemd())
|
||||
_loginManager = new LoginManagerSystemd();
|
||||
else
|
||||
- _loginManager = new LoginManagerDummy();
|
||||
+ _loginManager = new LoginManagerConsoleKit();
|
||||
}
|
||||
|
||||
return _loginManager;
|
||||
@@ -110,6 +136,9 @@ const LoginManagerSystemd = new Lang.Class({
|
||||
Lang.bind(this, this._prepareForSleep));
|
||||
},
|
||||
|
||||
+ // Having this function is a bit of a hack since the Systemd and ConsoleKit
|
||||
+ // session objects have different interfaces - but in both cases there are
|
||||
+ // Lock/Unlock signals, and that's all we count upon at the moment.
|
||||
getCurrentSessionProxy: function(callback) {
|
||||
if (this._currentSession) {
|
||||
callback (this._currentSession);
|
||||
@@ -177,13 +206,35 @@ const LoginManagerSystemd = new Lang.Class({
|
||||
});
|
||||
Signals.addSignalMethods(LoginManagerSystemd.prototype);
|
||||
|
||||
-const LoginManagerDummy = new Lang.Class({
|
||||
- Name: 'LoginManagerDummy',
|
||||
+const LoginManagerConsoleKit = new Lang.Class({
|
||||
+ Name: 'LoginManagerConsoleKit',
|
||||
|
||||
+ _init: function() {
|
||||
+ this._proxy = new ConsoleKitManager(Gio.DBus.system,
|
||||
+ 'org.freedesktop.ConsoleKit',
|
||||
+ '/org/freedesktop/ConsoleKit/Manager');
|
||||
+ },
|
||||
+
|
||||
+ // Having this function is a bit of a hack since the Systemd and ConsoleKit
|
||||
+ // session objects have different interfaces - but in both cases there are
|
||||
+ // Lock/Unlock signals, and that's all we count upon at the moment.
|
||||
getCurrentSessionProxy: function(callback) {
|
||||
- // we could return a DummySession object that fakes whatever callers
|
||||
- // expect (at the time of writing: connect() and connectSignal()
|
||||
- // methods), but just never calling the callback should be safer
|
||||
+ if (this._currentSession) {
|
||||
+ callback (this._currentSession);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ this._proxy.GetCurrentSessionRemote(Lang.bind(this,
|
||||
+ function(result, error) {
|
||||
+ if (error) {
|
||||
+ logError(error, 'Could not get a proxy for the current session');
|
||||
+ } else {
|
||||
+ this._currentSession = new ConsoleKitSession(Gio.DBus.system,
|
||||
+ 'org.freedesktop.ConsoleKit',
|
||||
+ result[0]);
|
||||
+ callback(this._currentSession);
|
||||
+ }
|
||||
+ }));
|
||||
},
|
||||
|
||||
canSuspend: function(asyncCallback) {
|
||||
@@ -203,4 +254,4 @@ const LoginManagerDummy = new Lang.Class({
|
||||
callback(null);
|
||||
}
|
||||
});
|
||||
-Signals.addSignalMethods(LoginManagerDummy.prototype);
|
||||
+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gnome-shell'
|
||||
pkgname=gnome-shell
|
||||
version=3.18.5
|
||||
revision=4
|
||||
version=3.22.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-compile --disable-systemd"
|
||||
hostmakedepends="
|
||||
|
@ -15,13 +15,13 @@ makedepends="
|
|||
caribou-devel gir-freedesktop gnome-control-center-devel
|
||||
folks-devel gnome-menus-devel"
|
||||
depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils
|
||||
gir-freedesktop gnome-control-center>=3.16 ConsoleKit2 upower"
|
||||
gir-freedesktop gnome-control-center>=3.16 elogind upower"
|
||||
short_desc="GNOME core user interface"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://live.gnome.org/GnomeShell"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=6fc9cd8b43b1ca0669e1c5a9de092a67eea648e38585f0cdb960f08a16c6cb20
|
||||
checksum=d1e6bd80ddd1fef92d80b518d4dbeffa296e8f003402551b8c37c42744b7d42f
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-sound-recorder'
|
||||
pkgname=gnome-sound-recorder
|
||||
version=3.18.2
|
||||
version=3.20.2
|
||||
revision=1
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
|
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=6f008f81ae760cee297a6a3c8e8b9418005c06897bff973a1e845a4f8c3e202b
|
||||
checksum=25b2b452cb59851205164426a942121964f0bf49091c3789fb6bce9b9c6de3f2
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-system-monitor'
|
||||
pkgname=gnome-system-monitor
|
||||
version=3.18.2
|
||||
version=3.22.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-compile --enable-wnck --disable-systemd"
|
||||
|
@ -11,4 +11,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=9e4a5d6aefa362448f301907fe07f3889e3dd7824922ceef8c48a7808be3e666
|
||||
checksum=68a5b097157a6e445fc2467cbaecfede77d00b774c93e8aa69b6f784055dc982
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
# Template build file for 'gnome-themes-standard'.
|
||||
pkgname=gnome-themes-standard
|
||||
version=3.20.2
|
||||
version=3.22.2
|
||||
revision=1
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config intltool librsvg-utils glib-devel"
|
||||
makedepends="gtk+-devel gtk+3-devel librsvg-devel"
|
||||
depends="cantarell-fonts adwaita-icon-theme>=${version}"
|
||||
depends="cantarell-fonts adwaita-icon-theme>=${version%.*}"
|
||||
short_desc="Standard GNOME themes"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org"
|
||||
license="LGPL-2.1"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915
|
||||
checksum=b34516cd59b873c187c1897c25bac3b9ce2d30a472f1fd7ae9d7105d93e17da5
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gnome-tweak-tool'
|
||||
pkgname=gnome-tweak-tool
|
||||
version=3.18.1
|
||||
revision=2
|
||||
version=3.22.0
|
||||
revision=1
|
||||
noarch=yes
|
||||
nocross=yes
|
||||
build_style=gnu-configure
|
||||
|
@ -14,4 +14,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="GPL-2"
|
||||
homepage="http://live.gnome.org/GnomeTweakTool"
|
||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
checksum=5c2c1103237648413c2d63a941e06b7057d6b102276b5968517753075de29430
|
||||
checksum=3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gnome-user-docs'
|
||||
pkgname=gnome-user-docs
|
||||
version=3.18.1
|
||||
version=3.22.0
|
||||
revision=1
|
||||
noarch="yes"
|
||||
build_style=gnu-configure
|
||||
|
@ -12,4 +12,4 @@ short_desc="User documentation for GNOME"
|
|||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=83e52528de6afe4412679d7fd8c7f8124b07770b4e291592f24e9e50657efae4
|
||||
checksum=7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
# Template file for 'gnome'
|
||||
pkgname=gnome
|
||||
version=3.18.0
|
||||
version=3.22.0
|
||||
revision=1
|
||||
build_style=meta
|
||||
depends="
|
||||
baobab>=${version}
|
||||
bijiben>=${version}
|
||||
bijiben>=3.20.2
|
||||
brasero>=3.12.0
|
||||
cantarell-fonts>=0.0.16
|
||||
cheese>=${version}
|
||||
|
@ -19,18 +19,18 @@ depends="
|
|||
gedit>=${version}
|
||||
glib>=2.46.0
|
||||
gnome-backgrounds>=${version}
|
||||
gnome-bluetooth>=${version}
|
||||
gnome-bluetooth>=3.20.1
|
||||
gnome-calculator>=${version}
|
||||
gnome-clocks>=${version}
|
||||
gnome-color-manager>=${version}
|
||||
gnome-color-manager>=3.18.0
|
||||
gnome-contacts>=${version}
|
||||
gnome-desktop>=${version}
|
||||
gnome-dictionary>=${version}
|
||||
gnome-disk-utility>=${version}
|
||||
gnome-dictionary>=3.18.1
|
||||
gnome-disk-utility>=3.18.3
|
||||
gnome-documents>=3.18.0.0
|
||||
gnome-font-viewer>=3.16.0
|
||||
gnome-initial-setup>=${version}
|
||||
gnome-keyring>=${version}
|
||||
gnome-keyring>=3.20.0
|
||||
gnome-maps>=${version}
|
||||
gnome-menus>=3.10.0
|
||||
gnome-music>=${version}
|
||||
|
@ -46,7 +46,7 @@ depends="
|
|||
gnome-terminal>=${version}
|
||||
gnome-themes-standard>=${version}
|
||||
gnome-user-docs>=${version}
|
||||
gnome-weather>=${version}
|
||||
gnome-weather>=3.20.2
|
||||
gtk+3>=${version}
|
||||
gucharmap>=${version}
|
||||
mousetweaks>=3.12.0
|
||||
|
@ -54,10 +54,8 @@ depends="
|
|||
nautilus-sendto>=3.8.0
|
||||
network-manager-applet>=1.0.4
|
||||
rygel>=0.28.0
|
||||
seahorse>=${version}
|
||||
seahorse-nautilus>=3.10.0
|
||||
seahorse-sharing>=3.8.0
|
||||
sushi>=${version}
|
||||
seahorse>=3.20.0
|
||||
sushi>=3.20.0
|
||||
totem>=${version}
|
||||
tracker>=1.6.0
|
||||
vinagre>=${version}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'intel-ucode'
|
||||
pkgname=intel-ucode
|
||||
version=20160714
|
||||
version=20161104
|
||||
revision=1
|
||||
noarch=yes
|
||||
create_wrksrc=yes
|
||||
|
@ -8,8 +8,8 @@ short_desc="Microcode update files for Intel CPUs"
|
|||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="INTEL Software License Agreement"
|
||||
homepage="http://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22microcode%22"
|
||||
distfiles="http://downloadmirror.intel.com/26156/eng/microcode-${version}.tgz"
|
||||
checksum=f3a9c6fc93275bf1febc26f7c397ac93ed5f109e47fb52932f6dbd5cfdbc840e
|
||||
distfiles="http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz"
|
||||
checksum=70154ca62ff9b3da6291dfdecc90daaeb399d7290c0d308d719df16dff5ee3d1
|
||||
|
||||
only_for_archs="i686 x86_64 i686-musl x86_64-musl"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'iperf3'
|
||||
pkgname=iperf3
|
||||
version=3.1.6
|
||||
version=3.1.7
|
||||
revision=1
|
||||
wrksrc="iperf-${version}"
|
||||
build_style=gnu-configure
|
||||
|
@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="3-clause-BSD"
|
||||
homepage="http://software.es.net/iperf/"
|
||||
distfiles="http://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"
|
||||
checksum=70f0c72d9e60c6ecb2c478ed17e4fd81d3b827d57896fee43bcd0c53abccb29d
|
||||
checksum=a4ef73406fe92250602b8da2ae89ec53211f805df97a1d1d629db5a14043734f
|
||||
|
||||
post_extract() {
|
||||
sed -i '1i#include <stdint.h>' src/timer.h src/cjson.h
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template build file for 'libGL'.
|
||||
pkgname=libGL
|
||||
version=17.0.0
|
||||
version=17.0.1
|
||||
revision=1
|
||||
wrksrc="mesa-${version}"
|
||||
build_style=gnu-configure
|
||||
|
@ -12,8 +12,8 @@ short_desc="Graphics library similar to SGI's OpenGL"
|
|||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.mesa3d.org/"
|
||||
license="MIT, LGPL-2.1"
|
||||
distfiles="https://mesa.freedesktop.org/archive/${version}/mesa-${version}.tar.xz"
|
||||
checksum=39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481
|
||||
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
||||
checksum=96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c
|
||||
|
||||
hostmakedepends="
|
||||
automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'lollypop'
|
||||
pkgname=lollypop
|
||||
version=0.9.229
|
||||
version=0.9.230
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
noarch=yes
|
||||
|
@ -15,4 +15,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
|||
license="GPL-3"
|
||||
homepage="https://gnumdk.github.io/lollypop-web/"
|
||||
distfiles="https://github.com/gnumdk/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
|
||||
checksum=19430b57cfa4d99b25809fe504019010a20ca60ce4b1a219ed018f7bf29192f5
|
||||
checksum=fe4d33b21affd2b428b1e4555ae60c11741ee67063eabf00b1db18c6e97417b1
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'mkvtoolnix'
|
||||
pkgname=mkvtoolnix
|
||||
version=9.8.0
|
||||
version=9.9.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-curl"
|
||||
hostmakedepends="autoconf pkg-config ruby"
|
||||
configure_args="--without-curl --with-docbook-xsl-root=/usr/share/xsl/docbook"
|
||||
hostmakedepends="autoconf pkg-config ruby libxslt docbook-xsl"
|
||||
makedepends="libebml-devel libmatroska-devel boost-devel libvorbis-devel
|
||||
libflac-devel file-devel qt5-devel qt5-tools-devel"
|
||||
short_desc="Create, alter and inspect Matroska videos"
|
||||
|
@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
|||
license="GPL-2"
|
||||
homepage="https://www.bunkus.org/videotools/mkvtoolnix/"
|
||||
distfiles="${homepage}/sources/${pkgname}-${version}.tar.xz"
|
||||
checksum=494b2fb9ff83a858d8849baecdd3320456717923bb7a854d31a02a49640228db
|
||||
checksum=f06c9359bd197b5de6556a05506f0ea9ddab72045b72f1ed04b1807e4e042043
|
||||
# Cross compiling fails due to dependency chain eigen -> jack -> pulseaudio
|
||||
nocross=yes
|
||||
|
||||
|
|
10
srcpkgs/mutter/patches/fix-includes.patch
Normal file
10
srcpkgs/mutter/patches/fix-includes.patch
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- src/wayland/meta-wayland-private.h.orig 2016-09-23 08:55:17.876037227 +0200
|
||||
+++ src/wayland/meta-wayland-private.h 2016-09-23 08:57:08.436042296 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include "window-private.h"
|
||||
#include <meta/meta-cursor-tracker.h>
|
||||
+#include <meta/meta-backend.h>
|
||||
|
||||
#include "meta-wayland.h"
|
||||
#include "meta-wayland-versions.h"
|
|
@ -1,23 +1,24 @@
|
|||
# Template file for 'mutter'
|
||||
pkgname=mutter
|
||||
version=3.18.3
|
||||
version=3.22.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-compile --disable-static --enable-compile-warnings=no"
|
||||
hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection
|
||||
glib-devel wayland-devel zenity"
|
||||
makedepends="
|
||||
gtk+3-devel startup-notification-devel libcanberra-devel
|
||||
clutter-devel gsettings-desktop-schemas-devel
|
||||
upower-devel gnome-desktop-devel libSM-devel
|
||||
zenity"
|
||||
# wayland is currently broken
|
||||
configure_args+=" --disable-wayland"
|
||||
hostmakedepends="pkg-config zenity glib-devel gobject-introspection"
|
||||
makedepends="json-glib-devel upower-devel gnome-desktop-devel libinput-devel
|
||||
glib-devel libcanberra-devel startup-notification-devel libSM-devel"
|
||||
depends="zenity desktop-file-utils"
|
||||
short_desc="Lightweight GTK+3 window manager"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=58dd88d5596bb0377ae3aed692b306995de45aefae9e215cfaf4b13287526846
|
||||
checksum=537eda8e5fdd4a70602da913b885ad745a7510678c24006b91ceba83ccab209a
|
||||
shlib_provides="libmutter-clutter-1.0.so libmutter-cogl-path.so libmutter-cogl.so libmutter-cogl-pango.so"
|
||||
nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio"
|
||||
|
||||
|
||||
# Package build options
|
||||
build_options="gir"
|
||||
|
@ -26,6 +27,16 @@ if [ -z "$CROSS_BUILD" ]; then
|
|||
build_options_default="gir"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
local _arch=x86
|
||||
for i in /usr/src/kernel-headers-*/include; do
|
||||
CFLAGS+=" -I$i -I$i/uapi -I$i/../arch/$_arch/include"
|
||||
done
|
||||
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool
|
||||
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool
|
||||
}
|
||||
|
||||
mutter-devel_package() {
|
||||
depends="gsettings-desktop-schemas>=3.16 gtk+3-devel>=3.16
|
||||
clutter-devel>=1.22 libX11-devel mutter>=${version}_${revision}"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'network-manager-applet'
|
||||
pkgname=network-manager-applet
|
||||
version=1.0.10
|
||||
revision=3
|
||||
version=1.4.4
|
||||
revision=1
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --without-bluetooth
|
||||
|
@ -12,14 +12,15 @@ hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel
|
|||
makedepends="
|
||||
dbus-glib-devel libgnome-keyring-devel libsecret-devel
|
||||
NetworkManager-devel gtk+3-devel libnotify-devel
|
||||
ModemManager-devel polkit-devel libgudev-devel iso-codes"
|
||||
ModemManager-devel polkit-devel libgudev-devel iso-codes
|
||||
jansson-devel"
|
||||
depends="iso-codes NetworkManager>=1.0 hicolor-icon-theme"
|
||||
short_desc="NetworkManager panel applet for GNOME"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.gnome.org/projects/NetworkManager/"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=b045ac3eaa68ccbbefe91510ad67b4002a7e09d1e5ce1c4bf9a67619bd2cf0eb
|
||||
checksum=693846eeae0986e79eb1cedfbc499f132f27a9976ef189a0f16938ac59ec3226
|
||||
|
||||
# Package build options
|
||||
build_options="gir"
|
||||
|
|
10
srcpkgs/ngspice/patches/xgraph_Makefile_am.patch
Normal file
10
srcpkgs/ngspice/patches/xgraph_Makefile_am.patch
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- xgraph/Makefile.am.bck 2017-03-03 13:46:57.354309383 -0500
|
||||
+++ xgraph/Makefile.am 2017-03-03 13:47:05.193092565 -0500
|
||||
@@ -50,7 +50,6 @@
|
||||
|
||||
# C_WARNINGS = -Wall
|
||||
C_WARNINGS =
|
||||
-CFLAGS=$(ADDITIONAL_INCLUDES) $(C_WARNINGS) -g $(X_CFLAGS)
|
||||
|
||||
xgraph_LDADD= $(ADDITIONAL_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lm
|
||||
|
15
srcpkgs/ngspice/patches/xgraph_Makefile_in.patch
Normal file
15
srcpkgs/ngspice/patches/xgraph_Makefile_in.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
104c104
|
||||
< CFLAGS = $(ADDITIONAL_INCLUDES) $(C_WARNINGS) -g $(X_CFLAGS)
|
||||
---
|
||||
> CFLAGS = @CFLAGS@
|
||||
--- xgraph/Makefile.in.bck 2017-03-03 13:56:19.941818032 -0500
|
||||
+++ xgraph/Makefile.in 2017-03-03 13:56:33.118453570 -0500
|
||||
@@ -101,7 +101,7 @@
|
||||
AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
-CFLAGS = $(ADDITIONAL_INCLUDES) $(C_WARNINGS) -g $(X_CFLAGS)
|
||||
+CFLAGS = @CFLAGS@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
15
srcpkgs/ngspice/template
Normal file
15
srcpkgs/ngspice/template
Normal file
|
@ -0,0 +1,15 @@
|
|||
# Template file for 'ngspice'
|
||||
pkgname=ngspice
|
||||
version=26
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-x --with-readline=yes --enable-xgraph"
|
||||
hostmakedepends="bison byacc"
|
||||
makedepends="readline-devel libX11-devel libXaw-devel"
|
||||
short_desc="Mixed Mode Mixed Level Circuit Simulator based on Spice3F5"
|
||||
maintainer="Toyam Cox <Vaelatern@gmail.com>"
|
||||
license="LGPL-2.1"
|
||||
homepage="http://ngspice.sourceforge.net"
|
||||
distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
|
||||
checksum=51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108
|
||||
nocross="https://travis-ci.org/Vaelatern/void-packages/jobs/207472663 but really should be possible with clearing CFLAGS for that binary"
|
105
srcpkgs/nvidia304/files/kernel_4.10.patch
Normal file
105
srcpkgs/nvidia304/files/kernel_4.10.patch
Normal file
|
@ -0,0 +1,105 @@
|
|||
From d270372bf8abcf45409b30cdb33069280527b0ff Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Wed, 15 Feb 2017 18:01:02 +0100
|
||||
Subject: [PATCH 1/1] Add support for Linux 4.10
|
||||
|
||||
---
|
||||
nv-linux.h | 5 +++++
|
||||
nv-pat.c | 40 ++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 45 insertions(+)
|
||||
|
||||
diff --git kernel/nv-linux.h kernel/nv-linux.h
|
||||
index b46e71f..3081c06 100644
|
||||
--- kernel/nv-linux.h
|
||||
+++ kernel/nv-linux.h
|
||||
@@ -1895,8 +1895,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
|
||||
|
||||
#else
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
||||
return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
|
||||
pages, vmas);
|
||||
+#else
|
||||
+ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
|
||||
+ pages, vmas, NULL);
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
|
||||
diff --git kernel/nv-pat.c kernel/nv-pat.c
|
||||
index e71e81c..d742789 100644
|
||||
--- kernel/nv-pat.c
|
||||
+++ kernel/nv-pat.c
|
||||
@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
|
||||
}
|
||||
|
||||
#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
||||
static int
|
||||
nv_kern_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
|
||||
{
|
||||
@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
|
||||
.notifier_call = nv_kern_cpu_callback,
|
||||
.priority = 0
|
||||
};
|
||||
+#else
|
||||
+static int nvidia_cpu_online(unsigned int hcpu)
|
||||
+{
|
||||
+ unsigned int cpu = get_cpu();
|
||||
+ if (cpu == hcpu)
|
||||
+ nv_setup_pat_entries(NULL);
|
||||
+ else
|
||||
+ NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
|
||||
+
|
||||
+ put_cpu();
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int nvidia_cpu_down_prep(unsigned int hcpu)
|
||||
+{
|
||||
+ unsigned int cpu = get_cpu();
|
||||
+ if (cpu == hcpu)
|
||||
+ nv_restore_pat_entries(NULL);
|
||||
+ else
|
||||
+ NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 1);
|
||||
+
|
||||
+ put_cpu();
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
|
||||
int nv_init_pat_support(nv_stack_t *sp)
|
||||
@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
|
||||
#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
|
||||
if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
||||
if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
|
||||
+#else
|
||||
+ if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
|
||||
+ "gpu/nvidia:online",
|
||||
+ nvidia_cpu_online,
|
||||
+ nvidia_cpu_down_prep) != 0)
|
||||
+#endif
|
||||
{
|
||||
nv_disable_pat_support();
|
||||
nv_printf(NV_DBG_ERRORS,
|
||||
@@ -280,7 +316,11 @@ void nv_teardown_pat_support(void)
|
||||
{
|
||||
nv_disable_pat_support();
|
||||
#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
||||
unregister_hotcpu_notifier(&nv_hotcpu_nfb);
|
||||
+#else
|
||||
+ cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);
|
||||
+#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -3,7 +3,7 @@ _desc="NVIDIA drivers (For GeForce 5 FX, 6, 7, 8 series)"
|
|||
|
||||
pkgname=nvidia304
|
||||
version=304.135
|
||||
revision=1
|
||||
revision=2
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="Proprietary NVIDIA license"
|
||||
homepage="http://www.nvidia.com"
|
||||
|
@ -38,6 +38,7 @@ do_extract() {
|
|||
do_configure() {
|
||||
cd ${_pkg}
|
||||
patch -sNp0 -i ${FILESDIR}/disable-mtrr.patch
|
||||
patch -sNp0 -i ${FILESDIR}/kernel_4.10.patch
|
||||
}
|
||||
do_install() {
|
||||
cd ${_pkg}
|
||||
|
|
|
@ -15,6 +15,7 @@ session optional pam_loginuid.so
|
|||
session include system-auth
|
||||
session optional pam_motd.so motd=/etc/motd
|
||||
session optional pam_mail.so dir=/var/spool/mail standard quiet
|
||||
session optional pam_elogind.so
|
||||
-session optional pam_systemd.so
|
||||
-session optional pam_ck_connector.so nox11
|
||||
session required pam_env.so
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'pam-base'
|
||||
pkgname=pam-base
|
||||
version=0.2
|
||||
version=0.3
|
||||
revision=1
|
||||
noarch=yes
|
||||
short_desc="PAM base configuration files"
|
||||
|
|
1
srcpkgs/polkit-elogind/files
Symbolic link
1
srcpkgs/polkit-elogind/files
Symbolic link
|
@ -0,0 +1 @@
|
|||
../polkit/files
|
1
srcpkgs/polkit-elogind/patches
Symbolic link
1
srcpkgs/polkit-elogind/patches
Symbolic link
|
@ -0,0 +1 @@
|
|||
../polkit/patches
|
53
srcpkgs/polkit-elogind/template
Normal file
53
srcpkgs/polkit-elogind/template
Normal file
|
@ -0,0 +1,53 @@
|
|||
# Template file for 'polkit'
|
||||
pkgname=polkit-elogind
|
||||
_pkgname=polkit
|
||||
version=0.113
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="$(vopt_enable gir introspection)
|
||||
--disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-17.0"
|
||||
short_desc="Authorization Toolkit"
|
||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||
homepage="http://www.freedesktop.org/wiki/Software/polkit"
|
||||
license="GPL-2"
|
||||
distfiles="${FREEDESKTOP_SITE}/${_pkgname}/releases/${_pkgname}-${version}.tar.gz"
|
||||
checksum=e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
|
||||
wrksrc="${_pkgname}-${version}"
|
||||
provides="${_pkgname}-${version}_${revision}"
|
||||
replaces="polkit>=0"
|
||||
|
||||
hostmakedepends="automake libtool gettext-devel pkg-config intltool libxslt
|
||||
docbook-xsl glib-devel gtk-doc gobject-introspection"
|
||||
makedepends="libglib-devel expat-devel pam-devel mozjs17-devel elogind-devel"
|
||||
system_accounts="polkitd"
|
||||
make_dirs="
|
||||
/etc/polkit-1/rules.d 0700 polkitd polkitd
|
||||
/usr/share/polkit-1/rules.d 0700 polkitd polkitd"
|
||||
|
||||
# Package build options
|
||||
build_options="gir"
|
||||
# Disable gir for cross builds.
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
build_options_default+=" gir"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.
|
||||
sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
|
||||
}
|
||||
post_configure() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
sed -e "s,/usr/include/js-17.0,${XBPS_CROSS_BASE}/usr/include/js-17.0," -i src/polkitbackend/Makefile
|
||||
fi
|
||||
}
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
|
||||
|
||||
rm -r $DESTDIR/usr/include
|
||||
rm -r $DESTDIR/usr/lib/pkgconfig
|
||||
if [ "$build_option_gir" ]; then
|
||||
rm -r $DESTDIR/usr/share/gir-*
|
||||
fi
|
||||
rm -r $DESTDIR/usr/lib/*.so
|
||||
}
|
28
srcpkgs/python-gitlab/template
Normal file
28
srcpkgs/python-gitlab/template
Normal file
|
@ -0,0 +1,28 @@
|
|||
# Template file for 'python-gitlab'
|
||||
pkgname=python-gitlab
|
||||
version=0.18
|
||||
revision=1
|
||||
noarch=yes
|
||||
build_style=python-module
|
||||
pycompile_module="gitlab"
|
||||
hostmakedepends="python-setuptools python3-setuptools"
|
||||
depends="python-requests python-six"
|
||||
short_desc="Wrapper for GitLab's API (Python2)"
|
||||
maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
|
||||
homepage="https://github.com/gpocentek/python-gitlab"
|
||||
license="LGPL-3"
|
||||
distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
|
||||
checksum=d60d67c82fedd8c3e4f0bb8b5241bf2df32307c98fdf2f02a94850e21db2d804
|
||||
alternatives="python-gitlab:gitlab:/usr/bin/gitlab2"
|
||||
|
||||
python3-gitlab_package() {
|
||||
noarch=yes
|
||||
depends="python3-requests python3-six"
|
||||
pycompile_module="gitlab"
|
||||
short_desc="${short_desc/Python2/Python3}"
|
||||
alternatives="python-gitlab:gitlab:/usr/bin/gitlab3"
|
||||
pkg_install() {
|
||||
vmove usr/bin/*3
|
||||
vmove usr/lib/python3*
|
||||
}
|
||||
}
|
1
srcpkgs/python3-gitlab
Symbolic link
1
srcpkgs/python3-gitlab
Symbolic link
|
@ -0,0 +1 @@
|
|||
python-gitlab
|
|
@ -1,28 +0,0 @@
|
|||
--- lib/getulong.c
|
||||
+++ lib/getulong.c
|
||||
@@ -44,22 +44,19 @@
|
||||
*/
|
||||
int getulong (const char *numstr, /*@out@*/unsigned long int *result)
|
||||
{
|
||||
- long long int val;
|
||||
+ unsigned long int val;
|
||||
char *endptr;
|
||||
|
||||
errno = 0;
|
||||
- val = strtoll (numstr, &endptr, 0);
|
||||
+ val = strtoul (numstr, &endptr, 0);
|
||||
if ( ('\0' == *numstr)
|
||||
|| ('\0' != *endptr)
|
||||
|| (ERANGE == errno)
|
||||
- /*@+ignoresigns@*/
|
||||
- || (val != (unsigned long int)val)
|
||||
- /*@=ignoresigns@*/
|
||||
) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
- *result = (unsigned long int)val;
|
||||
+ *result = val;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
Added support to cache the value of the id32bit test, to allow cross compilation.
|
||||
|
||||
--xtraeme
|
||||
|
||||
--- configure.in.orig 2014-05-09 13:53:10.000000000 +0200
|
||||
+++ configure.in 2014-08-25 10:41:31.198567162 +0200
|
||||
@@ -335,6 +335,9 @@ if test "$enable_subids" != "no"; then
|
||||
dnl
|
||||
dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc
|
||||
dnl
|
||||
+ AC_CACHE_CHECK(
|
||||
+ [wheter subordinate IDs are supported],
|
||||
+ [ac_cv_id32bit], [
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
#include <sys/types.h>
|
||||
int main(void) {
|
||||
@@ -342,9 +345,9 @@ int main(void) {
|
||||
gid_t g;
|
||||
return (sizeof u < 4) || (sizeof g < 4);
|
||||
}
|
||||
- ])], [id32bit="yes"], [id32bit="no"])
|
||||
+ ])])], [ac_cv_id32bit="yes"], [ac_cv_id32bit="no"])
|
||||
|
||||
- if test "x$id32bit" = "xyes"; then
|
||||
+ if test "x$ac_cv_id32bit" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.])
|
||||
enable_subids="yes"
|
||||
else
|
35
srcpkgs/shadow/patches/fix-load_defaults.patch
Normal file
35
srcpkgs/shadow/patches/fix-load_defaults.patch
Normal file
|
@ -0,0 +1,35 @@
|
|||
From 507f96cdeb54079fb636c7ce21e371f7a16a520e Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Mraz <tmraz@fedoraproject.org>
|
||||
Date: Thu, 25 Aug 2016 11:20:34 +0200
|
||||
Subject: [PATCH] Fix regression in useradd not loading defaults properly.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The get_defaults() has to be called before processing the flags.
|
||||
|
||||
Signed-off-by: Tomáš Mráz <tmraz@fedoraproject.org>
|
||||
---
|
||||
src/useradd.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- src/useradd.c.orig
|
||||
+++ src/useradd.c
|
||||
@@ -2027,6 +2027,8 @@ int main (int argc, char **argv)
|
||||
is_shadow_grp = sgr_file_present ();
|
||||
#endif
|
||||
|
||||
+ get_defaults ();
|
||||
+
|
||||
process_flags (argc, argv);
|
||||
|
||||
#ifdef ENABLE_SUBIDS
|
||||
@@ -2036,8 +2038,6 @@ int main (int argc, char **argv)
|
||||
(!user_id || (user_id <= uid_max && user_id >= uid_min));
|
||||
#endif /* ENABLE_SUBIDS */
|
||||
|
||||
- get_defaults ();
|
||||
-
|
||||
#ifdef ACCT_TOOLS_SETUID
|
||||
#ifdef USE_PAM
|
||||
{
|
33
srcpkgs/shadow/patches/fix-prototypes.patch
Normal file
33
srcpkgs/shadow/patches/fix-prototypes.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
From 32c0b283ef5d68b63e4ec05fb22ed0db938fea67 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 5 Dec 2016 17:15:29 -0500
|
||||
Subject: [PATCH] include getdef.h for getdef_bool prototype
|
||||
|
||||
Otherwise we get build warnings like:
|
||||
sgroupio.c:255:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration]
|
||||
shadowio.c:131:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration]
|
||||
---
|
||||
lib/sgroupio.c | 1 +
|
||||
lib/shadowio.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
--- lib/sgroupio.c.orig
|
||||
+++ lib/sgroupio.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#include "commonio.h"
|
||||
+#include "getdef.h"
|
||||
#include "sgroupio.h"
|
||||
|
||||
/*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent)
|
||||
--- lib/shadowio.c.orig
|
||||
+++ lib/shadowio.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <shadow.h>
|
||||
#include <stdio.h>
|
||||
#include "commonio.h"
|
||||
+#include "getdef.h"
|
||||
#include "shadowio.h"
|
||||
#ifdef WITH_TCB
|
||||
#include <tcb.h>
|
17
srcpkgs/shadow/patches/fix-su-snprintf.patch
Normal file
17
srcpkgs/shadow/patches/fix-su-snprintf.patch
Normal file
|
@ -0,0 +1,17 @@
|
|||
https://github.com/shadow-maint/shadow/issues/32
|
||||
|
||||
Anyway, we use su from util-linux.
|
||||
|
||||
--- src/su.c.orig 2016-12-01 20:41:50.000000000 +0100
|
||||
+++ src/su.c 2017-02-26 17:36:32.291904996 +0100
|
||||
@@ -373,8 +373,8 @@
|
||||
stderr);
|
||||
(void) kill (-pid_child, caught);
|
||||
|
||||
- snprintf (kill_msg, _(" ...killed.\n"));
|
||||
- snprintf (wait_msg, _(" ...waiting for child to terminate.\n"));
|
||||
+ snprintf (kill_msg, sizeof kill_msg, _(" ...killed.\n"));
|
||||
+ snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n"));
|
||||
|
||||
(void) signal (SIGALRM, kill_child);
|
||||
(void) alarm (2);
|
|
@ -1,10 +0,0 @@
|
|||
--- libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400
|
||||
+++ libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $"
|
||||
|
||||
+#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
|
@ -1,12 +1,12 @@
|
|||
# Template file for 'shadow'
|
||||
pkgname=shadow
|
||||
version=4.2.1
|
||||
revision=15
|
||||
version=4.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--bindir=/usr/bin --sbindir=/usr/bin
|
||||
--libdir=/usr/lib --enable-shared --disable-static
|
||||
--with-libpam --without-selinux --with-acl --with-attr
|
||||
--disable-nls --enable-subordinate-ids ac_cv_id32bit=yes"
|
||||
--disable-nls --enable-subordinate-ids"
|
||||
hostmakedepends="automake libtool gettext-devel"
|
||||
makedepends="acl-devel pam-devel"
|
||||
depends="pam"
|
||||
|
@ -28,9 +28,9 @@ conf_files="
|
|||
short_desc="Shadow password file utilities"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="BSD"
|
||||
homepage="http://pkg-shadow.alioth.debian.org"
|
||||
distfiles="http://pkg-shadow.alioth.debian.org/releases/$pkgname-$version.tar.xz"
|
||||
checksum=3b0893d1476766868cd88920f4f1231c4795652aa407569faff802bcda0f3d41
|
||||
homepage="https://github.com/shadow-maint/shadow"
|
||||
distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz"
|
||||
checksum=61a9a4041b552eab9a253788d589e3664cf9b903bdd1f1ca73ea8aac4a71f03c
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
|
21
srcpkgs/suricata/template
Normal file
21
srcpkgs/suricata/template
Normal file
|
@ -0,0 +1,21 @@
|
|||
# Template file for 'suricata'
|
||||
pkgname=suricata
|
||||
version=3.2.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel file-devel"
|
||||
short_desc="Next Generation Intrusion Detection and Prevention Engine"
|
||||
maintainer="demiaster <marta.celeste.feriani@gmail.com>"
|
||||
license="GPL-2"
|
||||
homepage="https://suricata-ids.org/"
|
||||
distfiles="https://www.openinfosecfoundation.org/download/$pkgname-$version.tar.gz"
|
||||
checksum=0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994
|
||||
|
||||
post_install() {
|
||||
vinstall $pkgname.yaml 644 etc/$pkgname/$pkgname.yaml
|
||||
vinstall classification.config 644 etc/$pkgname/classification.config
|
||||
vinstall reference.config 644 etc/$pkgname/reference.config
|
||||
vmkdir etc/$pkgname/rules
|
||||
vcopy rules/*.rules etc/$pkgname/rules
|
||||
}
|
Loading…
Reference in a new issue