From b6db56e82c4062ff5fdf47e1b8837732c9d5b5c2 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Jan 26 2011 02:54:40 +0000 Subject: long-needed update --- diff --git a/.gitignore b/.gitignore index 91d4146..11317ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ conserver-8.1.16.tar.gz +/conserver-8.1.18.tar.gz diff --git a/conserver-8.1.14-initscript.patch b/conserver-8.1.14-initscript.patch deleted file mode 100644 index 3b552cb..0000000 --- a/conserver-8.1.14-initscript.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN conserver-8.1.14/contrib/redhat-rpm/conserver.init conserver-8.1.14-patched/contrib/redhat-rpm/conserver.init ---- conserver-8.1.14/contrib/redhat-rpm/conserver.init 2003-02-27 20:06:50.000000000 -0600 -+++ conserver-8.1.14-patched/contrib/redhat-rpm/conserver.init 2006-04-07 13:52:23.000000000 -0500 -@@ -2,7 +2,7 @@ - # - # conserver -- serial-port console daemon - # --# chkconfig: 2345 92 08 -+# chkconfig: - 92 08 - # description: conserver is a serial-port console daemon - # config: /etc/conserver.cf - # -@@ -19,32 +19,49 @@ - # make sure conserver is installed and executable - [ -x /usr/sbin/conserver ] || exit 1 - -+start() -+{ -+ echo -n "Starting conserver: " -+ daemon conserver -d -+ RETVAL=$? -+ [ "$RETVAL" = 0 ] && touch /var/lock/subsys/conserver -+ echo -+} -+ -+stop() -+{ -+ echo -n "Shutting down conserver: " -+ killproc conserver -+ RETVAL=$? -+ [ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/conserver -+ echo -+} - - # See how we were called. - case "$1" in - start) -- echo -n "Starting conserver: " -- daemon conserver -d -- echo -- touch /var/lock/subsys/conserver -+ start - ;; - stop) -- echo -n "Shutting down conserver: " -- killproc conserver -- echo -- rm -f /var/lock/subsys/conserver -+ stop - ;; - status) - status conserver -+ RETVAL=$? - ;; - restart) -- echo -n "Restarting conserver: " -+ stop -+ start -+ ;; -+ reload) -+ echo -n "Reloading conserver: " - killproc conserver -HUP -+ RETVAL=$? - echo - ;; - *) -- echo "Usage: conserver {start|stop|restart|status}" -- exit 1 -+ echo "Usage: conserver {start|stop|restart|reload|status}" -+ RETVAL=1 - esac - --exit 0 -+exit $RETVAL diff --git a/conserver-8.1.14-no-exampledir.patch b/conserver-8.1.14-no-exampledir.patch deleted file mode 100644 index c4ef72b..0000000 --- a/conserver-8.1.14-no-exampledir.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -urN conserver-8.1.14/conserver/Makefile.in conserver-8.1.14-patched/conserver/Makefile.in ---- conserver-8.1.14/conserver/Makefile.in 2005-06-06 10:03:06.000000000 -0500 -+++ conserver-8.1.14-patched/conserver/Makefile.in 2006-04-07 12:56:44.000000000 -0500 -@@ -9,7 +9,6 @@ - datadir = @datadir@ - libdir = @libdir@ - pkglibdir = $(libdir)/conserver --exampledir = $(datadir)/examples/conserver - - ### Installation programs and flags - INSTALL = @INSTALL@ -@@ -63,8 +62,6 @@ - $(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir) - $(MKDIR) $(DESTDIR)$(mandir)/man8 - $(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8 -- $(MKDIR) $(DESTDIR)$(exampledir) -- $(INSTALL) conserver.rc $(DESTDIR)$(exampledir) - $(MKDIR) $(DESTDIR)$(pkglibdir) - $(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert - -diff -urN conserver-8.1.14/conserver.cf/Makefile.in conserver-8.1.14-patched/conserver.cf/Makefile.in ---- conserver-8.1.14/conserver.cf/Makefile.in 2004-02-09 18:32:28.000000000 -0600 -+++ conserver-8.1.14-patched/conserver.cf/Makefile.in 2006-04-07 12:57:07.000000000 -0500 -@@ -4,7 +4,6 @@ - mandir = @mandir@ - sysconfdir = @sysconfdir@ - datadir = @datadir@ --exampledir = $(datadir)/examples/conserver - - ### Installation programs and flags - INSTALL = @INSTALL@ -@@ -26,8 +25,5 @@ - $(MKDIR) $(DESTDIR)$(mandir)/man5 - $(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5 - $(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5 -- $(MKDIR) $(DESTDIR)$(exampledir) -- $(INSTALL) -m 0644 conserver.cf $(DESTDIR)$(exampledir) -- $(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir) - - .PHONY: clean distclean install diff --git a/conserver-8.1.14-oldkrb.patch b/conserver-8.1.14-oldkrb.patch deleted file mode 100644 index b592389..0000000 --- a/conserver-8.1.14-oldkrb.patch +++ /dev/null @@ -1,26 +0,0 @@ -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" diff --git a/conserver-initscript.patch b/conserver-initscript.patch new file mode 100644 index 0000000..56b680a --- /dev/null +++ b/conserver-initscript.patch @@ -0,0 +1,12 @@ +diff -urN conserver-8.1.18/contrib/redhat-rpm/conserver.init conserver-8.1.18-patched/contrib/redhat-rpm/conserver.init +--- conserver-8.1.18/contrib/redhat-rpm/conserver.init 2009-10-07 17:59:58.000000000 -0500 ++++ conserver-8.1.18-patched/contrib/redhat-rpm/conserver.init 2011-01-25 17:24:45.000000000 -0600 +@@ -2,7 +2,7 @@ + # + # conserver -- serial-port console daemon + # +-# chkconfig: 2345 92 08 ++# chkconfig: - 92 08 + # description: conserver is a serial-port console daemon + # config: /etc/conserver.cf + # diff --git a/conserver-manperms.patch b/conserver-manperms.patch deleted file mode 100644 index e042cc9..0000000 --- a/conserver-manperms.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- conserver-8.1.16/conserver.cf/Makefile.in.orig 2007-04-11 14:04:28.000000000 -0500 -+++ conserver-8.1.16/conserver.cf/Makefile.in 2007-04-11 14:06:51.000000000 -0500 -@@ -23,7 +23,7 @@ - - install: - $(MKDIR) $(DESTDIR)$(mandir)/man5 -- $(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5 -- $(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5 -+ $(INSTALL) -m 0644 conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5 -+ $(INSTALL) -m 0644 conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5 - - .PHONY: clean distclean install ---- conserver-8.1.16/conserver/Makefile.in.orig 2007-04-11 14:04:28.000000000 -0500 -+++ conserver-8.1.16/conserver/Makefile.in 2007-04-11 14:05:27.000000000 -0500 -@@ -61,7 +61,7 @@ - $(MKDIR) $(DESTDIR)$(sbindir) - $(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir) - $(MKDIR) $(DESTDIR)$(mandir)/man8 -- $(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8 -+ $(INSTALL) -m 0644 conserver.man $(DESTDIR)$(mandir)/man8/conserver.8 - $(MKDIR) $(DESTDIR)$(pkglibdir) - $(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert - ---- conserver-8.1.16/console/Makefile.in.orig 2004-05-12 16:02:13.000000000 -0500 -+++ conserver-8.1.16/console/Makefile.in 2007-04-11 14:05:13.000000000 -0500 -@@ -56,6 +56,6 @@ - $(MKDIR) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) console $(DESTDIR)$(bindir) - $(MKDIR) $(DESTDIR)$(mandir)/man1 -- $(INSTALL) console.man $(DESTDIR)$(mandir)/man1/console.1 -+ $(INSTALL) -m 0644 console.man $(DESTDIR)$(mandir)/man1/console.1 - - .PHONY: clean distclean install diff --git a/conserver-no-exampledir.patch b/conserver-no-exampledir.patch new file mode 100644 index 0000000..04cf90e --- /dev/null +++ b/conserver-no-exampledir.patch @@ -0,0 +1,40 @@ +diff -urN conserver-8.1.18/conserver/Makefile.in conserver-8.1.18-patched/conserver/Makefile.in +--- conserver-8.1.18/conserver/Makefile.in 2011-01-25 17:34:37.000000000 -0600 ++++ conserver-8.1.18-patched/conserver/Makefile.in 2011-01-25 16:40:37.000000000 -0600 +@@ -9,7 +9,6 @@ + datadir = @datadir@ + libdir = @libdir@ + pkglibdir = $(libdir)/conserver +-exampledir = $(datadir)/examples/conserver + + ### Installation programs and flags + INSTALL = @INSTALL@ +@@ -63,8 +62,6 @@ + $(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir) + $(MKDIR) $(DESTDIR)$(mandir)/man8 + $(INSTALL) -m 0644 conserver.man $(DESTDIR)$(mandir)/man8/conserver.8 +- $(MKDIR) $(DESTDIR)$(exampledir) +- $(INSTALL) conserver.rc $(DESTDIR)$(exampledir) + $(MKDIR) $(DESTDIR)$(pkglibdir) + $(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert + +diff -urN conserver-8.1.18/conserver.cf/Makefile.in conserver-8.1.18-patched/conserver.cf/Makefile.in +--- conserver-8.1.18/conserver.cf/Makefile.in 2009-10-07 18:00:04.000000000 -0500 ++++ conserver-8.1.18-patched/conserver.cf/Makefile.in 2011-01-25 17:35:34.000000000 -0600 +@@ -4,7 +4,6 @@ + mandir = @mandir@ + sysconfdir = @sysconfdir@ + datadir = @datadir@ +-exampledir = $(datadir)/examples/conserver + + ### Installation programs and flags + INSTALL = @INSTALL@ +@@ -26,8 +25,5 @@ + $(MKDIR) $(DESTDIR)$(mandir)/man5 + $(INSTALL) -m 0644 conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5 + $(INSTALL) -m 0644 conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5 +- $(MKDIR) $(DESTDIR)$(exampledir) +- $(INSTALL) -m 0644 conserver.cf $(DESTDIR)$(exampledir) +- $(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir) + + .PHONY: clean distclean install diff --git a/conserver.spec b/conserver.spec index ef238a7..806beff 100644 --- a/conserver.spec +++ b/conserver.spec @@ -1,19 +1,18 @@ Name: conserver -Version: 8.1.16 -Release: 9%{?dist} +Version: 8.1.18 +Release: 1%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: BSD with advertising and zlib URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: %{name}-8.1.14-no-exampledir.patch -Patch1: %{name}-8.1.14-initscript.patch -Patch2: %{name}-8.1.14-oldkrb.patch -Patch3: %{name}-manperms.patch +Patch0: %{name}-no-exampledir.patch +Patch1: %{name}-initscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pam-devel, openssl-devel, tcp_wrappers +BuildRequires: pam-devel, openssl-devel, tcp_wrappers-devel, krb5-devel +BuildRequires: libgssapi-devel, libgssglue-devel Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -35,8 +34,6 @@ This is the client package needed to interact with a Conserver daemon. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build @@ -47,7 +44,11 @@ f="conserver/Makefile.in" %configure --with-libwrap \ --with-openssl \ - --with-pam + --with-pam \ + --with-gssapi \ + --with-uds \ + --with-striprealm \ + --with-port=782 make %{?_smp_mflags} @@ -78,16 +79,6 @@ rm -rf $RPM_BUILD_ROOT if [ -x %{_initrddir}/conserver ]; then /sbin/chkconfig --add conserver fi -# make sure /etc/services has a conserver entry -if ! egrep '\' /etc/services > /dev/null 2>&1 ; then - echo "console 782/tcp conserver" >> /etc/services -fi - -%post client -# make sure /etc/services has a conserver entry -if ! egrep '\' /etc/services > /dev/null 2>&1 ; then - echo "console 782/tcp conserver" >> /etc/services -fi %preun @@ -117,6 +108,13 @@ fi %{_mandir}/man1/console.1.gz %changelog +* Tue Jan 25 2011 Patrick "Jima" Laughton 8.1.18-1 +- Updated to newer version for added Kerberos support (BZ#652688) +- Fixed BZ#466541 +- Fixed broken tcp_wrappers support +- Enabled Unix Domain Socket support +- Removed upstream-adopted patches + * Fri Aug 21 2009 Tomas Mraz - 8.1.16-9 - rebuilt with new openssl diff --git a/sources b/sources index 8996e9d..bfb3406 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2364ba56f5201b07646bdfaefedd330b conserver-8.1.16.tar.gz +93d1c38df71b4e3fd5d8f7ad6fc186bb conserver-8.1.18.tar.gz