From 2d932c154bbd9e0bdbeda47dbcee696d77d85fb8 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Mon, 2 Jan 2012 16:09:40 +0200 Subject: [PATCH] various changes to enable server packaging --- debian/changelog | 7 +- debian/compat | 2 +- debian/control | 105 +++++++++++++++++++----------- debian/freeipa-admintools.install | 42 +----------- debian/freeipa-server.install | 44 ++++++++----- debian/patches/no-testcert.patch | 10 +-- debian/patches/prefix.patch | 39 +++++++++++ debian/patches/series | 1 + debian/python-freeipa.install | 13 ++-- debian/rules | 13 ++-- 10 files changed, 158 insertions(+), 118 deletions(-) create mode 100644 debian/patches/prefix.patch diff --git a/debian/changelog b/debian/changelog index ff5e1597d..035a8fd23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ freeipa (2.1.4-1) UNRELEASED; urgency=low [ Michele Baldessari ] + * Initial release (Closes: #12345) * New upstream * Dropped 10_ipa_kpasswd patch, applied upstream @@ -20,9 +21,3 @@ freeipa (2.1.4-1) UNRELEASED; urgency=low * Add --list-missing for dh_install. -- Timo Aaltonen Tue, 01 Nov 2011 10:52:25 -0400 - -freeipa (1.2.0-1) UNRELEASED; urgency=low - - * Initial release (Closes: #12345) - - -- Michele Baldessari Mon, 24 Nov 2008 22:22:16 +0100 diff --git a/debian/compat b/debian/compat index 45a4fb75d..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index e979dc264..8e0c583ea 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: freeipa Section: net Priority: extra Maintainer: Michele Baldessari -Build-Depends: quilt, debhelper (>= 8), dh-autoreconf, +Build-Depends: quilt, debhelper (>= 8.1.3~), dh-autoreconf, # client gettext, krb5-user, @@ -26,42 +26,69 @@ Build-Depends: quilt, debhelper (>= 8), dh-autoreconf, python-sss, python-support, # server -# libdirsrv-dev (>= 1.1.3), -# python-turbogears, -# libmozldap-dev, -Standards-Version: 3.8.0 + libdirsrv-dev (>= 1.1.3), + libsvrcore-dev, + uuid-dev, + selinux-policy-dev, +# tests + python-lxml, + python-nose, +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/collab-maint/freeipa.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/freeipa.git Homepage: http://www.freeipa.org -#Package: freeipa-server -#Architecture: any -#Depends: ${shlibs:Depends}, ${misc:Depends}, -# python (>= 2.3), -# libjs-prototype, -# libjs-scriptaculous, -# python-freeipa, -#Description: FreeIPA is a centralized identity framework -# FreeIPA is an integrated solution to provide centrally managed Identity -# (machine, user, virtual machines, groups, authentication credentials), Policy -# (configuration settings, access control information) and Audit (events, -# logs, analysis thereof). -# . -# This is the server package +Package: freeipa-server +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, + freeipa-client (= ${binary:Version}), + freeipa-admintools (= ${binary:Version}), + python-freeipa (= ${binary:Version}), + 389-ds-base, + acl, + apache2, + dogtag-pki-common-theme, + dogtag-pki-ca-theme, + krb5-kdc, + krb5-kdc-ldap, + krb5-pkinit, + ldap-utils, + libnss3-tools, + libsasl2-modules-gssapi-mit, + libapache2-mod-wsgi, + libapache2-mod-auth-kerb, + libapache2-mod-nss, + ntp, + pki-ca, + pki-silent, + python-ldap, + python-krbv, + python-pyasn1, +# not packaged yet +# slapi-nis, + tomcat6, +Description: FreeIPA is a centralized identity framework + FreeIPA is an integrated solution to provide centrally managed Identity + (machine, user, virtual machines, groups, authentication credentials), Policy + (configuration settings, access control information) and Audit (events, + logs, analysis thereof). + . + This is the server package Package: freeipa-client Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + python-freeipa (= ${binary:Version}), bind9utils, certmonger, chkconfig, krb5-user, - libcurl3, + libcurl3 (>= 7.22.0), libnss3-tools, + libpam-krb5, libsasl2-modules-gssapi-mit, - libxmlrpc-c3-0, + libxmlrpc-core-c3 (>= 1.16.33-3.1ubuntu5), ntp, - python-freeipa, python-ldap, sssd, wget, @@ -73,28 +100,32 @@ Description: FreeIPA is a centralized identity framework . This is the client package -#Package: freeipa-admintools -#Architecture: any -#Depends: ${shlibs:Depends}, ${misc:Depends}, -# python (>= 2.3), -# python-freeipa, -#Description: FreeIPA is a centralized identity framework -# FreeIPA is an integrated solution to provide centrally managed Identity -# (machine, user, virtual machines, groups, authentication credentials), Policy -# (configuration settings, access control information) and Audit (events, -# logs, analysis thereof). -# . -# This is the containing some administration tools +Package: freeipa-admintools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, + freeipa-client (= ${binary:Version}), + python-freeipa (= ${binary:Version}), + python-krbv, + python-ldap, +Description: FreeIPA is a centralized identity framework + FreeIPA is an integrated solution to provide centrally managed Identity + (machine, user, virtual machines, groups, authentication credentials), Policy + (configuration settings, access control information) and Audit (events, + logs, analysis thereof). + . + This is the containing some administration tools Package: python-freeipa Architecture: any Section: python Depends: ${python:Depends}, ${misc:Depends}, - python-krbv, - python-ldap, + gnupg, + iproute, python-kerberos, - python-ldap, + python-libipa-hbac, + python-lxml, python-netaddr, + python-nss, python-openssl, Description: FreeIPA is a centralized identity framework FreeIPA is an integrated solution to provide centrally managed Identity diff --git a/debian/freeipa-admintools.install b/debian/freeipa-admintools.install index 18d413cd7..c93f3ccbf 100644 --- a/debian/freeipa-admintools.install +++ b/debian/freeipa-admintools.install @@ -1,40 +1,2 @@ -#etc/ipa/ipa.conf -usr/sbin/ipa-adddelegation -usr/sbin/ipa-addgroup -usr/sbin/ipa-addservice -usr/sbin/ipa-adduser -usr/sbin/ipa-defaultoptions -usr/sbin/ipa-deldelegation -usr/sbin/ipa-delgroup -usr/sbin/ipa-delservice -usr/sbin/ipa-deluser -usr/sbin/ipa-findgroup -usr/sbin/ipa-finduser -usr/sbin/ipa-findservice -usr/sbin/ipa-ldap-updater -usr/sbin/ipa-listdelegation -usr/sbin/ipa-lockuser -usr/sbin/ipa-moddelegation -usr/sbin/ipa-modgroup -usr/sbin/ipa-moduser -usr/sbin/ipa-passwd -usr/sbin/ipa-change-master-key -usr/share/man/man1/ipa-addgroup.1.gz -usr/share/man/man1/ipa-adddelegation.1.gz -usr/share/man/man1/ipa-addservice.1.gz -usr/share/man/man1/ipa-adduser.1.gz -usr/share/man/man1/ipa-defaultoptions.1.gz -usr/share/man/man1/ipa-deldelegation.1.gz -usr/share/man/man1/ipa-delgroup.1.gz -usr/share/man/man1/ipa-delservice.1.gz -usr/share/man/man1/ipa-deluser.1.gz -usr/share/man/man1/ipa-findgroup.1.gz -usr/share/man/man1/ipa-findservice.1.gz -usr/share/man/man1/ipa-finduser.1.gz -usr/share/man/man1/ipa-ldap-updater.1.gz -usr/share/man/man1/ipa-listdelegation.1.gz -usr/share/man/man1/ipa-lockuser.1.gz -usr/share/man/man1/ipa-moddelegation.1.gz -usr/share/man/man1/ipa-modgroup.1.gz -usr/share/man/man1/ipa-moduser.1.gz -usr/share/man/man1/ipa-passwd.1.gz +usr/bin/ipa +usr/share/man/man1/ipa.1 diff --git a/debian/freeipa-server.install b/debian/freeipa-server.install index c5de7d8f5..b5478fd2b 100644 --- a/debian/freeipa-server.install +++ b/debian/freeipa-server.install @@ -1,40 +1,50 @@ +usr/sbin/ipa-ca-install +usr/sbin/ipa-dns-install usr/sbin/ipa-server-install +usr/sbin/ipa-replica-conncheck usr/sbin/ipa-replica-install usr/sbin/ipa-replica-prepare usr/sbin/ipa-replica-manage +usr/sbin/ipa-csreplica-manage usr/sbin/ipa-server-certinstall +usr/sbin/ipa-ldap-updater +usr/sbin/ipa-compat-manage +usr/sbin/ipa-nis-manage +usr/sbin/ipa-managed-entries usr/sbin/ipa_kpasswd -usr/sbin/ipa_webgui usr/sbin/ipactl usr/sbin/ipa-upgradeconfig +usr/sbin/ipa-compliance etc/init.d/ipa_kpasswd -etc/init.d/ipa_webgui +usr/lib/python*/dist-packages/ipaserver/* +usr/share/ipa/wsgi.py usr/share/ipa/*.ldif +usr/share/ipa/*.uldif usr/share/ipa/*.template -usr/share/ipa/html/ssbrowser.html -usr/share/ipa/html/unauthorized.html -#etc/ipa/html/ssbrowser.html -#etc/ipa/html/unauthorized.html -usr/share/ipa/ipa_webgui.cfg +etc/ipa/html/* +usr/share/ipa/migration/* +usr/share/ipa/ui/* usr/share/ipa/ipa.conf usr/share/ipa/ipa-rewrite.conf -usr/share/ipa/ipagui/* -usr/share/ipa/ipa_gui.egg-info/* -usr/share/ipa/ipaserver/* -usr/share/ipa/locales/* -usr/lib/dirsrv/plugins/libipa_pwd_extop.so -usr/lib/dirsrv/plugins/libipa-memberof-plugin.so -usr/lib/dirsrv/plugins/libipa-dna-plugin.so +usr/share/ipa/ipa-pki-proxy.conf +usr/share/ipa/updates/* +usr/lib/*/dirsrv/plugins/*.so var/lib/ipa/sysrestore var/cache/ipa/sessions var/cache/ipa/kpasswd -#%dir %{python_sitelib}/ipaserver -#%{python_sitelib}/ipaserver/*.py* +usr/share/man/man1/ipa-replica-conncheck.1.gz usr/share/man/man1/ipa-replica-install.1.gz usr/share/man/man1/ipa-replica-manage.1.gz +usr/share/man/man1/ipa-csreplica-manage.1.gz usr/share/man/man1/ipa-replica-prepare.1.gz usr/share/man/man1/ipa-server-certinstall.1.gz usr/share/man/man1/ipa-server-install.1.gz +usr/share/man/man1/ipa-dns-install.1.gz +usr/share/man/man1/ipa-ca-install.1.gz +usr/share/man/man1/ipa-compat-manage.1.gz +usr/share/man/man1/ipa-nis-manage.1.gz +usr/share/man/man1/ipa-managed-entries.1.gz +usr/share/man/man1/ipa-ldap-updater.1.gz usr/share/man/man8/ipa_kpasswd.8.gz -usr/share/man/man8/ipa_webgui.8.gz usr/share/man/man8/ipactl.8.gz +usr/share/man/man1/ipa-compliance.1.gz diff --git a/debian/patches/no-testcert.patch b/debian/patches/no-testcert.patch index 27af82f0c..22bef5ee7 100644 --- a/debian/patches/no-testcert.patch +++ b/debian/patches/no-testcert.patch @@ -1,8 +1,8 @@ -diff --git a/Makefile b/Makefile -index 9d88025..9d1cbb5 100644 ---- a/Makefile -+++ b/Makefile -@@ -84,7 +84,7 @@ lint: +Index: freeipa/Makefile +=================================================================== +--- freeipa.orig/Makefile 2011-12-31 04:02:56.140475799 +0200 ++++ freeipa/Makefile 2011-12-31 04:04:39.887587352 +0200 +@@ -84,7 +84,7 @@ test: $(MAKE) -C install/po test_lang diff --git a/debian/patches/prefix.patch b/debian/patches/prefix.patch new file mode 100644 index 000000000..e5d410095 --- /dev/null +++ b/debian/patches/prefix.patch @@ -0,0 +1,39 @@ +diff --git a/Makefile b/Makefile +index 3cd08e2..97af4c0 100644 +--- a/Makefile ++++ b/Makefile +@@ -128,7 +128,7 @@ server-install: server + if [ "$(DESTDIR)" = "" ]; then \ + python setup.py install; \ + else \ +- python setup.py install --root $(DESTDIR); \ ++ python setup.py install --root $(DESTDIR) --install-layout=deb; \ + fi + + archive: +diff --git a/ipapython/Makefile b/ipapython/Makefile +index a09ffd1..a4cdc2d 100644 +--- a/ipapython/Makefile ++++ b/ipapython/Makefile +@@ -14,7 +14,7 @@ install: + if [ "$(DESTDIR)" = "" ]; then \ + python setup.py install; \ + else \ +- python setup.py install --root $(DESTDIR); \ ++ python setup.py install --root $(DESTDIR) --install-layout=deb; \ + fi + @for subdir in $(SUBDIRS); do \ + (cd $$subdir && $(MAKE) $@) || exit 1; \ +diff --git a/ipapython/py_default_encoding/Makefile b/ipapython/py_default_encoding/Makefile +index 7cd1f6c..f5754f6 100644 +--- a/ipapython/py_default_encoding/Makefile ++++ b/ipapython/py_default_encoding/Makefile +@@ -9,7 +9,7 @@ install: + if [ "$(DESTDIR)" = "" ]; then \ + python setup.py install; \ + else \ +- python setup.py install --root $(DESTDIR); \ ++ python setup.py install --root $(DESTDIR) --install-layout=deb; \ + fi + + clean: diff --git a/debian/patches/series b/debian/patches/series index 6b2a5790f..1c80328c5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ add_debian.py.patch include-stdint.patch no-arrows.patch no-testcert.patch +prefix.patch diff --git a/debian/python-freeipa.install b/debian/python-freeipa.install index e9828498f..3d77b681f 100644 --- a/debian/python-freeipa.install +++ b/debian/python-freeipa.install @@ -1,9 +1,8 @@ -#etc/ipa/ipa.conf -usr/local/lib/python2.7/dist-packages/ipalib/* -usr/local/lib/python2.7/dist-packages/ipapython/* -usr/local/lib/python2.7/dist-packages/default_encoding_utf8.so -usr/local/lib/python2.7/dist-packages/ipapython-*.egg-info -usr/local/lib/python2.7/dist-packages/freeipa-*.egg-info -usr/local/lib/python2.7/dist-packages/python_default_encoding-*.egg-info +usr/lib/python2.7/dist-packages/ipalib/* +usr/lib/python2.7/dist-packages/ipapython/* +usr/lib/python2.7/dist-packages/default_encoding_utf8.so +usr/lib/python2.7/dist-packages/ipapython-*.egg-info +usr/lib/python2.7/dist-packages/freeipa-*.egg-info +usr/lib/python2.7/dist-packages/python_default_encoding-*.egg-info usr/share/locale etc/ipa/default.conf diff --git a/debian/rules b/debian/rules index 1f9d224b9..d984c5214 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +#export DH_VERBOSE=1 -ONLY_CLIENT=1 +ONLY_CLIENT=0 DESTDIR=$(CURDIR)/debian/tmp PLATFORM="SUPPORTED_PLATFORM=debian" @@ -35,7 +35,7 @@ endif override_dh_auto_build: ifneq ($(ONLY_CLIENT), 1) make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no all - cd selinux ; make all +# cd selinux ; make all else make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no client endif @@ -49,8 +49,8 @@ ifneq ($(ONLY_CLIENT), 1) # Force re-generate of platform support rm -f ipapython/services.py make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no install DESTDIR=$(DESTDIR) - cd selinux - make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no install DESTDIR=$(DESTDIR) +# cd selinux +# make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no install DESTDIR=$(DESTDIR) cd .. else make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no client-install DESTDIR=$(DESTDIR) @@ -60,6 +60,9 @@ endif touch $(DESTDIR)/etc/ipa/default.conf mkdir -p $(DESTDIR)/var/lib/ipa-client/sysrestore + # purge .la files + find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \; + dh_install --list-missing %: