commit: 5e480fbea3092065653bd04cdbf0c257f687985f
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 04:20:54 2015 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 04:24:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e480fbe
sys-process/criu: version bump 1.7, drop 1.6-r1
Package-Manager: portage-2.2.22
sys-process/criu/Manifest | 2 +-
.../criu/{criu-1.6-r1.ebuild => criu-1.7.ebuild} | 2 +-
.../criu/files/criu-1.7-automagic-libbsd.patch | 29 ++++++++++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4fda2d0..02bfa5e 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,3 @@
DIST criu-1.5.2.tar.bz2 457573 SHA256
e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345 SHA512
c7916fde1f63cb66a89e71867c204a251dfa2b9de703ac467bc460c6f0d895947996fd466c17cb529d2502aba7b75b8b30162baf3944fefebb71625fb88e5458
WHIRLPOOL
c951692e684bd1b032bde1b534a4f4bd4b769a1e73afc56c74711ac943da907f638489205e8be2c68bbc345c1da8b641a7175dccd34aad907ca3251c3f2156a0
DIST criu-1.6.1.tar.bz2 484598 SHA256
c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512
59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8
WHIRLPOOL
07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23
-DIST criu-1.6.tar.bz2 484513 SHA256
35ba6f5df90bfb8a25ae5e53459272bb37b8a69790e084f86d7a9ffa0df35993 SHA512
0672c7342ffed7c23fdb747b7bd3b08f205a4bf3965577991d007f71e70be5243247e52ad823f0099713f7977f6f4be5403ea2073a840b5024b6a0f240f65bdc
WHIRLPOOL
da5a767b3f89efdd2cda21331cc60e60e0cdbab163a55ef1a3080d3601df924688d612c7e76000c3d383cdb22002b16c28ad2740b7bc6aba784021f31ebc54c4
+DIST criu-1.7.tar.bz2 507224 SHA256
977cf03d94415c2858581bb9894cfb90ac0c0b4b045e9bfa7c04c230aae01a21 SHA512
2d270ae68daa7ff96e5765220ee43b42f8cbbc7e6e2013209dbf69f6bcfba6ca89a632f70734e30fbc9d2985566913d0cae7b28ef6fb4f8aacb3badef2f8e69c
WHIRLPOOL
66324e4161bbe879c5cf1e7e94868bfa65007556aa5c24b8d1dcb09b6ac4731190cf178b70ef66e090e774492f3c8e465277a744b0a61a2ef6c1f30217ea76b3
diff --git a/sys-process/criu/criu-1.6-r1.ebuild
b/sys-process/criu/criu-1.7.ebuild
similarity index 96%
rename from sys-process/criu/criu-1.6-r1.ebuild
rename to sys-process/criu/criu-1.7.ebuild
index 3806853..23070e8 100644
--- a/sys-process/criu/criu-1.6-r1.ebuild
+++ b/sys-process/criu/criu-1.7.ebuild
@@ -29,7 +29,7 @@ RESTRICT="test"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
- epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch
+ epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
}
criu_arch() {
diff --git a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
new file mode 100644
index 0000000..4dadf95
--- /dev/null
+++ b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile.config b/Makefile.config
+index ce4b8d8..2ef64d3 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -3,10 +3,12 @@ include scripts/feature-tests.mak
+
+ CONFIG := include/config.h
+
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y)
+ LIBS += -lbsd
+ DEFINES += -DCONFIG_HAS_LIBBSD
+ endif
++endif
+
+ ifeq ($(call pkg-config-check,libselinux),y)
+ LIBS := -lselinux $(LIBS)
+@@ -38,9 +40,11 @@ endif
+ ifeq ($(VDSO),y)
+ $(Q) @echo '#define CONFIG_VDSO' >> $@
+ endif
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(SETPROCTITLE_INIT_TEST),-lbsd),y)
+ $(Q) @echo '#define CONFIG_HAS_SETPROCTITLE_INIT' >> $@
+ endif
++endif
+ ifeq ($(piegen-y),y)
+ $(Q) @echo '#define CONFIG_PIEGEN' >> $@
+ endif
