Projects
Kolab:Winterfell
guam
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 48
View file
guam.spec
Changed
@@ -7,9 +7,6 @@ %global realname kolab_guam %global binname guam -%global guam_user guam -%global guam_group guam - %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7 %global with_systemd 0 %else @@ -22,7 +19,7 @@ Name: guam Version: 0.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Smart Reverse IMAP Proxy Group: System Environment/Daemons @@ -65,9 +62,6 @@ BuildRequires: erlang-wx BuildRequires: erlang-xmerl -Requires(pre): shadow-utils -Requires(postun): shadow-utils - Requires: %lock_version erlang Requires: %lock_version erlang-eimap Requires: %lock_version erlang-goldrush @@ -94,7 +88,7 @@ %endif %description -Guam is a smart, unjustly outcasted Reverse IMAP Proxy that lives at +Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at the perimeter of your IMAP environment. %prep @@ -127,7 +121,7 @@ %{buildroot}%{_sysconfdir}/%{name}/ \ %{buildroot}%{_sbindir} \ %{buildroot}%{_erldir}/bin/ \ - %{buildroot}%{_erllibdir}/%{name}-%{version}/ \ + %{buildroot}%{_erllibdir}/%{realname}-%{version}/ \ %if 0%{?with_systemd} %{buildroot}%{_unitdir}/ \ %else @@ -154,48 +148,37 @@ ln -s ../lib/%{realname}-%{version}/bin/%{binname} %{realname} popd -cp -a _build/default/rel/%{name}/bin %{buildroot}%{_erllibdir}/%{name}-%{version}/ -cp -a _build/default/rel/%{name}/lib/%{realname}-%{version}/ebin/ %{buildroot}%{_erllibdir}/%{name}-%{version}/ -cp -a _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{name}-%{version}/ +cp -a _build/default/rel/%{name}/bin %{buildroot}%{_erllibdir}/%{realname}-%{version}/ +cp -a _build/default/rel/%{name}/lib/%{realname}-%{version}/ebin/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/ +cp -a _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/ %if 0%{?plesk} install -m 644 -p %{SOURCE100} %{buildroot}%{_sysconfdir}/guam/sys.config %endif -pushd %{buildroot}%{_erllibdir}/%{name}-%{version}/releases/%{version}/ +pushd %{buildroot}%{_erllibdir}/%{realname}-%{version}/releases/%{version}/ rm sys.config vm.args ln -sv ../../../../../../..%{_sysconfdir}/%{name}/sys.config sys.config ln -sv ../../../../../../..%{_sysconfdir}/%{name}/vm.args vm.args popd -pushd %{buildroot}%{_erllibdir}/%{name}-%{version}/ +pushd %{buildroot}%{_erllibdir}/%{realname}-%{version}/ ln -s ../../lib lib popd cat > %{buildroot}%{_sbindir}/%{name} << EOF #!/bin/bash -exec %{_erllibdir}/%{name}-%{version}/bin/%{binname} \$* +exec %{_erllibdir}/%{realname}-%{version}/bin/%{binname} \$* EOF %check # Hopeless on -0.9 rebar3 eunit -v || : -%pre -if [ $1 == 1 ]; then - /usr/sbin/groupadd --system %{guam_group} 2> /dev/null || : - /usr/sbin/useradd -c "Guam Service" -d /opt/kolab_guam -g %{guam_group} \ - -s /sbin/nologin --system %{guam_user} 2> /dev/null || : -fi - %postun %if 0%{?with_systemd} %systemd_postun %endif -if [ $1 == 0 ]; then - /usr/sbin/userdel %{guam_user} 2>/dev/null || : - /usr/sbin/groupdel %{guam_group} 2>/dev/null || : -fi %if 0%{?with_systemd} %post @@ -230,8 +213,8 @@ %config(noreplace) %{_sysconfdir}/%{name}/vm.args %attr(0750,root,root) %{_sbindir}/%{name} %{_libdir}/erlang/bin/%{realname} -%{_libdir}/erlang/lib/%{name}-%{version} -%attr(0640,%{guam_user},%{guam_group}) %{_var}/log/%{name}/ +%{_libdir}/erlang/lib/%{realname}-%{version} +%attr(0640,root,root) %{_var}/log/%{name}/ %if 0%{?with_systemd} %{_unitdir}/%{name}.service @@ -240,6 +223,9 @@ %endif %changelog +* Sat Apr 21 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-4 +- Fix packaging, dependencies and more stuff + * Thu Apr 19 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-3 - Use script rather than symlink
View file
make-it-very-easy-on-rebar3.patch
Changed
@@ -1,12 +1,13 @@ diff -ur guam-0.9.0.orig/apps/kolab_guam/src/kolab_guam.app.src guam-0.9.0/apps/kolab_guam/src/kolab_guam.app.src --- guam-0.9.0.orig/apps/kolab_guam/src/kolab_guam.app.src 2016-07-29 12:30:44.000000000 +0200 +++ guam-0.9.0/apps/kolab_guam/src/kolab_guam.app.src 2016-11-21 13:53:11.857715091 +0100 -@@ -9,8 +9,6 @@ +@@ -9,8 +9,8 @@ stdlib, compiler, syntax_tools, - goldrush, -- lager, + lager, ++ lager_syslog, crypto, ssl ]},
View file
debian.changelog
Changed
@@ -1,3 +1,10 @@ +guam (0.9.4-4) unstable; urgency=medium + + * Fix packaging, dependencies and more stuff + * Make package compatible with Erlang from backports + + -- Christoph Erhardt <kolab@sicherha.de> Sat, 21 Apr 2017 10:39:28 +0200 + guam (0.9.4-3) unstable; urgency=medium * Use script rather than symlink
View file
debian.control
Changed
@@ -3,18 +3,21 @@ Priority: extra Maintainer: Christoph Erhardt <kolab@sicherha.de> Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-bbmustache, erlang-eimap (>= 0.3.0), erlang-goldrush, erlang-lager, erlang-lager-syslog, erlang-reltool, psa | bash, erlang-rebar3 (>= 3.3.2) +Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-eimap (>= 0.3.0), erlang-lager, erlang-lager-syslog, psa | bash, erlang-rebar3 (>= 3.3.2) Homepage: https://kolab.org/about/guam Package: guam Architecture: any Section: mail -Depends: ${misc:Depends}, - erlang-base (>= 17.4) | erlang-base-hipe (>= 17.4), - erlang-eimap (>= 0.3.0), - erlang-goldrush, - erlang-lager, - erlang-lager-syslog +Depends: ${misc:Depends}, ${dist:GuamDepends} Description: Smart Reverse IMAP Proxy Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at the perimeter of your IMAP environment. + +Package: guam-bundled-libs +Architecture: any +Section: mail +Depends: ${misc:Depends} +Conflicts: ${dist:BundleConflicts} +Description: Bundled runtime environment for Guam + This is a support package for backports users.
View file
debian.rules
Changed
@@ -3,12 +3,34 @@ include /usr/share/dpkg/pkg-info.mk DESTDIR = $(CURDIR)/debian/guam +BUNDLEDIR = $(CURDIR)/debian/guam-bundled-libs + +# The versions of all dependencies are hardcoded by relx (which honestly sucks). +# The following magic tries to ensure that the Debian package's dependencies are +# pinned to the versions present on the build machine. If the dependencies +# cannot be satisfied on the end user's machine - for instance because a +# different Erlang version was installed from backports - we make the package +# manager pull in an extra package "guam-bundled-libs" that contains all the +# dependencies in the exact versions expected by relx. +# For maintainers, this means: please revision-bump this package every time one +# of its dependencies gets version-bumped. +GBL := guam-bundled-libs (= $(DEB_VERSION)) +currver = $(shell dpkg-query -f '$${Version}' -W $(1) | sed 's/[+-].*$$//') +nextver = $(shell echo $(call currver,$(1)) | perl -pe 's/((\d+\.)*)(\d+)$$/$$1.($$3+1)/e') +pinvermin = $(1) (>= $(call currver,$(1))) +pinvermax = $(1) (<< $(call nextver,$(1))) +pinvererlmin = $(1) (>= $(call currver,erlang)) +pinvererlmax = $(1) (<< $(call nextver,erlang)) +altbundle = $(call pinvermin,$(1)) | $(GBL), $(call pinvermax,$(1)) | $(GBL) +SUBSTVARS += -Vdist:GuamDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe) | $(GBL), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe) | $(GBL), $(call altbundle,erlang-asn1), $(call altbundle,erlang-eimap), $(call altbundle,erlang-inets), $(call altbundle,erlang-lager), $(call altbundle,erlang-lager-syslog), $(call altbundle,erlang-public-key)" +SUBSTVARS += -Vdist:BundleConflicts="$(call pinvererlmax,erlang-base), $(call pinvererlmax,erlang-base-hipe)" %: dh $@ --with=systemd override_dh_auto_build: - sed -i 's/"0\.9\.0"/"$(DEB_VERSION_UPSTREAM)"/' rebar.config + sed -i -e 's/"0\.9\.0"/"$(DEB_VERSION_UPSTREAM)"/' \ + -e 's/include_erts,\s*false/include_erts, true/' rebar.config export DEBUG=1 export HEX_OFFLINE=1 rebar3 release \ @@ -23,23 +45,24 @@ override_dh_auto_install: mkdir -p $(DESTDIR)/usr/sbin $(DESTDIR)/etc/guam \ $(DESTDIR)/lib/systemd/system $(DESTDIR)/var/log/ \ - $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/ \ + $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ \ $(DESTDIR)/usr/lib/erlang/bin $(DESTDIR)/var/log/guam + chmod o= $(DESTDIR)/var/log/guam install -p -m 644 contrib/guam.service \ $(DESTDIR)/lib/systemd/system/guam.service cp -a _build/default/rel/guam/bin \ - $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/ + $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ cp -a _build/default/rel/guam/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ebin \ - $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/ + $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/vm.args cp -a _build/default/rel/guam/releases \ - $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/ + $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ if [ -f "/etc/plesk-release" ]; then \ cp ../SOURCES/plesk.sys.config \ @@ -54,20 +77,32 @@ fi ln -s ../../../../../../../etc/guam/sys.config \ - $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config + $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config cp _build/default/rel/guam/vm.args $(DESTDIR)/etc/guam/vm.args ln -s ../../../../../../../etc/guam/vm.args \ - $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/vm.args + $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/vm.args - #mv $(DESTDIR)//usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/log/ $(DESTDIR)/var/log/guam - #ln -s ../../../../../var/log/guam /usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/log + #mv $(DESTDIR)//usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log/ $(DESTDIR)/var/log/guam + #ln -s ../../../../../var/log/guam /usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log echo '#!/bin/bash' > $(DESTDIR)/usr/sbin/guam - echo 'exec /usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/bin/guam $$*' \ + echo 'exec /usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam $$*' \ >> $(DESTDIR)/usr/sbin/guam chmod +x $(DESTDIR)/usr/sbin/guam - ln -s ../lib/guam-$(DEB_VERSION_UPSTREAM)/bin/guam \ + ln -s ../lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam \ $(DESTDIR)/usr/lib/erlang/bin/kolab_guam + + # Bundled runtime system and libraries + mkdir -p $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM) + cp -a _build/default/rel/guam/erts-* \ + $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ + cp -a _build/default/rel/guam/lib \ + $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ + rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM) + ln -s .. $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM) + +override_dh_gencontrol: + dh_gencontrol -- $(SUBSTVARS)
View file
guam.dsc
Changed
@@ -2,11 +2,11 @@ Source: guam Binary: guam Architecture: any -Version: 0.9.4-3 +Version: 0.9.4-4 Maintainer: Christoph Erhardt <kolab@sicherha.de> Homepage: https://kolab.org/about/guam Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-bbmustache, erlang-eimap (>= 0.3.0), erlang-goldrush, erlang-lager, erlang-lager-syslog, erlang-reltool, psa | bash, erlang-rebar3 (>= 3.3.2) +Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-eimap (>= 0.3.0), erlang-lager, erlang-lager-syslog, psa | bash, erlang-rebar3 (>= 3.3.2) Package-List: guam deb mail extra Files:
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.