Hello community, here is the log from the commit of package cntlm for openSUSE:Factory checked in at Mon Aug 8 15:37:46 CEST 2011.
-------- --- cntlm/cntlm.changes 2011-01-05 11:41:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/cntlm/cntlm.changes 2011-08-04 17:10:44.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 4 15:10:10 UTC 2011 - [email protected] + +- revert to 0.35.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cntlm-0.91-config.patch cntlm-0.91rc6.tar.bz2 New: ---- cntlm-0.35.1-Makefile.patch cntlm-0.35.1-config.patch cntlm-0.35.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cntlm.spec ++++++ --- /var/tmp/diff_new_pack.a86R8F/_old 2011-08-08 15:36:04.000000000 +0200 +++ /var/tmp/diff_new_pack.a86R8F/_new 2011-08-08 15:36:04.000000000 +0200 @@ -2,6 +2,7 @@ # spec file for package cntlm # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 Scorpio IT, Deidesheim, Germany # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +18,19 @@ # norootforbuild -%define rcversion 0.91rc6 Name: cntlm Summary: Fast NTLM authentication proxy with tunneling -Version: 0.90.99.06 -Release: 1 +Version: 0.35.1 +Release: 11 License: GNU GPL V2 Group: Productivity/Networking/Web/Proxy Url: http://cntlm.sourceforge.net/ -Source0: %{name}-%{rcversion}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-0.91-config.patch +Patch: %{name}-0.35.1-config.patch +Patch1: %{name}-0.35.1-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils grep @@ -44,8 +45,9 @@ %prep -%setup -q -n %{name}-%{rcversion} -%patch0 -p1 +%setup -q -n %{name}-%{version} +%patch -p1 +%patch1 -p1 %build ./configure ++++++ cntlm-0.35.1-Makefile.patch ++++++ diff -ruN cntlm-0.35.1-orig/Makefile cntlm-0.35.1/Makefile --- cntlm-0.35.1-orig/Makefile 2007-11-21 01:18:24.000000000 +0100 +++ cntlm-0.35.1/Makefile 2009-05-06 18:09:53.000000000 +0200 @@ -42,10 +42,10 @@ install -O root -G system -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \ install -O root -G system -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \ else \ - install -D -o root -g root -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ - install -D -o root -g root -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \ + install -D -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ + install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \ [ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \ - || install -D -o root -g root -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ + || install -D -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ fi @echo; echo "Cntlm will look for configuration in $(SYSCONFDIR)/$(NAME).conf" Dateien cntlm-0.35.1-orig/.Makefile.swp und cntlm-0.35.1/.Makefile.swp sind verschieden. ++++++ cntlm-0.91-config.patch -> cntlm-0.35.1-config.patch ++++++ --- cntlm/cntlm-0.91-config.patch 2011-01-05 11:41:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/cntlm/cntlm-0.35.1-config.patch 2009-05-06 18:41:52.000000000 +0200 @@ -1,9 +1,27 @@ -diff -ruN cntlm-0.91rc6-orig/doc/cntlm.conf cntlm-0.91rc6/doc/cntlm.conf ---- cntlm-0.91rc6-orig/doc/cntlm.conf 2010-03-22 10:51:25.000000000 +0100 -+++ cntlm-0.91rc6/doc/cntlm.conf 2011-01-05 11:21:12.000000000 +0100 -@@ -39,7 +39,12 @@ - # the appropriate IP address also in format <local_ip>:<local_port> - # Cntlm listens on 127.0.0.1:3128 by default +diff -ruN cntlm-0.35.1-orig/doc/cntlm.conf cntlm-0.35.1/doc/cntlm.conf +--- cntlm-0.35.1-orig/doc/cntlm.conf 2007-11-02 02:07:11.000000000 +0100 ++++ cntlm-0.35.1/doc/cntlm.conf 2009-05-06 16:49:22.000000000 +0200 +@@ -7,8 +7,15 @@ + + Username testuser + Domain corp-uk +-Password password # Use hashes instead (-H) +-#Workstation netbios_hostname # Should be auto-guessed ++Password password ++# Use hashes instead call "cntlm -H" ++#PassLM 1AD35398BE6565DDB5C4EF70C0593492 ++#PassNT 77B9081511704EE852F94227CF48A793 ++### Only for user 'testuser', domain 'corp-uk' ++#PassNTLMv2 D5826E9C665C37C80B53397D5C07BBCB ++ ++### Should be auto-guessed ++#Workstation netbios_hostname + + Proxy 10.217.112.41:8080 + Proxy 10.217.112.42:8080 +@@ -16,7 +23,12 @@ + # + # This is the port number where Cntlm will listen # -Listen 3128 +################################################## @@ -13,5 +31,5 @@ +# but if defined here it takes precedence over sysconfig +#Listen 3128 + # # If you wish to use the SOCKS5 proxy feature as well, uncomment - # the following option. It can be used several times ++++++ cntlm-0.91rc6.tar.bz2 -> cntlm-0.35.1.tar.bz2 ++++++ ++++ 10425 lines of diff (skipped) ++++++ cntlm.init ++++++ --- /var/tmp/diff_new_pack.a86R8F/_old 2011-08-08 15:36:04.000000000 +0200 +++ /var/tmp/diff_new_pack.a86R8F/_new 2011-08-08 15:36:04.000000000 +0200 @@ -54,16 +54,16 @@ # some defaults cntlm_desc="CNTLM Authentication Proxy" -cntlm_pid="/var/run/cntlm/cntlm.pid" +cntlm_pid="/var/run/cntlm/cntlmd.pid" cntlm_lock="/var/lock/subsys/cntlm" -cntlm_user="${CNTLM_USER:=-U cntlm}" +cntlm_user="-U ${CNTLM_USER:=cntlm}" cntlm_opts=${CNTLM_OPTS:=""} # if no "Proxy" is set in cntlm.conf try '127.0.0.1:3128' as a default if [ `/bin/cat $cntlm_config | grep -e "^Listen" >/dev/null; echo $?` -eq 0 ]; then cntlm_listen= else - cntlm_listen="${CNTLM_LISTEN:=-l 127.0.0.1:3128}" + cntlm_listen="-l ${CNTLM_LISTEN:=127.0.0.1:3128}" fi # Source LSB init functions ++++++ cntlm.sysconfig ++++++ --- /var/tmp/diff_new_pack.a86R8F/_old 2011-08-08 15:36:04.000000000 +0200 +++ /var/tmp/diff_new_pack.a86R8F/_new 2011-08-08 15:36:04.000000000 +0200 @@ -2,12 +2,9 @@ ## Description: Basic configuration of cntlm auth proxy ## Config: cntlm ## Type: string -## Default: "-U cntlm" +## Default: "cntlm" # -# -U <uid> -# Run as uid. It is an important security measure not to run as root. -# -CNTLM_USER="-U cntlm" +CNTLM_USER="" ## Type: string ## Default: "" @@ -45,6 +42,8 @@ # -S <size_in_kb> # Enable transparent handler of ISA AV scanner plugin for files up to size_in_kb KiB. # -s Do not use threads, serialize all requests - for debugging only. +# -U <uid> +# Run as uid. It is an important security measure not to run as root. # -u <user>[@<domain] # Domain/workgroup can be set separately. # -v Print debugging information. @@ -54,10 +53,10 @@ CNTLM_OPTS="" ## Type: string -## Default: "-l 127.0.0.1:3128" if not set in cntlm.conf +## Default: "127.0.0.1:3128" if not set in cntlm.conf # # -l [<saddr>:]<lport> # Main listening port for the NTLM proxy. # -CNTLM_LISTEN="-l 127.0.0.1:3128" +CNTLM_LISTEN="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
