Version 6.9 released

4 files changed, 10 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1719823e83..612254b98f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ldap-account-manager
 	pkgdesc = A webfrontend for managing entries stored in an LDAP directory
-	pkgver = 6.8
+	pkgver = 6.9
 	pkgrel = 1
 	url = https://www.ldap-account-manager.org/
 	arch = any
@@ -14,14 +14,10 @@ pkgbase = ldap-account-manager
 	optdepends = php-apache: Run LDAP Account Manager on Apache
 	optdepends = php-fpm: Run LDAP Account Manager on other webservers
 	options = !strip
-	source = http://downloads.sourceforge.net/lam/ldap-account-manager-6.8.tar.bz2
-	source = dont-look-for-alternate-perl.patch
-	source = fix-htmldir-and-docdir.patch
+	source = https://sourceforge.net/projects/lam/files/LAM/6.9/ldap-account-manager-6.9.tar.bz2/download
 	source = apache.example.conf
 	source = nginx.example.conf
-	sha256sums = e04fd60b6624d402b4dd919e9bb0cf9248f3613f554495a08c010c5958aa066e
-	sha256sums = 013dd520a357ce39e9eda5169d26c73b48d05c7e73c7ce4377f31ace8f4c88a1
-	sha256sums = dc4afc691a53f5ff46eec4ef25cc3d593d7a5a2dcbcde070d54f6554027822b3
+	sha256sums = 0849d4d817b02f4327f06c13d7c20ff7ab40ac565b73b05755cf1cfdcf127153
 	sha256sums = 229b281a85770f82f449e1e77ebd26b7583b5bc1266b234c653f2778067b1f34
 	sha256sums = c1a95b12bf047afa2c6d268b66e54a6572c5c3eef46f4726920e09789b672b3e
 
diff --git a/PKGBUILD b/PKGBUILD
index 6fecc9b8be5..96d37b7c962 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: dccafe
 
 pkgname=ldap-account-manager
-pkgver=6.8
+pkgver=6.9
 pkgrel=1
 pkgdesc="A webfrontend for managing entries stored in an LDAP directory"
 arch=('any')
@@ -15,14 +15,14 @@ optdepends=('php-mcrypt: Store LDAP password encrypted in the session file'
             'php-apache: Run LDAP Account Manager on Apache'
             'php-fpm: Run LDAP Account Manager on other webservers')
 options=('!strip')
-source=("http://downloads.sourceforge.net/lam/${pkgname}-${pkgver}.tar.bz2"
-        "dont-look-for-alternate-perl.patch"
-        "fix-htmldir-and-docdir.patch"
+source=("https://sourceforge.net/projects/lam/files/LAM/${pkgver}/ldap-account-manager-${pkgver}.tar.bz2/download"
+#        "dont-look-for-alternate-perl.patch"
+#        "fix-htmldir-and-docdir.patch"
         "apache.example.conf"
         "nginx.example.conf")
-sha256sums=('e04fd60b6624d402b4dd919e9bb0cf9248f3613f554495a08c010c5958aa066e'
-            '013dd520a357ce39e9eda5169d26c73b48d05c7e73c7ce4377f31ace8f4c88a1'
-            'dc4afc691a53f5ff46eec4ef25cc3d593d7a5a2dcbcde070d54f6554027822b3'
+sha256sums=('0849d4d817b02f4327f06c13d7c20ff7ab40ac565b73b05755cf1cfdcf127153'
+#            '013dd520a357ce39e9eda5169d26c73b48d05c7e73c7ce4377f31ace8f4c88a1'
+#            'dc4afc691a53f5ff46eec4ef25cc3d593d7a5a2dcbcde070d54f6554027822b3'
             '229b281a85770f82f449e1e77ebd26b7583b5bc1266b234c653f2778067b1f34'
             'c1a95b12bf047afa2c6d268b66e54a6572c5c3eef46f4726920e09789b672b3e')
 
diff --git a/dont-look-for-alternate-perl.patch b/dont-look-for-alternate-perl.patch
deleted file mode 100644
index 419d1bc96a7..00000000000
--- a/dont-look-for-alternate-perl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/ldap-account-manager-4.2.1/configure.ac	2013-06-17 21:09:37.000000000 +0200
-+++ configure.ac.modified	2013-07-31 18:07:19.182647332 +0200
-@@ -116,13 +116,7 @@
- 		fi
- 	],
- 	[
--# We search these paths before $PATH to find a more up-to-date/capable
--# version of perl than the system installed one.
--		TestPath="/opt/bin"
--		TestPath="${TestPath}${PATH_SEPARATOR}/opt/sfw/bin"
--		TestPath="${TestPath}${PATH_SEPARATOR}/usr/local/bin"
--		TestPath="${TestPath}${PATH_SEPARATOR}$PATH"
--		AC_PATH_PROGS(perl_path, perl5 perl, , $TestPath)
-+		AC_PATH_PROGS(perl_path, perl5 perl)
- 	]
- )
- 
diff --git a/fix-htmldir-and-docdir.patch b/fix-htmldir-and-docdir.patch
deleted file mode 100644
index bb3fef039ee..00000000000
--- a/fix-htmldir-and-docdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/ldap-account-manager-4.2.1/Makefile.in	2013-06-17 21:09:37.000000000 +0200
-+++ Makefile.in.modified	2013-07-31 18:45:48.246058432 +0200
-@@ -24,7 +24,8 @@
- sysconfdir=@sysconfdir@
- localstatedir=@localstatedir@
- mandir=@mandir@
--htmldir=@prefix@/html
-+docdir=@docdir@
-+htmldir=@htmldir@
- web_root=@WEB_ROOT@
- 
- srcdir=@srcdir@
-@@ -73,9 +74,9 @@
- 		(cd $(DESTDIR)$(sysconfdir) ; $(TAR) xf -) ; \
- 	$(LN_S) $(sysconfdir) ${LIST3} ; \
- 	(cd $(srcdir) ; $(TAR) cf - $(LIST1)) | $(TAR) xf - ; \
--	[ -d $(DESTDIR)$(prefix)/docs ]  ||  \
--		$(MKDIR) -p $(DESTDIR)$(prefix)/docs  ||  exit 1 ; \
--	(cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(prefix)/docs) ; \
-+	[ -d $(DESTDIR)$(docdir) ]  ||  \
-+		$(MKDIR) -p $(DESTDIR)$(docdir)  ||  exit 1 ; \
-+	(cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(docdir)) ; \
- 	$(PERL) -pi -e "s~/usr/bin/perl~$(PERL)~" \
- 		$(DESTDIR)$(web_root)/lib/lamdaemon.pl ; \
- 	cd $${HERE} ; \