rpms/conserver/devel conserver-8.1.14-initscript.patch, NONE, 1.1 conserver-8.1.14-no-exampledir.patch, NONE, 1.1 conserver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Patrick Laughton (jima)
fedora-extras-commits at redhat.com
Mon Apr 10 19:25:15 UTC 2006
Author: jima
Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20480/devel
Modified Files:
.cvsignore sources
Added Files:
conserver-8.1.14-initscript.patch
conserver-8.1.14-no-exampledir.patch conserver.spec
Log Message:
auto-import conserver-8.1.14-1 on branch devel from conserver-8.1.14-1.src.rpm
conserver-8.1.14-initscript.patch:
--- NEW FILE conserver-8.1.14-initscript.patch ---
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
conserver-8.1.14-no-exampledir.patch:
--- NEW FILE conserver-8.1.14-no-exampledir.patch ---
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
--- NEW FILE conserver.spec ---
Name: conserver
Version: 8.1.14
Release: 1%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel, openssl-devel, tcp_wrappers
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%description
Conserver is an application that allows multiple users to watch a serial
console at the same time. It can log the data, allows users to take
write-access of a console (one at a time), and has a variety of bells
and whistles to accentuate that basic functionality.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
# we don't want to install the solaris conserver.rc file
f="conserver/Makefile.in"
%{__mv} $f $f.orig
%{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f
%configure --with-uds \
--with-libwrap \
--with-openssl \
--with-pam
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# put commented copies of the sample configure files in the
# system configuration directory
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}
%{__sed} -e 's/^/#/' \
< conserver.cf/conserver.cf \
> $RPM_BUILD_ROOT/%{_sysconfdir}/conserver.cf
%{__sed} -e 's/^/#/' \
< conserver.cf/conserver.passwd \
> $RPM_BUILD_ROOT/%{_sysconfdir}/conserver.passwd
# install copy of init script
%{__mkdir_p} $RPM_BUILD_ROOT/%{_initrddir}
%{__cp} contrib/redhat-rpm/conserver.init $RPM_BUILD_ROOT/%{_initrddir}/conserver
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ -x %{_initrddir}/conserver ]; then
/sbin/chkconfig --add conserver
fi
# make sure /etc/services has a conserver entry
if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
echo "console 782/tcp conserver" >> /etc/services
fi
%preun
if [ "$1" = 0 ]; then
if [ -x %{_initrddir}/conserver ]; then
%{_initrddir}/conserver stop > /dev/null 2>&1
/sbin/chkconfig --del conserver
fi
fi
%files
%defattr(-,root,root,-)
%doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
%config(noreplace) %{_sysconfdir}/conserver.*
%{_initrddir}/conserver
%{_bindir}/console
%{_libdir}/conserver
%{_mandir}/man1/console.1.gz
%{_mandir}/man5/conserver.cf.5.gz
%{_mandir}/man5/conserver.passwd.5.gz
%{_mandir}/man8/conserver.8.gz
%{_sbindir}/conserver
%changelog
* Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
- Figures, two days after my initial Fedora Extras RPM, a new release...
* Fri Apr 07 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.13-1
- Initial Fedora Extras RPM
- Added patch to disable /usr/share/examples/conserver -- non-standard
- Added patch to correct poorly written initscript
- Cleaned up what goes in /usr/share/doc/conserver-8.1.13/ (sloppy)
- Other .spec cleanups with lots of help from Dennis Gilmore (thanks!)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Apr 2006 19:23:47 -0000 1.1
+++ .cvsignore 10 Apr 2006 19:25:15 -0000 1.2
@@ -0,0 +1 @@
+conserver-8.1.14.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Apr 2006 19:23:47 -0000 1.1
+++ sources 10 Apr 2006 19:25:15 -0000 1.2
@@ -0,0 +1 @@
+f7825728e5af8992ed4a99fb560a3df8 conserver-8.1.14.tar.gz
More information about the fedora-extras-commits
mailing list