Hello community,
here is the log from the commit of package cntlm for openSUSE:Factory
checked in at Thu Aug 18 10:02:06 CEST 2011.
--------
--- cntlm/cntlm.changes 2011-08-04 17:10:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/cntlm/cntlm.changes 2011-08-17 19:10:54.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 17 17:00:28 UTC 2011 - chris@computersalat.de
+
+- fix bnc#710275
+ * /var/run/cntlm -> tmpfs (created by init script)
+- spec cleanup
+- set defaults in sysconfig
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cntlm.spec ++++++
--- /var/tmp/diff_new_pack.cPeWbp/_old 2011-08-18 10:01:27.000000000 +0200
+++ /var/tmp/diff_new_pack.cPeWbp/_new 2011-08-18 10:01:27.000000000 +0200
@@ -16,14 +16,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: cntlm
Summary: Fast NTLM authentication proxy with tunneling
Version: 0.35.1
-Release: 11
-License: GNU GPL V2
+Release: 13
+License: GPLv2
Group: Productivity/Networking/Web/Proxy
Url: http://cntlm.sourceforge.net/
Source0: %{name}-%{version}.tar.bz2
@@ -56,22 +55,22 @@
MANDIR=%{_mandir}
%install
-%makeinstall SYSCONFDIR=$RPM_BUILD_ROOT/%{_sysconfdir} \
- BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \
- MANDIR=$RPM_BUILD_ROOT/%{_mandir}
-%{__install} -d $RPM_BUILD_ROOT/var/run/%{name}
-%{__install} -D -m 755 %{S:1} $RPM_BUILD_ROOT/%{_initrddir}/%{name}
-%{__ln_s} -f ../..%{_sysconfdir}/init.d/%{name} ${RPM_BUILD_ROOT}/usr/sbin/rc%{name}
-%{__install} -D -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
+%makeinstall SYSCONFDIR=%{buildroot}/%{_sysconfdir} \
+ BINDIR=%{buildroot}/%{_sbindir} \
+ MANDIR=%{buildroot}/%{_mandir}
+%{__install} -d %{buildroot}/var/run/%{name}
+%{__install} -D -m 755 %{S:1} %{buildroot}/%{_initrddir}/%{name}
+%{__ln_s} -f ../..%{_sysconfdir}/init.d/%{name} %{buildroot}/usr/sbin/rc%{name}
+%{__install} -D -m 644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
%pre
# on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2
- # user cntlm
- if [ -z "`%{_bindir}/getent passwd "%{name}"`" ]; then
+# user cntlm
+if [ -z "`%{_bindir}/getent passwd "%{name}"`" ]; then
%{_sbindir}/useradd -c "CNTLM Proxy Auth" -d /var/run/%{name} -g nogroup \
-r -s /bin/false %{name} 2>/dev/null;
- fi
+fi
%preun
# on `rpm -e` PARAM is 0
@@ -91,7 +90,7 @@
%{insserv_cleanup}
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
@@ -100,7 +99,7 @@
%config(noreplace) %{_initrddir}/%{name}
%{_sbindir}/*
%{_mandir}/man1/%{name}.1*
-%dir %attr(755,%{name},root) /var/run/%{name}
+%ghost %dir %attr(755,%{name},root) /var/run/%{name}
/var/adm/fillup-templates/sysconfig.%{name}
%changelog
++++++ cntlm.init ++++++
--- /var/tmp/diff_new_pack.cPeWbp/_old 2011-08-18 10:01:27.000000000 +0200
+++ /var/tmp/diff_new_pack.cPeWbp/_new 2011-08-18 10:01:27.000000000 +0200
@@ -55,7 +55,6 @@
# some defaults
cntlm_desc="CNTLM Authentication Proxy"
cntlm_pid="/var/run/cntlm/cntlmd.pid"
-cntlm_lock="/var/lock/subsys/cntlm"
cntlm_user="-U ${CNTLM_USER:=cntlm}"
cntlm_opts=${CNTLM_OPTS:=""}
@@ -66,6 +65,11 @@
cntlm_listen="-l ${CNTLM_LISTEN:=127.0.0.1:3128}"
fi
+# check for pid_dir
+[ ! -d /var/run/cntlm ] && {
+ install -d -m0755 -o ${CNTLM_USER:=cntlm} -g root /var/run/cntlm;
+}
+
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
++++++ cntlm.sysconfig ++++++
--- /var/tmp/diff_new_pack.cPeWbp/_old 2011-08-18 10:01:27.000000000 +0200
+++ /var/tmp/diff_new_pack.cPeWbp/_new 2011-08-18 10:01:27.000000000 +0200
@@ -4,7 +4,10 @@
## Type: string
## Default: "cntlm"
#
-CNTLM_USER=""
+# -U <uid>
+# Run as uid. It is an important security measure not to run as root.
+#
+CNTLM_USER="cntlm"
## Type: string
## Default: ""
@@ -42,8 +45,6 @@
# -S