[cntlm] install NetworkManager dispatcher script, fixes BZ650079
Matt Domsch
mdomsch at fedoraproject.org
Mon Nov 8 17:43:28 UTC 2010
commit 6f348ee5f1906498e0e60b39a6bb1594b45348ec
Author: Matt Domsch <Matt_Domsch at dell.com>
Date: Mon Nov 8 11:39:59 2010 -0600
install NetworkManager dispatcher script, fixes BZ650079
cntlm.NetworkManager | 15 +++++++++++++++
cntlm.spec | 10 +++++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/cntlm.NetworkManager b/cntlm.NetworkManager
new file mode 100755
index 0000000..e0bfe48
--- /dev/null
+++ b/cntlm.NetworkManager
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+export LC_ALL=C
+
+if [ "$2" = "down" ]; then
+ /sbin/ip route ls | grep -q ^default || {
+ [ -f /var/lock/subsys/cntlmd ] && /etc/rc.d/init.d/cntlmd stop || :
+ } && { :; }
+fi
+
+if [ "$2" = "up" ]; then
+ /sbin/ip -o route show dev "$1" | grep -q '^default' && {
+ /sbin/chkconfig cntlmd && /etc/rc.d/init.d/cntlmd start || :
+ } || { :; }
+fi
diff --git a/cntlm.spec b/cntlm.spec
index d3d059f..f189746 100644
--- a/cntlm.spec
+++ b/cntlm.spec
@@ -3,7 +3,7 @@
Summary: Fast NTLM authentication proxy with tunneling
Name: cntlm
Version: 0.35.1
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://cntlm.sourceforge.net/
@@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
Source1: cntlm.init
Source2: cntlm.init.fedora
Source3: cntlm.sysconfig
+Source4: cntlm.NetworkManager
Patch0: cntlm-0.35.1-Makefile.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): chkconfig
@@ -40,6 +41,7 @@ make BINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir} SYSCONFDIR=%{b
install -D -m 0755 %{SOURCE2} %{buildroot}%{_initddir}/cntlmd
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/cntlmd
mkdir -p -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/10-cntlm
%clean
rm -rf %{buildroot}
@@ -53,6 +55,9 @@ rm -rf %{buildroot}
%attr(-,cntlm,cntlm) %{_localstatedir}/run/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/sysconfig/cntlmd
+%dir %{_sysconfdir}/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%{_sysconfdir}/NetworkManager/dispatcher.d/10-cntlm
%pre
getent group %{name} > /dev/null || groupadd -r %{name}
@@ -79,6 +84,9 @@ fi
exit 0
%changelog
+* Mon Nov 8 2010 Matt Domsch <mdomsch at fedoraproject.org> - 0.35.1-7
+- install NetworkManager dispatcher script, fixes BZ650079
+
* Mon Sep 27 2010 Matt Domsch <mdomsch at fedoraproject.org> - 0.35.1-6
- set SYSCONFDIR during build. Fixes BZ637767
More information about the scm-commits
mailing list