Create ipa-radius-admintools

13 files changed, 121 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 25af85334..63f024cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=ipa-server ipa-admintools ipa-python ipa-client ipa-radius-server
+SUBDIRS=ipa-server ipa-admintools ipa-python ipa-client ipa-radius-server ipa-radius-admintools
 
 PRJ_PREFIX=ipa
 
@@ -42,6 +42,13 @@ RADIUS_SERVER_VERSION=$(RADIUS_SERVER_MAJOR).$(RADIUS_SERVER_MINOR).$(RADIUS_SER
 RADIUS_SERVER_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)
 RADIUS_SERVER_TARBALL=$(RADIUS_SERVER_TARBALL_PREFIX).tgz
 
+RADIUS_ADMINTOOLS_MAJOR=0
+RADIUS_ADMINTOOLS_MINOR=5
+RADIUS_ADMINTOOLS_RELEASE=0
+RADIUS_ADMINTOOLS_VERSION=$(RADIUS_ADMINTOOLS_MAJOR).$(RADIUS_ADMINTOOLS_MINOR).$(RADIUS_ADMINTOOLS_RELEASE)
+RADIUS_ADMINTOOLS_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)
+RADIUS_ADMINTOOLS_TARBALL=$(RADIUS_ADMINTOOLS_TARBALL_PREFIX).tgz
+
 LIBDIR ?= /usr/lib
 
 all: bootstrap-autogen
@@ -87,6 +94,9 @@ version-update:
 	sed s/VERSION/$(RADIUS_SERVER_VERSION)/ ipa-radius-server/ipa-radius-server.spec.in \
 		> ipa-radius-server/ipa-radius-server.spec
 
+	sed s/VERSION/$(RADIUS_ADMINTOOLS_VERSION)/ ipa-radius-admintools/ipa-radius-admintools.spec.in \
+		> ipa-radius-admintools/ipa-radius-admintools.spec
+
 
 archive:
 	-mkdir -p dist
@@ -136,6 +146,12 @@ tarballs:
 	cd dist; tar cfz sources/$(RADIUS_SERVER_TARBALL) $(RADIUS_SERVER_TARBALL_PREFIX)
 	rm -fr dist/$(RADIUS_SERVER_TARBALL_PREFIX)
 
+        # ipa-radius-admintools
+	mv dist/ipa/ipa-radius-admintools dist/$(RADIUS_ADMINTOOLS_TARBALL_PREFIX)
+	rm -f dist/sources/$(RADIUS_ADMINTOOLS_TARBALL)
+	cd dist; tar cfz sources/$(RADIUS_ADMINTOOLS_TARBALL) $(RADIUS_ADMINTOOLS_TARBALL_PREFIX)
+	rm -fr dist/$(RADIUS_ADMINTOOLS_TARBALL_PREFIX)
+
 
 rpmroot:
 	mkdir -p $(RPMBUILD)/BUILD
@@ -178,8 +194,14 @@ rpm-ipa-radius-server:
 	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)-*.rpm dist/rpms/
 	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)-*.src.rpm dist/srpms/
 
+rpm-ipa-radius-admintools:
+	cp dist/sources/$(RADIUS_ADMINTOOLS_TARBALL) $(RPMBUILD)/SOURCES/.
+	rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-radius-admintools/ipa-radius-admintools.spec
+	cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)-*.rpm dist/rpms/
+	cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)-*.src.rpm dist/srpms/
+
 
-rpms: rpmroot rpmdistdir rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client rpm-ipa-radius-server
+rpms: rpmroot rpmdistdir rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client rpm-ipa-radius-server rpm-ipa-radius-admintools
 
 repodata:
 	-createrepo -p dist
diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile
index 5c3fdfe8c..9586e71cf 100644
--- a/ipa-admintools/Makefile
+++ b/ipa-admintools/Makefile
@@ -23,14 +23,6 @@ install:
 	install -m 755 ipa-listdelegation $(SBINDIR)
 	install -m 755 ipa-moddelegation $(SBINDIR)
 	install -m 755 ipa-getkeytab $(SBINDIR)
-	install -m 755 ipa-addradiusclient $(SBINDIR)
-	install -m 755 ipa-radiusclientmod $(SBINDIR)
-	install -m 755 ipa-delradiusclient $(SBINDIR)
-	install -m 755 ipa-findradiusclient $(SBINDIR)
-	install -m 755 ipa-addradiusprofile $(SBINDIR)
-	install -m 755 ipa-radiusprofilemod $(SBINDIR)
-	install -m 755 ipa-delradiusprofile $(SBINDIR)
-	install -m 755 ipa-findradiusprofile $(SBINDIR)
 
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
diff --git a/ipa-radius-admintools/Makefile b/ipa-radius-admintools/Makefile
new file mode 100644
index 000000000..3f2da11af
--- /dev/null
+++ b/ipa-radius-admintools/Makefile
@@ -0,0 +1,21 @@
+SBINDIR = $(DESTDIR)/usr/sbin
+
+
+all: ;
+
+install:
+	install -m 755 ipa-addradiusclient $(SBINDIR)
+	install -m 755 ipa-radiusclientmod $(SBINDIR)
+	install -m 755 ipa-delradiusclient $(SBINDIR)
+	install -m 755 ipa-findradiusclient $(SBINDIR)
+	install -m 755 ipa-addradiusprofile $(SBINDIR)
+	install -m 755 ipa-radiusprofilemod $(SBINDIR)
+	install -m 755 ipa-delradiusprofile $(SBINDIR)
+	install -m 755 ipa-findradiusprofile $(SBINDIR)
+
+clean:
+	rm -f *~ *.pyc
+
+distclean: clean
+
+test:
diff --git a/ipa-admintools/ipa-addradiusclient b/ipa-radius-admintools/ipa-addradiusclient
index 1db571a71..1db571a71 100644
--- a/ipa-admintools/ipa-addradiusclient
+++ b/ipa-radius-admintools/ipa-addradiusclient
diff --git a/ipa-admintools/ipa-addradiusprofile b/ipa-radius-admintools/ipa-addradiusprofile
index 66db52267..66db52267 100644
--- a/ipa-admintools/ipa-addradiusprofile
+++ b/ipa-radius-admintools/ipa-addradiusprofile
diff --git a/ipa-admintools/ipa-delradiusclient b/ipa-radius-admintools/ipa-delradiusclient
index dd26e8ac9..dd26e8ac9 100644
--- a/ipa-admintools/ipa-delradiusclient
+++ b/ipa-radius-admintools/ipa-delradiusclient
diff --git a/ipa-admintools/ipa-delradiusprofile b/ipa-radius-admintools/ipa-delradiusprofile
index f77d01747..f77d01747 100644
--- a/ipa-admintools/ipa-delradiusprofile
+++ b/ipa-radius-admintools/ipa-delradiusprofile
diff --git a/ipa-admintools/ipa-findradiusclient b/ipa-radius-admintools/ipa-findradiusclient
index ade4bd397..ade4bd397 100644
--- a/ipa-admintools/ipa-findradiusclient
+++ b/ipa-radius-admintools/ipa-findradiusclient
diff --git a/ipa-admintools/ipa-findradiusprofile b/ipa-radius-admintools/ipa-findradiusprofile
index ba714068a..ba714068a 100644
--- a/ipa-admintools/ipa-findradiusprofile
+++ b/ipa-radius-admintools/ipa-findradiusprofile
diff --git a/ipa-radius-admintools/ipa-radius-admintools.spec b/ipa-radius-admintools/ipa-radius-admintools.spec
new file mode 100644
index 000000000..bd4ee32f9
--- /dev/null
+++ b/ipa-radius-admintools/ipa-radius-admintools.spec
@@ -0,0 +1,38 @@
+Name:           ipa-radius-admintools
+Version:        0.5.0
+Release:        1%{?dist}
+Summary:        IPA authentication server - radius admin tools
+
+Group:          System Environment/Base
+License:        GPL
+URL:            http://www.freeipa.org
+Source0:        %{name}-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: 	noarch
+
+Requires: python python-krbV ipa-python ipa-admintools
+
+%description
+IPA is a server for identity, policy, and audit.
+
+%prep
+%setup -q
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_sbindir}
+
+make install DESTDIR=%{buildroot}
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_sbindir}/ipa*
+
+%changelog
+* Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
+- Initial rpm version
diff --git a/ipa-radius-admintools/ipa-radius-admintools.spec.in b/ipa-radius-admintools/ipa-radius-admintools.spec.in
new file mode 100644
index 000000000..f40baa8e8
--- /dev/null
+++ b/ipa-radius-admintools/ipa-radius-admintools.spec.in
@@ -0,0 +1,38 @@
+Name:           ipa-radius-admintools
+Version:        VERSION
+Release:        1%{?dist}
+Summary:        IPA authentication server - radius admin tools
+
+Group:          System Environment/Base
+License:        GPL
+URL:            http://www.freeipa.org
+Source0:        %{name}-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: 	noarch
+
+Requires: python python-krbV ipa-python ipa-admintools
+
+%description
+IPA is a server for identity, policy, and audit.
+
+%prep
+%setup -q
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_sbindir}
+
+make install DESTDIR=%{buildroot}
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_sbindir}/ipa*
+
+%changelog
+* Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
+- Initial rpm version
diff --git a/ipa-admintools/ipa-radiusclientmod b/ipa-radius-admintools/ipa-radiusclientmod
index 9e973b121..9e973b121 100644
--- a/ipa-admintools/ipa-radiusclientmod
+++ b/ipa-radius-admintools/ipa-radiusclientmod
diff --git a/ipa-admintools/ipa-radiusprofilemod b/ipa-radius-admintools/ipa-radiusprofilemod
index 405abcfcc..405abcfcc 100644
--- a/ipa-admintools/ipa-radiusprofilemod
+++ b/ipa-radius-admintools/ipa-radiusprofilemod