Updated fusiondirectory to 1.4

2 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78df8b0f54be..0b1c49ee36a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fusiondirectory
 	pkgdesc = A combination of system administrator and end user web interface, designed to handle LDAP based setups
-	pkgver = 1.4.dev
-	pkgrel = 3
+	pkgver = 1.4
+	pkgrel = 1
 	url = http://fusiondirectory.org/
 	install = fusiondirectory.install
 	arch = any
@@ -30,13 +30,13 @@ pkgbase = fusiondirectory
 	optdepends = nginx: webserver
 	optdepends = php-cas: cas authentication
 	options = !strip
-	source = https://github.com/fusiondirectory/fusiondirectory/archive/952afba6f3c0adf945937cb2fc21c40fa1d21d36.tar.gz
+	source = https://github.com/fusiondirectory/fusiondirectory/archive/refs/tags/fusiondirectory-1.4.tar.gz
 	source = http://script.aculo.us/dist/scriptaculous-js-1.9.0.zip
 	source = fusiondirectory.php.ini
 	source = fusiondirectory.tmpfiles
-	sha256sums = 4f27b6e1cbb5e78aeaacddfe27ed62155d97897e615a59cd15f08c499c706c09
-	sha256sums = 1fa39bd110d3326a14f920601803813f088d08ecb2cc645aa7075884d998f6f6
-	sha256sums = a8264c307ff6ec8fd3723831414bd8ce343703347dcddaa945b8cb18be4c89a7
-	sha256sums = 1929afae6a7917535e44feac5455be35a2d6045a226e858a5ddd9b6204852f84
+	b2sums = c0e021f9b4302e781640116097233465dd0768d4ef44c42f1051e307a341ea5cfa62bfd4c6690023e37dd7c9b5fe4b230a927c609bf530901f0f98c5623c1d29
+	b2sums = 1d3b125eaeba7c9017cb02f91b9081aceb83c0cbedcb5e6d8e3bf75d7282cc8ca2392240621f06fad8d05af0801433a8572979d95a8a6f7fb2ad47c12f23a132
+	b2sums = 44c6f9f67d2d10291ecbc5cdc652181d4e4e03ea68e559093ab5e6cf4cfd50ed5148dc840ca73e390d493652805f6ce945b8abb750a39a6a6fa7aa329aedb0bd
+	b2sums = 01764572fbcb0a39b0130b20ab1bdad7d1cd2c1800dd51a91fb71a289c2630e0f6cb82d440a59218c8117eea366fdd463f92066f3ea8bcab2c9de42e377ef5d4
 
 pkgname = fusiondirectory
diff --git a/PKGBUILD b/PKGBUILD
index a1a9316877f1..5b337a0f3b82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,8 @@
 # Contributor K1412 <jonathan@opensides.be>
 
 pkgname="fusiondirectory"
-pkgver=1.4.dev
-pkgrel=3
-_commit="952afba6f3c0adf945937cb2fc21c40fa1d21d36"
+pkgver=1.4
+pkgrel=1
 pkgdesc="A combination of system administrator and end user web interface, designed to handle LDAP based setups"
 url="http://fusiondirectory.org/"
 license=("GPL2")
@@ -33,20 +32,19 @@ optdepends=("fusiondirectory-plugins: core plugins"
             "nginx: webserver"
             "php-cas: cas authentication"
             )
-source=(#"https://repos.fusiondirectory.org/sources/$pkgname/$pkgname-$pkgver.tar.gz"
-        "https://github.com/fusiondirectory/fusiondirectory/archive/$_commit.tar.gz"
+source=("https://github.com/fusiondirectory/$pkgname/archive/refs/tags/fusiondirectory-$pkgver.tar.gz"
         "http://script.aculo.us/dist/scriptaculous-js-1.9.0.zip"
         "$pkgname.php.ini"
         "$pkgname.tmpfiles")
-sha256sums=('4f27b6e1cbb5e78aeaacddfe27ed62155d97897e615a59cd15f08c499c706c09'
-            '1fa39bd110d3326a14f920601803813f088d08ecb2cc645aa7075884d998f6f6'
-            'a8264c307ff6ec8fd3723831414bd8ce343703347dcddaa945b8cb18be4c89a7'
-            '1929afae6a7917535e44feac5455be35a2d6045a226e858a5ddd9b6204852f84')
+b2sums=('c0e021f9b4302e781640116097233465dd0768d4ef44c42f1051e307a341ea5cfa62bfd4c6690023e37dd7c9b5fe4b230a927c609bf530901f0f98c5623c1d29'
+        '1d3b125eaeba7c9017cb02f91b9081aceb83c0cbedcb5e6d8e3bf75d7282cc8ca2392240621f06fad8d05af0801433a8572979d95a8a6f7fb2ad47c12f23a132'
+        '44c6f9f67d2d10291ecbc5cdc652181d4e4e03ea68e559093ab5e6cf4cfd50ed5148dc840ca73e390d493652805f6ce945b8abb750a39a6a6fa7aa329aedb0bd'
+        '01764572fbcb0a39b0130b20ab1bdad7d1cd2c1800dd51a91fb71a289c2630e0f6cb82d440a59218c8117eea366fdd463f92066f3ea8bcab2c9de42e377ef5d4')
 install="$pkgname.install"
 options=("!strip")
 
 prepare() {
- cd "$pkgname-$_commit"
+ cd "fusiondirectory-$pkgname-$pkgver"
  find . -type f -exec sed -i {} \
                           -e "s|/etc/$pkgname|/etc/webapps/$pkgname|g" \
                           -e "s|/etc/ldap|/etc/openldap|g" \
@@ -56,7 +54,7 @@ prepare() {
 }
 
 package(){
- cd "$pkgname-$_commit"
+ cd "fusiondirectory-$pkgname-$pkgver"
  # directories
  install -d -m 755 "$pkgdir/etc/openldap/schema/$pkgname"
  install -d -m 750 "$pkgdir/etc/webapps/$pkgname"
@@ -73,9 +71,9 @@ package(){
  done
  cp -a ../"scriptaculous-js-1.9.0/src/"* "$pkgdir/usr/share/webapps/$pkgname/html/include"
  cp -a ../"scriptaculous-js-1.9.0/lib/prototype.js" "$pkgdir/usr/share/webapps/$pkgname/html/include"
- # executables
- find "contrib/bin/" -type f -exec chmod +x {} \;
- mv "contrib/bin/" "$pkgdir/usr/"
+ # executables, no more in 1.4
+ #find "contrib/bin/" -type f -exec chmod +x {} \;
+ #mv "contrib/bin/" "$pkgdir/usr/"
  # ldap schemas
  cp "contrib/openldap/"* "$pkgdir/etc/openldap/schema/$pkgname/"
  # configuration file template
@@ -85,12 +83,12 @@ package(){
  # smarty3 plugins
  cp "contrib/smarty/plugins/"* "$pkgdir/usr/share/php/smarty3/plugins/"
  rm -r "contrib/smarty"
- # man pages
- gzip -f "contrib/man/$pkgname-setup.1" "contrib/man/$pkgname-insert-schema.1" "contrib/man/$pkgname.conf.5"
- install -D -m 644 "contrib/man/$pkgname-setup.1.gz" "$pkgdir/usr/share/man/man1/$pkgname-setup.1.gz"
- install -D -m 644 "contrib/man/$pkgname-insert-schema.1.gz" "$pkgdir/usr/share/man/man1/$pkgname-insert-schema.1.gz"
- install -D -m 644 "contrib/man/$pkgname.conf.5.gz" "$pkgdir/usr/share/man/man5/$pkgname.conf.5.gz"
- rm -r "contrib/man/"
+ # man pages, no more in 1.4
+ #gzip -f "contrib/man/$pkgname-setup.1" "contrib/man/$pkgname-insert-schema.1" "contrib/man/$pkgname.conf.5"
+ #install -D -m 644 "contrib/man/$pkgname-setup.1.gz" "$pkgdir/usr/share/man/man1/$pkgname-setup.1.gz"
+ #install -D -m 644 "contrib/man/$pkgname-insert-schema.1.gz" "$pkgdir/usr/share/man/man1/$pkgname-insert-schema.1.gz"
+ #install -D -m 644 "contrib/man/$pkgname.conf.5.gz" "$pkgdir/usr/share/man/man5/$pkgname.conf.5.gz"
+ #rm -r "contrib/man/"
  # example snippets
  cp -r "contrib" "$pkgdir/usr/share/doc/$pkgname/"
  # directories and file permission