[packages/util-vserver] - drop utmpx patch, we switched back to utmp everywhere else - rel 4

baggins baggins at pld-linux.org
Mon Jan 13 21:46:15 CET 2014


commit d66f35bf271c65eb058a4da9bae0ad80fb94e19d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jan 13 21:45:14 2014 +0100

    - drop utmpx patch, we switched back to utmp everywhere else
    - rel 4

 util-vserver-utmpx.patch | 29 -----------------------------
 util-vserver.spec        |  4 +---
 2 files changed, 1 insertion(+), 32 deletions(-)
---
diff --git a/util-vserver.spec b/util-vserver.spec
index b3c482f..04ff65e 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -19,7 +19,7 @@
 %define		reqdb_ver	5.2
 %define		reqdb_pkg	db%{reqdb_ver}
 %define		snap	pre3054
-%define		rel	3
+%define		rel	4
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -57,7 +57,6 @@ Patch3:		%{name}-tld.patch
 Patch4:		%{name}-m4-diet.patch
 Patch5:		%{name}-yum-verb-nogpg.patch
 Patch6:		%{name}-build-umask.patch
-Patch7:		%{name}-utmpx.patch
 Patch8:		%{name}-vprocunhide.patch
 Patch9:		%{name}-dev.patch
 Patch10:	%{name}-no-dynamic-ctx.patch
@@ -427,7 +426,6 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %{?with_no_dynamic_context:%patch10 -p1}
diff --git a/util-vserver-utmpx.patch b/util-vserver-utmpx.patch
deleted file mode 100644
index 48b2600..0000000
--- a/util-vserver-utmpx.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- util-vserver-0.30.214/scripts/vserver.functions~	2007-09-02 23:06:48.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver.functions	2007-09-02 23:14:40.713357250 +0200
-@@ -284,7 +284,7 @@
- 		INITCMD_START=( "$i" "$RUNLEVEL_START" )
- 		INITCMD_STOP=(  "$i" "$RUNLEVEL_STOP"  )
- 	    done
--	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp )
-+	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmpx )
- 	    OPTS_ENV=( "${OPTS_ENV[@]}" PREVLEVEL=N RUNLEVEL="$RUNLEVEL_START" )
- 	    if test -n "$OPTION_DEBUG_SYSV"; then
- 		INITCMD_START=( /bin/bash -x "${INITCMD_START[@]}" )
-@@ -309,7 +309,7 @@
- 	    _NEED_VSHELPER_SYNC=1
- 	    test -z "$RUNLEVEL_START"         || INITCMD_START=( "${INITCMD_START[@]}" "$RUNLEVEL_START" )
- 	    test -z "$RUNLEVEL_STOP"          || INITCMD_STOP=(  "${INITCMD_STOP[@]}"  "$RUNLEVEL_STOP"  )
--	    ! isNumber "${RUNLEVEL_START:-3}" || INITCMD_PREPARE=( $_FAKE_RUNLEVEL "${RUNLEVEL_START:-3}" /var/run/utmp )
-+	    ! isNumber "${RUNLEVEL_START:-3}" || INITCMD_PREPARE=( $_FAKE_RUNLEVEL "${RUNLEVEL_START:-3}" /var/run/utmpx )
- 	    ;;
- 
- 	(xgentoo)
-@@ -317,7 +317,7 @@
- 
- 	    INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" )
- 	    INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
--	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
-+	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmpx )
- 	    ;;
- 
- 	(x) ;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-vserver.git/commitdiff/d66f35bf271c65eb058a4da9bae0ad80fb94e19d



More information about the pld-cvs-commit mailing list