aboutsummaryrefslogtreecommitdiffstats
path: root/main/util-vserver
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-02-29 13:46:28 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-02-29 13:47:47 +0000
commit770eae0fd0130faefbd2e2b176fb6efa3a281d6c (patch)
tree1571e07f977cd7e14fde613f170ca5fd560b3302 /main/util-vserver
parentf9c71e0714e1c2a0b7202ba08dc1012636e360c9 (diff)
downloadaports-770eae0fd0130faefbd2e2b176fb6efa3a281d6c.tar.bz2
aports-770eae0fd0130faefbd2e2b176fb6efa3a281d6c.tar.xz
main/util-vserver: upgrade to 0.30.216_pre3029
we have finally upstreamed all patches
Diffstat (limited to 'main/util-vserver')
-rw-r--r--main/util-vserver/0001-build-fix-for-automake-1.11.2-and-newer.patch97
-rw-r--r--main/util-vserver/APKBUILD27
-rw-r--r--main/util-vserver/alpine.patch26
-rw-r--r--main/util-vserver/bb-grep.patch20
-rw-r--r--main/util-vserver/chmod.patch12
-rw-r--r--main/util-vserver/ensc_pathprog.patch14
-rw-r--r--main/util-vserver/validate.patch10
7 files changed, 3 insertions, 203 deletions
diff --git a/main/util-vserver/0001-build-fix-for-automake-1.11.2-and-newer.patch b/main/util-vserver/0001-build-fix-for-automake-1.11.2-and-newer.patch
deleted file mode 100644
index eaba2fd760..0000000000
--- a/main/util-vserver/0001-build-fix-for-automake-1.11.2-and-newer.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 98fe85548a8acd4cb9dfc53ea85fcd94fff9a745 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 29 Feb 2012 10:37:47 +0000
-Subject: [PATCH] build: fix for automake 1.11.2 and newer
-
-From automake 1.11.2 pkglib_{DATA,SCRIPTS,PROGRAMS} becomes invalid
-and automake will exit with an error.
-
-We change to pkgdata_{DATA,SCRIPTS} and pkglibexec_PROGRAMS.
-
-The automake commit that introduces it:
-http://git.savannah.gnu.org/cgit/automake.git/commit/?h=maint&id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- Makefile.am | 8 ++++----
- gentoo/Makefile-files | 2 +-
- scripts/Makefile-files | 4 ++--
- src/Makefile-files | 4 ++--
- vserver-start/Makefile-files | 2 +-
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b9587b0..e67c1e0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -34,9 +34,9 @@ lib_LIBRARIES =
- lib_LTLIBRARIES =
- pkglib_LTLIBRARIES =
-
--pkglib_SCRIPTS =
--pkglib_DATA = FEATURES.txt
--pkglib_PROGRAMS =
-+pkgdata_SCRIPTS =
-+pkgdata_DATA = FEATURES.txt
-+pkglibexec_PROGRAMS =
- legacy_SCRIPTS =
- legacy_PROGRAMS =
-
-@@ -167,7 +167,7 @@ pkgstaterevdir = $(confdefaultsdir)/run.rev
- vserverpkgdir = $(vserverdir)/.pkg
- vshelperstatedir = $(localstatedir)/run/vshelper
-
--fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
-+fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkgdata_SCRIPTS))) \
- $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \
- $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) \
- $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS)))
-diff --git a/gentoo/Makefile-files b/gentoo/Makefile-files
-index faf7cbd..f9abd05 100644
---- a/gentoo/Makefile-files
-+++ b/gentoo/Makefile-files
-@@ -29,5 +29,5 @@ EXTRA_DIST += $(gentoo_src_SCRPTS) \
-
- if HAVE_GENTOO_INIT
- initrd_SCRIPTS += $(gentoo_src_SCRPTS)
--pkglib_SCRIPTS += gentoo/bash-wrapper
-+pkgdata_SCRIPTS += gentoo/bash-wrapper
- endif
-diff --git a/scripts/Makefile-files b/scripts/Makefile-files
-index 4422172..9958710 100644
---- a/scripts/Makefile-files
-+++ b/scripts/Makefile-files
-@@ -116,9 +116,9 @@ scripts_subst_SRCS = scripts/util-vserver-vars.pathsubst \
- sbin_SCRIPTS += $(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) \
- $(scripts_legacy_src_PRGS)
- scripts_sbincfg_DTA = $(scripts_sbincfg_gen_DTA)
--pkglib_SCRIPTS += $(scripts_pkglib_src_SCRPTS)
-+pkgdata_SCRIPTS += $(scripts_pkglib_src_SCRPTS)
- legacy_SCRIPTS += $(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS)
--pkglib_DATA += $(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
-+pkgdata_DATA += $(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
-
- CLEANFILES += $(scripts_pkglib_gen_DTA) \
- $(scripts_sbin_gen_PRGS) \
-diff --git a/src/Makefile-files b/src/Makefile-files
-index a9a18b6..8d986a7 100644
---- a/src/Makefile-files
-+++ b/src/Makefile-files
-@@ -102,7 +102,7 @@ noinst_HEADERS += src/capability-compat.h \
- src/context-sync.hc \
- src/attribute-util.h
-
--pkglib_PROGRAMS += src/capchroot \
-+pkglibexec_PROGRAMS += src/capchroot \
- src/chain-echo \
- src/chcontext-compat \
- src/check-unixfile \
-@@ -128,7 +128,7 @@ pkglib_PROGRAMS += src/capchroot \
-
- if ENSC_HAVE_C99_COMPILER
- if ENSC_HAVE_CRYPTO
--pkglib_PROGRAMS += src/vhashify
-+pkglibexec_PROGRAMS += src/vhashify
- endif ENSC_HAVE_CRYPTO
- endif ENSC_HAVE_C99_COMPILER
-
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD
index f3a0b83d7f..f2364f452a 100644
--- a/main/util-vserver/APKBUILD
+++ b/main/util-vserver/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-vserver
-pkgver=0.30.216_pre3025
-_realver=${pkgver%_*}-${pkgver#*_}
+pkgver=0.30.216_pre3029
+_realver=${pkgver/_/-}
pkgrel=0
pkgdesc="Linux-VServer admin utilities"
url="http://www.nongnu.org/util-vserver/"
@@ -13,12 +13,6 @@ makedepends="iptables-dev e2fsprogs-dev beecrypt-dev autoconf automake
depends="bash make"
source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_realver.tar.bz2
- chmod.patch
- ensc_pathprog.patch
- validate.patch
- alpine.patch
- bb-grep.patch
- 0001-build-fix-for-automake-1.11.2-and-newer.patch
setup-vs-template
setup-vs-guest
"
@@ -33,15 +27,6 @@ prepare() {
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
- msg "Running autotools..."
- libtoolize --force && aclocal -I m4 && autoconf && automake --gnu \
- || return 1
-
- # this is an ugly workaround
- sed -i -e "s:as_echo=.*:as_echo=echo:g" configure
-
- # issue 305
- sed -i -e 's/^function //' gentoo/util-vserver
}
build() {
@@ -71,12 +56,6 @@ package() {
install -Dm755 ../setup-vs-guest "$pkgdir"/usr/sbin/setup-vs-guest
}
-md5sums="46592e4695c6011c828872b66a483fc0 util-vserver-0.30.216-pre3025.tar.bz2
-73c7437dea6937a57cf38d166ef83c09 chmod.patch
-ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch
-da8b70c4fd40e68894b3903ffd121397 validate.patch
-04000261fd990a3963b0e98260b481bd alpine.patch
-3fc52e20d998f02995f21912738f5d36 bb-grep.patch
-2d7aad80502cb9778b18fab0f5ff4adf 0001-build-fix-for-automake-1.11.2-and-newer.patch
+md5sums="e0775fe6ee9ce390be2be84c94eca4ab util-vserver-0.30.216-pre3029.tar.bz2
fae6626b724dec90a19924d68d355cd2 setup-vs-template
4778b260b0fa8b5ce05d0a64f0b2fb39 setup-vs-guest"
diff --git a/main/util-vserver/alpine.patch b/main/util-vserver/alpine.patch
deleted file mode 100644
index eacc2cb624..0000000000
--- a/main/util-vserver/alpine.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: distrib/alpine/initpost
-===================================================================
---- a/distrib/alpine/initpost (revision 2855)
-+++ b/distrib/alpine/initpost (working copy)
-@@ -1,6 +1,6 @@
- #!/bin/bash
-
--# Copyright (C) 2007 Natanael Copa <ncopa@alpinelinux.org>
-+# Copyright (C) 2007, 2009 Natanael Copa <ncopa@alpinelinux.org>
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -37,7 +37,12 @@
- $_VSERVER "$vserver" stop &>/dev/null || true
- $_VSERVER "$vserver" start --rescue --rescue-init /bin/busybox sh -c '
- /bin/busybox --install -s
-- /sbin/rc_add -s 20 -k syslog
-+ if [ -x /sbin/rc-update ]; then
-+ /sbin/rc-update add syslog boot
-+ /bin/rmdir /etc/rcL.d /etc/rcK.d
-+ else
-+ /sbin/rc_add -s 20 -k syslog
-+ fi
- '
-
- # set up hostname
diff --git a/main/util-vserver/bb-grep.patch b/main/util-vserver/bb-grep.patch
deleted file mode 100644
index ce6c5f0459..0000000000
--- a/main/util-vserver/bb-grep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./scripts/functions.orig
-+++ ./scripts/functions
-@@ -553,7 +553,7 @@
- for _ga_j in "${_ga_marks[@]}"; do
- _ga_mark="$(echo "$_ga_j" | $_SED 's/^[!~]//')"
- test "$_ga_j" = "$_ga_mark" || _ga_invert=true
-- test -s "$_ga_markfile" && $_GREP -qx "$_ga_mark" "$_ga_markfile" && \
-+ test -s "$_ga_markfile" && $_GREP -q "^$_ga_mark\$" "$_ga_markfile" && \
- _ga_f=true || :
- done
- test $_ga_f = $_ga_invert && \
-@@ -637,7 +637,7 @@
- set -- $($_GREP '^Tasks:' "/proc/virtual/$1/status" 2>/dev/null)
- _gp_procnr_cnt=$2
- else
-- _gp_procnr_cnt=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$1" | $_WC -l )
-+ _gp_procnr_cnt=$($_VPS ax | $_AWK '{print $2}' | $_GREP "^$1\$" | $_WC -l )
- fi
-
- let _gp_procnr_cnt=_gp_procnr_cnt+0
diff --git a/main/util-vserver/chmod.patch b/main/util-vserver/chmod.patch
deleted file mode 100644
index 53861e8932..0000000000
--- a/main/util-vserver/chmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru a/Makefile.am b/Makefile.am
---- a/Makefile.am 2009-09-29 13:48:10.000000000 +0000
-+++ b/Makefile.am 2009-09-29 13:50:00.000000000 +0000
-@@ -149,7 +149,7 @@
- @mkdir -p $$(dirname '$@')
- @echo "$(SED) -e '...' $*.pathsubst >$*"
- @$(SED) -e '$(pathsubst_RULES)' '$<' >'$@.tmp'
-- @-chmod --reference='$<' '$@.tmp'
-+ @-chmod $$(stat -c %a '$<') '$@.tmp'
- @if cmp -s '$@.tmp' '$*'; then \
- echo "... no changes, reusing old version"; \
- rm -f '$@.tmp'; \
diff --git a/main/util-vserver/ensc_pathprog.patch b/main/util-vserver/ensc_pathprog.patch
deleted file mode 100644
index e14c1f6dab..0000000000
--- a/main/util-vserver/ensc_pathprog.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru a/m4/ensc_pathprog.m4 b/m4/ensc_pathprog.m4
---- a/m4/ensc_pathprog.m4 2009-10-02 17:25:49.000000000 +0000
-+++ b/m4/ensc_pathprog.m4 2009-10-02 17:31:28.000000000 +0000
-@@ -61,7 +61,9 @@
-
- if test "x$5" = x; then
- if test -h "${$1}"; then
-- $1=`readlink -f "${$1}"`
-+ case `readlink "{$1}"` in
-+ ../*) $1=`readlink -f "${$1}"`;;
-+ esac
- fi
- fi
-
diff --git a/main/util-vserver/validate.patch b/main/util-vserver/validate.patch
deleted file mode 100644
index 081dce5a31..0000000000
--- a/main/util-vserver/validate.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ru a/m4/validate.am b/m4/validate.am
---- a/m4/validate.am 2009-10-02 17:57:03.000000000 +0000
-+++ b/m4/validate.am 2009-10-02 17:58:15.000000000 +0000
-@@ -26,5 +26,5 @@
- .%-up-to-date:
- @rm -f .*-up-to-date
- @$(MAKE) -s clean
-- @touch -t 197001020000 '$@'
-+ @cp -a Makefile.am '$@'
- @$(MAKE) -s $(BUILT_SOURCES)