From df55a6201abb4858b32658a75f3ed68ce4e5cbb0 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Dec 07 2011 05:30:46 +0000 Subject: update to new bugfix release (BZ760164) --- 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.35.1-Makefile.patch b/cntlm-0.35.1-Makefile.patch deleted file mode 100644 index e52db0b..0000000 --- a/cntlm-0.35.1-Makefile.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -urNp --exclude-from=/home/mdomsch/excludes --minimal cntlm-0.35.1.orig/Makefile cntlm-0.35.1/Makefile ---- cntlm-0.35.1.orig/Makefile 2007-11-20 18:18:24.000000000 -0600 -+++ cntlm-0.35.1/Makefile 2010-08-25 12:24:44.556317839 -0500 -@@ -13,41 +13,34 @@ MANDIR=/usr/local/man - # - CC=gcc - OBJS=utils.o ntlm.o xcrypt.o config.o socket.o acl.o auth.o http.o proxy.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 -DVERSION=\"`cat VERSION`\" --LDFLAGS=-lpthread -+MYFLAGS=-std=c99 -pedantic -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -DVERSION=\"`cat VERSION`\" -+MYLDFLAGS=-lpthread - NAME=cntlm - VER=`cat VERSION` - DIR=`pwd` - - $(NAME): configure-stamp $(OBJS) - @echo "Linking $@" -- @$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(MYCFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(MYLDFLAGS) - - proxy.o: proxy.c - @echo "Compiling $<" - @if [ -z "$(SYSCONFDIR)" ]; then \ -- $(CC) $(CFLAGS) -c proxy.c -o $@; \ -+ $(CC) $(CFLAGS) $(MYFLAGS) -c proxy.c -o $@; \ - else \ -- $(CC) $(CFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c proxy.c -o $@; \ -+ $(CC) $(CFLAGS) $(MYFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c proxy.c -o $@; \ - fi - - .c.o: - @echo "Compiling $<" -- @$(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(MYFLAGS) -c -o $@ $< - - install: $(NAME) -- # AIX? -- if [ -f /usr/bin/oslevel ]; then \ -- install -O root -G system -M 755 -S -f $(BINDIR) $(NAME); \ -- 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; \ -- [ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \ -- || install -D -o root -g root -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ -- fi -- @echo; echo "Cntlm will look for configuration in $(SYSCONFDIR)/$(NAME).conf" -+ 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" - - rpm: - if [ `id -u` = 0 ]; then \ 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.init b/cntlm.init deleted file mode 100644 index 964fe04..0000000 --- a/cntlm.init +++ /dev/null @@ -1,173 +0,0 @@ -#!/bin/sh -# -# cntlmd: Start/stop the cntlm proxy. -# -# chkconfig: - 26 89 -# Description: Cntlm is meant to be given your proxy address and becomming -# the primary proxy then, listening on a selected local port. -# You point all your proxy-aware programs to it and don't ever -# have to deal with proxy authentication again. -# -### BEGIN INIT INFO -# Provides: cntlm -# Required-Start: $syslog $network $time -# Required-Stop: $syslog $network $time -# Short-Description: Authenticating HTTP accelerator for NTLM secured proxies -# Description: Cntlm is meant to be given your proxy address and becomming -# the primary proxy then, listening on a selected local port. -# You point all your proxy-aware programs to it and don't ever -# have to deal with proxy authentication again. -### END INIT INFO - -# Determining Linux RedHat/SuSE -# -# /etc/redhat-release -# /etc/SuSE-release - -SuSE=false -RedHat=false - -if [ -f /etc/SuSE-release ]; then - SuSE=true -elif [ -f /etc/redhat-release ]; then - RedHat=true -else - echo "Error: your platform is not supported by $0" > /dev/stderr - exit 1 -fi - -# Source function library SuSE/RedHat. - -if $SuSE; then - if [ -f /lib/lsb/init-functions ]; then - . /lib/lsb/init-functions - else - echo "Error: your platform is not supported by $0" > /dev/stderr - exit 1 - fi -else - if [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions - else - echo "Error: your platform is not supported by $0" > /dev/stderr - exit 1 - fi -fi - -[ -r /etc/sysconfig/cntlmd ] && . /etc/sysconfig/cntlmd - -# First reset status of this service SuSE/RedHat - -if $SuSE; then - rc_reset -else - RETVAL=0 -fi - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - insufficient privilege -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signalling is not supported) are -# considered a success. - -# Shell functions sourced from /etc/rc.status only on SuSE Linux: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status - -test -f $DAEMON || exit 5 - -start() { - # Start daemons. - echo -n "Starting $DESC: " - - if $SuSE; then - startproc -p $PIDFILE $DAEMON $OPTARGS 2>/dev/null - rc_status -v - else - daemon cntlm $OPTARGS 2>/dev/null - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $LOCKFILE - return $RETVAL - fi -} - -stop() { - echo -n "Shutting down $DESC: " - - if $SuSE; then - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -p $PIDFILE -TERM $DAEMON - - # Remember status and be verbose - rc_status -v - - else - killproc cntlm - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $LOCKFILE - return $RETVAL - fi -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - echo -n "Checking for $DESC: " - - if $SuSE; then - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc -p $PIDFILE $DAEMON - rc_status -v - else - status cntlm - fi - ;; - restart|reload) - stop - start - ;; - *) - echo $"Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -if $SuSE; then - rc_exit -else - exit $RETVAL -fi 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 - 0.92-1 +- update to new bugfix release (BZ760164) + * Wed Nov 24 2010 Matt Domsch - 0.35.1-8 - add /etc/tmpfiles.d/cntlm.conf to create /var/run/cntlm/ (BZ656561) diff --git a/cntlm.sysconfig b/cntlm.sysconfig deleted file mode 100644 index b6e19b1..0000000 --- a/cntlm.sysconfig +++ /dev/null @@ -1,15 +0,0 @@ -# -# DAEMON Location of the binary -# PIDFILE Make sure that you or, if used, -U uid can create/write it -# TIMEOUT How long to wait before forcing cntlm to stop with a second -# signal when active connections are still not finished -# RUNAS Name or number of the non-privileged account to run as -# - -DAEMON=/usr/sbin/cntlm -PIDFILE=/var/run/cntlm/cntlmd.pid -LOCKFILE=/var/lock/subsys/cntlmd -TIMEOUT=5 -RUNAS=cntlm -DESC="CNTLM Authentication Proxy" -OPTARGS="-U $RUNAS -P $PIDFILE" 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