Rebase to 0.93
Make use of systemd rpm macros for scriptlets, BZ 850174
This commit is contained in:
Chris Leech
parent
ea4f6a807a
commit
bca8ecb453
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
open-isns-0.91.tar.bz2
|
||||
open-isns-0.93.tar.bz2
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- open-isns-20070927.orig//COPYING 2008-01-17 17:28:45.000000000 -0600
|
||||
+++ open-isns-20070927/COPYING 2008-01-17 17:37:24.000000000 -0600
|
||||
@@ -1,7 +1,7 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
- Copyright © 1991, 1999 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
@@ -471,7 +471,7 @@ convey the exclusion of warranty; and ea
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
- Copyright © <year> <name of author>
|
||||
+ Copyright (C) <year> <name of author>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
@ -1,33 +0,0 @@
|
||||
diff -aurp open-isns-0.91/db-file.c open-isns-0.91.work/db-file.c
|
||||
--- open-isns-0.91/db-file.c 2007-09-21 04:16:43.000000000 -0500
|
||||
+++ open-isns-0.91.work/db-file.c 2008-02-11 16:54:47.000000000 -0600
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "isns.h"
|
||||
#include "objects.h"
|
||||
diff -aurp open-isns-0.91/isnsadm.c open-isns-0.91.work/isnsadm.c
|
||||
--- open-isns-0.91/isnsadm.c 2007-09-22 15:27:24.000000000 -0500
|
||||
+++ open-isns-0.91.work/isnsadm.c 2008-02-11 16:55:00.000000000 -0600
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "isns.h"
|
||||
#include "util.h"
|
||||
diff -aurp open-isns-0.91/pki.c open-isns-0.91.work/pki.c
|
||||
--- open-isns-0.91/pki.c 2007-09-22 14:59:30.000000000 -0500
|
||||
+++ open-isns-0.91.work/pki.c 2008-02-11 16:54:07.000000000 -0600
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/err.h>
|
||||
#include <fcntl.h>
|
||||
+#include <limits.h>
|
||||
#include "isns.h"
|
||||
#include "security.h"
|
||||
#include "util.h"
|
||||
@ -1,13 +0,0 @@
|
||||
diff -aurp open-isns-0.91.orig/etc/isnsd.conf open-isns-0.91/etc/isnsd.conf
|
||||
--- open-isns-0.91.orig/etc/isnsd.conf 2008-01-18 10:24:46.000000000 -0600
|
||||
+++ open-isns-0.91/etc/isnsd.conf 2008-01-18 10:25:13.000000000 -0600
|
||||
@@ -40,7 +40,7 @@ RegistrationPeriod = 10m
|
||||
# create a virtual "default discovery domain", which
|
||||
# holds all nodes that are not part of any administratively
|
||||
# configured discovery domain.
|
||||
-DefaultDiscoveryDomain = 0
|
||||
+DefaultDiscoveryDomain = 1
|
||||
|
||||
# Authentication enable/disable.
|
||||
# When set to 1, the client will sign
|
||||
Only in open-isns-0.91/etc: isnsd.conf.orig
|
||||
@ -1,12 +0,0 @@
|
||||
diff -aurp open-isns-20070927.orig/doc/isnsadm.8 open-isns-20070927/doc/isnsadm.8
|
||||
--- open-isns-20070927.orig/doc/isnsadm.8 2007-09-18 05:23:22.000000000 -0500
|
||||
+++ open-isns-20070927/doc/isnsadm.8 2008-01-15 01:47:52.000000000 -0600
|
||||
@@ -44,7 +44,7 @@ By default,
|
||||
.B isnsadm
|
||||
will take most of its settings from the configuration
|
||||
file
|
||||
-.BR /etc/isns/client.conf ,
|
||||
+.BR /etc/isns/isnsadm.conf ,
|
||||
with the exception of the following options:
|
||||
.TP
|
||||
.BI \--config " filename\fR, " \-c " filename
|
||||
@ -1,22 +1,15 @@
|
||||
Name: isns-utils
|
||||
Version: 0.91
|
||||
Release: 8%{?dist}
|
||||
Version: 0.93
|
||||
Release: 1%{?dist}
|
||||
Summary: The iSNS daemon and utility programs
|
||||
|
||||
Group: System Environment/Daemons
|
||||
License: LGPLv2+
|
||||
URL: http://oss.oracle.com/~okir/open-isns/
|
||||
Source0: http://oss.oracle.com/~okir/open-isns/open-isns-%{version}.tar.bz2
|
||||
URL: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns/releases/open-isns-%{version}.tar.bz2
|
||||
Source1: isnsd.service
|
||||
Patch0: isns-utils-turn-default-dd-on-to-match-msft.patch
|
||||
Patch1: isns-utils-update-isnsadm-man.patch
|
||||
Patch2: isns-utils-fix-non-utf8-chars-in-copying.patch
|
||||
Patch3: isns-utils-include-limits.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: openssl-devel automake pkgconfig
|
||||
#Requires: /sbin/chkconfig /sbin/service
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
@ -30,10 +23,6 @@ Fibre Channel devices (using iFCP gateways) on a TCP/IP network.
|
||||
|
||||
%prep
|
||||
%setup -q -n open-isns-%{version}
|
||||
%patch0 -p1 -b .turn-default-dd-on-to-match-msft
|
||||
%patch1 -p1 -b .update-isnsadm-man
|
||||
%patch2 -p1 -b .fix-non-utf8-chars-in-copying
|
||||
%patch3 -p1 -b .isns-utils-include-limits
|
||||
|
||||
|
||||
%build
|
||||
@ -50,7 +39,6 @@ autoheader
|
||||
|
||||
|
||||
%install
|
||||
%{__rm} -rf %{buildroot}
|
||||
%{__install} -d %{buildroot}%{_sbindir}
|
||||
%{__install} -d %{buildroot}%{_mandir}/man8
|
||||
%{__install} -d %{buildroot}%{_mandir}/man5
|
||||
@ -64,40 +52,21 @@ autoheader
|
||||
%{__install} -p -m 644 etc/isnsadm.conf %{buildroot}%{_sysconfdir}/isns/isnsadm.conf
|
||||
|
||||
%{__install} -p -m 755 isnsd isnsdd isnsadm isnssetup %{buildroot}%{_sbindir}
|
||||
%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service
|
||||
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service
|
||||
%{__install} -p -m 644 doc/isns_config.5 %{buildroot}/%{_mandir}/man5/
|
||||
%{__install} -p -m 644 doc/isnsd.8 doc/isnsdd.8 doc/isnsadm.8 %{buildroot}/%{_mandir}/man8/
|
||||
|
||||
|
||||
%post
|
||||
#/sbin/chkconfig --add isnsd
|
||||
if [ $1 -eq 1 ] ; then
|
||||
# Initial installation
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
fi
|
||||
%systemd_post isnsd.service
|
||||
|
||||
|
||||
%postun
|
||||
#if [ "$1" = "1" ] ; then
|
||||
# /sbin/service isnsd condrestart > /dev/null 2>&1
|
||||
#fi
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
/bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%systemd_postun isnsd.service
|
||||
|
||||
|
||||
%preun
|
||||
#if [ "$1" = "0" ] ; then
|
||||
# /sbin/chkconfig isnsd stop > /dev/null 2>&1
|
||||
# /sbin/chkconfig --del isnsd
|
||||
#fi
|
||||
if [ $1 -eq 0 ] ; then
|
||||
# Package removal, not upgrade
|
||||
/bin/systemctl --no-reload disable isnsd.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl stop isnsd.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
%systemd_preun isnsd.service
|
||||
|
||||
|
||||
%triggerun -- isns-utils < 0.91-7
|
||||
@ -115,7 +84,6 @@ fi
|
||||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-, root, root, -)
|
||||
%doc COPYING README
|
||||
%{_sbindir}/isnsd
|
||||
%{_sbindir}/isnsadm
|
||||
@ -129,6 +97,10 @@ fi
|
||||
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 10 2012 Chris Leech <cleech@redhat.com> - 0.93-1
|
||||
- Rebase to 0.93
|
||||
- Make use of systemd rpm macros for scriptlets, BZ 850174
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.91-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
||||
16
isnsd.init
16
isnsd.init
@ -23,6 +23,8 @@ RETVAL=0
|
||||
|
||||
start()
|
||||
{
|
||||
[ `id -u` = 0 ] || exit 4
|
||||
|
||||
echo -n "Starting iSNS Server:"
|
||||
daemon isnsd
|
||||
echo
|
||||
@ -34,6 +36,8 @@ start()
|
||||
|
||||
stop()
|
||||
{
|
||||
[ `id -u` = 0 ] || exit 4
|
||||
|
||||
echo -n "Stopping iSNS Server: "
|
||||
if [ ! -f /var/lock/subsys/isnsd ]; then
|
||||
echo
|
||||
@ -60,6 +64,12 @@ case "$1" in
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
reload)
|
||||
exit 3
|
||||
;;
|
||||
force-reload)
|
||||
restart
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
@ -67,12 +77,12 @@ case "$1" in
|
||||
status isnsd
|
||||
RETVAL=$?
|
||||
;;
|
||||
condrestart)
|
||||
condrestart|try-restart)
|
||||
[ -f /var/lock/subsys/isnsd ] && restart
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|restart|status|condrestart}"
|
||||
exit 1
|
||||
echo $"Usage: $0 {start|stop|restart|status|force-reload|condrestart|try-restart}"
|
||||
exit 2
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
Loading…
Reference in New Issue
Block a user