From edc0094cd5db85122956647b4200f0ef6d24ad3d Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Mon, 17 Feb 2014 13:40:23 +0100 Subject: [PATCH 01/50] first commit --- .SRCINFO | 21 +++++++++++++++++++++ .gitignore | 5 +++++ PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ wallabag.install | 19 +++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 .SRCINFO create mode 100644 .gitignore create mode 100644 PKGBUILD create mode 100644 wallabag.install diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..d3daebf --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,21 @@ +pkgbase = wallabag + pkgdesc = Self hostable application for saving web pages + pkgver = 1.5.0 + pkgrel = 1 + url = http://www.wallabag.org/ + install = wallabag.install + arch = x86_64 + license = WTFPL + depends = php>=5.3 + depends = php-tidy + depends = pcre + depends = mariadb + optdepends = php-sqlite: For sqlite storage + optdepends = php-pgsql: For postgres storage + source = https://github.com/wallabag/wallabag/archive/1.5.0.tar.gz + source = vendor.zip::http://wllbg.org/vendor + sha256sums = d76dd80920e7474d1b017540d6639908752e4ab35a82d0dee8e149ba33b708a4 + sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 + +pkgname = wallabag + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2baac1a --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*tar.gz +*pkg.tar.xz +src/ +pkg/ +vendor.zip diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..9ea0493 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Philipp Schmitt (philippschmittco) + +pkgname=wallabag +pkgver=1.5.0 +pkgrel=1 +pkgdesc='Self hostable application for saving web pages' +arch=('x86_64') +url='http://www.wallabag.org/' +license=('WTFPL') +depends=('php>=5.3' 'php-tidy' 'pcre' 'mariadb') +optdepends=('php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') +install="$pkgname.install" +source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" + "vendor.zip::http://wllbg.org/vendor") +sha256sums=('d76dd80920e7474d1b017540d6639908752e4ab35a82d0dee8e149ba33b708a4' + 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + local default_config=inc/poche/config.inc.php.new + # Salt + local salt=$(< /dev/urandom tr -dc A-Za-z0-9_ | head -c100 | sha512sum | awk '{ print $1 }') + sed -i "s/\('SALT',\).*'/\1 '${salt}'/" $default_config + # Change default storage to mysql + sed -i "s/\('STORAGE',\).*'/\1 'mysql'/" $default_config + # Change default database name + sed -i "s/\('STORAGE_DB',\).*'/\1 '${pkgname}'/" $default_config + # Change default user + sed -i "s/\('STORAGE_USER',\).*'/\1 '${pkgname}'/" $default_config + # Change default password + sed -i "s/\('STORAGE_PASSWORD',\).*'/\1 '${pkgname}'/" $default_config +} + +package() { + cd "${pkgdir}" + mkdir -p usr/share/webapps + mv "${srcdir}/${pkgname}-${pkgver}" usr/share/webapps/${pkgname} + mv "${srcdir}/vendor" usr/share/webapps/${pkgname}/vendor + chown -R http:http "${pkgdir}" +} + diff --git a/wallabag.install b/wallabag.install new file mode 100644 index 0000000..a695ae0 --- /dev/null +++ b/wallabag.install @@ -0,0 +1,19 @@ +post_install() { + echo 'To get started you need to: + - Enable tidy.so and allow_url_fopen in /etc/php/php.ini + - Create a new mariadb user and a database: + $ mysql -u root -p + > create database wallabag; + > GRANT ALL ON wallabag.* TO wallabag@localhost IDENTIFIED BY '"'mypassword'"'; + - Initialize the database: + $ mysql -u root -p wallabag < /usr/share/webapps/wallabag/install/mysql.sql + - Create a config file: + $ cp /usr/share/webapps/wallabag/inc/poche/config.inc.php.new /usr/share/webapps/wallabag/inc/poche/config.inc.php + - Adjust your prefered STORAGE_SERVER (mysql, sqlite, postgres) + - Set the database credentials: STORAGE_SERVER, STORAGE_DB, STORAGE_USER, STORAGE_PASSWORD + - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) + - Remove /usr/share/webapps/wallabag/install + + More info: http://doc.wallabag.org/doku.php?id=users:begin:install' +} + From dc40282ab1b7cc5f30872e8391f89ef1d0f0ebb0 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Mon, 17 Feb 2014 13:44:51 +0100 Subject: [PATCH 02/50] Add license and readme --- LICENSE | 14 ++++++++++++++ README.md | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..012ddd9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,14 @@ + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..b751a27 --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +# wallabag + +## Description + +AUR package for wallabag + +## Installation + +``` bash +git clone https://github.com/pschmitt/aur-wallabag /tmp/wallabag +cd /tmp/wallabag +makepkg -si +``` + +## Links + +* AUR page: https://aur.archlinux.org/packages/wallabag +* Upstream: http://www.wallabag.org/ and https://github.com/wallabag/wallabag From 3e1e0da5cc4b1f848b968afeda4b539dc92e58b1 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Wed, 19 Feb 2014 16:33:35 +0100 Subject: [PATCH 03/50] Update to 1.5.1.1, add new post_upgrade instructions and make available for any arch --- .SRCINFO | 9 +++++---- PKGBUILD | 7 ++++--- wallabag.install | 7 +++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d3daebf..54ee9ce 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.5.0 + pkgver = 1.5.1.1 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install - arch = x86_64 + arch = any license = WTFPL depends = php>=5.3 depends = php-tidy @@ -12,9 +12,10 @@ pkgbase = wallabag depends = mariadb optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage - source = https://github.com/wallabag/wallabag/archive/1.5.0.tar.gz + options = !strip + source = https://github.com/wallabag/wallabag/archive/1.5.1.1.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = d76dd80920e7474d1b017540d6639908752e4ab35a82d0dee8e149ba33b708a4 + sha256sums = d0d63e5efe56ea28c4ebda2a0ea84162d75c9f7899fccb45aa3fb3e7afc12f5f sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 9ea0493..7742c25 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,18 +1,19 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.5.0 +pkgver=1.5.1.1 pkgrel=1 pkgdesc='Self hostable application for saving web pages' -arch=('x86_64') +arch=('any') url='http://www.wallabag.org/' license=('WTFPL') depends=('php>=5.3' 'php-tidy' 'pcre' 'mariadb') optdepends=('php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" +options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('d76dd80920e7474d1b017540d6639908752e4ab35a82d0dee8e149ba33b708a4' +sha256sums=('d0d63e5efe56ea28c4ebda2a0ea84162d75c9f7899fccb45aa3fb3e7afc12f5f' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') prepare() { diff --git a/wallabag.install b/wallabag.install index a695ae0..6ef80b5 100644 --- a/wallabag.install +++ b/wallabag.install @@ -17,3 +17,10 @@ post_install() { More info: http://doc.wallabag.org/doku.php?id=users:begin:install' } +post_upgrade() { + echo 'After each upgrade you have to manually: + - Remove the installation folder (/usr/share/webapps/wallabag/install) + - Empty the cache folder (/usr/share/webapps/wallabag/cache) + + $ sudo -u http rm -rf /usr/share/webapps/wallabag/{install,cache/*}' +} From d5d5cda807f10d620cd8744e1d172bdcd71e8882 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Fri, 11 Apr 2014 23:52:19 +0200 Subject: [PATCH 04/50] Update upstream version -> Remove prepare() in favor of upstream install script + Update install instructions --- .SRCINFO | 6 +++--- PKGBUILD | 20 ++------------------ wallabag.install | 2 +- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 54ee9ce..288eaaf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.5.1.1 + pkgver = 1.6.1 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -13,9 +13,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.5.1.1.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.6.1.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = d0d63e5efe56ea28c4ebda2a0ea84162d75c9f7899fccb45aa3fb3e7afc12f5f + sha256sums = ff3cd32235fbc1247dd93faff2b355c7aec1368bc96c5a85da954e0aee1c7d42 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 7742c25..5dab97d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.5.1.1 +pkgver=1.6.1 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -13,25 +13,9 @@ install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('d0d63e5efe56ea28c4ebda2a0ea84162d75c9f7899fccb45aa3fb3e7afc12f5f' +sha256sums=('ff3cd32235fbc1247dd93faff2b355c7aec1368bc96c5a85da954e0aee1c7d42' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - local default_config=inc/poche/config.inc.php.new - # Salt - local salt=$(< /dev/urandom tr -dc A-Za-z0-9_ | head -c100 | sha512sum | awk '{ print $1 }') - sed -i "s/\('SALT',\).*'/\1 '${salt}'/" $default_config - # Change default storage to mysql - sed -i "s/\('STORAGE',\).*'/\1 'mysql'/" $default_config - # Change default database name - sed -i "s/\('STORAGE_DB',\).*'/\1 '${pkgname}'/" $default_config - # Change default user - sed -i "s/\('STORAGE_USER',\).*'/\1 '${pkgname}'/" $default_config - # Change default password - sed -i "s/\('STORAGE_PASSWORD',\).*'/\1 '${pkgname}'/" $default_config -} - package() { cd "${pkgdir}" mkdir -p usr/share/webapps diff --git a/wallabag.install b/wallabag.install index 6ef80b5..61e4107 100644 --- a/wallabag.install +++ b/wallabag.install @@ -8,7 +8,7 @@ post_install() { - Initialize the database: $ mysql -u root -p wallabag < /usr/share/webapps/wallabag/install/mysql.sql - Create a config file: - $ cp /usr/share/webapps/wallabag/inc/poche/config.inc.php.new /usr/share/webapps/wallabag/inc/poche/config.inc.php + # cp /usr/share/webapps/wallabag/inc/poche/config.inc.php{.new,} - Adjust your prefered STORAGE_SERVER (mysql, sqlite, postgres) - Set the database credentials: STORAGE_SERVER, STORAGE_DB, STORAGE_USER, STORAGE_PASSWORD - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) From 8ef375088863eac8e851854819975cefd17f0cee Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 29 May 2014 20:59:45 +0200 Subject: [PATCH 05/50] Update to 1.7.0 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 288eaaf..72906ee 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.6.1 + pkgver = 1.7.0 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -13,9 +13,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.6.1.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.7.0.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = ff3cd32235fbc1247dd93faff2b355c7aec1368bc96c5a85da954e0aee1c7d42 + sha256sums = 98c38237b054f7dbf044c986fbaf0057fa48508e6451d0b643d42dce9736a369 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 5dab97d..c6727b6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.6.1 +pkgver=1.7.0 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -13,7 +13,7 @@ install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('ff3cd32235fbc1247dd93faff2b355c7aec1368bc96c5a85da954e0aee1c7d42' +sha256sums=('98c38237b054f7dbf044c986fbaf0057fa48508e6451d0b643d42dce9736a369' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From 92fe073fe231f74b80e034e231ee1d9d3fb11716 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Tue, 22 Jul 2014 20:48:23 +0200 Subject: [PATCH 06/50] Update to 1.7.1 and make mariadb an optional dependency --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 72906ee..31a3546 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.7.0 + pkgver = 1.7.1 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -9,13 +9,13 @@ pkgbase = wallabag depends = php>=5.3 depends = php-tidy depends = pcre - depends = mariadb + optdepends = mariadb: For MySQL storage optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.7.0.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.7.1.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = 98c38237b054f7dbf044c986fbaf0057fa48508e6451d0b643d42dce9736a369 + sha256sums = c8374578489fc36b4f93852c8a1eaa0184330f8bf84e37fc54e01c48cc4a5dbf sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index c6727b6..b31ca13 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,19 +1,19 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' license=('WTFPL') -depends=('php>=5.3' 'php-tidy' 'pcre' 'mariadb') -optdepends=('php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') +depends=('php>=5.3' 'php-tidy' 'pcre') +optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('98c38237b054f7dbf044c986fbaf0057fa48508e6451d0b643d42dce9736a369' +sha256sums=('c8374578489fc36b4f93852c8a1eaa0184330f8bf84e37fc54e01c48cc4a5dbf' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From 44e13f38313908095dd3b95ec09ca17f98b5bfd9 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Sun, 27 Jul 2014 22:15:55 +0200 Subject: [PATCH 07/50] Update to 1.7.2 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 31a3546..cb24925 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.7.1 + pkgver = 1.7.2 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -13,9 +13,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.7.1.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.7.2.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = c8374578489fc36b4f93852c8a1eaa0184330f8bf84e37fc54e01c48cc4a5dbf + sha256sums = 1bbef1dc2d1359fa19975c25a70cc1dd4144ba11882ebda70a1939aa1c39ebb8 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index b31ca13..fd45e36 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -13,7 +13,7 @@ install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('c8374578489fc36b4f93852c8a1eaa0184330f8bf84e37fc54e01c48cc4a5dbf' +sha256sums=('1bbef1dc2d1359fa19975c25a70cc1dd4144ba11882ebda70a1939aa1c39ebb8' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From be498bfb84385fc69c1e4359fa0dbc32286898cd Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Mon, 25 Aug 2014 20:14:29 +0200 Subject: [PATCH 08/50] Update default config path and bump pkgrel --- .SRCINFO | 2 +- PKGBUILD | 2 +- wallabag.install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cb24925..a6b421c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages pkgver = 1.7.2 - pkgrel = 1 + pkgrel = 2 url = http://www.wallabag.org/ install = wallabag.install arch = any diff --git a/PKGBUILD b/PKGBUILD index fd45e36..3521287 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=wallabag pkgver=1.7.2 -pkgrel=1 +pkgrel=2 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' diff --git a/wallabag.install b/wallabag.install index 61e4107..d4f03d1 100644 --- a/wallabag.install +++ b/wallabag.install @@ -8,7 +8,7 @@ post_install() { - Initialize the database: $ mysql -u root -p wallabag < /usr/share/webapps/wallabag/install/mysql.sql - Create a config file: - # cp /usr/share/webapps/wallabag/inc/poche/config.inc.php{.new,} + # cp /usr/share/webapps/wallabag/inc/poche/config.inc{.default,}.php - Adjust your prefered STORAGE_SERVER (mysql, sqlite, postgres) - Set the database credentials: STORAGE_SERVER, STORAGE_DB, STORAGE_USER, STORAGE_PASSWORD - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) From 0211720d507a1fc8807bd587be3e0cf37b3f63b0 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Sun, 26 Oct 2014 08:59:09 +0100 Subject: [PATCH 09/50] Update to 1.8.0 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a6b421c..2697669 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.7.2 - pkgrel = 2 + pkgver = 1.8.0 + pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install arch = any @@ -13,9 +13,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.7.2.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.8.0.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = 1bbef1dc2d1359fa19975c25a70cc1dd4144ba11882ebda70a1939aa1c39ebb8 + sha256sums = 60d674624aa5877d49861bc48a2f01466cc9db3893ae450c418714260c9445a2 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 3521287..b380a24 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.7.2 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' @@ -13,7 +13,7 @@ install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('1bbef1dc2d1359fa19975c25a70cc1dd4144ba11882ebda70a1939aa1c39ebb8' +sha256sums=('60d674624aa5877d49861bc48a2f01466cc9db3893ae450c418714260c9445a2' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From 23187cd49530ac5fd6acbfc9fe9f79522fb22a16 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Wed, 17 Dec 2014 19:46:24 +0100 Subject: [PATCH 10/50] Update version, checksum and license --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2697669..ee4f981 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,11 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.8.0 + pkgver = 1.8.1b pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install arch = any - license = WTFPL + license = MIT depends = php>=5.3 depends = php-tidy depends = pcre @@ -13,9 +13,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.8.0.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.8.1b.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = 60d674624aa5877d49861bc48a2f01466cc9db3893ae450c418714260c9445a2 + sha256sums = 03a07e7e34565892a75d0fcb7c7f693d8318f69fd216b984005b6a7aa8640761 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index b380a24..4a83258 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,19 +1,19 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.8.0 +pkgver=1.8.1b pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' -license=('WTFPL') +license=('MIT') depends=('php>=5.3' 'php-tidy' 'pcre') optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('60d674624aa5877d49861bc48a2f01466cc9db3893ae450c418714260c9445a2' +sha256sums=('03a07e7e34565892a75d0fcb7c7f693d8318f69fd216b984005b6a7aa8640761' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From 5b252a4085924176a7445a3c49434562e80ad6ca Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 19 Feb 2015 11:32:19 +0100 Subject: [PATCH 11/50] Update license to MIT (wallabag/wallabag@3602405ec0dbc576fce09ff9e865ba2404622080) --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2697669..e828a0f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,7 +5,7 @@ pkgbase = wallabag url = http://www.wallabag.org/ install = wallabag.install arch = any - license = WTFPL + license = MIT depends = php>=5.3 depends = php-tidy depends = pcre diff --git a/PKGBUILD b/PKGBUILD index b380a24..42c9bbe 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' -license=('WTFPL') +license=('MIT') depends=('php>=5.3' 'php-tidy' 'pcre') optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" From 74166af94d5414e3e6e25e284250fa683f534041 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 19 Feb 2015 11:49:02 +0100 Subject: [PATCH 12/50] Remove trailing whitespace --- wallabag.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallabag.install b/wallabag.install index d4f03d1..19ed1f5 100644 --- a/wallabag.install +++ b/wallabag.install @@ -21,6 +21,6 @@ post_upgrade() { echo 'After each upgrade you have to manually: - Remove the installation folder (/usr/share/webapps/wallabag/install) - Empty the cache folder (/usr/share/webapps/wallabag/cache) - + $ sudo -u http rm -rf /usr/share/webapps/wallabag/{install,cache/*}' } From c8f9dd9314b04f1b6ceed3fb4a7806304ac7e492 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 19 Feb 2015 11:49:41 +0100 Subject: [PATCH 13/50] Update to upstream version 1.9 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ee4f981..14534d6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,21 +1,21 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.8.1b + pkgver = 1.9 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install arch = any license = MIT - depends = php>=5.3 + depends = php>=5.3.3 depends = php-tidy depends = pcre optdepends = mariadb: For MySQL storage optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.8.1b.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.9.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = 03a07e7e34565892a75d0fcb7c7f693d8318f69fd216b984005b6a7aa8640761 + sha256sums = 3a1959a1bac161578d8d4e037d34c2ffaac0f3ecfdb72b6940f2b75a45812dfd sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 4a83258..8a791e6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,19 +1,19 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.8.1b +pkgver=1.9 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' license=('MIT') -depends=('php>=5.3' 'php-tidy' 'pcre') +depends=('php>=5.3.3' 'php-tidy' 'pcre') optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('03a07e7e34565892a75d0fcb7c7f693d8318f69fd216b984005b6a7aa8640761' +sha256sums=('3a1959a1bac161578d8d4e037d34c2ffaac0f3ecfdb72b6940f2b75a45812dfd' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From c1db7f95d80eaeedb597bd56a61e36a552134ca5 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 19 Feb 2015 15:08:00 +0100 Subject: [PATCH 14/50] Don't try to chown /usr --- .SRCINFO | 1 + PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 14534d6..073615a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -9,6 +9,7 @@ pkgbase = wallabag depends = php>=5.3.3 depends = php-tidy depends = pcre + depends = php-gd optdepends = mariadb: For MySQL storage optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage diff --git a/PKGBUILD b/PKGBUILD index 8a791e6..513ce0c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' license=('MIT') -depends=('php>=5.3.3' 'php-tidy' 'pcre') +depends=('php>=5.3.3' 'php-tidy' 'pcre' 'php-gd') optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" options=(!strip) @@ -21,6 +21,6 @@ package() { mkdir -p usr/share/webapps mv "${srcdir}/${pkgname}-${pkgver}" usr/share/webapps/${pkgname} mv "${srcdir}/vendor" usr/share/webapps/${pkgname}/vendor - chown -R http:http "${pkgdir}" + chown -R http:http "${pkgdir}/usr/share/webapps/wallabag" } From 49c4be86c08515faf75db584e673d6a946c08a49 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 26 Nov 2015 12:02:40 +0100 Subject: [PATCH 15/50] Update to 1.9.1-b --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 073615a..9a0f865 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.9 + pkgver = 1.9.1-b pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -14,9 +14,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.9.tar.gz + source = https://github.com/wallabag/wallabag/archive/1.9.1-b.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = 3a1959a1bac161578d8d4e037d34c2ffaac0f3ecfdb72b6940f2b75a45812dfd + sha256sums = 964d2cfb0a4f664285ddbaa08b873d55066b9937762d4b892a03e3619ad3ec09 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 513ce0c..e09bc38 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.9 +pkgver=1.9.1-b pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -13,7 +13,7 @@ install="$pkgname.install" options=(!strip) source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('3a1959a1bac161578d8d4e037d34c2ffaac0f3ecfdb72b6940f2b75a45812dfd' +sha256sums=('964d2cfb0a4f664285ddbaa08b873d55066b9937762d4b892a03e3619ad3ec09' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { From 574370148b53d2a5919bf7f6f4e37ee24a6d8221 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 26 Nov 2015 13:14:14 +0100 Subject: [PATCH 16/50] Fix: pkgver must not include a hyphen --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e09bc38..487c551 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.9.1-b +pkgver=1.9.1b +_pkgver="$(sed -r 's/([a-zA-Z])/-\1/' <<< $pkgver)" pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -11,15 +12,14 @@ depends=('php>=5.3.3' 'php-tidy' 'pcre' 'php-gd') optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" options=(!strip) -source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" - "vendor.zip::http://wllbg.org/vendor") +source=("https://github.com/wallabag/wallabag/archive/${_pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") sha256sums=('964d2cfb0a4f664285ddbaa08b873d55066b9937762d4b892a03e3619ad3ec09' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { cd "${pkgdir}" mkdir -p usr/share/webapps - mv "${srcdir}/${pkgname}-${pkgver}" usr/share/webapps/${pkgname} + mv "${srcdir}/${pkgname}-${_pkgver}" usr/share/webapps/${pkgname} mv "${srcdir}/vendor" usr/share/webapps/${pkgname}/vendor chown -R http:http "${pkgdir}/usr/share/webapps/wallabag" } From c126677768e997c7f3dc6cb46e325bb7e6678a72 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 26 Nov 2015 13:19:23 +0100 Subject: [PATCH 17/50] Update URL --- wallabag.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallabag.install b/wallabag.install index 19ed1f5..bbe07aa 100644 --- a/wallabag.install +++ b/wallabag.install @@ -14,7 +14,7 @@ post_install() { - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) - Remove /usr/share/webapps/wallabag/install - More info: http://doc.wallabag.org/doku.php?id=users:begin:install' + More info: http://doc.wallabag.org/en/Administrator/download_and_install.html } post_upgrade() { From e87dad9afb450375b6f44fe522aa7c8c30f610bb Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Thu, 26 Nov 2015 13:19:35 +0100 Subject: [PATCH 18/50] Update SRCINFO --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 9a0f865..2b4e722 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.9.1-b + pkgver = 1.9.1b pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install From 8e9b7dc9b7109d840d1b5c9dcaf16ea8a79708b0 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Fri, 6 May 2016 07:54:15 +0200 Subject: [PATCH 19/50] Update to 2.0.3 --- .SRCINFO | 8 +++++--- PKGBUILD | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2b4e722..298bd7a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Fri May 6 05:54:02 UTC 2016 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 1.9.1b + pkgver = 2.0.3 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -14,9 +16,9 @@ pkgbase = wallabag optdepends = php-sqlite: For sqlite storage optdepends = php-pgsql: For postgres storage options = !strip - source = https://github.com/wallabag/wallabag/archive/1.9.1-b.tar.gz + source = https://github.com/wallabag/wallabag/archive/2.0.3.tar.gz source = vendor.zip::http://wllbg.org/vendor - sha256sums = 964d2cfb0a4f664285ddbaa08b873d55066b9937762d4b892a03e3619ad3ec09 + sha256sums = 2252e0218917bc71db03db60a7b6940b4b8bdc8602732a458e906147e3c99a73 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 487c551..ed8dd91 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=1.9.1b -_pkgver="$(sed -r 's/([a-zA-Z])/-\1/' <<< $pkgver)" +pkgver=2.0.3 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -12,14 +11,14 @@ depends=('php>=5.3.3' 'php-tidy' 'pcre' 'php-gd') optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') install="$pkgname.install" options=(!strip) -source=("https://github.com/wallabag/wallabag/archive/${_pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('964d2cfb0a4f664285ddbaa08b873d55066b9937762d4b892a03e3619ad3ec09' +source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") +sha256sums=('2252e0218917bc71db03db60a7b6940b4b8bdc8602732a458e906147e3c99a73' 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') package() { cd "${pkgdir}" mkdir -p usr/share/webapps - mv "${srcdir}/${pkgname}-${_pkgver}" usr/share/webapps/${pkgname} + mv "${srcdir}/${pkgname}-${pkgver}" usr/share/webapps/${pkgname} mv "${srcdir}/vendor" usr/share/webapps/${pkgname}/vendor chown -R http:http "${pkgdir}/usr/share/webapps/wallabag" } From 1d3e7630c4d6f6dc5ba7be30bb6b21b0deba95b7 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Fri, 6 May 2016 07:56:46 +0200 Subject: [PATCH 20/50] Fix syntax --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- wallabag.install | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 298bd7a..0b6cb3d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri May 6 05:54:02 UTC 2016 +# Fri May 6 05:56:19 UTC 2016 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages pkgver = 2.0.3 - pkgrel = 1 + pkgrel = 2 url = http://www.wallabag.org/ install = wallabag.install arch = any diff --git a/PKGBUILD b/PKGBUILD index ed8dd91..02c62bb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=wallabag pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' diff --git a/wallabag.install b/wallabag.install index bbe07aa..f347dc5 100644 --- a/wallabag.install +++ b/wallabag.install @@ -14,7 +14,8 @@ post_install() { - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) - Remove /usr/share/webapps/wallabag/install - More info: http://doc.wallabag.org/en/Administrator/download_and_install.html + More info: + http://doc.wallabag.org/en/Administrator/download_and_install.html' } post_upgrade() { From 3efc6bbf7239b58e9ad8e11b77f250454b09048d Mon Sep 17 00:00:00 2001 From: Anthony Ruhier Date: Sat, 7 May 2016 00:53:32 +0200 Subject: [PATCH 21/50] Update for wallabag 2 Download the archive with all libs already fetched Update the install msg to fit to wallabag v2 Move the configuration file in /etc/webapps/wallabag --- .SRCINFO | 18 +++++++++--------- PKGBUILD | 34 +++++++++++++++++++++++++--------- wallabag.install | 46 ++++++++++++++++++++++++---------------------- 3 files changed, 58 insertions(+), 40 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0b6cb3d..ce574f8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,25 +1,25 @@ # Generated by mksrcinfo v8 -# Fri May 6 05:56:19 UTC 2016 +# Sat May 7 10:29:37 UTC 2016 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages pkgver = 2.0.3 - pkgrel = 2 + pkgrel = 3 url = http://www.wallabag.org/ install = wallabag.install arch = any license = MIT depends = php>=5.3.3 + depends = php-gd depends = php-tidy depends = pcre - depends = php-gd - optdepends = mariadb: For MySQL storage - optdepends = php-sqlite: For sqlite storage + optdepends = php-mysql: For MySQL storage optdepends = php-pgsql: For postgres storage + optdepends = php-sqlite: For sqlite storage options = !strip - source = https://github.com/wallabag/wallabag/archive/2.0.3.tar.gz - source = vendor.zip::http://wllbg.org/vendor - sha256sums = 2252e0218917bc71db03db60a7b6940b4b8bdc8602732a458e906147e3c99a73 - sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 + backup = etc/webapps/wallabag/parameters.yml + backup = usr/share/webapps/wallabag/parameters.yml + source = wallabag.tar.xz::http://wllbg.org/latest-v2-package + sha256sums = 6c69e2fd1dbebbd4311e4d385928dcad60cb80b16247d1e18181eb66a91e8bd7 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 02c62bb..7d7e108 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,24 +2,40 @@ pkgname=wallabag pkgver=2.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' license=('MIT') -depends=('php>=5.3.3' 'php-tidy' 'pcre' 'php-gd') -optdepends=('mariadb: For MySQL storage' 'php-sqlite: For sqlite storage' 'php-pgsql: For postgres storage') +depends=( + 'php>=5.3.3' + 'php-gd' + 'php-tidy' + 'pcre' +) +optdepends=( + 'php-mysql: For MySQL storage' + 'php-pgsql: For postgres storage' + 'php-sqlite: For sqlite storage' +) install="$pkgname.install" options=(!strip) -source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" "vendor.zip::http://wllbg.org/vendor") -sha256sums=('2252e0218917bc71db03db60a7b6940b4b8bdc8602732a458e906147e3c99a73' - 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') +source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") +sha256sums=('6c69e2fd1dbebbd4311e4d385928dcad60cb80b16247d1e18181eb66a91e8bd7') +backup=("etc/webapps/${pkgname}/parameters.yml" + "usr/share/webapps/${pkgname}/parameters.yml") package() { cd "${pkgdir}" mkdir -p usr/share/webapps - mv "${srcdir}/${pkgname}-${pkgver}" usr/share/webapps/${pkgname} - mv "${srcdir}/vendor" usr/share/webapps/${pkgname}/vendor + mv "${srcdir}/release-${pkgver}" usr/share/webapps/${pkgname} + + WALLABAG_CONF_DIR="${pkgdir}/usr/share/webapps/${pkgname}/app/config" + + install -d "${pkgdir}/etc/webapps/${pkgname}/" + mv "${WALLABAG_CONF_DIR}"/parameters.yml ${pkgdir}/etc/webapps/${pkgname}/ + chown -R http:http ${pkgdir}/etc/webapps/${pkgname} + ln -s /etc/webapps/${pkgname}/parameters.yml "${WALLABAG_CONF_DIR}"/ + chown -R http:http "${pkgdir}/usr/share/webapps/wallabag" } - diff --git a/wallabag.install b/wallabag.install index f347dc5..55b211b 100644 --- a/wallabag.install +++ b/wallabag.install @@ -1,27 +1,29 @@ -post_install() { - echo 'To get started you need to: - - Enable tidy.so and allow_url_fopen in /etc/php/php.ini - - Create a new mariadb user and a database: - $ mysql -u root -p - > create database wallabag; - > GRANT ALL ON wallabag.* TO wallabag@localhost IDENTIFIED BY '"'mypassword'"'; - - Initialize the database: - $ mysql -u root -p wallabag < /usr/share/webapps/wallabag/install/mysql.sql - - Create a config file: - # cp /usr/share/webapps/wallabag/inc/poche/config.inc{.default,}.php - - Adjust your prefered STORAGE_SERVER (mysql, sqlite, postgres) - - Set the database credentials: STORAGE_SERVER, STORAGE_DB, STORAGE_USER, STORAGE_PASSWORD - - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) - - Remove /usr/share/webapps/wallabag/install - More info: - http://doc.wallabag.org/en/Administrator/download_and_install.html' +post_install() { + echo "" + echo "==> Installed in : /usr/share/webapps/wallabag" + echo "" + echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" + echo "" + echo -n "Change the configuration to fit to your current setup, and then " + echo "init wallabag by launching:" + echo "php /usr/share/webapps/wallabag/bin/console wallabag:install --env=prod" + echo "" + echo -n "To setup your webserver and enable the needed php extensions, " + echo "plase read: http://doc.wallabag.org/en/master/user/installation.html" +} + + +pre_upgrade() { + # save old untracked config and make it tracked + if [[ -f /usr/share/webapps/wallabag/app/config/parameters.yml && \ + ! -h /usr/share/webapps/wallabag/app/config/parameters.yml ]]; + then install -Dm644 \ + /usr/share/webapps/wallabag/app/config/parameters.yml \ + -t /etc/webapps/wallabag/ + fi } post_upgrade() { - echo 'After each upgrade you have to manually: - - Remove the installation folder (/usr/share/webapps/wallabag/install) - - Empty the cache folder (/usr/share/webapps/wallabag/cache) - - $ sudo -u http rm -rf /usr/share/webapps/wallabag/{install,cache/*}' + rm -rf /usr/share/webapps/wallabag/var/cache/* } From 6f8a2e2f8f88b2f1f1eded4ec2aad96dbcb9eb86 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Tue, 7 Jun 2016 13:21:07 +0200 Subject: [PATCH 22/50] Update to version 2.0.5 --- PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7d7e108..5b8a857 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.0.3 -pkgrel=3 +pkgver=2.0.5 +pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' @@ -21,7 +21,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") -sha256sums=('6c69e2fd1dbebbd4311e4d385928dcad60cb80b16247d1e18181eb66a91e8bd7') +sha256sums=('c3df0fe67782538cc7fbdeedb48845a8a23eceb11b58888fbd8ee3b97f8842fc') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml") From 4c7918c7a767974224131b747447066a0a18166b Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Tue, 7 Jun 2016 13:22:42 +0200 Subject: [PATCH 23/50] Update SRCINFO --- .SRCINFO | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ce574f8..21951d0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sat May 7 10:29:37 UTC 2016 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.0.3 - pkgrel = 3 + pkgver = 2.0.5 + pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install arch = any @@ -19,7 +17,7 @@ pkgbase = wallabag backup = etc/webapps/wallabag/parameters.yml backup = usr/share/webapps/wallabag/parameters.yml source = wallabag.tar.xz::http://wllbg.org/latest-v2-package - sha256sums = 6c69e2fd1dbebbd4311e4d385928dcad60cb80b16247d1e18181eb66a91e8bd7 + sha256sums = c3df0fe67782538cc7fbdeedb48845a8a23eceb11b58888fbd8ee3b97f8842fc pkgname = wallabag From 61fd0bd1e791384a4255c7a5008d984cb6410577 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Wed, 19 Oct 2016 17:17:26 +0400 Subject: [PATCH 24/50] Bump version to 2.1.2 --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 21951d0..71f7c1f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.0.5 + pkgver = 2.1.2 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -17,7 +17,7 @@ pkgbase = wallabag backup = etc/webapps/wallabag/parameters.yml backup = usr/share/webapps/wallabag/parameters.yml source = wallabag.tar.xz::http://wllbg.org/latest-v2-package - sha256sums = c3df0fe67782538cc7fbdeedb48845a8a23eceb11b58888fbd8ee3b97f8842fc + sha256sums = f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 5b8a857..e5ebb92 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.0.5 +pkgver=2.1.2 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -21,7 +21,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") -sha256sums=('c3df0fe67782538cc7fbdeedb48845a8a23eceb11b58888fbd8ee3b97f8842fc') +sha256sums=('f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml") From 4dc334c2fec4dc713d99d08c2db6cef6e5dbec3a Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Wed, 19 Oct 2016 17:35:20 +0400 Subject: [PATCH 25/50] Move "data" and "var" directories to /var/lib/wallabag/ --- .SRCINFO | 2 ++ PKGBUILD | 12 ++++++++++-- wallabag.install | 27 ++++++++++++++++++--------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 71f7c1f..8ced9bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -16,6 +16,8 @@ pkgbase = wallabag options = !strip backup = etc/webapps/wallabag/parameters.yml backup = usr/share/webapps/wallabag/parameters.yml + backup = var/lib/wallabag/data/db/wallabag.sqlite + backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite source = wallabag.tar.xz::http://wllbg.org/latest-v2-package sha256sums = f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406 diff --git a/PKGBUILD b/PKGBUILD index e5ebb92..deca386 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,7 +23,9 @@ options=(!strip) source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") sha256sums=('f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406') backup=("etc/webapps/${pkgname}/parameters.yml" - "usr/share/webapps/${pkgname}/parameters.yml") + "usr/share/webapps/${pkgname}/parameters.yml" + "var/lib/${pkgname}/data/db/wallabag.sqlite" + "usr/share/webapps/${pkgname}/data/db/wallabag.sqlite") package() { cd "${pkgdir}" @@ -37,5 +39,11 @@ package() { chown -R http:http ${pkgdir}/etc/webapps/${pkgname} ln -s /etc/webapps/${pkgname}/parameters.yml "${WALLABAG_CONF_DIR}"/ - chown -R http:http "${pkgdir}/usr/share/webapps/wallabag" + _VAR_DIR="${pkgdir}/var/lib/${pkgname}/" + install -d "$_VAR_DIR" + mv "${pkgdir}/usr/share/webapps/${pkgname}/"{data,var} "$_VAR_DIR" + ln -s "/var/lib/${pkgname}/"{data,var} "${pkgdir}/usr/share/webapps/${pkgname}/" + chown -R http:http "$_VAR_DIR" + + chown -R http:http "${pkgdir}/usr/share/webapps/${pkgname}" } diff --git a/wallabag.install b/wallabag.install index 55b211b..bbb2880 100644 --- a/wallabag.install +++ b/wallabag.install @@ -1,10 +1,10 @@ post_install() { - echo "" - echo "==> Installed in : /usr/share/webapps/wallabag" - echo "" - echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" - echo "" + echo "" + echo "==> Installed in : /usr/share/webapps/wallabag" + echo "" + echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" + echo "" echo -n "Change the configuration to fit to your current setup, and then " echo "init wallabag by launching:" echo "php /usr/share/webapps/wallabag/bin/console wallabag:install --env=prod" @@ -15,15 +15,24 @@ post_install() { pre_upgrade() { - # save old untracked config and make it tracked - if [[ -f /usr/share/webapps/wallabag/app/config/parameters.yml && \ + # save old untracked config and make it tracked + if [[ -f /usr/share/webapps/wallabag/app/config/parameters.yml && \ ! -h /usr/share/webapps/wallabag/app/config/parameters.yml ]]; then install -Dm644 \ /usr/share/webapps/wallabag/app/config/parameters.yml \ -t /etc/webapps/wallabag/ - fi + fi + # also move `data` and `var` to /var/lib/wallabag/ + if [[ -d /usr/share/webapps/wallabag/data && \ + ! -h /usr/share/webapps/wallabag/data && \ + -d /usr/share/webapps/wallabag/var && \ + ! -h /usr/share/webapps/wallabag/var ]]; then + install -d /var/lib/wallabag/ + chown http:http /var/lib/wallabag/ + mv /usr/share/webapps/wallabag/{data,var} /var/lib/wallabag/ + fi } post_upgrade() { - rm -rf /usr/share/webapps/wallabag/var/cache/* + rm -rf /var/lib/wallabag/var/cache/* } From fa716cdc1b13b36b069748eb6f5e6bff17fc1974 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Wed, 19 Oct 2016 18:35:09 +0400 Subject: [PATCH 26/50] Update optdeps and post-install comment --- .SRCINFO | 2 ++ PKGBUILD | 2 ++ wallabag.install | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 8ced9bc..eafc0ac 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -13,6 +13,8 @@ pkgbase = wallabag optdepends = php-mysql: For MySQL storage optdepends = php-pgsql: For postgres storage optdepends = php-sqlite: For sqlite storage + optdepends = rabbitmq: For async import + optdepends = redis: For async import options = !strip backup = etc/webapps/wallabag/parameters.yml backup = usr/share/webapps/wallabag/parameters.yml diff --git a/PKGBUILD b/PKGBUILD index deca386..ce118c0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,6 +17,8 @@ optdepends=( 'php-mysql: For MySQL storage' 'php-pgsql: For postgres storage' 'php-sqlite: For sqlite storage' + 'rabbitmq: For async import' + 'redis: For async import' ) install="$pkgname.install" options=(!strip) diff --git a/wallabag.install b/wallabag.install index bbb2880..1b342a2 100644 --- a/wallabag.install +++ b/wallabag.install @@ -10,7 +10,10 @@ post_install() { echo "php /usr/share/webapps/wallabag/bin/console wallabag:install --env=prod" echo "" echo -n "To setup your webserver and enable the needed php extensions, " - echo "plase read: http://doc.wallabag.org/en/master/user/installation.html" + echo "please read: http://doc.wallabag.org/en/master/user/installation.html" + echo "" + echo -n "If you upgraded from 2.0.x, you might need to check the upgrade guide: " + echo "http://doc.wallabag.org/en/master/user/upgrade-2.0.x-2.1.1.html" } From ad69d98a2944e348450f64fbf43c11d6eef4939b Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Mon, 14 Nov 2016 14:26:34 +0400 Subject: [PATCH 27/50] Bump version: 2.1.3 --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index eafc0ac..535b601 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.1.2 + pkgver = 2.1.3 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -21,7 +21,7 @@ pkgbase = wallabag backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite source = wallabag.tar.xz::http://wllbg.org/latest-v2-package - sha256sums = f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406 + sha256sums = f72d6e8dfd7975c4f407e5d531c52b865b3e2a72d755798ac908dcfc22d6815e pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index ce118c0..6115bc2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -23,7 +23,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") -sha256sums=('f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406') +sha256sums=('f72d6e8dfd7975c4f407e5d531c52b865b3e2a72d755798ac908dcfc22d6815e') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 1bcd35b9b373dcb244c024b9fad33fdd80230bb9 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Mon, 14 Nov 2016 14:32:16 +0400 Subject: [PATCH 28/50] Remove php-mysql optdep --- .SRCINFO | 1 - PKGBUILD | 1 - 2 files changed, 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 535b601..5fe83bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,7 +10,6 @@ pkgbase = wallabag depends = php-gd depends = php-tidy depends = pcre - optdepends = php-mysql: For MySQL storage optdepends = php-pgsql: For postgres storage optdepends = php-sqlite: For sqlite storage optdepends = rabbitmq: For async import diff --git a/PKGBUILD b/PKGBUILD index 6115bc2..b80b30e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,6 @@ depends=( 'pcre' ) optdepends=( - 'php-mysql: For MySQL storage' 'php-pgsql: For postgres storage' 'php-sqlite: For sqlite storage' 'rabbitmq: For async import' From 90eb80a908e3b26be204700430c95096fd3b67ae Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Sun, 20 Nov 2016 15:18:52 +0400 Subject: [PATCH 29/50] Change URL to point directly to files on framabag.org --- .SRCINFO | 6 +++--- PKGBUILD | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5fe83bc..54539fa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.1.3 + pkgver = 2.1.4 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = wallabag.tar.xz::http://wllbg.org/latest-v2-package - sha256sums = f72d6e8dfd7975c4f407e5d531c52b865b3e2a72d755798ac908dcfc22d6815e + source = https://framabag.org/wallabag-release-2.1.4.tar.gz + sha256sums = eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index b80b30e..c99fab3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.1.3 +pkgver=2.1.4 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -21,8 +21,9 @@ optdepends=( ) install="$pkgname.install" options=(!strip) -source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") -sha256sums=('f72d6e8dfd7975c4f407e5d531c52b865b3e2a72d755798ac908dcfc22d6815e') +source=("https://framabag.org/wallabag-release-${pkgver}.tar.gz") +#source=("${pkgname}-release-${pkgver}.tar.gz::http://wllbg.org/latest-v2-package") # you may try this URL, if the above one is not available +sha256sums=('eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 5b0734320c01529b250e1476a5b5c3b5198225d7 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Tue, 24 Jan 2017 20:07:03 +0400 Subject: [PATCH 30/50] Update to 2.1.6 Also update source URL --- .SRCINFO | 8 ++++---- PKGBUILD | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 54539fa..0d9100d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.1.4 + pkgver = 2.1.6 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install arch = any license = MIT - depends = php>=5.3.3 + depends = php>=5.5 depends = php-gd depends = php-tidy depends = pcre @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://framabag.org/wallabag-release-2.1.4.tar.gz - sha256sums = eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768 + source = https://static.wallabag.org/releases/wallabag-release-2.1.6.tar.gz + sha256sums = dd9daaba82a367c06cd62e7b55132830d70725136af9361d53b0572af3e4de7e pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index c99fab3..fa8050e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.1.4 +pkgver=2.1.6 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' license=('MIT') depends=( - 'php>=5.3.3' + 'php>=5.5' 'php-gd' 'php-tidy' 'pcre' @@ -21,9 +21,8 @@ optdepends=( ) install="$pkgname.install" options=(!strip) -source=("https://framabag.org/wallabag-release-${pkgver}.tar.gz") -#source=("${pkgname}-release-${pkgver}.tar.gz::http://wllbg.org/latest-v2-package") # you may try this URL, if the above one is not available -sha256sums=('eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768') +source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") +sha256sums=('dd9daaba82a367c06cd62e7b55132830d70725136af9361d53b0572af3e4de7e') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 8ddaa020b659f37123d983a1b08c16d8f9ef85cf Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Sun, 29 Jan 2017 10:31:24 +0100 Subject: [PATCH 31/50] Update to version 2.2.0 --- .SRCINFO | 8 +++++--- PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0d9100d..b5b460d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Sun Jan 29 09:30:48 UTC 2017 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.1.6 + pkgver = 2.2.0 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +21,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.1.6.tar.gz - sha256sums = dd9daaba82a367c06cd62e7b55132830d70725136af9361d53b0572af3e4de7e + source = https://static.wallabag.org/releases/wallabag-release-2.2.0.tar.gz + sha256sums = fcd0fd9b3d93fe26adbcf27c3e252d07997c9345f3f6f520c635a6c579143d2a pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index fa8050e..871f11f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.1.6 +pkgver=2.2.0 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('dd9daaba82a367c06cd62e7b55132830d70725136af9361d53b0572af3e4de7e') +sha256sums=('fcd0fd9b3d93fe26adbcf27c3e252d07997c9345f3f6f520c635a6c579143d2a') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 82f727e29a389078e1cbce6b8943754b736f400e Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Mon, 30 Jan 2017 16:47:54 +0400 Subject: [PATCH 32/50] Fix var-related error --- PKGBUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index 871f11f..7ba7ecd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -46,5 +46,7 @@ package() { ln -s "/var/lib/${pkgname}/"{data,var} "${pkgdir}/usr/share/webapps/${pkgname}/" chown -R http:http "$_VAR_DIR" + sed -i "${_VAR_DIR}/var/bootstrap.php.cache" -e "s@__DIR__.'/../@'/usr/share/webapps/${pkgname}/@" + chown -R http:http "${pkgdir}/usr/share/webapps/${pkgname}" } From 1c5c5ac71474c08800e36f8d01b5f39030b3b493 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Mon, 30 Jan 2017 16:52:49 +0400 Subject: [PATCH 33/50] Update doc URL --- wallabag.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wallabag.install b/wallabag.install index 1b342a2..efdd2cd 100644 --- a/wallabag.install +++ b/wallabag.install @@ -12,8 +12,8 @@ post_install() { echo -n "To setup your webserver and enable the needed php extensions, " echo "please read: http://doc.wallabag.org/en/master/user/installation.html" echo "" - echo -n "If you upgraded from 2.0.x, you might need to check the upgrade guide: " - echo "http://doc.wallabag.org/en/master/user/upgrade-2.0.x-2.1.1.html" + echo -n "If you upgraded from 2.0.x or 2.1.x, you might need to check " + echo "the upgrade guide: http://doc.wallabag.org/en/master/user/upgrade.html" } From c9d63a218b57ca8913d3868965745f908a7ebf6d Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Wed, 1 Feb 2017 12:07:46 +0400 Subject: [PATCH 34/50] Update to 2.2.1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b5b460d..1ceeed6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -2,7 +2,7 @@ # Sun Jan 29 09:30:48 UTC 2017 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.2.0 + pkgver = 2.2.1 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -21,8 +21,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.2.0.tar.gz - sha256sums = fcd0fd9b3d93fe26adbcf27c3e252d07997c9345f3f6f520c635a6c579143d2a + source = https://static.wallabag.org/releases/wallabag-release-2.2.1.tar.gz + sha256sums = 0f60cbab3c89be14a0ae9ce5dbb924458f6527b707847b27097fe91bdd74e14e pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 7ba7ecd..e985a13 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('fcd0fd9b3d93fe26adbcf27c3e252d07997c9345f3f6f520c635a6c579143d2a') +sha256sums=('0f60cbab3c89be14a0ae9ce5dbb924458f6527b707847b27097fe91bdd74e14e') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 840af07b6036bb6f4a8f18f097d1ffe19ca7efce Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Fri, 3 Mar 2017 14:18:33 +0400 Subject: [PATCH 35/50] Update to 2.2.2 --- .SRCINFO | 8 +++----- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1ceeed6..793b027 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Sun Jan 29 09:30:48 UTC 2017 pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.2.1 + pkgver = 2.2.2 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -21,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.2.1.tar.gz - sha256sums = 0f60cbab3c89be14a0ae9ce5dbb924458f6527b707847b27097fe91bdd74e14e + source = https://static.wallabag.org/releases/wallabag-release-2.2.2.tar.gz + sha256sums = 40d98bd556116dbc28f92339f0e5b93836ece87dcb01e7aaa628ea98855a1f51 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index e985a13..e301650 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('0f60cbab3c89be14a0ae9ce5dbb924458f6527b707847b27097fe91bdd74e14e') +sha256sums=('40d98bd556116dbc28f92339f0e5b93836ece87dcb01e7aaa628ea98855a1f51') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From b39852c260b702790d7b0c55b6b572662c3c301d Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Fri, 19 May 2017 14:29:11 +0400 Subject: [PATCH 36/50] Update to 2.2.3 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 793b027..3fa8e27 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.2.2 + pkgver = 2.2.3 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.2.2.tar.gz - sha256sums = 40d98bd556116dbc28f92339f0e5b93836ece87dcb01e7aaa628ea98855a1f51 + source = https://static.wallabag.org/releases/wallabag-release-2.2.3.tar.gz + sha256sums = 13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857 pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index e301650..d601238 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('40d98bd556116dbc28f92339f0e5b93836ece87dcb01e7aaa628ea98855a1f51') +sha256sums=('13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From d797e2d212c049ee342da788171813e2f0fe4586 Mon Sep 17 00:00:00 2001 From: Roshless Date: Sat, 20 Jan 2018 13:48:54 +0100 Subject: [PATCH 37/50] update to 2.3.1 --- PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index d601238..4ee6776 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') url='http://www.wallabag.org/' license=('MIT') depends=( - 'php>=5.5' + 'php>=5.6' 'php-gd' 'php-tidy' 'pcre' @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857') +sha256sums=('c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 2ddf40f387bc5c6b6f6637d1579776ef6b626a42 Mon Sep 17 00:00:00 2001 From: Roshless Date: Sat, 20 Jan 2018 13:52:45 +0100 Subject: [PATCH 38/50] change in folder --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 4ee6776..cee29f7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -31,7 +31,7 @@ backup=("etc/webapps/${pkgname}/parameters.yml" package() { cd "${pkgdir}" mkdir -p usr/share/webapps - mv "${srcdir}/release-${pkgver}" usr/share/webapps/${pkgname} + mv "${srcdir}/${pkgver}" usr/share/webapps/${pkgname} WALLABAG_CONF_DIR="${pkgdir}/usr/share/webapps/${pkgname}/app/config" From 8a91dc77600a1b8a264f679b835ed5953e24603b Mon Sep 17 00:00:00 2001 From: Roshless Date: Sat, 20 Jan 2018 14:29:18 +0100 Subject: [PATCH 39/50] srcinfo update and note about migrations --- .SRCINFO | 8 ++++---- wallabag.install | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3fa8e27..d7e556e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.2.3 + pkgver = 2.3.1 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install arch = any license = MIT - depends = php>=5.5 + depends = php>=5.6 depends = php-gd depends = php-tidy depends = pcre @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.2.3.tar.gz - sha256sums = 13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857 + source = https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz + sha256sums = c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2 pkgname = wallabag diff --git a/wallabag.install b/wallabag.install index efdd2cd..3c068a1 100644 --- a/wallabag.install +++ b/wallabag.install @@ -38,4 +38,11 @@ pre_upgrade() { post_upgrade() { rm -rf /var/lib/wallabag/var/cache/* + echo "" + echo "=====================================================================================" + echo " If you upgraded from 2.2.3 to 2.3.X you need to do database " + echo " migrations, check the guide: " + echo "https://doc.wallabag.org/en/admin/upgrade.html#explanations-about-database-migrations" + echo "=====================================================================================" + echo "" } From da6c63435b494fcf77b19ae57034eb2e32a5a136 Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Sun, 28 Jan 2018 18:23:10 +0400 Subject: [PATCH 40/50] Update to 2.3.2 --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d7e556e..e0ded47 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.3.1 + pkgver = 2.3.2 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz - sha256sums = c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2 + source = https://static.wallabag.org/releases/wallabag-release-2.3.2.tar.gz + sha256sums = 047a49d48a1199bd1634cab76d4af3dba95096885d4f7814377210fa76fbcc9f pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index cee29f7..42b655e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2') +sha256sums=('047a49d48a1199bd1634cab76d4af3dba95096885d4f7814377210fa76fbcc9f') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" @@ -31,7 +31,7 @@ backup=("etc/webapps/${pkgname}/parameters.yml" package() { cd "${pkgdir}" mkdir -p usr/share/webapps - mv "${srcdir}/${pkgver}" usr/share/webapps/${pkgname} + mv "${srcdir}/wallabag-release-${pkgver}" usr/share/webapps/${pkgname} WALLABAG_CONF_DIR="${pkgdir}/usr/share/webapps/${pkgname}/app/config" From 3b9bf3ed1de8281970005f861fd19e38cc793210 Mon Sep 17 00:00:00 2001 From: Robert Sprunk Date: Wed, 29 Aug 2018 09:21:05 +0200 Subject: [PATCH 41/50] Version 2.3.3 (#15) * Update to 2.3.3 * Different name of extracted folder * Quote variables --- PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 42b655e..42f41fb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.2 +pkgver=2.3.3 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('047a49d48a1199bd1634cab76d4af3dba95096885d4f7814377210fa76fbcc9f') +sha256sums=('eff21708f49f5d3d28dc51a34a5de63e551c1062ea3b7fd3c59d58fca26a058b') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" @@ -31,14 +31,14 @@ backup=("etc/webapps/${pkgname}/parameters.yml" package() { cd "${pkgdir}" mkdir -p usr/share/webapps - mv "${srcdir}/wallabag-release-${pkgver}" usr/share/webapps/${pkgname} + mv "${srcdir}/${pkgver}" "usr/share/webapps/${pkgname}" WALLABAG_CONF_DIR="${pkgdir}/usr/share/webapps/${pkgname}/app/config" install -d "${pkgdir}/etc/webapps/${pkgname}/" - mv "${WALLABAG_CONF_DIR}"/parameters.yml ${pkgdir}/etc/webapps/${pkgname}/ - chown -R http:http ${pkgdir}/etc/webapps/${pkgname} - ln -s /etc/webapps/${pkgname}/parameters.yml "${WALLABAG_CONF_DIR}"/ + mv "${WALLABAG_CONF_DIR}"/parameters.yml "${pkgdir}/etc/webapps/${pkgname}/" + chown -R http:http "${pkgdir}/etc/webapps/${pkgname}" + ln -s "/etc/webapps/${pkgname}/parameters.yml" "${WALLABAG_CONF_DIR}"/ _VAR_DIR="${pkgdir}/var/lib/${pkgname}/" install -d "$_VAR_DIR" From a7acf43421cdd508134a6f6518ee3759911e230e Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Wed, 29 Aug 2018 09:22:42 +0200 Subject: [PATCH 42/50] Update .SRCINFO --- .SRCINFO | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e0ded47..29a001e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.3.2 + pkgver = 2.3.3 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.3.2.tar.gz - sha256sums = 047a49d48a1199bd1634cab76d4af3dba95096885d4f7814377210fa76fbcc9f + source = https://static.wallabag.org/releases/wallabag-release-2.3.3.tar.gz + sha256sums = eff21708f49f5d3d28dc51a34a5de63e551c1062ea3b7fd3c59d58fca26a058b pkgname = wallabag From 88aab383a3176ce114b6d256474aafac337499ad Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Thu, 4 Oct 2018 10:47:48 +0200 Subject: [PATCH 43/50] Update config location (#16) --- wallabag.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallabag.install b/wallabag.install index 3c068a1..041b287 100644 --- a/wallabag.install +++ b/wallabag.install @@ -3,7 +3,7 @@ post_install() { echo "" echo "==> Installed in : /usr/share/webapps/wallabag" echo "" - echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" + echo "==> Config is at /etc/webapps/wallabag/parameters.yml" echo "" echo -n "Change the configuration to fit to your current setup, and then " echo "init wallabag by launching:" From a3edf9f356a542c50230f806c96859b9ae2b6d83 Mon Sep 17 00:00:00 2001 From: DonHugo69 <10484857+DonHugo69@users.noreply.github.com> Date: Mon, 7 Jan 2019 07:50:10 +0100 Subject: [PATCH 44/50] Update PKGBUILD (#17) --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 42f41fb..e5932d7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.3 +pkgver=2.3.5 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('eff21708f49f5d3d28dc51a34a5de63e551c1062ea3b7fd3c59d58fca26a058b') +sha256sums=('1b506a5050ccd9319833d16cebb1b0ed354445e03de991f0eb130c40a92f94e6') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 6d369c01047c0db5c98e841fa5da9fd9e0368b74 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Mon, 7 Jan 2019 07:52:03 +0100 Subject: [PATCH 45/50] Update .SRCINFO --- .SRCINFO | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 29a001e..1a6a3db 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.3.3 + pkgver = 2.3.5 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.3.3.tar.gz - sha256sums = eff21708f49f5d3d28dc51a34a5de63e551c1062ea3b7fd3c59d58fca26a058b + source = https://static.wallabag.org/releases/wallabag-release-2.3.5.tar.gz + sha256sums = 1b506a5050ccd9319833d16cebb1b0ed354445e03de991f0eb130c40a92f94e6 pkgname = wallabag From 30d4a0f43598b2b2f1b41abd417003d02eb29ff0 Mon Sep 17 00:00:00 2001 From: Christoph Wagner Date: Mon, 18 Feb 2019 13:25:06 +0000 Subject: [PATCH 46/50] Updated Version and sha256 checksum to 2.3.6 (#19) --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e5932d7..a601b6f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.5 +pkgver=2.3.6 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('1b506a5050ccd9319833d16cebb1b0ed354445e03de991f0eb130c40a92f94e6') +sha256sums=('018384e901a1ede2c8e3989726076d3c6f50757e6ba7e5bbbb454f92f2f00d54') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From 605cd7545ead9c0d87d47f0f64ae102797770f70 Mon Sep 17 00:00:00 2001 From: Christoph Wagner Date: Mon, 18 Feb 2019 13:25:20 +0000 Subject: [PATCH 47/50] Changed http links to https (#18) --- wallabag.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wallabag.install b/wallabag.install index 041b287..3895243 100644 --- a/wallabag.install +++ b/wallabag.install @@ -10,10 +10,10 @@ post_install() { echo "php /usr/share/webapps/wallabag/bin/console wallabag:install --env=prod" echo "" echo -n "To setup your webserver and enable the needed php extensions, " - echo "please read: http://doc.wallabag.org/en/master/user/installation.html" + echo "please read: https://doc.wallabag.org/en/master/user/installation.html" echo "" echo -n "If you upgraded from 2.0.x or 2.1.x, you might need to check " - echo "the upgrade guide: http://doc.wallabag.org/en/master/user/upgrade.html" + echo "the upgrade guide: https://doc.wallabag.org/en/master/user/upgrade.html" } From 03521deea7b6cbc9dc2e2e08c7d9cbd1fe2ca8d7 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Mon, 18 Feb 2019 14:27:09 +0100 Subject: [PATCH 48/50] Update .SRCINFO --- .SRCINFO | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1a6a3db..d41b3d0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.3.5 + pkgver = 2.3.6 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.3.5.tar.gz - sha256sums = 1b506a5050ccd9319833d16cebb1b0ed354445e03de991f0eb130c40a92f94e6 + source = https://static.wallabag.org/releases/wallabag-release-2.3.6.tar.gz + sha256sums = 018384e901a1ede2c8e3989726076d3c6f50757e6ba7e5bbbb454f92f2f00d54 pkgname = wallabag From 5aff2eb58ab1c65fecda87d66bba35cbd38963d6 Mon Sep 17 00:00:00 2001 From: marquis-de-muesli Date: Fri, 26 Apr 2019 09:42:25 +0200 Subject: [PATCH 49/50] Update to 2.3.7 (#20) --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d41b3d0..3f04af7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.3.6 + pkgver = 2.3.7 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.3.6.tar.gz - sha256sums = 018384e901a1ede2c8e3989726076d3c6f50757e6ba7e5bbbb454f92f2f00d54 + source = https://static.wallabag.org/releases/wallabag-release-2.3.7.tar.gz + sha256sums = e223de12d8ea9f889e8660df4555c37c965f5ae1ca77af3d3532ab76889762cf pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index a601b6f..633a241 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.6 +pkgver=2.3.7 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('018384e901a1ede2c8e3989726076d3c6f50757e6ba7e5bbbb454f92f2f00d54') +sha256sums=('e223de12d8ea9f889e8660df4555c37c965f5ae1ca77af3d3532ab76889762cf') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" From f2909b0b9177de0eb30fe8cc6ba7b1e3ec43d693 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Thu, 16 May 2019 08:28:10 +0200 Subject: [PATCH 50/50] Update to 2.3.8 (#21) --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3f04af7..daabb69 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wallabag pkgdesc = Self hostable application for saving web pages - pkgver = 2.3.7 + pkgver = 2.3.8 pkgrel = 1 url = http://www.wallabag.org/ install = wallabag.install @@ -19,8 +19,8 @@ pkgbase = wallabag backup = usr/share/webapps/wallabag/parameters.yml backup = var/lib/wallabag/data/db/wallabag.sqlite backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite - source = https://static.wallabag.org/releases/wallabag-release-2.3.7.tar.gz - sha256sums = e223de12d8ea9f889e8660df4555c37c965f5ae1ca77af3d3532ab76889762cf + source = https://static.wallabag.org/releases/wallabag-release-2.3.8.tar.gz + sha256sums = 58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb pkgname = wallabag diff --git a/PKGBUILD b/PKGBUILD index 633a241..42e0245 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.7 +pkgver=2.3.8 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('e223de12d8ea9f889e8660df4555c37c965f5ae1ca77af3d3532ab76889762cf') +sha256sums=('58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite"