From: Benedikt Boehm Date: Wed, 6 Sep 2006 14:41:33 +0000 (+0000) Subject: fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev rules for... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4f34142ca7b529a843d9887faecbcfd30cecc4d;p=gentoo.git fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev rules for /dev/vzctl; fix check for /dev/vzctl Package-Manager: portage-2.1.1_pre4-r3 --- diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest index 4ab5c7b9821d..9894d778a965 100644 --- a/sys-cluster/vzctl/Manifest +++ b/sys-cluster/vzctl/Manifest @@ -9,35 +9,27 @@ AUX vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 SHA1 967cc1a9d MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 files/vz.initd 5465 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0 files/vz.initd 5465 -AUX vzctl-3.0.10-Makefile.patch 2109 RMD160 02650e496e114734961012246753d948f5dccc3c SHA1 f1409eceaa4b119572b417e980caae8ee29edc86 SHA256 564fda20c9f54a70150a53a7a32d42de0c638262d55c2bdd75ec6378ef6aaf1c -MD5 f2df784d2dfd20f96eb69177204c3dfa files/vzctl-3.0.10-Makefile.patch 2109 -RMD160 02650e496e114734961012246753d948f5dccc3c files/vzctl-3.0.10-Makefile.patch 2109 -SHA256 564fda20c9f54a70150a53a7a32d42de0c638262d55c2bdd75ec6378ef6aaf1c files/vzctl-3.0.10-Makefile.patch 2109 -AUX vzctl-3.0.10-as-needed.patch 2873 RMD160 fd68de2965e760119ff733228bed686f3ecc002c SHA1 a5d9a14d12865cd788fddb79b4d67fb2888baecd SHA256 7eebb62833d9987d1df650fe3dca86e9bfa26e006b59f15ec29497d4177ff198 -MD5 0414e832d240f2f381486930011960a7 files/vzctl-3.0.10-as-needed.patch 2873 -RMD160 fd68de2965e760119ff733228bed686f3ecc002c files/vzctl-3.0.10-as-needed.patch 2873 -SHA256 7eebb62833d9987d1df650fe3dca86e9bfa26e006b59f15ec29497d4177ff198 files/vzctl-3.0.10-as-needed.patch 2873 DIST vzctl-3.0.0-8.tar.bz2 115033 RMD160 5bba4d678ea617f05220b4aca921ea62cd355e98 SHA1 f6dc12f3572897cbc9f0ebf8b4f438756b320983 SHA256 7322bebc6f6b476cd2c8a1f9a3e601f9e723142ee317eb3304d40d0e068fc632 DIST vzctl-3.0.0.8-patches-r0.tar.bz2 3816 RMD160 33fa63aa9749beedf6bd7dfd03f11658edfa6266 SHA1 727e323d73c3505ebc47221850df7f695f7bc43d SHA256 f1ac3df3a9f6f0f62ef97dd0b770cee800c37e3a267105c8fddc2f68dd05d535 -DIST vzctl-3.0.10.tar.bz2 124070 RMD160 e3a1ae0846a5b7b8a054fb416c20eb7ae57d0008 SHA1 99acb9b213e5d463144b32fb40975a3c4ac2e66a SHA256 5509857493533cf68b55a2183154aac12d23ab65d555db3b4328c0619ca8080f +DIST vzctl-3.0.11-patches-r1.tar.bz2 10808 RMD160 b1da2a6bafcc0b6bb1261a13d52b1ea8298a6d5e SHA1 5ab93262d2d9cab58256db689b0223394d15b846 SHA256 c514ac4698dca559de34c24421790f14b46acfbcc69fc2c208004f989e6efc39 DIST vzctl-3.0.11-patches.tar.bz2 10408 RMD160 e5765b4a13c644206a2b14888e80b96e91f62dda SHA1 eb281e41fe7df0f621a2a7c46bf3ffae11f8f679 SHA256 91460d16c8c799de7080f498d0c6677b37c413bba35f8f928465e2f04aedf67e DIST vzctl-3.0.11.tar.bz2 125685 RMD160 af04926dc3971d4078e83333d015a9db49e63ff7 SHA1 77edcc11bc2013068f51706280ecc5010d0630c0 SHA256 03b255ba3cdc700178bb7d20af928ab3896ac799404866187f0293ed87a9aecb EBUILD vzctl-3.0.0.8.ebuild 1720 RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 SHA1 a3d5124f6e47ff95f5b7fc5359533f88e893542e SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c MD5 8c19abdd920fd9bc4734c496aae0bec4 vzctl-3.0.0.8.ebuild 1720 RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 vzctl-3.0.0.8.ebuild 1720 SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c vzctl-3.0.0.8.ebuild 1720 -EBUILD vzctl-3.0.10-r2.ebuild 1360 RMD160 084226e75fb574cd3e1a2c33fe5967f7a98ffb91 SHA1 76cfb2c7553a6faf9e3de5dfec34e2b36d624161 SHA256 9fec3a5d14ff5dbf42e6f9af852be25bf75334ce6c8207b42a7b450697bb92f5 -MD5 becfcfd7c8681430a4a8a55111613138 vzctl-3.0.10-r2.ebuild 1360 -RMD160 084226e75fb574cd3e1a2c33fe5967f7a98ffb91 vzctl-3.0.10-r2.ebuild 1360 -SHA256 9fec3a5d14ff5dbf42e6f9af852be25bf75334ce6c8207b42a7b450697bb92f5 vzctl-3.0.10-r2.ebuild 1360 +EBUILD vzctl-3.0.11-r1.ebuild 2028 RMD160 3e469305c50ba719eb90eb78431f4f64cbec56a0 SHA1 398744d65d5012459fc7de0bbc6688335b7b0b48 SHA256 078301e45b59460a1c3ea1725dc237b9ed4c38cce89f818e352c1bac15a06d29 +MD5 8dd261233a038d993096d8b12347195a vzctl-3.0.11-r1.ebuild 2028 +RMD160 3e469305c50ba719eb90eb78431f4f64cbec56a0 vzctl-3.0.11-r1.ebuild 2028 +SHA256 078301e45b59460a1c3ea1725dc237b9ed4c38cce89f818e352c1bac15a06d29 vzctl-3.0.11-r1.ebuild 2028 EBUILD vzctl-3.0.11.ebuild 1813 RMD160 3ec168fb31e3a8a74309b45b9be4625c55e2fd4b SHA1 ec821617a342afa7a123484adc846e5b78b4b1df SHA256 ae3e0fa449513633332d930b5e8fb78dc736364ee1475ac0b2cef0512de7347f MD5 7473255b317ef43aba9203f8aba53728 vzctl-3.0.11.ebuild 1813 RMD160 3ec168fb31e3a8a74309b45b9be4625c55e2fd4b vzctl-3.0.11.ebuild 1813 SHA256 ae3e0fa449513633332d930b5e8fb78dc736364ee1475ac0b2cef0512de7347f vzctl-3.0.11.ebuild 1813 -MISC ChangeLog 5845 RMD160 bb2589fcb856ec548376fec6bc51288629750ab8 SHA1 ffdd1860636dfe49146fd0d8eca7f019572f8416 SHA256 50449535791c0e48c391241d7c64c0a7854165b7e98ca7c18da1fa7742a0dcd7 -MD5 a6f1eafbba00000da90efb9b1e45642b ChangeLog 5845 -RMD160 bb2589fcb856ec548376fec6bc51288629750ab8 ChangeLog 5845 -SHA256 50449535791c0e48c391241d7c64c0a7854165b7e98ca7c18da1fa7742a0dcd7 ChangeLog 5845 +MISC ChangeLog 6178 RMD160 6cf48dd245e0ae9b390c683dcc1d45b8c78c5e84 SHA1 d0137d4f88a192ef2c1a422d23f0b0d2fa6b694d SHA256 e09cddc64ea4e39c5d3cf06e058312b7a134952b3c813c5751cc8a84fd31669b +MD5 8a14125bff16537ef3c5611811ede002 ChangeLog 6178 +RMD160 6cf48dd245e0ae9b390c683dcc1d45b8c78c5e84 ChangeLog 6178 +SHA256 e09cddc64ea4e39c5d3cf06e058312b7a134952b3c813c5751cc8a84fd31669b ChangeLog 6178 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231 @@ -45,16 +37,16 @@ SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata MD5 29df91389efeb4843177a9078a89ca58 files/digest-vzctl-3.0.0.8 515 RMD160 9e0f277c9a8385fa918174cc1edc0f9e641dec50 files/digest-vzctl-3.0.0.8 515 SHA256 dc1dba3fb70c9a7212de8916eaaeb3c2b4a6b847702d90e0c58d06c62e9b3dc2 files/digest-vzctl-3.0.0.8 515 -MD5 7365696cd7a02b0e95dcb8f2fd2dc4f6 files/digest-vzctl-3.0.10-r2 241 -RMD160 a261afbc8cb201122078369798a48a35c9683419 files/digest-vzctl-3.0.10-r2 241 -SHA256 f8a7e2630d02bb442a709d0486c7028b1b75b93d53ea747661a1e6b93095c8d7 files/digest-vzctl-3.0.10-r2 241 MD5 ccd292780c6c4570b7a38991d29d4f59 files/digest-vzctl-3.0.11 503 RMD160 bc7cf49787969da60f3280e7cfd4829a63761586 files/digest-vzctl-3.0.11 503 SHA256 def52e0628774f1ec868c83c1af5184f6664e2aed793a567259be51fe1bbf02c files/digest-vzctl-3.0.11 503 +MD5 8d85d47388a7b8ba79c87325b83f9577 files/digest-vzctl-3.0.11-r1 512 +RMD160 0b01afe81799a9ac967c7a309fe815e924aef50e files/digest-vzctl-3.0.11-r1 512 +SHA256 952d478acc62c00bc8276a90bb112e36b889fcb3ec5aab69e02ccbcfc9aee88b files/digest-vzctl-3.0.11-r1 512 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE8XMeyuNVb5qfaOYRAkaSAKCoCE6FpaQ9YJRHAtIhirdWVHl+BACgmMLp -4DQcaREeIg0ixc10rJ8Vuno= -=cQV5 +iD8DBQFE/t4ZmPFBzbX68WERArV5AKCWiTNyopblPHk1CrGJgdLtv5EhWQCgl27m +0n053lS7i/j0jILT2fa33h8= +=XinV -----END PGP SIGNATURE----- diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 b/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 deleted file mode 100644 index d1e71e8f4e47..000000000000 --- a/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 790dc15a779764a453b11c2368bccc40 vzctl-3.0.10.tar.bz2 124070 -RMD160 e3a1ae0846a5b7b8a054fb416c20eb7ae57d0008 vzctl-3.0.10.tar.bz2 124070 -SHA256 5509857493533cf68b55a2183154aac12d23ab65d555db3b4328c0619ca8080f vzctl-3.0.10.tar.bz2 124070 diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch deleted file mode 100644 index 68bef8cd1dd8..000000000000 --- a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: vzctl-3.0.10/src/Makefile -=================================================================== ---- vzctl-3.0.10.orig/src/Makefile -+++ vzctl-3.0.10/src/Makefile -@@ -23,7 +23,6 @@ - VPSCONFDIR = /etc/vz/conf - LIBSCRIPTSDIR = /usr/lib/vzctl/scripts/ - SCRIPTSDIR = /usr/share/vzctl/scripts --NETSCRIPTDIR = /etc/sysconfig/network-scripts - CRONDDIR = /etc/cron.d - INITDDIR = /etc/init.d - VZDIR = /vz -@@ -70,10 +69,8 @@ LIBSCRIPTS = vps-create vps-postcreate v - PROGS = vzctl vzlist arpsend vzsplit vzcfgvalidate vzmemcheck vzcalc - LIBS = $(LIB_vzctl) $(LIB_simfs) - --INITSCRIPTS = vz - CRONSCRIPTS = vpsreboot vpsnetclean - SCRIPTS = vpsreboot vpsnetclean --NETSCRIPTS = ifcfg-venet0 ifdown-venet ifup-venet - VE0CONFIG = 0.conf - VECONFIG = ve-light.conf-sample ve-vps.basic.conf-sample - VECONFIG_IA64 = ve-light.conf-sample ve-vps.basic.conf-sample -@@ -155,13 +152,6 @@ inst-scripts: - for file in $(SCRIPTS); do \ - $(INSTALL) -m755 ../etc/$$file $(DESTDIR)$(SCRIPTSDIR)/$$file; \ - done --inst-netscripts: --ifneq "" "$(NETSCRIPTS)" -- $(INSTALL) -d $(DESTDIR)$(NETSCRIPTDIR) -- for file in $(NETSCRIPTS); do \ -- $(INSTALL) -m 755 ../etc/$$file $(DESTDIR)$(NETSCRIPTDIR)/$$file; \ -- done --endif - inst-configs: - $(INSTALL) -m 644 ../etc/vz.conf $(DESTDIR)$(GLBCONFIG) - ifeq ($(ARCH),ia64) -@@ -182,11 +172,6 @@ else - $(INSTALL) -m 644 ../etc/$(VE0CONFIG) $(DESTDIR)$(VPSCONFDIR)/$(VE0CONFIG) - endif - endif --inst-initd: -- for file in $(INITSCRIPTS); do \ -- $(INSTALL) -m 755 ../etc/init.d/$$file $(DESTDIR)$(INITDDIR)/$$file; \ -- done -- - inst-cron: - for file in $(CRONSCRIPTS); do \ - $(INSTALL) -m 644 ../etc/cron.d/$$file $(DESTDIR)$(CRONDDIR)/$$file; \ -@@ -208,8 +193,7 @@ inst-dirs: - $(INSTALL) -d $(DESTDIR)$(IPSTATEDIR) - $(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl - --install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \ -- inst-netscripts inst-configs inst-initd inst-cron -+install: $(PROGS) inst-dirs install-lib inst-sbin inst-configs inst-cron inst-scripts - clean: - rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend - diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch deleted file mode 100644 index afe717e34402..000000000000 --- a/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Igor Sukhih -Date: Wed, 14 Jun 2006 13:28:00 +0000 (+0400) -Subject: Move LDFLAGS after libraries list for workaround for Wl,--as-needed -X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff;h=1da5df6aedd33b141374bf3c738d9fb6589f0d0d - -Move LDFLAGS after libraries list for workaround for Wl,--as-needed ---- - -Index: vzctl-3.0.10/src/Makefile -=================================================================== ---- vzctl-3.0.10.orig/src/Makefile -+++ vzctl-3.0.10/src/Makefile -@@ -102,7 +102,7 @@ check-version: - $(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@ - - $(LIB_simfs) : $(OBJ_simfs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_simfs) $(LDFLAGS) -shared -o $@ - - $(LIB_fs): $(LIB_simfs) - ln -sf $(LIB_simfs) $(LIB_fs) -@@ -112,16 +112,16 @@ libvzctl.a: $(OBJ_libvzctl) - ranlib $@ - - $(LIB_vzctl) : $(LIB_simfs) $(OBJ_libvzctl) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_libvzctl) $(LD_FLAGS) -shared -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_libvzctl) $(LD_FLAGS) $(LDFLAGS) -shared -o $@ - - vzctl-static: $(OBJ_vzctl) libvzctl.a - $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzctl) $(OBJ_simfs) libvzctl.a -rdynamic -ldl -lutil -o $@ - - vzctl: check-version $(LIB_vzctl) $(OBJ_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzctl) $(LD_FLAGS) $(LIB_vzctl) $(LIB_fs) -lutil -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_vzctl) $(LD_FLAGS) $(LIB_vzctl) $(LIB_fs) $(LDFLAGS) -lutil -o $@ - - vzlist: $(OBJ_vzlist) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzlist) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_vzlist) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@ - - arpsend: $(OBJ_arp) - $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -o $@ -@@ -130,13 +130,13 @@ vzsplit: $(OBJ_split) - $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -o $@ - - vzmemcheck: $(OBJ_memcheck) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $^ -o $@ -+ $(CC) $(CFLAGS) $(INC) $(LD_FLAGS) $(LIB_fs) $(LDFLAGS) $(LIB_vzctl) $^ -o $@ - - vzcfgvalidate: $(OBJ_cfgvalidate) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@ -+ $(CC) $(CFLAGS) $(INC) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@ - - vzcalc: $(OBJ_calc) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@ -+ $(CC) $(CFLAGS) $(INC) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@ - - inst-sbin :$(PROGS) - for file in $(PROGS); do \ -@@ -205,7 +205,6 @@ inst-dirs: - $(INSTALL) -d $(DESTDIR)$(LOGRDIR) - $(INSTALL) -d $(DESTDIR)$(CACHEDIR) - $(INSTALL) -d $(DESTDIR)$(VEIPDUMPDIR) -- $(INSTALL) -d $(DESTDIR)$(IPSTATEDIR) - $(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl - - install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \ diff --git a/sys-cluster/vzctl/vzctl-3.0.10-r2.ebuild b/sys-cluster/vzctl/vzctl-3.0.10-r2.ebuild deleted file mode 100644 index 9bb1af62d6dd..000000000000 --- a/sys-cluster/vzctl/vzctl-3.0.10-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.10-r2.ebuild,v 1.1 2006/07/09 10:29:24 phreak Exp $ - -inherit eutils - -DESCRIPTION="OpenVZ VPS control utility" -HOMEPAGE="http://openvz.org/" -SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-admin/logrotate - sys-apps/ed - net-firewall/iptables - sys-fs/vzquota - sys-apps/iproute2" - -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - - epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-as-needed.patch -} - -src_install() { - make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed" - - # Provide a symlink for vz.conf (part 1 of fixing #138462) - dosym /etc/vz/vz.conf /etc/conf.d/vz - - # Install gentoo specific init script - newinitd "${FILESDIR}"/vz-${PV}.initd vz -} - -pkg_postinst() { - if has_version "<3.0.10"; then - ewarn - ewarn "The location of some vzctl files have changed. Most notably," - ewarn "VE configuration files and samples directory has changed from" - ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with" - ewarn "your VEs, please do the following:" - ewarn - ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/" - ewarn - fi -}