rpms/conserver/devel conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3

[Patrick Laughton (jima)]

Author: jima

Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237/devel

Modified Files:
	conserver.spec 
Added Files:
	conserver-8.1.14-oldkrb.patch 
Log Message:

Fixing bug 192910


conserver-8.1.14-oldkrb.patch:

--- NEW FILE conserver-8.1.14-oldkrb.patch ---
diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure
--- conserver-8.1.14/configure	2006-04-07 09:38:24.000000000 -0500
+++ conserver-8.1.14-nate/configure	2006-04-26 14:25:07.000000000 -0500
@@ -5847,6 +5847,9 @@
 	    OPENSSLCPPFLAGS=""
 	    OPENSSLLDFLAGS=""
 	fi
+	if test -e "/usr/kerberos/include/krb5.h"; then
+	    OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include"
+	fi
 
 	oCPPFLAGS="$CPPFLAGS"
 	oLDFLAGS="$LDFLAGS"
diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in
--- conserver-8.1.14/configure.in	2006-04-07 09:30:22.000000000 -0500
+++ conserver-8.1.14-nate/configure.in	2006-04-26 14:24:53.000000000 -0500
@@ -456,6 +456,9 @@
 	    OPENSSLCPPFLAGS=""
 	    OPENSSLLDFLAGS=""
 	fi
+	if test -e "/usr/kerberos/include/krb5.h"; then
+	    OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include"
+	fi
 
 	oCPPFLAGS="$CPPFLAGS"
 	oLDFLAGS="$LDFLAGS"


Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/conserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conserver.spec	26 Apr 2006 16:07:30 -0000	1.2
+++ conserver.spec	24 May 2006 12:38:36 -0000	1.3
@@ -1,14 +1,15 @@
 Name:           conserver
 Version:        8.1.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
 License:        Distributable
 URL:            http://www.conserver.com/
 Source0:        http://www.conserver.com/%{name}-%{version}.tar.gz
-Patch0:        http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch
-Patch1:        http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch
+Patch0:         http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch
+Patch1:         http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch
+Patch2:         http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel, openssl-devel, tcp_wrappers
@@ -33,6 +34,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -41,8 +43,7 @@
 %{__mv} $f $f.orig
 %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f
 
-%configure --with-uds \
-	--with-libwrap \
+%configure --with-libwrap \
 	--with-openssl \
 	--with-pam
 
@@ -114,6 +115,10 @@
 %{_mandir}/man1/console.1.gz
 
 %changelog
+* Wed May 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 8.1.14-3
+- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910)
+- Fix from Nate Straz: krb detection
+
 * Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
 - Split 'console' out to -client subpackage, as suggested by Nate Straz