Updates to build kpaswd and the slapi plugins.

8 files changed, 110 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 5de0c5d3b..084c63e71 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ SUBDIRS=ipa-server ipa-admintools ipa-python
 
 PRJ_PREFIX=freeipa
 
+# set to 1 to produce a debug build of all subprojects
+#DEBUG=1
+
 # Version numbers - this is for the entire server. After
 # updating this you should run the version-update
 # target.
@@ -26,12 +29,18 @@ PYTHON_VERSION=$(PYTHON_MAJOR).$(PYTHON_MINOR).$(PYTHON_RELEASE)
 PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-python-$(PYTHON_VERSION)
 PYTHON_TARBALL=$(PYTHON_TARBALL_PREFIX).tgz
 
+ifeq ($(DEBUG),1)
+	export CFLAGS = -g -Wall -Wshadow
+	export LDFLAGS = -g
+endif
+
+
 all:
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
 	done
 
-install:
+install: all
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
 	done
diff --git a/ipa-server/Makefile b/ipa-server/Makefile
index dd3fa71ef..faee6e61c 100644
--- a/ipa-server/Makefile
+++ b/ipa-server/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=ipa-install xmlrpc-server
+SUBDIRS=ipa-install xmlrpc-server ipa-kpasswd ipa-slapi-plugins
 PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaserver
 
 all:
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec
index 463db5893..85ddeb937 100755
--- a/ipa-server/freeipa-server.spec
+++ b/ipa-server/freeipa-server.spec
@@ -1,6 +1,6 @@
 Name:           freeipa-server
 Version:        0.1.0
-Release:        3%{?dist}
+Release:        %{?dist}
 Summary:        FreeIPA authentication server
 
 Group:          System Environment/Base
@@ -8,11 +8,14 @@ License:        GPL
 URL:            http://www.freeipa.org
 Source0:        %{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: 	noarch
+#BuildArch: 	
 
-Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi
+BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap-devel openssl-devel mhash-devel
+
+Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi nss
 
 %define httpd_conf /etc/httpd/conf.d
+%define plugin_dir /usr/lib/fedora-ds/plugins
 
 %description
 FreeIPA is a server for identity, policy, and audit.
@@ -20,9 +23,14 @@ FreeIPA is a server for identity, policy, and audit.
 %prep
 %setup -q
 
+%build
+
+make DESTDIR=%{buildroot}
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{plugin_dir}
 
 make install DESTDIR=%{buildroot}
 
@@ -35,12 +43,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_sbindir}/ipa-server-install
 %{_sbindir}/ipa-server-setupssl
+%{_sbindir}/ipa_kpasswd
+
 
 %dir %{_usr}/share/ipa
 %{_usr}/share/ipa/*
 
+%{plugin_dir}/libipa_pwd_extop.so
+
 
 %changelog
+* Fri Aug 10 2007 Karl MacMillan <kmacmill@localhost.localdomain> - 0.1.0-3
+- Added support for ipa_kpasswd and ipa_pwd_extop
+
 * Mon Aug  5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3
 - Abstracted client class to work directly or over RPC
 
diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in
index 549afc979..e108da15a 100644
--- a/ipa-server/freeipa-server.spec.in
+++ b/ipa-server/freeipa-server.spec.in
@@ -1,6 +1,6 @@
 Name:           freeipa-server
 Version:        VERSION
-Release:        3%{?dist}
+Release:        %{?dist}
 Summary:        FreeIPA authentication server
 
 Group:          System Environment/Base
@@ -8,11 +8,13 @@ License:        GPL
 URL:            http://www.freeipa.org
 Source0:        %{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: 	noarch
 
-Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi
+BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap-devel openssl-devel mhash-devel
+
+Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi nss
 
 %define httpd_conf /etc/httpd/conf.d
+%define plugin_dir /usr/lib/fedora-ds/plugins
 
 %description
 FreeIPA is a server for identity, policy, and audit.
@@ -20,9 +22,14 @@ FreeIPA is a server for identity, policy, and audit.
 %prep
 %setup -q
 
+%build
+
+make DESTDIR=%{buildroot}
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{plugin_dir}
 
 make install DESTDIR=%{buildroot}
 
@@ -35,12 +42,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_sbindir}/ipa-server-install
 %{_sbindir}/ipa-server-setupssl
+%{_sbindir}/ipa_kpasswd
+
 
 %dir %{_usr}/share/ipa
 %{_usr}/share/ipa/*
 
+%{plugin_dir}/libipa_pwd_extop.so
+
 
 %changelog
+* Fri Aug 10 2007 Karl MacMillan <kmacmill@localhost.localdomain> - VERSION-3
+- Added support for ipa_kpasswd and ipa_pwd_extop
+
 * Mon Aug  5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3
 - Abstracted client class to work directly or over RPC
 
diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile
index 877ae09cc..2524baf31 100644
--- a/ipa-server/ipa-install/Makefile
+++ b/ipa-server/ipa-install/Makefile
@@ -3,6 +3,7 @@ SBINDIR=$(DESTDIR)/usr/sbin
 all: ;
 
 install:
+	-mkdir $(SBINDIR)
 	install -m 755 ipa-server-install $(SBINDIR)
 	install -m 755 ipa-server-setupssl $(SBINDIR)
 	$(MAKE) -C share $@
diff --git a/ipa-server/ipa-kpasswd/Makefile b/ipa-server/ipa-kpasswd/Makefile
index 4182b7705..11755a9a5 100644
--- a/ipa-server/ipa-kpasswd/Makefile
+++ b/ipa-server/ipa-kpasswd/Makefile
@@ -1,5 +1,22 @@
-all:
-	gcc ipa_kpasswd.c -I/usr/include -lkrb5 -llber -lldap -g -o ipa_kpasswd
+PREFIX ?= $(DESTDIR)/usr
+SBIN = $(PREFIX)/sbin
+
+LDFLAGS +=-lkrb5 -llber -lldap
+CFLAGS ?= -Wall -Wshadow -O2
+
+OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+
+all: $(OBJS)
+	$(CC) $(LDFLAGS) $(OBJS) -o ipa_kpasswd
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 install:
-	cp -f ipa_kpasswd /usr/sbin/
+	-mkdir -p $(SBIN)
+	install -m 755 ipa_kpasswd $(SBIN)
+
+clean:
+	rm -f *.o
+	rm -f ipa_kpasswd
+	rm -f *~
\ No newline at end of file
diff --git a/ipa-server/ipa-slapi-plugins/Makefile b/ipa-server/ipa-slapi-plugins/Makefile
new file mode 100644
index 000000000..95ed26c65
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/Makefile
@@ -0,0 +1,17 @@
+SUBDIRS=ipa-pwd-extop
+
+all:
+	@for subdir in $(SUBDIRS); do \
+		(cd $$subdir && $(MAKE) $@) || exit 1; \
+	done
+
+install:
+	@for subdir in $(SUBDIRS); do \
+		(cd $$subdir && $(MAKE) $@) || exit 1; \
+	done
+
+clean:
+	@for subdir in $(SUBDIRS); do \
+		(cd $$subdir && $(MAKE) $@) || exit 1; \
+	done
+	rm -f *~
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
index 2a5646432..e89ca27ad 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
@@ -1,5 +1,28 @@
-all:
-	gcc ipa_pwd_extop.c -I/usr/include -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -I/usr/include/fedora-ds -lkrb5 -lmhash -llber -lssl -shared -g -fPIC -DPIC -Wl,-soname -Wl,libipa_pwd_extop.so -o libipa_pwd_extop.so
+PREFIX ?= $(DESTDIR)/usr
+LIBDIR = $(PREFIX)/lib/fedora-ds/plugins
+SHAREDIR = $(DESTDIR)/usr/share/ipa
+
+SONAME = libipa_pwd_extop.so
+LDFLAGS += -lkrb5 -llber -lldap -lmhash -llber -lssl
+CFLAGS ?= -Wall -Wshadow -O2
+CFLAGS += -I/usr/include/fedora-ds -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
+
+OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+
+all: $(OBJS)
+	$(CC) $(LDFLAGS) $(OBJS) -Wl,-soname -Wl,$(SONAME) -shared -o $(SONAME)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 install:
-	cp -f libipa_pwd_extop.so /usr/lib/fedora-ds/plugins/
+	-mkdir -p $(LIBDIR)
+	install -m 644 libipa_pwd_extop.so $(LIBDIR)
+	install -m 644 *.ldif $(SHAREDIR)
+
+clean:
+	rm -f *.o
+	rm -f $(SONAME)
+	rm -f *~
+
+