0005139: Debian packaging files in source tarball are outdated - SOGo

ID	Project	Category	View Status	Date Submitted	Last Update

0005139	SOGo	Packaging (Debian)	public	2020-08-24 08:54	2020-08-24 08:54

Reporter	ddt-consult	Assigned To
Priority	normal	Severity	tweak	Reproducibility	have not tried
Status	new	Resolution	open
OS	Debian	OS Version	Buster
Product Version	5.0.0

Summary	0005139: Debian packaging files in source tarball are outdated
Description	It seems the files in debian/packaging coming with the source tarball (https://packages.inverse.ca/SOGo/sources/SOGo-5.0.0.tar.gz) are outdated when compared to the files used for the nightly builds. I'll attach a diff (diff for changelog removed) of the debian directories from the source tarball and the one from the nightly build repository (https://packages.inverse.ca/SOGo/nightly/5/debian/pool/buster/s/sogo/sogo_5.0.0.20200824-1.debian.tar.xz) It would be nice if the packaging data coming with the source tarball would be in sync the what is used for builduing the nightlies.
Tags	No tags attached.

ddt-consult

2020-08-24 08:54

reporter

debian_files.diff (7,290 bytes)

diff -rNu src_tarball/debian/compat nightly/debian/compat
--- src_tarball/debian/compat	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/compat	2020-08-24 07:47:02.000000000 +0200
@@ -1 +1 @@
-7
+8
diff -rNu src_tarball/debian/control nightly/debian/control
--- src_tarball/debian/control	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/control	2020-08-24 07:47:02.000000000 +0200
@@ -1,14 +1,16 @@
 Source: sogo
 Priority: optional
 Maintainer: Inverse Support <support@inverse.ca>
-Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libwbxml2-dev (>= 0.11.2), liblasso3-dev (>= 2.3.5), libzip-dev, libsodium-dev (>= 1.0.9) | base-files (<= 9.4ubuntu4)
+Build-Depends: debhelper (>= 8.0.0), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libwbxml2-dev (>= 0.11.2), liblasso3-dev (>= 2.3.5), libzip-dev, libsodium-dev (>= 1.0.9) | base-files (<= 9.4ubuntu4)
 Section: web
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: sogo
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3 | libcurl4, libzip1 | libzip2 | libzip4 | libzip5, liblasso3 (>= 2.3.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3 | libcurl4, zip, libzip1 | libzip2 | libzip4 | libzip5, liblasso3 (>= 2.3.5)
 Recommends: memcached, apache2 | nginx | httpd
 Description: a modern and scalable groupware
  SOGo is a groupware server built around OpenGroupware.org (OGo) and
diff -rNu src_tarball/debian/rules nightly/debian/rules
--- src_tarball/debian/rules	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/rules	2020-08-24 07:47:02.000000000 +0200
@@ -5,10 +5,10 @@
 
 DESTDIR=$(CURDIR)/debian/tmp
 DIST_CODENAME=$(shell lsb_release -cs)
+SAML2_CONFIG=--enable-saml2
 
 # Debian 6
 ifeq ($(DIST_CODENAME), squeeze)
-SAML2_CONFIG=--enable-saml2
 SODIUM_CONFIG=--disable-sodium
 endif
 
@@ -108,7 +108,7 @@
 
 	install -D -m 644 Scripts/sogo-default debian/tmp/etc/default/sogo
 	install -D -m 644 debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
-	install -D -m 644 Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
+	install -D -m 644 Apache/SOGo.conf debian/tmp/etc/apache2/conf-available/SOGo.conf
 	install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo
 	install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo
 	install -d -m 750 debian/tmp/etc/sogo/
@@ -133,7 +133,7 @@
 	  ln -s GNUstep/Frameworks/SOGo.framework/Versions/*/libSOGo* ./ )
 	dh_compress -X.py -X.sh
 	dh_fixperms
-	dh_makeshlibs -X/usr/lib/mapistore_backends
+	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol
diff -rNu src_tarball/debian/sogo.init nightly/debian/sogo.init
--- src_tarball/debian/sogo.init	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/sogo.init	2020-08-24 07:47:02.000000000 +0200
@@ -63,27 +63,25 @@
 	log_daemon_msg "Starting $DESC" "$NAME"
 
         # Enforce directory existence and permissions
-        install -o $USER -g $USER -m 775 -d /var/run/$NAME
-        install -o $USER -g $USER -m 770 -d /var/spool/$NAME
-        install -o $USER -g $USER -m 770 -d /var/log/$NAME
+        install -o $USER -g $USER -m 755 -d /var/run/$NAME
+        install -o $USER -g $USER -m 750 -d /var/spool/$NAME
+        install -o $USER -g $USER -m 750 -d /var/log/$NAME
 
 	if ! start-stop-daemon -c $USER --quiet --start --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS 
 	then
 	    log_progress_msg "already running"
         fi
-	[ -e $PIDFILE ] && chown root:root $PIDFILE
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-	[ -e $PIDFILE ] && chown root:root $PIDFILE
 	start-stop-daemon -c $USER --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
 	rm -f $PIDFILE
 	log_end_msg 0
 	;;
   restart|force-reload)
 	log_daemon_msg "Restarting $DESC" "$NAME"
-	[ -e $PIDFILE ] && chown root:root $PIDFILE
 	start-stop-daemon -c $USER --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
 	rm -f $PIDFILE
         # Ensure directory's existence and permissions
@@ -91,7 +89,7 @@
         install -o $USER -g adm -m 750 -d /var/spool/$NAME
         install -o $USER -g adm -m 750 -d /var/log/$NAME
 	start-stop-daemon -c $USER --quiet --start --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS 
-	[ -e $PIDFILE ] && chown root:root $PIDFILE
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   status)
diff -rNu src_tarball/debian/sogo.install nightly/debian/sogo.install
--- src_tarball/debian/sogo.install	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/sogo.install	2020-08-24 07:47:02.000000000 +0200
@@ -1,4 +1,4 @@
-etc/apache2/conf.d/SOGo.conf
+etc/apache2/conf-available/SOGo.conf
 etc/cron.d/sogo
 etc/default/sogo
 etc/logrotate.d/sogo
diff -rNu src_tarball/debian/sogo.postinst nightly/debian/sogo.postinst
--- src_tarball/debian/sogo.postinst	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/sogo.postinst	2020-08-24 07:47:02.000000000 +0200
@@ -45,6 +45,18 @@
 https://sogo.nu/files/docs/SOGoInstallationGuide.html#_upgrading
 
 EOF
+
+          # Apache 2.2 / 2.4 kungfu
+          COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+          if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+              . /usr/share/apache2/apache2-maintscript-helper
+              apache2_invoke enconf SOGo || exit $?
+          elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+              if [ -d /etc/apache2/conf.d/ -a ! -e /etc/apache2/conf.d/SOGo.conf ]; then
+                  ln -s ../conf-available/SOGo.conf /etc/apache2/conf.d/SOGo.conf
+              fi
+          fi
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff -rNu src_tarball/debian/sogo.prerm nightly/debian/sogo.prerm
--- src_tarball/debian/sogo.prerm	2020-08-10 17:31:39.000000000 +0200
+++ nightly/debian/sogo.prerm	2020-08-24 07:47:02.000000000 +0200
@@ -13,5 +13,17 @@
 # for details, see /usr/share/doc/packaging-manual/
 
 #DEBHELPER#
+if [ "$1" = "deconfigure" ]  ; then
 
+    # Apache 2.2 / 2.4 kungfu
+    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+                . /usr/share/apache2/apache2-maintscript-helper
+                apache2_invoke disconf SOGo || exit $?
+    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+        [ ! -L /etc/apache2/conf.d/SOGo.conf ] || rm /etc/apache2/conf.d/SOGo.conf
+    fi
+
+fi
 exit 0

debian_files.diff (7,290 bytes)

Date Modified	Username	Field	Change
2020-08-24 08:54	ddt-consult	New Issue
2020-08-24 08:54	ddt-consult	File Added: debian_files.diff

View Issue Details

Activities

Issue History