packages: resolvconf/resolvconf.spec, resolvconf/resolv.conf-mode.patch (NE...

[glen]

Author: glen                         Date: Thu Nov  5 17:33:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- keep /etc/resolv.conf world readable regardless of root umask; rel 2

---- Files affected:
packages/resolvconf:
   resolvconf.spec (1.14 -> 1.15) , resolv.conf-mode.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/resolvconf/resolvconf.spec
diff -u packages/resolvconf/resolvconf.spec:1.14 packages/resolvconf/resolvconf.spec:1.15
--- packages/resolvconf/resolvconf.spec:1.14	Fri Mar 13 21:17:43 2009
+++ packages/resolvconf/resolvconf.spec	Thu Nov  5 18:33:05 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Program obsługujący informacje o serwerach nazw
 Name:		resolvconf
 Version:	1.43
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Base
 Source0:	ftp://ftp.debian.org/debian/pool/main/r/resolvconf/%{name}_%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-pld.patch
+Patch1:		resolv.conf-mode.patch
 Requires:	rc-scripts
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 touch etc/resolvconf/resolv.conf.d/tail
 
 # cleanup backups after patching
@@ -43,12 +45,12 @@
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sysconfdir}/%{name}/run/interface,%{_libdir}/%{name},%{_sbindir},%{_mandir}/{ru/,}man{5,8}}
 
 cp -a etc/%{name}/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install bin/resolvconf $RPM_BUILD_ROOT%{_sbindir}
-install bin/list-records $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p bin/resolvconf $RPM_BUILD_ROOT%{_sbindir}
+install -p bin/list-records $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -a man/interface-order.5 $RPM_BUILD_ROOT%{_mandir}/man5
 cp -a man/resolvconf.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/run/resolv.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/run/enable-updates
 
@@ -87,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2009/11/05 17:33:05  glen
+- keep /etc/resolv.conf world readable regardless of root umask; rel 2
+
 Revision 1.14  2009/03/13 20:17:43  duddits
 - up to 1.43
 

================================================================
Index: packages/resolvconf/resolv.conf-mode.patch
diff -u /dev/null packages/resolvconf/resolv.conf-mode.patch:1.1
--- /dev/null	Thu Nov  5 18:33:10 2009
+++ packages/resolvconf/resolv.conf-mode.patch	Thu Nov  5 18:33:05 2009
@@ -0,0 +1,10 @@
+--- resolvconf-1.43/etc/resolvconf/update.d/libc~	2009-11-05 19:30:31.554926706 +0200
++++ resolvconf-1.43/etc/resolvconf/update.d/libc	2009-11-05 19:30:44.748256920 +0200
+@@ -131,6 +131,7 @@
+ fi
+ 
+ # The file has changed
++chmod 644 "$TMPFILE"
+ mv -f "$TMPFILE" "$DYNAMICRSLVCNFFILE"
+ 
+ # Restart nscd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/resolvconf/resolvconf.spec?r1=1.14&r2=1.15&f=u