From 68b7cd4d1b7d7c2d8e8c517f8b0da14d5d5c0822 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 13 Mar 2024 13:18:30 +0100 Subject: [PATCH] Integrate with Debian packaging --- local.mk => Makefile | 5 +- argeo-freed.spec | 56 +++-------------------- debian/.gitignore | 5 +- debian/argeo-freed-cms-user.install | 2 - debian/argeo-freed-cms.install | 12 ++--- debian/argeo-freed-libreswan.install | 2 +- debian/argeo-freed-roaming-client.install | 7 ++- debian/argeo-freed-roaming-host.install | 2 - debian/changelog | 6 +-- debian/control | 17 +------ debian/rules | 5 +- 11 files changed, 33 insertions(+), 86 deletions(-) rename local.mk => Makefile (93%) delete mode 100644 debian/argeo-freed-cms-user.install delete mode 100644 debian/argeo-freed-roaming-host.install diff --git a/local.mk b/Makefile similarity index 93% rename from local.mk rename to Makefile index dabffac..474c896 100644 --- a/local.mk +++ b/Makefile @@ -16,7 +16,7 @@ INSTALL=install -m644 -D --target-directory COPY=cp --reflink=auto # TODO use argeo-build -BUILD_BASE = output/argeo-freed +BUILD_BASE ?= output/argeo-freed all: mkdir -p $(BUILD_BASE)$(sysconfdir) $(BUILD_BASE)$(bindir) $(BUILD_BASE)$(libdir) $(BUILD_BASE)$(libexecdir) $(COPY) -r etc/* $(BUILD_BASE)$(sysconfdir) @@ -34,7 +34,10 @@ clean: $(RM) -r $(BUILD_BASE) # $(MAKE) -C sjbin clean +distclean: clean + install: + mkdir -p $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir) # TODO use install and wildcard ? $(COPY) -v -r --no-clobber $(BUILD_BASE)$(sysconfdir)/* $(DESTDIR)$(sysconfdir) $(COPY) -v -r $(BUILD_BASE)$(libdir)/* $(DESTDIR)$(libdir) diff --git a/argeo-freed.spec b/argeo-freed.spec index 1357e2f..2912049 100644 --- a/argeo-freed.spec +++ b/argeo-freed.spec @@ -1,5 +1,5 @@ Name: argeo-freed -Version: 2.3.5 +Version: 2.3.6 Release: 1%{?dist} Summary: Utilities for a FREEd compatible domain @@ -19,10 +19,6 @@ BuildRequires: systemd-rpm-macros Summary: FREEd Argeo CMS services Requires: argeo-cms -%package cms-user -Summary: FREEd Argeo CMS user services -Requires: argeo-cms - %description cms %package libreswan @@ -37,75 +33,41 @@ Requires: argeo-freed-libreswan %description roaming-client -%package roaming-host -Summary: FREEd roaming host -Requires: argeo-freed-libreswan - -%description roaming-host - %prep %setup -q %build %install -mkdir -p %{buildroot}%{_bindir} -cp -a ./usr/bin/* %{buildroot}%{_bindir} - -mkdir -p %{buildroot}%{_sysconfdir} -cp -a ./etc/* %{buildroot}%{_sysconfdir} - -mkdir -p %{buildroot}%{_datadir} -cp -a ./usr/share/* %{buildroot}%{_datadir} - -mkdir -p %{buildroot}%{_unitdir} -cp -a ./usr/lib/systemd/system/* %{buildroot}%{_unitdir} - -mkdir -p %{buildroot}%{_userunitdir} -cp -a ./usr/lib/systemd/user/* %{buildroot}%{_userunitdir} - -mkdir -p %{buildroot}%{_libexecdir} -cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir} %files cms %attr(755, root, root) %{_bindir}/argeo %attr(755, root, root) %{_bindir}/jshc %{_sysconfdir}/argeo.d -%{_datadir}/argeo -%{_unitdir}/argeo@.service - -%files cms-user -%{_sysconfdir}/argeo.user.d -%{_userunitdir}/argeo@.service +%{_sysconfdir}/argeo +%{_unitdir}/argeo*.service +%{_userunitdir}/argeo*.service %files libreswan %attr(755, root, root) %{_libexecdir}/ipsec %files roaming-client -%{_sysconfdir}/ipsec.d/roaming.conf - %{_unitdir}/freed-ipsec-roaming@.service %{_unitdir}/freed-onresume.service %{_unitdir}/freed-onsuspend.service %post cms %systemd_post argeo@.service +%systemd_user_post argeo.service %preun cms %systemd_preun argeo@.service +%systemd_user_preun argeo.service %postun cms %systemd_postun argeo@.service - -%post cms-user -%systemd_user_post argeo@.service - -%preun cms-user -%systemd_user_preun argeo@.service - -%postun cms-user -%systemd_user_postun argeo@.service +%systemd_user_postun argeo.service %post roaming-client %systemd_post freed-ipsec-roaming@.service @@ -121,7 +83,3 @@ cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir} %systemd_postun freed-ipsec-roaming@.service %systemd_postun freed-onresume.service %systemd_postun freed-onsuspend.service - -%files roaming-host -%{_sysconfdir}/ipsec.d/roaming-host.conf -%{_sysconfdir}/ipsec.d/roaming-host-domain.conf.template diff --git a/debian/.gitignore b/debian/.gitignore index 3eb1ca1..3319cda 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,5 +1,6 @@ files -.debhelper +*.debhelper debhelper* argeo-*/ -*.substvars \ No newline at end of file +*.substvars +/tmp/ diff --git a/debian/argeo-freed-cms-user.install b/debian/argeo-freed-cms-user.install deleted file mode 100644 index 037dcd0..0000000 --- a/debian/argeo-freed-cms-user.install +++ /dev/null @@ -1,2 +0,0 @@ -./etc/argeo.user.d/* ./etc/argeo.user.d -./usr/lib/systemd/user/argeo@.service ./usr/lib/systemd/user diff --git a/debian/argeo-freed-cms.install b/debian/argeo-freed-cms.install index b2195f0..1fce35a 100644 --- a/debian/argeo-freed-cms.install +++ b/debian/argeo-freed-cms.install @@ -1,8 +1,8 @@ -./usr/bin/argeo ./usr/bin -./usr/bin/jshc ./usr/bin +/usr/bin/argeo +/usr/bin/jshc -./etc/argeo.d/* ./etc/argeo.d +/etc/argeo/* +/etc/argeo.d/* -./usr/lib/systemd/system/argeo@.service ./usr/lib/systemd/system - -./usr/share/argeo/* ./usr/share/argeo +/usr/lib/systemd/system/argeo*.service +/usr/lib/systemd/user/argeo*.service diff --git a/debian/argeo-freed-libreswan.install b/debian/argeo-freed-libreswan.install index 57586ba..811f5db 100644 --- a/debian/argeo-freed-libreswan.install +++ b/debian/argeo-freed-libreswan.install @@ -1 +1 @@ -./usr/libexec/ipsec/* ./usr/libexec/ipsec +/usr/libexec/ipsec diff --git a/debian/argeo-freed-roaming-client.install b/debian/argeo-freed-roaming-client.install index 6f0a7ae..b612fb3 100644 --- a/debian/argeo-freed-roaming-client.install +++ b/debian/argeo-freed-roaming-client.install @@ -1,4 +1,3 @@ -./etc/ipsec.d/roaming.conf ./etc/ipsec.d -./usr/lib/systemd/system/freed-ipsec-roaming@.service ./usr/lib/systemd/system -./usr/lib/systemd/system/freed-onresume.service ./usr/lib/systemd/system -./usr/lib/systemd/system/freed-onsuspend.service ./usr/lib/systemd/system +/usr/lib/systemd/system/freed-ipsec-roaming@.service +/usr/lib/systemd/system/freed-onresume.service +/usr/lib/systemd/system/freed-onsuspend.service diff --git a/debian/argeo-freed-roaming-host.install b/debian/argeo-freed-roaming-host.install deleted file mode 100644 index acfec8d..0000000 --- a/debian/argeo-freed-roaming-host.install +++ /dev/null @@ -1,2 +0,0 @@ -./etc/ipsec.d/roaming-host.conf ./etc/ipsec.d -./etc/ipsec.d/roaming-host-domain.conf.template ./etc/ipsec.d diff --git a/debian/changelog b/debian/changelog index 73ce3cd..d0d2678 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -argeo-freed (2.3.5) unstable; urgency=medium +argeo-freed (2.3.6) unstable; urgency=medium - * Adapt to changes in Argeo TP + * New directory structure - -- Mathieu Baudier Thu, 14 Dec 2023 05:48:41 +0000 + -- Mathieu Baudier Wed, 13 Mar 2024 11:12:52 +0000 diff --git a/debian/control b/debian/control index 6c4b9d3..7a07f79 100644 --- a/debian/control +++ b/debian/control @@ -13,27 +13,14 @@ Conflicts: argeo-init Description: FREEd Argeo CMS services FREEd Argeo CMS services -Package: argeo-freed-cms-user -Architecture: all -Depends: ${misc:Depends}, argeo-cms -Conflicts: argeo-init -Description: FREEd Argeo CMS user services - FREEd Argeo CMS user services - Package: argeo-freed-libreswan Architecture: all Depends: ${misc:Depends}, libreswan Description: FREEd extensions to libreswan - Argeo FREEd extensions to libreswan + FREEd extensions to libreswan Package: argeo-freed-roaming-client Architecture: all Depends: ${misc:Depends}, argeo-freed-libreswan Description: FREEd roaming client - Argeo FREEd roaming client - -Package: argeo-freed-roaming-host -Architecture: all -Depends: ${misc:Depends}, argeo-freed-libreswan -Description: FREEd roaming host - Argeo FREEd roaming host + FREEd roaming client diff --git a/debian/rules b/debian/rules index 2d33f6a..cd69d93 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + prefix=/usr sysconfdir=/etc dh $@ + +override_dh_missing: + # Ignore missing files -- 2.30.2