root
5 years ago
parent
0f572cd13a
commit
5ced20d2b1
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 29311 BLAKE2B c2afcebd0ddac7542cf9bdadf9a40b11303d7221615dd217b7c838e668435e510ca7bbe6011e11f3ba789d79dcc2c74aad191a235142d46075099095a6a87871 SHA512 7d373715155535129fb83d7a927d0aa1fef188dc29fc0741072d4450851a2b4458455471f15da50cb4edd0a633357a3ef82debfc0098d461b6321ab48d3c5060
|
||||
TIMESTAMP 2019-06-17T22:38:52Z
|
||||
MANIFEST Manifest.files.gz 29290 BLAKE2B b2784b5f7f6197d68776c972129c1a6b9b56d93cd1948dfab55442943d622255321a184dc5a1a6268c51d65740f58f2b5a93f0c47e88e98c0e56927ab428a2e2 SHA512 eabe413c574a156e8046178dbb12f87b5205542b0f1e275d63572a14070c9c5e9536c22b76f305307c80ce27afffc110f4468959934a8c1fa7eefde11f52b06c
|
||||
TIMESTAMP 2019-06-18T05:08:52Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0IFnxfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0IceRfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klC3fhAAiueI0jqXn4+GkCw0cRIH0A+HlLaV76fWrRKkfl0YWNVMkgu7On41KN7s
|
||||
64+L7Q0664cTBNCP13WwtoRrLX9+TlZ3AsP5WxT78MHOwVJLrJo5Ww+oaQnycJzc
|
||||
4tYMH3NsZyWH1R/wjKpUvNd8ad4hiJplUv5UvY4b1MBQ2MxdMB66+J3qWjUKa6NW
|
||||
rKmk3/Zrp3vXdxCBujR/qk4Ru4r2Jrw0J9awY3MDXb8i9BT24MJT82R0yTptz/Hx
|
||||
93EuuhWf9dMaDapcvau7dGeRPm1pbcec/M3+Oaot3ky3vCwKKXG4U2loZsuU8FOW
|
||||
4tAe7Nrd2FYiiGsaCZBCocTd/t57vEir3fIZe823mwiCdxszlLXmkS/T67gOHcCJ
|
||||
hQsLarnQRVb52YroLvsfA2rrJz2hcaMTkdLccng8pEopsu9EkBwEulIrDw/kSrEV
|
||||
EUz5lfYTnfUhNqwk0B/AviDIJi3kozoBwGkarLfIfSxg/ta/Ab7wOHYBwwWkIEIb
|
||||
/w6nYYk4d4ILIeBchiLpBC78hH0m295cc1o9AYN67n29gREKK02gSu1g66eP9qYn
|
||||
BDhnrH+TaotYpZQRnO0GfillqMYDWekq4ZMBY+7AdR8t3xWC5q1C9h0w9sml64cX
|
||||
hDK9EOpf7PWO3RRhyEXY09al8XQk9Uv8f0jXef1UJvXmIYxEafI=
|
||||
=rAq8
|
||||
klA2CBAAstCkoHqg2x35BCG4iG/xcBoFIXoqF1gp2xFsCJGljpB7BsoLZtA4SRBY
|
||||
NBVG8D5McmtjgkDuPqUudw+AuW/5Qf2y4RH8WqSv26fmeO8mV6U0bl0QHuncTSns
|
||||
PSsPaNsVPMLW7uV7x8JBAgPuDVu6ZAVR3OTJAuJfAdHKggGy3wvtouLWteyX7WKY
|
||||
2pvIV27v222rpIlOVEudZmLMBJE+sWl5cqGBQq0EImOvYT55CNvxHghLZVtVM+JD
|
||||
XbA3AGnUiSOlw8kRDR+rOqVKLypDErG6AswGsaXvo37hd77M/fkNyNhjUiuYFOjq
|
||||
MxMg0Wn0/0Bc0/i2pzsbZT+K9rxBwqmFoj3R4kRC2mIRKi3GuW7LmrNLspGNtQHV
|
||||
/CXm64PwBJse5FQjk7+gDpTrgI3/aYVusmrNzuq1AMfOaK0ZWkZf/n4BDmVnjRpa
|
||||
jWbpo9VF4cE8kat1/VESxGVHLW/gQ+uEUtCtMGXc7Xfbl+XNQIK16Mlv6INO2o+R
|
||||
9nWIrU5ZQjv/09fp2TdAVkY6xmOwwLdWi5jFItZc0wyY73AhVxFbD6x/USiznvsP
|
||||
GOT7XzltFHoaqJTbeD6dEug7iTcks0zf3J6tsfQQuehB5az/TADDY+/e4wO79GFn
|
||||
B58/MqnWpYKbfEFBKQ2vgkOljnmFcVRhBnTaj4m0ZF2V/RXb2r4=
|
||||
=+39Y
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,216 +0,0 @@
|
||||
From 947ef7a44e94989f324e0d533499454d540fdef9 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <947ef7a44e94989f324e0d533499454d540fdef9.1547196492.git.mprivozn@redhat.com>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Tue, 26 Jun 2018 06:51:06 +0200
|
||||
Subject: [PATCH] gentoo: do not use sysconf
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/Makefile.am | 29 ++++++-----------------------
|
||||
src/locking/virtlockd.service.in | 3 +--
|
||||
src/logging/virtlogd.service.in | 3 +--
|
||||
src/remote/libvirtd.service.in | 3 +--
|
||||
tools/Makefile.am | 17 ++++-------------
|
||||
tools/libvirt-guests.service.in | 2 +-
|
||||
tools/libvirt-guests.sysconf | 7 +++++++
|
||||
7 files changed, 21 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index cd386297ed..52a63885d6 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT
|
||||
|
||||
EXTRA_DIST += $(SYSCONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
SYSVINIT_FILES_IN += \
|
||||
locking/virtlockd.init.in \
|
||||
$(NULL)
|
||||
@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
initdir = $(sysconfdir)/rc.d/init.d
|
||||
|
||||
-install-init:: $(SYSVINIT_FILES) install-sysconfig
|
||||
+install-init:: $(SYSVINIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(initdir)
|
||||
for f in $(SYSVINIT_FILES:%.init=%) ; \
|
||||
do \
|
||||
$(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
|
||||
done
|
||||
|
||||
-uninstall-init:: uninstall-sysconfig
|
||||
+uninstall-init::
|
||||
rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
|
||||
rmdir $(DESTDIR)$(initdir) || :
|
||||
|
||||
@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
|
||||
if WITH_LIBVIRTD
|
||||
if LIBVIRT_INIT_SCRIPT_UPSTART
|
||||
|
||||
-install-upstart: install-sysconfig
|
||||
+install-upstart:
|
||||
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
|
||||
for f in $(UPSTART_FILES:%.upstart=%); \
|
||||
do \
|
||||
@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
|
||||
$(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
|
||||
done
|
||||
|
||||
-uninstall-upstart: uninstall-sysconfig
|
||||
+uninstall-upstart:
|
||||
for f in $(UPSTART_FILES:%.upstart=%); \
|
||||
do \
|
||||
tgt=`basename $$f` ; \
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index 3c9d587032..2449b201d9 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlockd
|
||||
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
|
||||
+ExecStart=@sbindir@/virtlockd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# Loosing the locks is a really bad thing that will
|
||||
# cause the machine to be fenced (rebooted), so make
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index 3d9ae36150..43736191d5 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlogd
|
||||
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
|
||||
+ExecStart=@sbindir@/virtlogd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# Loosing the logs is a really bad thing that will
|
||||
# cause the machine to be fenced (rebooted), so make
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 7f689e08a8..239beeced9 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirtd
|
||||
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 613c9a77f0..224b511074 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
|
||||
uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
|
||||
|
||||
install-initscript: libvirt-guests.init
|
||||
@@ -362,8 +353,8 @@ uninstall-initscript:
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
BUILT_SOURCES += libvirt-guests.init
|
||||
-install-init: install-sysconfig install-initscript
|
||||
-uninstall-init: uninstall-sysconfig uninstall-initscript
|
||||
+install-init: install-initscript
|
||||
+uninstall-init: uninstall-initscript
|
||||
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
install-init:
|
||||
uninstall-init:
|
||||
@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 491ca62138..f0f417bffb 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirt-guests
|
||||
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=@libexecdir@/libvirt-guests.sh start
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046507..45b0b9ea46 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# Warning: This configuration file is only sourced by the systemd
|
||||
+# libvirt-guests.service unit. The coresponding openrc facility is in
|
||||
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@ -1,196 +0,0 @@
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 8c8dfe3..25ced3a 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT
|
||||
|
||||
EXTRA_DIST += $(SYSCONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
SYSVINIT_FILES_IN += \
|
||||
locking/virtlockd.init.in \
|
||||
$(NULL)
|
||||
@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
initdir = $(sysconfdir)/rc.d/init.d
|
||||
|
||||
-install-init: $(SYSVINIT_FILES) install-sysconfig
|
||||
+install-init: $(SYSVINIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(initdir)
|
||||
for f in $(SYSVINIT_FILES:%.init=%) ; \
|
||||
do \
|
||||
$(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
|
||||
done
|
||||
|
||||
-uninstall-init: uninstall-sysconfig
|
||||
+uninstall-init:
|
||||
rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
|
||||
rmdir $(DESTDIR)$(initdir) || :
|
||||
|
||||
@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
|
||||
if WITH_LIBVIRTD
|
||||
if LIBVIRT_INIT_SCRIPT_UPSTART
|
||||
|
||||
-install-upstart: install-sysconfig
|
||||
+install-upstart:
|
||||
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
|
||||
for f in $(UPSTART_FILES:%.upstart=%); \
|
||||
do \
|
||||
@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
|
||||
$(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
|
||||
done
|
||||
|
||||
-uninstall-upstart: uninstall-sysconfig
|
||||
+uninstall-upstart:
|
||||
for f in $(UPSTART_FILES:%.upstart=%); \
|
||||
do \
|
||||
tgt=`basename $$f` ; \
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index 3c9d587..2449b20 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlockd
|
||||
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
|
||||
+ExecStart=@sbindir@/virtlockd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# Loosing the locks is a really bad thing that will
|
||||
# cause the machine to be fenced (rebooted), so make
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index 3d9ae36..4373619 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlogd
|
||||
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
|
||||
+ExecStart=@sbindir@/virtlogd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# Loosing the logs is a really bad thing that will
|
||||
# cause the machine to be fenced (rebooted), so make
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 7f689e0..239beec 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirtd
|
||||
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index f2f84f7..1188d3c 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
|
||||
uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
|
||||
|
||||
install-initscript: libvirt-guests.init
|
||||
@@ -362,8 +353,8 @@ uninstall-initscript:
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
BUILT_SOURCES += libvirt-guests.init
|
||||
-install-init: install-sysconfig install-initscript
|
||||
-uninstall-init: uninstall-sysconfig uninstall-initscript
|
||||
+install-init: install-initscript
|
||||
+uninstall-init: uninstall-initscript
|
||||
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
install-init:
|
||||
uninstall-init:
|
||||
@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 491ca62..f0f417b 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirt-guests
|
||||
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=@libexecdir@/libvirt-guests.sh start
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046..45b0b9e 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# Warning: This configuration file is only sourced by the systemd
|
||||
+# libvirt-guests.service unit. The coresponding openrc facility is in
|
||||
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST splice-1.0.1.tar.bz2 12369 BLAKE2B ce43b38a74dd8c51c4fb2d23951119c259595dcc3f5bbeb5524d747a373ba7e71dc2bf4df957b48dca5aba5f2c04bb18bbe83d9551f63d2b055cdeddbc523713 SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede
|
||||
DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
|
||||
EBUILD splice-1.0.1.ebuild 714 BLAKE2B 8fa5503c2b6890d44042de0f9b1efa6c448d40906c5b74a2a474b991368fb6308856e3469068a6831a4b09f77c16715a7b754add1024dd0dafe1d2675e628245 SHA512 c9700ac764a36afd97ccec149dd45d8a8236eae470ecb3939b7856be70efdfeea87748c8ecb061eaec0813ccc57c93de06efd3eed28995e7adb5d5ae3e4dcf61
|
||||
EBUILD splice-1.1.0.ebuild 895 BLAKE2B 045d92ea5a059198aed734dc79190b543836dfb452a3fa637c53de4aa8a9d222f7c357e9969fda9f34965e27e0a95e5db14ce085856d00d1df7e5c06cb5d4bc7 SHA512 69fcde94ee3b9c1d76629c6e067a53fd1d93f5e8d7919b560a98d4a2f0ab380789de4a467617375ca2a0da8e6d50dc5ad3e30f25c1e3e9e184cebbd8f593d4b4
|
||||
EBUILD splice-1.0.1.ebuild 704 BLAKE2B 48796ab35b24832539495210a80b93a6e0981da47b6c2fcdc7ec3f5b41bfe6e30aeef2d630d9390c94c196a524001675d80e70a7318a2af9aeb48f607acc695c SHA512 1e8d8bb58cbb54e586fec5c082675189c45152d49ad10c7b6e37d5a2724b9d0780f2d9f8d124880d5a294b95f59e793eb0d2c58a489e956b6e7585abaec8cdac
|
||||
EBUILD splice-1.1.0.ebuild 886 BLAKE2B 1465580ca5ac656b5f400911dffd513c09795a9f7aaeb96bb5de7316bcb1f9a86a0904a69f416ccf7a6bf5c93604ee2c543761a9cd2ca5b030ef1f0b9d6724b6 SHA512 3bd938952eb3155f5430d0b98afbe8fa3e41e27b6f9efa47504fa9158ca8afdc80c95d10d8df011d99190e8ac9b4c91266a4347e4f01b9cd048642d0b1d39fde
|
||||
MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
|
||||
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
|
||||
DIST jmh-core-1.4.1.tar.gz 585746 BLAKE2B ff6e9d3e8b11827042a9ff9983505fa5272d943a8365cf14ac43d940a7815f280c2b82c3ab810f1c22328a932912f6b09b9c5d5f1838a3cb357e6ebe21006e49 SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b
|
||||
EBUILD jmh-core-1.21.ebuild 885 BLAKE2B d71329a17545d899a25a48821f3bfa2c960a914cfc9d055b7b5cd51d1a34a73759985d9965c51dff1d510cb8ff965131059d2cc414f55ee97dfaaa20bf306368 SHA512 00165f788eb323b41db8f8a77fb838663dfe8db751994986f422db89f1fdec5b50885d2afd1e12f41b943c8e760ef2593afbf7c602210f34fe41f4d9a538d2b5
|
||||
EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 7071fed0c19efaf7f06e1d43dce2b76113ed59b4337220c2a34f50802a0ccd9cbb7e1288421918bbe58500a9203bff9a3e1c0e0a080930f5154d9f9d0aeee4eb SHA512 4d33e35a17571595b71bc01c46c2ce2ab7bfb596a61fcf64ddfd0564a014f753591682f1d7456ab006dfb4dc019d2f16c3cb339f4f4750635b18f3554189aceb
|
||||
EBUILD jmh-core-1.21.ebuild 885 BLAKE2B b5ab688fae4c7af12e0cfd2f5df1d578eb289ef2f2cf8a447749c6a21f840af6a88538773a9589785cc7aca78d90a2b2aadcba45921a4dd70371a0dfc30aa125 SHA512 542c21c157bb7b3c4b05b9ae50fccf42ddd0c6a279a3da4850e65e9f6c441d8e19d51cbd5234b55e7fa9006067c043129bcffd627a257caa5d3be10dc48ac6d3
|
||||
EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 19bbd2fd6f94225ccd6c228ad5ba369770b301e86084eca8483a2f1234b20df183e4c47667e58bb28699d8766f413f76d5942390356c7b9b27822a2f584f2b59 SHA512 148cd479199a30796be28f2ff29a4a47db9b63179f99a5f7d9183f8e578cf8cb50e47843d8da7aecdcf1232ba365223cff6b3012ea7e35ad44f101c068b37211
|
||||
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
|
||||
|
||||
@ -1,168 +0,0 @@
|
||||
#!/bin/sh
|
||||
# ----------------------------------------------------------------------------
|
||||
# Copyright 2001-2004 The Apache Software Foundation.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
|
||||
# reserved.
|
||||
|
||||
FOREHEAD_VERSION=1.0-beta-5
|
||||
|
||||
if [ -z "$MAVEN_OPTS" ] ; then
|
||||
MAVEN_OPTS="-Xmx256m"
|
||||
fi
|
||||
|
||||
if [ -f "$HOME/.mavenrc" ] ; then
|
||||
. "$HOME/.mavenrc"
|
||||
fi
|
||||
|
||||
# OS specific support. $var _must_ be set to either true or false.
|
||||
cygwin=false;
|
||||
darwin=false;
|
||||
case "`uname`" in
|
||||
CYGWIN*) cygwin=true ;;
|
||||
Darwin*) darwin=true
|
||||
if [ -z "$JAVA_VERSION" ] ; then
|
||||
JAVA_VERSION="CurrentJDK"
|
||||
else
|
||||
echo "Using Java version: $JAVA_VERSION"
|
||||
fi
|
||||
if [ -z "$JAVA_HOME" ] ; then
|
||||
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# try a couple ways to find MAVEN_HOME
|
||||
|
||||
if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
|
||||
MAVEN_HOME=/opt/maven
|
||||
fi
|
||||
|
||||
if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
|
||||
MAVEN_HOME="$HOME/maven"
|
||||
fi
|
||||
|
||||
# try to load from env.d file
|
||||
if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
|
||||
MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
|
||||
fi
|
||||
|
||||
# try to figure it out from how this script was invoked
|
||||
if [ -z ${MAVEN_HOME} ]; then
|
||||
## resolve links - $0 may be a link to maven's home
|
||||
PRG=$0
|
||||
progname=`basename $0`
|
||||
saveddir=`pwd`
|
||||
|
||||
# need this for relative symlinks
|
||||
cd `dirname $PRG`
|
||||
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '.*/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG="`dirname $PRG`/$link"
|
||||
fi
|
||||
done
|
||||
|
||||
MAVEN_HOME=`dirname "$PRG"`/..
|
||||
|
||||
# make it fully qualified
|
||||
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
|
||||
|
||||
cd $saveddir
|
||||
fi
|
||||
|
||||
[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
|
||||
|
||||
# For Cygwin, ensure paths are in UNIX format before anything is touched
|
||||
if $cygwin ; then
|
||||
[ -n "$MAVEN_HOME" ] &&
|
||||
MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
|
||||
[ -n "$MAVEN_HOME_LOCAL" ] &&
|
||||
MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
||||
[ -n "$CLASSPATH" ] &&
|
||||
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
|
||||
fi
|
||||
|
||||
if [ -z "$JAVACMD" ] ; then
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
echo "Error: JAVA_HOME is not defined correctly."
|
||||
echo " We cannot execute $JAVACMD"
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ -z "$JAVA_HOME" ] ; then
|
||||
echo "Warning: JAVA_HOME environment variable is not set."
|
||||
echo " If build fails because sun.* classes could not be found"
|
||||
echo " you will need to set the JAVA_HOME environment variable"
|
||||
echo " to the installation directory of java."
|
||||
fi
|
||||
|
||||
MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin; then
|
||||
[ -n "$MAVEN_HOME" ] &&
|
||||
MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
|
||||
[ -n "$MAVEN_HOME_LOCAL" ] &&
|
||||
MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
|
||||
[ -n "$HOME" ] &&
|
||||
HOME=`cygpath --path --windows "$HOME"`
|
||||
[ -n "$MAVEN_ENDORSED" ] &&
|
||||
MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
|
||||
fi
|
||||
|
||||
# For Darwin, use classes.jar for TOOLS_JAR
|
||||
TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
|
||||
if $darwin; then
|
||||
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
|
||||
fi
|
||||
|
||||
MAIN_CLASS=com.werken.forehead.Forehead
|
||||
if [ -n "$MAVEN_HOME_LOCAL" ]; then
|
||||
MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home.local=${MAVEN_HOME_LOCAL}"
|
||||
fi
|
||||
|
||||
"$JAVACMD" \
|
||||
$MAVEN_OPTS \
|
||||
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
|
||||
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
|
||||
"-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
|
||||
-classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
|
||||
"-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf" \
|
||||
"-Dtools.jar=$TOOLS_JAR" \
|
||||
"-Dmaven.home=${MAVEN_HOME}" \
|
||||
$MAIN_CLASS "$@"
|
||||
|
||||
Binary file not shown.
@ -1,17 +0,0 @@
|
||||
Fix ocasional failure with parallel install
|
||||
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=322965
|
||||
R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
|
||||
|
||||
Patch by Sebastien Fabbro
|
||||
|
||||
--- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000
|
||||
+++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000
|
||||
@@ -81,7 +81,7 @@
|
||||
Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status
|
||||
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
-install: installdirs install-intl-@USE_INCLUDED_LIBINTL@
|
||||
+install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@
|
||||
@for d in $(SUBDIRS); do \
|
||||
(cd $${d} && $(MAKE) $@) || exit 1; \
|
||||
done
|
||||
@ -1,20 +0,0 @@
|
||||
Update for zlib header changes for zlib > 1.2.5
|
||||
|
||||
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=383431
|
||||
R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
|
||||
|
||||
Patch by Michael Schreckenbauer
|
||||
|
||||
--- src/main/unzip.h.orig 2011-09-24 19:35:53.000000000 -0700
|
||||
+++ src/main/unzip.h 2011-09-24 19:37:06.000000000 -0700
|
||||
@@ -58,6 +58,10 @@
|
||||
#define ZLIB_FILEFUNC_SEEK_END (2)
|
||||
#define ZLIB_FILEFUNC_SEEK_SET (0)
|
||||
|
||||
+#ifndef OF
|
||||
+#define OF(x) x
|
||||
+#endif
|
||||
+
|
||||
#define ZLIB_FILEFUNC_MODE_READ (1)
|
||||
#define ZLIB_FILEFUNC_MODE_WRITE (2)
|
||||
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
|
||||
@ -1,28 +0,0 @@
|
||||
Link with libm to fix unresolved symbols when linked with as-needed
|
||||
and add a soname to the standalone math library
|
||||
R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
|
||||
|
||||
Patch by Sebastien Fabbro
|
||||
Adapted to R-3.0.0 by Denis Dupeyron
|
||||
|
||||
--- src/nmath/standalone/Makefile.in.orig 2013-04-04 14:39:15.777544946 -0600
|
||||
+++ src/nmath/standalone/Makefile.in 2013-04-04 14:40:51.256153179 -0600
|
||||
@@ -64,7 +64,8 @@
|
||||
Rexeclibdir_LTLIBRARIES = $(libRmath_la)
|
||||
libRmath_la_SOURCES = $(SOURCES)
|
||||
libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
|
||||
-libRmath_la_LDFLAGS =
|
||||
+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so
|
||||
+libRmath_la_LIBADD = $(LIBM)
|
||||
|
||||
CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
|
||||
DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
|
||||
@@ -117,7 +118,7 @@
|
||||
|
||||
## under peculiar circumstances, $(LIBM) here helps.
|
||||
$(libRmath_la): $(libRmath_la_OBJECTS)
|
||||
- $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM)
|
||||
+ $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@
|
||||
|
||||
test: $(srcdir)/test.c
|
||||
$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
|
||||
@ -1,20 +0,0 @@
|
||||
Index: R.m4
|
||||
===================================================================
|
||||
--- m4/R.m4 (revision 71152)
|
||||
+++ m4/R.m4 (revision 71889)
|
||||
@@ -3105,10 +3105,11 @@
|
||||
#include <string.h>
|
||||
#include <zlib.h>
|
||||
int main() {
|
||||
-#ifdef ZLIB_VERSION
|
||||
-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
|
||||
- version on the master site zlib.net */
|
||||
- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
|
||||
+#ifdef ZLIB_VERNUM
|
||||
+ if (ZLIB_VERNUM < 0x1250) {
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
Binary file not shown.
@ -1,60 +0,0 @@
|
||||
From f8fbbc9733035c96ffb085726bf24d15502e1095 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sun, 21 Apr 2019 13:02:16 +0200
|
||||
Subject: [PATCH 1/2] fix up install paths
|
||||
|
||||
This is similar to the Fedora patch, but this uses more common conventions
|
||||
like "DESTDIR" instead of "destdir".
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
src/Makefile | 11 ++++++-----
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c1fb831..e9dbdb0 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -14,7 +14,7 @@ all:
|
||||
@$(MAKE) -C src
|
||||
|
||||
install:
|
||||
- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
|
||||
+ @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
|
||||
|
||||
check:
|
||||
@$(MAKE) -C harness check
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 37ae219..66534b9 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -1,6 +1,7 @@
|
||||
prefix=/usr
|
||||
includedir=$(prefix)/include
|
||||
libdir=$(prefix)/lib
|
||||
+usrlibdir=$(libdir)
|
||||
|
||||
CFLAGS ?= -g -fomit-frame-pointer -O2
|
||||
CFLAGS += -Wall -I. -fPIC
|
||||
@@ -58,12 +59,12 @@ $(libname): $(libaio_sobjs) libaio.map
|
||||
$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
|
||||
|
||||
install: $(all_targets)
|
||||
- install -D -m 644 libaio.h $(includedir)/libaio.h
|
||||
- install -D -m 644 libaio.a $(libdir)/libaio.a
|
||||
+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
|
||||
+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
|
||||
ifeq ($(ENABLE_SHARED),1)
|
||||
- install -D -m 755 $(libname) $(libdir)/$(libname)
|
||||
- ln -sf $(libname) $(libdir)/$(soname)
|
||||
- ln -sf $(libname) $(libdir)/libaio.so
|
||||
+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
|
||||
+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
|
||||
+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
|
||||
endif
|
||||
|
||||
$(libaio_objs): libaio.h
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Binary file not shown.
@ -1,5 +1,4 @@
|
||||
AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d3e873e58e06c86e523964f2b79a6c4de7b14267f63f5733313dec32e081133b8413cc36feb5afa61ff5fb43cc0a4da622e7 SHA512 4679b5b45654c22856278c59ddc37b405960504687cd0f055e74946fcc8e48e97d78f44a664e197cd96cc0ed73ada6ca9d48df05e086e98fd2139998d31a7bde
|
||||
AUX hiredis-0.2.0-system-libs.patch 899 BLAKE2B d84ddab512839d0901b0f14d649970252e3cb00716871f26a68206a54b60e4b015f4e8498211727b0de7d72981e4171ae5517258ba8630678343da02ac0f3c7c SHA512 fcfd8b3bdc4e987bc82d461babec71b7f35c50aa9a9032784821dc782cb45ae714c2f199806f84449aa5e8b9a5d4480b0ca76ec1b4f1cfbb869a5ada7486951b
|
||||
DIST hiredis-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86
|
||||
EBUILD hiredis-0.2.0-r1.ebuild 613 BLAKE2B 85b60462fba3c0008a66822f4a80d966cf3f9700bc8791dc76791c573690e662f8c9d33ddc91c0cd764d2633e117605238322def6a5630c8bc5c6365c1189155 SHA512 abc9e2e0d5778abc443499ed17ac6a9e5975d3c7f70ddc90dc700dd222bd3911dd9440bef2be45b24723cee0c97e10a5bd17e78bc468499791011b4b52dbc8d3
|
||||
MISC metadata.xml 494 BLAKE2B 066e1d365169e3818e9b5d37f7a2c7812af63ccd2ef79ce1e8dd224b2aa4d110792441762e769791d2c93f5f90349390cb04671ebe4cd199117df20f6fa7d8bd SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
Remove vendor and var 'lib' from setup.py
|
||||
diff -u hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
|
||||
--- setup.py 2015-06-21 11:47:28.796472027 +0800
|
||||
+++ setup.py 2015-06-21 11:49:53.047949803 +0800
|
||||
@@ -40,12 +40,9 @@
|
||||
# supported Python versions is worse...
|
||||
#
|
||||
# Also see: https://github.com/pietern/hiredis-py/issues/15
|
||||
-lib = ("hiredis_for_hiredis_py", {
|
||||
- "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
|
||||
|
||||
ext = Extension("hiredis.hiredis",
|
||||
- sources=glob.glob("src/*.c"),
|
||||
- include_dirs=["vendor"])
|
||||
+ sources=glob.glob("src/*.c"))
|
||||
|
||||
setup(
|
||||
name="hiredis",
|
||||
@@ -57,7 +54,6 @@
|
||||
keywords=["Redis"],
|
||||
license="BSD",
|
||||
packages=["hiredis"],
|
||||
- libraries=[lib],
|
||||
ext_modules=[ext],
|
||||
|
||||
# Override "install_lib" command
|
||||
Common subdirectories: hiredis-0.2.0.orig/src and hiredis-0.2.0/src
|
||||
Common subdirectories: hiredis-0.2.0.orig/vendor and hiredis-0.2.0/vendor
|
||||
@ -1,3 +1,5 @@
|
||||
DIST vine-1.1.3.tar.gz 52520 BLAKE2B 751fdc358aac52403ffd9c6f9f112f68b363fe0ded465ebda732744bc2dfd6e10d8bb57cef357e65fa16c1954ec2657bd8a4f80ae81f9432dd03aaafe79a2535 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f
|
||||
DIST vine-1.3.0.tar.gz 51953 BLAKE2B e58d750dd7a84f4a3abb24156de6ec7ab84a911692587643cabcb0df750d3768e70b14ea134da4a39978782ecc530f4fa08ba0ecb780a7a32fb2d9b506633ef5 SHA512 f7242378ebc9b591b6e0a7b6263514f32cee4b996bc6461313221b9a391dd0dd1d833591d6e9ca72ae003f6ce5c4204856d49bb5e57c69a125072cac25758688
|
||||
EBUILD vine-1.1.3.ebuild 605 BLAKE2B 8877b811883d6a5bcb947c0d938574344b546b682a21c92f56b426b4562ed8dd8b1e4368077f5a7b8830a94999101bc1258ab6f0549b87e00309b75eb49213fd SHA512 f15e7764db69305e9cb9041c459083f6924f6bac419c26b67a5259698276be6780aa0b03af5d8840d036325fcc8785bcab86703135b6d5a22f22a445c30e84eb
|
||||
EBUILD vine-1.3.0.ebuild 607 BLAKE2B 42b3f8652fa4aabcadcab5a318e117c1eeec1ab6c51194297c89992e73a45a684170a4630de78bff6b7556186886653fefc12015de0d2675d6045239b62fb43e SHA512 82597725eec29d867575f07c7cce971b0e0d67963d5d1f25a95555c15cd1e6de4f01d173f44538281f2a7f42aaf2fecd58efbdb599705735cbf2f6bddc2f1598
|
||||
MISC metadata.xml 336 BLAKE2B c113bf51d676148154f535f077ce15d52100f3f2acd6e7cdbf715f41876e6401cf755d980d66cf61bc4b0fe0884135fa8478a7512c518253d081e3ef5b75494f SHA512 992b2b4914db3beeba877533b6ad293f6449f230e2eefd8ede373cd1f9ffaeeb79fbb92234434b38c9c392a88e52779e5b0cdc6b4f1e3f69098b7847925ec21f
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python Promises"
|
||||
HOMEPAGE="https://pypi.org/project/vine/ https://github.com/celery/vine"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,15 @@
|
||||
BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/case-1.3.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
|
||||
DESCRIPTION=Python Promises
|
||||
EAPI=7
|
||||
HOMEPAGE=https://pypi.org/project/vine/ https://github.com/celery/vine
|
||||
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
|
||||
KEYWORDS=~amd64 ~arm64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
|
||||
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://pypi/v/vine/vine-1.3.0.tar.gz
|
||||
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
|
||||
_md5_=a5394340fa528a16a4268afd00cca647
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon Jun 17 22:38:48 UTC 2019
|
||||
Tue Jun 18 05:08:47 UTC 2019
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 23:00:01 +0000
|
||||
Tue, 18 Jun 2019 05:30:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
a69e6ee5589e9a9b664f6c66bac36f0a23f2d4cc 1560805144 2019-06-17T20:59:04+00:00
|
||||
832b3ba10b16b2d0a637c62718a957c85b7e9b36 1560818107 2019-06-18T00:35:07+00:00
|
||||
|
||||
@ -1 +1 @@
|
||||
1560810901 Mon 17 Jun 2019 10:35:01 PM UTC
|
||||
1560834301 Tue 18 Jun 2019 05:05:01 AM UTC
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
AUX fwbuilder-5.3.7-qtbindir.patch 1833 BLAKE2B 715f3e218f2e1dd48a58b969da0035bc0caf228d928fc17b3035a57b2170f50efc29d9199193530894ccaae096a285a655093d63548d4a0450fb611833d642cc SHA512 926ea0ebd8fbb58e37c225d84b1e6674ee4e8838ebad35303045e982b689d9b511057d3bdbc93039ad9aa0cd58d875ddcf1717d83c77208bfd1aa125b7b7c2de
|
||||
DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
|
||||
EBUILD fwbuilder-5.3.7.ebuild 1419 BLAKE2B 554981de2730a50840309e822c73ca362abfd22c58fce313cfaefc179a5a85d80d46b1ab0d8db628a4dcc1437dd60fa8206046ddef688343dabadc69b7bab509 SHA512 778f843817d904b2348a9565e2eefa4587b654300696633a485de2bd3c9bded0cd98c0a571dfccf2881ca32dd3464c846ebf9e89c805272c9cb46674f9c578cc
|
||||
MISC metadata.xml 520 BLAKE2B 396078caf521038a991589d7aaca8c6c35cec058a3e163f15372512138bfef9c523b7759005c86884ee17522275877ecdef32bdec0085d6d46d7adceb6f962ef SHA512 deda312a012b6b7e342fa3b37d53a6c6fc2b5de129121314856ea659dad92cf3e7b17923f2942bc606deab719907a26e9908c35d087596291b05c0f2e1645e62
|
||||
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
|
||||
|
||||
@ -1,16 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>kevin.bauman80@gmail.com</email>
|
||||
<name>Kevin Bauman</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Gentoo Proxy Maintainers Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">UNINETT/fwbuilder</remote-id>
|
||||
<remote-id type="sourceforge">fwbuilder</remote-id>
|
||||
</upstream>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
@ -1,45 +0,0 @@
|
||||
diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
|
||||
--- a/apps/ministreaming/java/build.xml 2019-01-30 13:31:14.958832623 +0100
|
||||
+++ b/apps/ministreaming/java/build.xml 2019-01-30 13:39:00.050869739 +0100
|
||||
@@ -173,7 +173,7 @@
|
||||
|
||||
<javac debug="true" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="false" source="1.8" srcdir="./test/junit" target="1.8">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
<pathelement location="${junit.home}/junit4.jar" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest.jar" />
|
||||
diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
|
||||
--- a/apps/streaming/java/build.xml 2019-01-30 13:31:14.953832622 +0100
|
||||
+++ b/apps/streaming/java/build.xml 2019-01-30 13:38:56.683869470 +0100
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
<javac debug="true" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="false" source="1.8" srcdir="./test/junit" target="1.8">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
|
||||
<pathelement location="${junit.home}/junit4.jar" />
|
||||
diff -Naur a/router/java/build.xml b/router/java/build.xml
|
||||
--- a/router/java/build.xml 2019-01-30 13:31:22.905833257 +0100
|
||||
+++ b/router/java/build.xml 2019-01-30 13:39:04.133870065 +0100
|
||||
@@ -130,7 +130,7 @@
|
||||
<mkdir dir="./build/obj_scala" />
|
||||
<scalac deprecation="on" destdir="./build/obj_scala" srcdir="./test/scalatest">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="${scala-library.jar}" />
|
||||
<pathelement location="${scalactic.jar}" />
|
||||
<pathelement location="${scalatest.jar}" />
|
||||
@@ -148,7 +148,7 @@
|
||||
<property name="junit.home" value="${ant.home}/lib/" />
|
||||
<javac debug="true" debuglevel="lines,vars,source" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="true" source="1.8" srcdir="./test/junit" target="1.8">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
|
||||
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting fuse"
|
||||
if ! kldstat -q -m fuse; then
|
||||
kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
|
||||
fi
|
||||
eend ${?}
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping fuse"
|
||||
if kldstat -q -m fuse; then
|
||||
kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module"
|
||||
fi
|
||||
eend ${?}
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
MOUNTPOINT=/sys/fs/fuse/connections
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
}
|
||||
|
||||
start() {
|
||||
|
||||
ebegin "Starting fuse"
|
||||
if ! grep -qw fuse /proc/filesystems; then
|
||||
modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
|
||||
fi
|
||||
if grep -qw fusectl /proc/filesystems && \
|
||||
! grep -qw $MOUNTPOINT /proc/mounts; then
|
||||
mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
|
||||
eerror $? "Error mounting control filesystem"
|
||||
fi
|
||||
eend ${?}
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
ebegin "Stopping fuse"
|
||||
if grep -qw $MOUNTPOINT /proc/mounts; then
|
||||
umount $MOUNTPOINT >/dev/null 2>&1 || \
|
||||
eerror $? "Error unmounting control filesystem"
|
||||
fi
|
||||
eend ${?}
|
||||
|
||||
}
|
||||
Binary file not shown.
@ -1,43 +0,0 @@
|
||||
From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001
|
||||
From: Brandon Bergren <xfce@bdragon.rtk0.net>
|
||||
Date: Sun, 26 Aug 2018 10:28:05 -0400
|
||||
Subject: [PATCH] fix build failure when dbus is not in the system include path
|
||||
(Bug #14386)
|
||||
|
||||
The d-bus direct depenencies were taken out in 91860af3a38080,
|
||||
but the #include <dbus/dbus.h> in xfce4-session/xfsm-global.h
|
||||
and the #include <dbus/dbus-glib.h> line in xfsm-error.c got left
|
||||
in accidentally.
|
||||
---
|
||||
xfce4-session/xfsm-error.c | 2 --
|
||||
xfce4-session/xfsm-global.h | 1 -
|
||||
2 files changed, 3 deletions(-)
|
||||
|
||||
diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c
|
||||
index 2b7f6c04..f0766f5f 100644
|
||||
--- a/xfce4-session/xfsm-error.c
|
||||
+++ b/xfce4-session/xfsm-error.c
|
||||
@@ -20,8 +20,6 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#include <dbus/dbus-glib.h>
|
||||
-
|
||||
#include <xfce4-session/xfsm-error.h>
|
||||
|
||||
#define XFSM_DBUS_NAME "org.xfce.SessionManager"
|
||||
diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
|
||||
index d4587123..610d5bf7 100644
|
||||
--- a/xfce4-session/xfsm-global.h
|
||||
+++ b/xfce4-session/xfsm-global.h
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <X11/SM/SMlib.h>
|
||||
|
||||
#include <xfce4-session/xfsm-splash-screen.h>
|
||||
-#include <dbus/dbus.h>
|
||||
|
||||
typedef struct _FailsafeClient FailsafeClient;
|
||||
struct _FailsafeClient
|
||||
--
|
||||
2.19.0
|
||||
|
||||
Loading…
Reference in new issue