[cntlm: 1/2] update to new bugfix release (BZ760164)

[Matt Domsch]

commit df55a6201abb4858b32658a75f3ed68ce4e5cbb0
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Tue Dec 6 23:30:46 2011 -0600

    update to new bugfix release (BZ760164)

 .gitignore                  |    1 +
 cntlm-0.35.1-Makefile.patch |   56 --------------
 cntlm-0.92-Makefile.patch   |   53 +++++++++++++
 cntlm.init                  |  173 -------------------------------------------
 cntlm.spec                  |   13 ++--
 cntlm.sysconfig             |   15 ----
 sources                     |    1 +
 7 files changed, 62 insertions(+), 250 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9b98c7..0b8a29b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cntlm-0.35.1.tar.gz
+/cntlm-0.92.tar.gz
diff --git a/cntlm-0.92-Makefile.patch b/cntlm-0.92-Makefile.patch
new file mode 100644
index 0000000..a3acbf3
--- /dev/null
+++ b/cntlm-0.92-Makefile.patch
@@ -0,0 +1,53 @@
+--- cntlm-0.92.orig/Makefile	2011-10-14 06:45:26.000000000 -0500
++++ cntlm-0.92/Makefile	2011-12-05 16:30:44.068746335 -0600
+@@ -16,39 +16,31 @@
+ CC=gcc
+ VER=`cat VERSION`
+ OBJS=utils.o ntlm.o xcrypt.o config.o socket.o acl.o auth.o http.o forward.o direct.o scanner.o pages.o main.o
+-CFLAGS=$(FLAGS) -std=c99 -Wall -pedantic -O3 -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"`cat VERSION`\"
+-OS=$(shell uname -s)
+-OSLDFLAGS=$(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl")
+-LDFLAGS:=-lpthread $(OSLDFLAGS)
++MYFLAGS=-std=c99 -pedantic -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"`cat VERSION`\"
++MYLDFLAGS:=-lpthread
+ 
+ $(NAME): configure-stamp $(OBJS)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
++	@$(CC) $(CFLAGS) $(MYFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(MYLDFLAGS)
+ 
+ main.o: main.c
+ 	@echo "Compiling $<"
+ 	@if [ -z "$(SYSCONFDIR)" ]; then \
+-		$(CC) $(CFLAGS) -c main.c -o $@; \
++		$(CC) $(CFLAGS) $(MYFLAGS) -c main.c -o $@; \
+ 	else \
+-		$(CC) $(CFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c main.c -o $@; \
++		$(CC) $(CFLAGS) $(MYFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c main.c -o $@; \
+ 	fi
+ 
+ .c.o:
+ 	@echo "Compiling $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	@echo "CFLAGS=$(CFLAGS)"
++	@$(CC) $(CFLAGS) $(MYFLAGS) -c -o $@ $<
+ 
+ install: $(NAME)
+-	# AIX?
+-	if [ -f /usr/bin/oslevel ]; then \
+-		install -M 755 -S -f $(BINDIR) $(NAME); \
+-		install -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \
+-		install -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \
+-	else \
+-		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 -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \
+-	fi
++	install -D -m 755 $(NAME) $(BINDIR)/$(NAME); \
++	install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \
++	[ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \
++		|| install -D -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf;
+ 	@echo; echo "Cntlm will look for configuration in $(SYSCONFDIR)/$(NAME).conf"
+ 
+ tgz:
diff --git a/cntlm.spec b/cntlm.spec
index 99a60aa..8853e3f 100644
--- a/cntlm.spec
+++ b/cntlm.spec
@@ -2,18 +2,16 @@
 
 Summary:        Fast NTLM authentication proxy with tunneling
 Name:           cntlm
-Version:        0.35.1
-Release:        8%{?dist}
+Version:        0.92
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 URL:            http://cntlm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        cntlm.init
 Source2:        cntlm.init.fedora
-Source3:        cntlm.sysconfig
 Source4:	cntlm.NetworkManager
 Source5:	cntlm.tmpfiles
-Patch0:         cntlm-0.35.1-Makefile.patch
+Patch0:		cntlm-0.92-Makefile.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post):  chkconfig
 Requires(preun): chkconfig
@@ -40,7 +38,7 @@ rm -rf %{buildroot}
 make BINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir} SYSCONFDIR=%{buildroot}%{_sysconfdir} install
 
 install -D -m 0755 %{SOURCE2} %{buildroot}%{_initddir}/cntlmd
-install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/cntlmd
+install -D -m 0644 rpm/%{name}.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/cntlmd
 install -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/10-%{name}
 install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 mkdir -p -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
@@ -87,6 +85,9 @@ fi
 exit 0
 
 %changelog
+* Mon Dec  5 2011 Matt Domsch <mdomsch at fedoraproject.org> - 0.92-1
+- update to new bugfix release (BZ760164)
+
 * Wed Nov 24 2010 Matt Domsch <mdomsch at fedoraproject.org> - 0.35.1-8
 - add /etc/tmpfiles.d/cntlm.conf to create /var/run/cntlm/ (BZ656561)
 
diff --git a/sources b/sources
index dd833dd..f2c79a2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 95c4f76829624db9440795a36c626ebd  cntlm-0.35.1.tar.gz
+e0cf045167c9dce383742a403ed8756d  cntlm-0.92.tar.gz