[packages/resolvconf] Use the Debian-style run-parts now

jajcus jajcus at pld-linux.org
Mon Jan 6 10:32:27 CET 2014


commit 6434aabc682411b165ceeb5234e36529ed6c3ecf
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Mon Jan 6 10:30:30 2014 +0100

    Use the Debian-style run-parts now
    
    Release: 5

 resolvconf-pld.patch | 12 +-----------
 resolvconf.init      |  2 +-
 resolvconf.spec      |  4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/resolvconf.spec b/resolvconf.spec
index 409e420..44bce0e 100644
--- a/resolvconf.spec
+++ b/resolvconf.spec
@@ -2,7 +2,7 @@ Summary:	Nameserver information handler
 Summary(pl.UTF-8):	Program obsługujący informacje o serwerach nazw
 Name:		resolvconf
 Version:	1.43
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Base
 Source0:	ftp://ftp.debian.org/debian/pool/main/r/resolvconf/%{name}_%{version}.tar.gz
@@ -14,7 +14,7 @@ Source4:	%{name}-dhclient-exit-hook.sh
 Patch0:		%{name}-pld.patch
 Patch1:		resolv.conf-mode.patch
 Requires:	dhcp-client-dirs
-Requires:	rc-scripts
+Requires:	rc-scripts >= 0.4.8
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
diff --git a/resolvconf-pld.patch b/resolvconf-pld.patch
index 79f7459..2725210 100644
--- a/resolvconf-pld.patch
+++ b/resolvconf-pld.patch
@@ -9,15 +9,6 @@
  
  Order of entries in resolv.conf
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---- resolvconf-1.42/bin/resolvconf	2008-06-05 11:50:40.000000000 +0300
-+++ resolvconf-1.42-pld/bin/resolvconf	2008-11-24 21:18:08.000000000 +0200
-@@ -92,5 +92,4 @@
- 
- [ -e "$ENABLE_UPDATES_FLAGFILE" ] || exit 0
- 
--exec run-parts "--arg=$CMD" ${IFACE:+--arg="$IFACE"} /etc/resolvconf/update.d
--
-+exec run-parts /etc/resolvconf/update.d "$CMD" ${IFACE:+"$IFACE"} 
 --- resolvconf-1.42/etc/resolvconf/update.d/bind	2008-06-05 11:50:40.000000000 +0300
 +++ resolvconf-1.42-pld/etc/resolvconf/update.d/bind	2008-11-24 21:18:08.000000000 +0200
 @@ -96,7 +96,7 @@
@@ -83,8 +74,7 @@
  fi
  
  # Notify users of the resolver
--exec run-parts ${NSCD_RESTARTED:+--arg="--nscd"} "${ETCRESOLVCONF}/update-libc.d"
-+exec run-parts "${ETCRESOLVCONF}/update-libc.d" ${NSCD_RESTARTED:+--nscd}
+ exec run-parts ${NSCD_RESTARTED:+--arg="--nscd"} "${ETCRESOLVCONF}/update-libc.d"
  
 --- resolvconf-1.42/man/resolvconf.8	2008-06-05 11:50:40.000000000 +0300
 +++ resolvconf-1.42-pld/man/resolvconf.8	2008-11-24 21:18:08.000000000 +0200
diff --git a/resolvconf.init b/resolvconf.init
index 9dcab1c..3d29614 100644
--- a/resolvconf.init
+++ b/resolvconf.init
@@ -79,7 +79,7 @@ case "$1" in
 		show "could not enable updates"
 		exit 1
 	fi
-	update -i
+	update --arg=-i
 	RETVAL=$?
 	if [ $RETVAL = 0 ]; then
 		ok
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/resolvconf.git/commitdiff/6434aabc682411b165ceeb5234e36529ed6c3ecf



More information about the pld-cvs-commit mailing list