From 17ee712502af226a3ef69a2cea54d23038f5d10e Mon Sep 17 00:00:00 2001 From: Federico Ceratto Date: Wed, 25 Oct 2017 21:25:41 +0100 Subject: [PATCH] debian: Switch to native package Reviewed-by: Sunil Mohan Adapa --- debian/TODO.Debian | 3 + debian/changelog | 450 ++++++++++++++++++ debian/compat | 1 + debian/control | 86 ++++ debian/copyright | 50 ++ debian/manpages | 1 + ...0001-disable-privileged-actions-test.patch | 22 + debian/patches/0002-skip-copy-doc-dir.patch | 13 + .../0003-disable-missing-packages.patch | 12 + .../patches/0004-enable-login-services.patch | 22 + debian/patches/series | 4 + debian/plinth.doc-base | 16 + debian/plinth.docs | 5 + debian/plinth.links | 4 + debian/plinth.lintian-overrides | 7 + debian/plinth.maintscript | 8 + debian/postinst | 18 + debian/postrm | 14 + debian/rules | 15 + debian/source/format | 1 + debian/watch | 5 + 21 files changed, 757 insertions(+) create mode 100644 debian/TODO.Debian create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/manpages create mode 100644 debian/patches/0001-disable-privileged-actions-test.patch create mode 100644 debian/patches/0002-skip-copy-doc-dir.patch create mode 100644 debian/patches/0003-disable-missing-packages.patch create mode 100644 debian/patches/0004-enable-login-services.patch create mode 100644 debian/patches/series create mode 100644 debian/plinth.doc-base create mode 100644 debian/plinth.docs create mode 100644 debian/plinth.links create mode 100644 debian/plinth.lintian-overrides create mode 100644 debian/plinth.maintscript create mode 100755 debian/postinst create mode 100755 debian/postrm create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/TODO.Debian b/debian/TODO.Debian new file mode 100644 index 000000000..de8b174e2 --- /dev/null +++ b/debian/TODO.Debian @@ -0,0 +1,3 @@ +* /var/lib/plinth should be owned by www-data (-R) +* improper installation procedure (see tons of lintian warnings) +* Embedded libraries? diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..6489f4df5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,450 @@ +plinth (0.15.4) UNRELEASED; urgency=medium + + * Switched to native package. + + -- Federico Ceratto Wed, 25 Oct 2017 13:03:50 +0100 + +plinth (0.15.3+ds-1) unstable; urgency=high + + [ James Valleroy ] + * Switch from gir1.2-networkmanager-1.0 to gir1.2-nm-1.0 (Closes: #862758). + Thanks to Michael Biebl. + * Bump standards version to 4.1.1. + * New upstream version 0.15.3 (Closes: #877371). + * Add patch to skip letsencrypt tests that require root privileges. + * Cleanup disks module (renamed to storage). + * Add patch with workaround for login issues. + * Add myself to uploaders. + + [ Sunil Mohan Adapa ] + * Break older version of freedombox-setup (<< 0.11~) + * Bump Django version to 1.11 + + [ Joseph Nuthalapati ] + * Add new dependencies - axes and captcha + + -- James Valleroy Sat, 21 Oct 2017 14:14:00 -0400 + +plinth (0.15.2+ds-1) unstable; urgency=medium + + [ James Valleroy ] + * Cleanup config for removed modules (Closes: #876627). + * New upstream version 0.15.2 (Closes: #876640). + * Add python3-configobj depend. + + -- Federico Ceratto Mon, 25 Sep 2017 15:03:35 +0100 + +plinth (0.15.1+ds-1) unstable; urgency=medium + + [ James Valleroy ] + * Sort dependency list for essential modules (Closes: #872541). + * Bump standards version to 4.0.1. + + [ Federico Ceratto ] + * New upstream version 0.15.1 + + -- Federico Ceratto Sat, 23 Sep 2017 11:35:41 +0100 + +plinth (0.14.0+ds-1) unstable; urgency=medium + + [ James Valleroy ] + * New upstream version 0.14.0. + * Refresh patches. + + -- Sunil Mohan Adapa Thu, 20 Apr 2017 19:48:03 +0530 + +plinth (0.13.1+ds-1) unstable; urgency=medium + + [ James Valleroy ] + * Disable shaarli module, package removed from Debian. + * New upstream version 0.13.1. + * Update paths for jsxc symlinks. + * Remove configuration for obsolete xmpp module. + + -- Federico Ceratto Sun, 22 Jan 2017 21:48:59 +0000 + +plinth (0.12.0+ds-1) unstable; urgency=medium + + [ James Valleroy ] + * Exclude new symlink in upstream source. + * New upstream version 0.12.0. + * Remove patches that have been merged upstream. + * Rearrange copyright file with more general license at the top. + * Move plinth into web section. + * Update symlinks for jsxc 3.0.0. + + -- Federico Ceratto Sat, 10 Dec 2016 18:42:29 +0100 + +plinth (0.11.0+ds-1) unstable; urgency=medium + + [ James Valleroy ] + * New upstream version 0.11.0. + * Replace python3-yaml dependency with python3-ruamel.yaml. + * Add python3-apt dependency. + * Add patch to fix permissions and use new setup command (Closes: #837206). + * Add patch to include xmpp module static files in build. + * Add links for jsxc static files. Workaround for #838183. + * Remove symlinks from source package. + + [ Sunil Mohan Adapa ] + * Automatically add essential packages to depends (Closes: #837332). + + -- Federico Ceratto Mon, 26 Sep 2016 14:52:36 +0100 + +plinth (0.10.0-1) unstable; urgency=medium + + [ James Valleroy ] + * New upstream version 0.10.0. + * Bump minimum required python3-django to 1.10. + + -- Federico Ceratto Sun, 21 Aug 2016 13:07:54 +0100 + +plinth (0.9.4-2) unstable; urgency=medium + + [ James Valleroy ] + * Add breaks/replaces on freedombox-setup << 0.9.2~ (Closes: #829743). + + -- Federico Ceratto Sat, 16 Jul 2016 14:55:37 +0100 + +plinth (0.9.4-1) unstable; urgency=medium + + [ James Valleroy ] + * New upstream version 0.9.4. + * Remove init script override. Init script was removed from upstream. + * Drop packagekit dependency. No longer required by upstream. + * Drop gir1.2-packagekitglib-1.0 depend and build-depend. + + -- Federico Ceratto Fri, 24 Jun 2016 22:02:54 +0100 + +plinth (0.9.2-1) unstable; urgency=medium + + [ James Valleroy ] + * New upstream version 0.9.2. + + [ Petter Reinholdtsen ] + * Added d/gbp.conf to enforce the user of pristine-tar. + * Adjusted d/copyright to make sure license names are unique. Thanks lintian. + * Updated Standards-Version from 3.9.6 to 3.9.8. + + -- Petter Reinholdtsen Wed, 25 May 2016 07:16:08 +0000 + +plinth (0.9.1-1) unstable; urgency=low + + [ James Valleroy ] + * New upstream version 0.9.1. + * Add python3-requests as dependency and build-dep. + + -- Federico Ceratto Sat, 02 Apr 2016 16:53:42 +0100 + +plinth (0.8.2-1) unstable; urgency=low + + [ James Valleroy ] + * New upstream version 0.8.2. + + -- Federico Ceratto Fri, 26 Feb 2016 19:51:37 +0000 + +plinth (0.8.1-1) unstable; urgency=low + + [ James Valleroy ] + * Skip filter-pristine-tar step for new upstream. + * New upstream version 0.8.1. + * Add docbook-utils as build dependency. + * Add packagekit as dependency. + + -- Federico Ceratto Tue, 16 Feb 2016 18:38:53 +0000 + +plinth (0.7.2-1) unstable; urgency=low + + [ James Valleroy ] + * New upstream version 0.7.2. + * Remove patch to enable javascript-common, fixed upstream. + + -- Federico Ceratto Fri, 25 Dec 2015 13:47:03 +0000 + +plinth (0.7.1-1) unstable; urgency=low + + [ James Valleroy ] + * New upstream version 0.7.1. + * Remove patch to fix config test, fixed upstream. + * Refresh patch. + * Add gettext as build dependency. + * Disable restore module, node-restore package not available in Debian yet. + + [ Sunil Mohan Adapa ] + * Remove Django HTMLParser workaround as it is no longer need. + * Add javascript-common as dependency as we are enabling it during setup. + + * Update package description (Closes: #804753) + + -- Federico Ceratto Sat, 12 Dec 2015 15:12:48 +0000 + +plinth (0.6-1) unstable; urgency=low + + [ Nick Daly ] + * Uploaded new version. + + [ James Valleroy ] + * New upstream version 0.6. + * Drop obsolete documentation patch. + * Add dblatex and xmlto as build dependencies, for manual. Drop pandoc. + * Add network-manager, ppp, pppoe, and python3-psutil as dependencies. + * Remove old TODO from docs. + * Add patch to workaround django 1.7 issue with python 3.5. + * Add patch to fix failing plinth config test. + * Add gir1.2-networkmanager-1.0 and python3-psutil also as build-depends. + * Cleanup installation documenation. + + -- Nick Daly Fri, 16 Oct 2015 22:57:10 -0500 + +plinth (0.5-1) unstable; urgency=low + + [ Nick Daly ] + * Package new upstream version 0.5. + + [ James Valleroy ] + * Add augeas-tools, gir1.2-glib-2.0, gir1.2-networkmanager-1.0, ldapscripts, + python3-augeas, and python3-django-stronghold as dependencies. + * Disable "packages" module when upgrading. + * Remove patches for python-networkmanager (obsolete) and ikiwiki + (upstreamed). + * Add patch to skip privileged actions test while building. + * Add some build-depends needed for tests. + + [ James Valleroy ] + * New upstream version 0.4.5. + * Remove patch that has been upstreamed. + * Add new patch to remove python-networkmanager dependency, because + python3-networkmanager package is not available in Debian yet. The networks + module is disabled for now. + * Enable systemd service file. + * Add new patch to enable javascript-common apache conf in plinth setup. + * Add new patch to require ikiwiki module to install some of ikiwiki's + recommends that are needed for compiling wikis. + + [ Sunil Mohan Adapa ] + * Add python3-yaml as dependency. + * Add lintian override for extra apache configuration. + * Update Debian copyright file. + + -- Nick Daly Sun, 02 Aug 2015 17:14:50 -0500 + +plinth (0.4.4-1) unstable; urgency=low + + [ Sunil Mohan Adapa ] + * New upstream version 0.4.4. Closes: #769328, #755619, #765916, + #768666, #737456, #741919. + * Update dependencies as per upstream changes. + * Require Django 1.7 reflecting upstream changes. + * Remove patches that have been upstreamed. + * Update standards version to 3.9.6. + * Properly remove obsolete module configuration. + * Remove upstream install documentation. + + -- Bdale Garbee Tue, 13 Jan 2015 22:25:07 +1300 + +plinth (0.4.1-1) unstable; urgency=low + + [ Sunil Mohan Adapa ] + * New upstream version 0.4.1. + * Remove install override which is no longer required. Upstream + does not contain images with executable permissions anymore. + * Remove patch for changing paths which is no longer necessary. + * Change upstream URLs to point to github.com/freedombox. + * Update license information. Remove information about files no + longer present in upstream. + * Remove link to configuration file no longer necessary due to + upstream changes. + * Remove debian/clean no longer necessary. + * Build package as Python 3 package. Upstream migrated to Python 3. + * Fix issue with cleaning the package after build. + + -- Petter Reinholdtsen Sun, 02 Nov 2014 17:20:26 +0000 + +plinth (0.3.2.0.git.20140829-1) unstable; urgency=high + + * Updated to new git version from Nick Daly based on commit + 250b0100aab236fcf9dfa65eccf656fe037f9422. + - Fixes broken web pages (Closes: #754117). + * Updated patch program-paths.diff to include actions_dir setting, + and drop now obsolete patch actions-path.diff. + + -- Petter Reinholdtsen Sat, 30 Aug 2014 08:26:06 +0200 + +plinth (0.3.2.0.git.20140621-1) unstable; urgency=medium + + * Updated to new git version from Nick Daly based on commit + af08066cafefb5d10304b7d8b22ed1f18c4df6d0. + - Drop now obsolete patch drop-firewalld-services.diff. + + -- Petter Reinholdtsen Sat, 21 Jun 2014 20:39:30 +0200 + +plinth (0.3.2.0.git.20140614-3) unstable; urgency=medium + + * Add libjs-twitter-bootstrap as binary dependency in addition to + being a build dependency. + + -- Petter Reinholdtsen Sun, 15 Jun 2014 23:38:57 +0200 + +plinth (0.3.2.0.git.20140614-2) unstable; urgency=low + + * Update dependencies, drop python-cheetah and python-simplejson, + which are no longer used, and add python-bootstrapform needed to + show the first page. + + -- Petter Reinholdtsen Sat, 14 Jun 2014 08:51:34 +0200 + +plinth (0.3.2.0.git.20140614-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on commit + a01ef055beab017fcd77ca9da7cab6fe01eeffbe. + * Add build-depend on libjs-twitter-bootstrap, now needed to + build documentation. + * Add new patch drop-firewalld-services.diff to remove firewalld + service definitions now available in firewalld version 0.3.10-1 + (Closes: #750927). + + -- Petter Reinholdtsen Sat, 14 Jun 2014 00:30:42 +0200 + +plinth (0.3.2.0.git.20140504-2) unstable; urgency=low + + * Drop python-contract dependency. It is not used any more. + * Add python-django as binary dependency on request from Nick Daly. + + -- Petter Reinholdtsen Mon, 05 May 2014 13:27:27 +0200 + +plinth (0.3.2.0.git.20140504-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on commit + d7a323512073cea9e4ee5a1cd91870a9f04959a6. + - Move firewall setup from freedombox-setup to plinth. + * Add Sunil and Nick as uploaders. + + -- Petter Reinholdtsen Sun, 04 May 2014 09:53:25 +0200 + +plinth (0.3.1.git.20140327-1) unstable; urgency=low + + * New upstream version 0.3.1.git.20140327. + + -- Petter Reinholdtsen Thu, 27 Mar 2014 10:29:36 +0100 + +plinth (0.3.1.git.20140304-1) unstable; urgency=low + + * Add sudo as a run time dependency, to make sure the privileged + commands work. + * Update Standards-Version from 3.9.4 to 3.9.5. No changes needed. + * Create plinth user with /var/lib/plinth as home directory, to keep + lintian happy. + + -- Petter Reinholdtsen Sat, 08 Mar 2014 22:25:32 +0100 + +plinth (0.3.0.0.git.20131229-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on commit + cb9ca1b86c7b7440e87b6d5b65ab6ccf51f760cf . + - Remove patch correct-issue-tracker.diff now included upstream. + - Updated patches actions-path.diff and program-paths.diff to match + changes done upstream. + * Updated copyright file with more details using the new upstream + LICENSES file. + + -- Petter Reinholdtsen Sun, 29 Dec 2013 16:06:53 +0100 + +plinth (0.3.0.0.git.20131117-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on commit + 7f3b1a62c81f760da465497030b68d77139406d7. + - Add new dependencies libjs-jquery and libjs-modernizr to plinth. + Patch from James Valleroy. + - Add new dependencies on python-passlib (>= 1.6.1) and python-bcrypt. + * Remove now obsolete disable-override-config patch + * Updated program-paths.diff patch to match new upstream source. + * Add new patch actions-path.diff to use correct path to actions scripts. + * Add new patch correct-issue-tracker.diff to use correct URL to current + upstream github repository. + + -- Petter Reinholdtsen Sun, 17 Nov 2013 13:07:21 +0100 + +plinth (0.3.0.0.git.20131101-2) unstable; urgency=low + + * Rewrite config to get plinth starting out of the box. New patches + program-paths and disable-override-config. + + -- Petter Reinholdtsen Sat, 02 Nov 2013 07:54:37 +0100 + +plinth (0.3.0.0.git.20131101-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on commit + b9b4e0a2ec21edc1b1f73cffc905463a96c18f25. + * Drop patch install-actions-lib made obsolete by latest upstream + changes. + * Depend on pandoc-data | pandoc (<= 1.11.1-3) to make sure + documentation can be built with the latest pandoc package in + unstable. + + -- Petter Reinholdtsen Fri, 01 Nov 2013 13:14:41 +0100 + +plinth (0.3.0.0.git.20131028-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on commit + 0296a1a99cb1ad0a21729ea37fd53e171ee60614. + - Drops local copies of javascript libraries also available from + Debian packages. + * Add new dependency python-contract needed by new upstream version. + * Reduce the versioned python-withsqlite dependency from + 0.0.0~git.20130929-1 to 0.0.0~git.20130929, to also accept the + 0.0.0~git.20130929-1~pere.0 version currently available from the + non-debian repo. + * New patch install-actions-lib to fix install target (Upstream + issue #41). + + -- Petter Reinholdtsen Wed, 30 Oct 2013 22:25:25 +0100 + +plinth (0.3.0.0.git.20131010-1) unstable; urgency=low + + * Updated to new git version from Nick Daly based on + commit 5ec749af8e5cb2480556e6926e239972ac890b4c + * Dropped patch debpathes now merged upstream. + * Changed depend on python-withsqlite to (>= 0.0.0~git.20130929-1), + making sure a version with support for more than one table in + one sqlite file is available. + + -- Petter Reinholdtsen Thu, 10 Oct 2013 22:51:34 +0200 + +plinth (0.0.0~git.20130928-1) unstable; urgency=low + + * Updated to new git version from Nick Daly. + * Drop patches keep-vendor-dir.diff, handle-unknown-users.diff, + sudo-not-exmachina.diff and app-owncloud.diff now merged upstream. + * Drop workaround for keep-vendor-dir.diff from rules file. + + -- Petter Reinholdtsen Sat, 28 Sep 2013 22:55:36 +0200 + +plinth (0.0.0~git.20130925-2) unstable; urgency=low + + * Depend on python-withsqlite (>= 0.0.0~git.20130915-2) to make sure a + version with support for the check_same_thread constructor option is + available. + * New patch handle-unknown-users.diff to make sure unknown users + are handled exactly like incorrect passwords when login fail. + * New patch app-owncloud.diff to add owncloud support to Plinth. + * Adjusted rules to make sure actions/* scripts are executable. + + -- Petter Reinholdtsen Fri, 27 Sep 2013 09:06:38 +0200 + +plinth (0.0.0~git.20130925-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * Initial release. (Closes: #722093) + + [ Petter Reinholdtsen ] + * New patch keep-vendor-dir.diff to avoid removing directories that + should survive the clean Makefile target. + * Add workaround in rules addressing the problem caused by + keep-vendor-dir.diff being applied after 'make clean' is executed. + * New patch sudo-not-exmachina.diff to drop the exmachina dependency, + and adjust binary dependencies and the debpathes patch to cope with + this. Drop dependency on augeas-tools, no longer used with this + patch. + * Set priority to optional, as the package do not conflict with anything. + + -- Petter Reinholdtsen Thu, 26 Sep 2013 09:14:54 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..b36de739f --- /dev/null +++ b/debian/control @@ -0,0 +1,86 @@ +Source: plinth +Section: web +Priority: optional +Maintainer: FreedomBox packaging team +Uploaders: + Tzafrir Cohen + , Piotr Ożarowski + , Bdale Garbee + , Petter Reinholdtsen + , Sunil Mohan Adapa + , Nick Daly + , Federico Ceratto + , James Valleroy +Build-Depends: debhelper (>= 10~) + , dblatex + , dh-python + , docbook-utils + , gir1.2-nm-1.0 + , libjs-bootstrap + , python3-all + , python3-apt + , python3-augeas + , python3-bootstrapform + , python3-cherrypy3 + , python3-configobj + , python3-coverage + , python3-django (>= 1.11) + , python3-django-axes + , python3-django-captcha + , python3-django-stronghold + , python3-gi + , python3-psutil + , python3-requests + , python3-ruamel.yaml + , python3-yaml + , python3-setuptools + , python3-setuptools-git + , xmlto +Standards-Version: 4.1.1 +Homepage: https://github.com/freedombox/Plinth/ +Vcs-Git: https://anonscm.debian.org/git/freedombox/plinth.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=freedombox/plinth.git;a=summary + +Package: plinth +Breaks: freedombox-setup (<< 0.11~) +Replaces: freedombox-setup (<< 0.11~) +Architecture: all +Depends: ${python3:Depends} + , ${misc:Depends} + , ${plinth:Depends} + , adduser + , augeas-tools + , gettext + , gir1.2-glib-2.0 + , gir1.2-nm-1.0 + , javascript-common + , ldapscripts + , libjs-bootstrap + , libjs-jquery + , libjs-modernizr + , network-manager + , ppp + , pppoe + , python3-apt + , python3-augeas + , python3-bootstrapform + , python3-cherrypy3 + , python3-configobj + , python3-django (>= 1.11) + , python3-django-axes + , python3-django-captcha + , python3-django-stronghold + , python3-gi + , python3-psutil + , python3-requests + , python3-ruamel.yaml + , sudo +Description: web front end for administering every aspect of a FreedomBox + The FreedomBox is a net appliance conceived by Eben Moglen. It + contains free software and is designed to allow you to interface with + the rest of the net under conditions of protected privacy and data + security. + . + The Plinth front end is a web interface to administer the functions of + the FreedomBox. For example, the FreedomBox is a wireless router, + and the front end is where you can adjust its settings. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..62a71b46f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,50 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/freedombox/Plinth +Upstream-Name: Plinth +Files-Excluded: plinth/modules/jsxc/static/img plinth/modules/jsxc/static/libjs-jsxc/* + +Files: * +Copyright: 2011-2015 Plinth Developers +License: AGPL-3+ + Released under the GNU Affero General Public License, version 3 or later. + See https://www.gnu.org/licenses/agpl.html for terms. + +Files: static/themes/default/FreedomBox-Logo.7z +Copyright: 2012 Robert Martinez +License: GPL-3+-or-CC-BY-SA + Some rights reserved. + +Files: plinth/tests/coverage/coverage.py +Copyright: 2009 Jeet Sukumaran and Mark T. Holder +License: GPL-3+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program. If not, see . + +Files: debian/* +Copyright: 2013 Tzafrir Cohen +License: GPL-2+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems you will find a copy of the GPL (version 2) at + /usr/share/common-licenses/GPL-2. diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 000000000..1b517d232 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +./doc/plinth.1 diff --git a/debian/patches/0001-disable-privileged-actions-test.patch b/debian/patches/0001-disable-privileged-actions-test.patch new file mode 100644 index 000000000..67913607c --- /dev/null +++ b/debian/patches/0001-disable-privileged-actions-test.patch @@ -0,0 +1,22 @@ +Subject: Skip privileged actions test + +--- a/plinth/tests/test_actions.py ++++ b/plinth/tests/test_actions.py +@@ -33,6 +33,7 @@ + cfg.actions_dir = os.path.join(root_dir, 'actions') + + ++@unittest.skip('Skipping privileged actions tests') + class TestPrivileged(unittest.TestCase): + """Verify that privileged actions perform as expected. + +--- a/plinth/modules/letsencrypt/tests/test_domain_name_changes.py ++++ b/plinth/modules/letsencrypt/tests/test_domain_name_changes.py +@@ -23,6 +23,7 @@ + from .. import on_domain_added, on_domain_removed + + ++@unittest.skip('Skipping tests that require root privileges') + class TestDomainNameChanges(unittest.TestCase): + """Test for automatically obtaining and revoking Let's Encrypt certs""" + diff --git a/debian/patches/0002-skip-copy-doc-dir.patch b/debian/patches/0002-skip-copy-doc-dir.patch new file mode 100644 index 000000000..9396c0c1f --- /dev/null +++ b/debian/patches/0002-skip-copy-doc-dir.patch @@ -0,0 +1,13 @@ +Subject: Skip copying the doc/ directory + +--- a/setup.py ++++ b/setup.py +@@ -44,7 +44,7 @@ + ] + + DIRECTORIES_TO_COPY = [ +- ('/usr/share/doc/plinth', 'doc'), ++ #('/usr/share/doc/plinth', 'doc'), + ('/usr/share/plinth/static', 'static'), + ] + diff --git a/debian/patches/0003-disable-missing-packages.patch b/debian/patches/0003-disable-missing-packages.patch new file mode 100644 index 000000000..79e9a2ee8 --- /dev/null +++ b/debian/patches/0003-disable-missing-packages.patch @@ -0,0 +1,12 @@ +Subject: Disable the restore module + +--- a/data/etc/plinth/modules-enabled/restore ++++ b/data/etc/plinth/modules-enabled/restore +@@ -1 +1 @@ +-plinth.modules.restore ++#plinth.modules.restore +--- a/data/etc/plinth/modules-enabled/shaarli ++++ b/data/etc/plinth/modules-enabled/shaarli +@@ -1 +1 @@ +-plinth.modules.shaarli ++#plinth.modules.shaarli diff --git a/debian/patches/0004-enable-login-services.patch b/debian/patches/0004-enable-login-services.patch new file mode 100644 index 000000000..119896088 --- /dev/null +++ b/debian/patches/0004-enable-login-services.patch @@ -0,0 +1,22 @@ +Subject: workaround for login issue + +When testing new image builds, I found users created through plinth +could not login through console or SSH. The reason is that slapd and +nslcd services were not enabled and not running. I don't know what is +causing this situation, so this is just a workaround. + +--- a/actions/users ++++ b/actions/users +@@ -113,6 +113,12 @@ + {'nsswitch': 'group, passwd, shadow'}) + action_utils.service_restart('nscd') + ++ # XXX: Workaround for login issue ++ action_utils.service_enable('slapd') ++ action_utils.service_start('slapd') ++ action_utils.service_enable('nslcd') ++ action_utils.service_start('nslcd') ++ + + def configure_ldap_structure(): + """Configure LDAP basic structure.""" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..7f03b9cc1 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +#0001-disable-privileged-actions-test.patch +#0002-skip-copy-doc-dir.patch +#0003-disable-missing-packages.patch +#0004-enable-login-services.patch diff --git a/debian/plinth.doc-base b/debian/plinth.doc-base new file mode 100644 index 000000000..ae85f500d --- /dev/null +++ b/debian/plinth.doc-base @@ -0,0 +1,16 @@ +Document: plinth +Title: Plinth Documentation +Author: Plinth Authors +Abstract: web front end for administering every aspect of a FreedomBox + The FreedomBox is a net appliance conceived by Eben Moglen. It + contains free software and is designed to allow you to interface with + the rest of the net under conditions of protected privacy and data + security. + The Plinth front end is a web interface to administer the functions of + the FreedomBox. For example, the FreedomBox is a wireless router, + and the front end is where you can adjust its settings. +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/plinth/freedombox-manual.html +Files: /usr/share/doc/plinth/* diff --git a/debian/plinth.docs b/debian/plinth.docs new file mode 100644 index 000000000..408bb2b65 --- /dev/null +++ b/debian/plinth.docs @@ -0,0 +1,5 @@ +README.md +HACKING +doc/*.html +doc/*.pdf +doc/images diff --git a/debian/plinth.links b/debian/plinth.links new file mode 100644 index 000000000..8d6d2fc33 --- /dev/null +++ b/debian/plinth.links @@ -0,0 +1,4 @@ +/usr/share/libjs-jsxc/img/ /usr/lib/python3/dist-packages/plinth/modules/jsxc/static/img +/usr/share/libjs-jsxc/css/jsxc.css /usr/lib/python3/dist-packages/plinth/modules/jsxc/static/libjs-jsxc/jsxc.css +/usr/share/javascript/jsxc/lib /usr/lib/python3/dist-packages/plinth/modules/jsxc/static/libjs-jsxc/lib +/usr/share/libjs-jsxc/sound/ /usr/lib/python3/dist-packages/plinth/modules/jsxc/static/libjs-jsxc/sound diff --git a/debian/plinth.lintian-overrides b/debian/plinth.lintian-overrides new file mode 100644 index 000000000..b92dd0965 --- /dev/null +++ b/debian/plinth.lintian-overrides @@ -0,0 +1,7 @@ +# Apache configuration for the Plinth itself is shipped with proper +# name plinth.conf. However, due to the nature of the package, Plinth +# takes the responsibility of configuring various other services +# behind Apache. The upstream hence ships various Apache +# configuration files which are enabled and disabled when user +# requests. +plinth binary: non-standard-apache2-configuration-name * diff --git a/debian/plinth.maintscript b/debian/plinth.maintscript new file mode 100644 index 000000000..d49e7b9f5 --- /dev/null +++ b/debian/plinth.maintscript @@ -0,0 +1,8 @@ +rm_conffile /etc/plinth/modules-enabled/lib 0.4.3-1~ +rm_conffile /etc/plinth/modules-enabled/expert_mode 0.4.3-1~ +rm_conffile /etc/plinth/modules-enabled/packages 0.5-1~ +rm_conffile /etc/plinth/modules-enabled/xmpp 0.13.0+ds-1~ +rm_conffile /etc/plinth/modules-enabled/apps 0.15.1+ds-2~ +rm_conffile /etc/plinth/modules-enabled/owncloud 0.15.1+ds-2~ +rm_conffile /etc/plinth/modules-enabled/system 0.15.1+ds-2~ +rm_conffile /etc/plinth/modules-enabled/disks 0.15.3+ds-1~ diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 000000000..639713c43 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +daemonuser=plinth +daemongroup=plinth + +case "$1" in +configure) + addgroup --system --quiet plinth + adduser --system --quiet --ingroup plinth --no-create-home --home /var/lib/plinth plinth + chown -R plinth: /var/lib/plinth /var/log/plinth + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/postrm b/debian/postrm new file mode 100755 index 000000000..755b5c2ee --- /dev/null +++ b/debian/postrm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +case "$1" in +purge) + deluser --system --quiet plinth || true + rm -rf /var/log/plinth /var/lib/plinth + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..496d0c31a --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +export DH_VERBOSE=1 +export PYBUILD_NAME=plinth + +%: + dh $@ --with python3 --with systemd --buildsystem=pybuild + +override_dh_auto_install-indep: + dh_auto_install + ./run --list-dependencies 2> /dev/null | sort | tr '\n' ', ' | \ + sed -e 's/^/plinth:Depends=/' >> debian/plinth.substvars + +new-upstream: + gbp import-orig --uscan --verbose --pristine-tar --no-filter-pristine-tar diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..c9243fcd0 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=3 + +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/plinth-$1\.tar\.gz/,\ +dversionmangle=s/\+ds$//,repacksuffix=+ds \ + https://github.com/freedombox/Plinth/tags .*/v?(\d\S*)\.tar\.gz