diff options
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | PKGBUILD | 179 | ||||
-rw-r--r-- | odoo.conf | 1 | ||||
-rw-r--r-- | odoo.confd | 3 | ||||
-rw-r--r-- | odoo.install | 22 | ||||
-rw-r--r-- | odoo.logrotate | 5 | ||||
-rw-r--r-- | odoo.service | 13 | ||||
-rw-r--r-- | odoo.sysusers | 2 | ||||
-rw-r--r-- | odoo.tmpfiles | 4 |
9 files changed, 141 insertions, 122 deletions
@@ -1,25 +1,26 @@ pkgbase = odoo pkgdesc = Web-based Open Source Business Apps - pkgver = 13.0 - pkgrel = 4 + pkgver = 14.0 + pkgrel = 1 url = https://www.odoo.com/ install = odoo.install arch = any license = GPL3 makedepends = python-setuptools + makedepends = python-wheel + depends = postgresql depends = wkhtmltopdf-static - depends = python depends = python-babel depends = python-chardet depends = python-decorator depends = python-docutils - depends = python-ebaysdk depends = python-feedparser depends = python-gevent depends = python-greenlet depends = python-html2text + depends = python-idna depends = python-jinja - depends = sassc + depends = python-libsass depends = python-lxml depends = python-mako depends = python-markupsafe @@ -33,35 +34,38 @@ pkgbase = odoo depends = python-psycopg2 depends = python-pydot depends = python-ldap - depends = python-pyparsing depends = python-pypdf2 depends = python-pyserial depends = python-dateutil + depends = python-pyopenssl depends = python-pytz depends = python-pyusb depends = python-qrcode depends = python-reportlab depends = python-requests - depends = python-zeep - depends = python-vatnumber + depends = python-stdnum depends = python-vobject depends = python-werkzeug depends = python-xlsxwriter depends = python-xlwt depends = python-xlrd + depends = python-zeep conflicts = openerp replaces = openerp + options = !strip backup = etc/odoo/odoo.conf - source = https://nightly.odoo.com/13.0/nightly/src/odoo_13.0.20200321.tar.gz + source = https://nightly.odoo.com/14.0/nightly/src/odoo_14.0.20210604.tar.gz source = odoo.conf - source = odoo.confd + source = odoo.logrotate source = odoo.service source = odoo.sysusers - md5sums = 59de4b28f920bfdcf9a6a9eb0502379f - md5sums = 863418f31f0fb982cde0008fa63f35f0 - md5sums = 742fa9ad94a92ac2aa910197a26af4e8 - md5sums = 5bddcc6edbdefdd07cae945165c63604 - md5sums = 720b7b8c3df3142dfd0383acd1c9e9b4 + source = odoo.tmpfiles + sha256sums = 62d529ee4f919a18682be962609a5ec76c1e69201edc3db295d8ed3bf0a42fb2 + sha256sums = 33d3331e47ab31705e2122ee9cebf791bf2a23169767960fd949ff26e3fb420e + sha256sums = 0cfb2d663be2c23491be71ded73284a6a81460e44e5e1f3c37cfcdd73ee51c01 + sha256sums = 949cfeb604af5425860cffa197b7464b9d87ab3999424d890b2210511823264f + sha256sums = b06fcf6f6fc0cd7e3dbc7699bbd31138b39a0a1d1f8d06984ff2605a5eeb3257 + sha256sums = b6bae94d1a5e51c6cae42987124dd1528626a6f87331c1777c104394c34a95cb pkgname = odoo @@ -1,91 +1,106 @@ -# Maintainer: Petit Pierre <petit.pierre@outlook.com> +# Maintainer: AlphaJack <alphajack at tuta dot io> +# Contributor: Petit Pierre <petit.pierre@outlook.com> # Contributor: Bidossessi Sodonon -pkgname=odoo -pkgver=13.0 -_pkgsubver=20200321 -pkgrel=4 +pkgname="odoo" +pkgver=14.0 +_pkgsubver=20210604 +pkgrel=1 pkgdesc="Web-based Open Source Business Apps" -url=https://www.odoo.com/ -arch=('any') -license=('GPL3') -conflicts=('openerp') -replaces=('openerp') -makedepends=('python-setuptools') -depends=( - 'wkhtmltopdf-static' - 'python' - 'python-babel' - 'python-chardet' - 'python-decorator' - 'python-docutils' - 'python-ebaysdk' - 'python-feedparser' - 'python-gevent' - 'python-greenlet' - 'python-html2text' - 'python-jinja' - 'sassc' - 'python-lxml' - 'python-mako' - 'python-markupsafe' - 'python-mock' - 'python-num2words' - 'python-ofxparse' - 'python-passlib' - 'python-pillow' - 'python-polib' - 'python-psutil' - 'python-psycopg2' - 'python-pydot' - 'python-ldap' - 'python-pyparsing' - 'python-pypdf2' - 'python-pyserial' - 'python-dateutil' - 'python-pytz' - 'python-pyusb' - 'python-qrcode' - 'python-reportlab' - 'python-requests' - 'python-zeep' - 'python-vatnumber' - 'python-vobject' - 'python-werkzeug' - 'python-xlsxwriter' - 'python-xlwt' - 'python-xlrd' - -) +url="https://www.odoo.com/" +arch=("any") +license=("GPL3") +conflicts=("openerp") +replaces=("openerp") +makedepends=("python-setuptools" "python-wheel") +depends=("postgresql" + #"sassc" # not needed + "wkhtmltopdf-static" + "python-babel" + "python-chardet" + "python-decorator" + "python-docutils" + #"python-ebaysdk" # aur checksum is wrong at 2021-06-04 + "python-feedparser" + # "python-freezegun" # used for testing + "python-gevent" + "python-greenlet" + "python-html2text" + "python-idna" + "python-jinja" + "python-libsass" + "python-lxml" + "python-mako" + "python-markupsafe" + "python-mock" + "python-num2words" + "python-ofxparse" + "python-passlib" + "python-pillow" + "python-polib" + "python-psutil" + "python-psycopg2" + "python-pydot" + "python-ldap" + #"python-pyparsing" # not needed + "python-pypdf2" + "python-pyserial" + "python-dateutil" + "python-pyopenssl" + "python-pytz" + "python-pyusb" + "python-qrcode" + "python-reportlab" + "python-requests" + "python-stdnum" + #"python-vatnumber" # not needed + "python-vobject" + "python-werkzeug" + "python-xlsxwriter" + "python-xlwt" + "python-xlrd" + "python-zeep" + ) +source=("https://nightly.odoo.com/$pkgver/nightly/src/${pkgname}_$pkgver.$_pkgsubver.tar.gz" + "odoo.conf" + "odoo.logrotate" + "odoo.service" + "odoo.sysusers" + "odoo.tmpfiles") +sha256sums=("62d529ee4f919a18682be962609a5ec76c1e69201edc3db295d8ed3bf0a42fb2" + "33d3331e47ab31705e2122ee9cebf791bf2a23169767960fd949ff26e3fb420e" + "0cfb2d663be2c23491be71ded73284a6a81460e44e5e1f3c37cfcdd73ee51c01" + "949cfeb604af5425860cffa197b7464b9d87ab3999424d890b2210511823264f" + "b06fcf6f6fc0cd7e3dbc7699bbd31138b39a0a1d1f8d06984ff2605a5eeb3257" + "b6bae94d1a5e51c6cae42987124dd1528626a6f87331c1777c104394c34a95cb") +backup=("etc/odoo/odoo.conf") +install="odoo.install" +options=("!strip") -source=("https://nightly.odoo.com/${pkgver}/nightly/src/${pkgname}_${pkgver}.${_pkgsubver}.tar.gz" - odoo.conf - odoo.confd - odoo.service - odoo.sysusers) -md5sums=('59de4b28f920bfdcf9a6a9eb0502379f' - '863418f31f0fb982cde0008fa63f35f0' - '742fa9ad94a92ac2aa910197a26af4e8' - '5bddcc6edbdefdd07cae945165c63604' - '720b7b8c3df3142dfd0383acd1c9e9b4') - -backup=('etc/odoo/odoo.conf') -install=odoo.install +prepare(){ + # posixemulation has been removed in werkzeug 2.0 + sed -i "$pkgname-$pkgver.post$_pkgsubver/$pkgname/tools/_vendor/sessions.py" \ + -e "s/from werkzeug.posixemulation import rename/#from werkzeug.posixemulation import rename/" \ + -e "s/rename(tmp, fn)/os.rename(tmp, fn)/" +} -build() { - cd ${srcdir}/${pkgname}-${pkgver}.post${_pkgsubver} - python setup.py build +build(){ + cd "$pkgname-$pkgver.post$_pkgsubver" + python setup.py build >/dev/null } -package() -{ - cd ${srcdir}/${pkgname}-${pkgver}.post${_pkgsubver} - python setup.py install --root="${pkgdir}" --optimize=1 --skip-build +package(){ + cd "$pkgname-$pkgver.post$_pkgsubver" + python setup.py install --root="$pkgdir" --optimize=1 --skip-build >/dev/null + + install -d -m 750 "$pkgdir/etc/odoo" + install -d -m 700 "$pkgdir/var/lib/odoo" + install -d "$pkgdir/etc/logrotate.d" + install -d "$pkgdir/usr/lib/systemd/system" - mkdir -p ${pkgdir}/etc/{conf.d,odoo} - mkdir -p ${pkgdir}/usr/lib/systemd/system - install -Dm 644 ${srcdir}/odoo.conf ${pkgdir}/etc/odoo/odoo.conf - install -Dm 644 ${srcdir}/odoo.confd ${pkgdir}/etc/conf.d/odoo - install -Dm 644 ${srcdir}/odoo.service ${pkgdir}/usr/lib/systemd/system/odoo.service - install -Dm 644 ${srcdir}/odoo.sysusers ${pkgdir}/usr/lib/sysusers.d/odoo.conf + install -D -m 640 "$srcdir/odoo.conf" "$pkgdir/etc/odoo/odoo.conf" + install -D -m 644 "$srcdir/odoo.logrotate" "$pkgdir/etc/logrotate.d/odoo" + install -D -m 644 "$srcdir/odoo.service" "$pkgdir/usr/lib/systemd/system/odoo.service" + install -D -m 644 "$srcdir/odoo.sysusers" "$pkgdir/usr/lib/sysusers.d/odoo.conf" + install -D -m 644 "$srcdir/odoo.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/odoo.conf" } diff --git a/odoo.conf b/odoo.conf index df604142acd4..c85f59802d39 100644 --- a/odoo.conf +++ b/odoo.conf @@ -5,3 +5,4 @@ db_host = False db_port = False db_user = odoo db_password = False +;addons_path = /usr/lib/python3/dist-packages/odoo/addons diff --git a/odoo.confd b/odoo.confd deleted file mode 100644 index eb9409443b8a..000000000000 --- a/odoo.confd +++ /dev/null @@ -1,3 +0,0 @@ -# Settings for the OpenERP service -ODOO_CONF=/etc/odoo/odoo.conf -ODOO_ARGS="" diff --git a/odoo.install b/odoo.install index 32f959743ac4..1a3ae82e28ba 100644 --- a/odoo.install +++ b/odoo.install @@ -1,14 +1,12 @@ -post_upgrade() { - # hooks are ran *after* this function, so we have to call - # systemd-sysusers manually to make sure the odoo user exists - systemd-sysusers - mkdir -p /var/lib/odoo - chown -R odoo:odoo /var/lib/odoo +post_upgrade(){ + # show message only if major version differs + if [ "${1%.*}" -gt "${2%.*}" ]; then + echo " +A new major version of Odoo has been released, you should upgrade +the Odoo database by running the following as the odoo user - # show message only if major version differs - if [ "${1%.*}" -gt "${2%.*}" ]; then - echo "You should manually upgrade the Odoo database by running 'odoo -u all' as the odoo user." - echo "When using sudo you can use 'sudo -u odoo odoo -u all'." - echo "Then visit the the web interface while the upgrade command is running." - fi + odoo -u all + +" + fi } diff --git a/odoo.logrotate b/odoo.logrotate new file mode 100644 index 000000000000..060ec54d0122 --- /dev/null +++ b/odoo.logrotate @@ -0,0 +1,5 @@ +/var/log/odoo/*.log { + copytruncate + missingok + notifempty +} diff --git a/odoo.service b/odoo.service index 70020fd4ace1..805152936b2e 100644 --- a/odoo.service +++ b/odoo.service @@ -1,18 +1,13 @@ [Unit] -Description=Advanced OpenSource ERP and CRM server - +Description=Odoo Open Source ERP and CRM +After=network.target [Service] Type=simple -PermissionsStartOnly=true -EnvironmentFile=-/etc/conf.d/odoo User=odoo Group=odoo -SyslogIdentifier=Odoo -PIDFile=/run/odoo/odoo.pid -ExecStartPre=/usr/bin/install -d -m755 -o odoo -g odoo /run/odoo -ExecStart=/usr/bin/odoo -c $ODOO_CONF --pidfile=/run/odoo/odoo.pid $ODOO_ARGS -ExecStop=/bin/kill $MAINPID +ExecStart=/usr/bin/odoo --config /etc/odoo/odoo.conf --logfile /var/log/odoo/odoo-server.log +KillMode=mixed [Install] WantedBy=multi-user.target diff --git a/odoo.sysusers b/odoo.sysusers index 69a58dd7714f..9c470a1d74ad 100644 --- a/odoo.sysusers +++ b/odoo.sysusers @@ -1 +1 @@ -u odoo - "Odoo daemon" /var/lib/odoo +u odoo - "Odoo user" /var/lib/odoo diff --git a/odoo.tmpfiles b/odoo.tmpfiles new file mode 100644 index 000000000000..c155a858857f --- /dev/null +++ b/odoo.tmpfiles @@ -0,0 +1,4 @@ +d /etc/odoo 0750 root odoo +f /etc/odoo/odoo.conf 0640 root odoo +d /var/lib/odoo 0700 odoo odoo +Z /var/lib/odoo - odoo odoo |