diff --git a/build.xml b/build.xml
index c9441af6e0cca8573b22d8b461664675a562d228..e2cd118bc8d0593936b2c4fc214fb1271bcb569c 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,6 @@
<property name="pgsqlhost" value="localhost" />
<property name="pgsqlrootuser" value="postgres" />
<property name="phpunit_extra_params" value="" />
- <property name="composer_version" value="1.10.8" />
<property name="composer_extra_params" value="" />
<property name="mink_driver" value="selenium" />
<property name="selenium_browser" value="firefox" />
@@ -30,7 +29,7 @@
<property name="skip_phpdoc" value="false" />
<property name="phpdoc_version" value="3.0.0-alpha.4" />
- <property name="version" value="6.1.2" />
+ <property name="version" value="6.1.1" />
<!-- We only need the -p switch if the password is non-blank -->
<if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>
@@ -183,11 +182,6 @@
<exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_LOCAL_DIR=${srcdir}/local VUFIND_URL=${vufindurl} ${srcdir}/vendor/bin/phpunit -dzend.enable_gc=0 ${phpunit_extra_params}" passthru="true" checkreturn="true" />
</target>
- <!-- PHPUnit without logging output, stopping at first error or failure -->
- <target name="phpunitfaster" description="Run tests until first failure">
- <exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_LOCAL_DIR=${srcdir}/local VUFIND_URL=${vufindurl} ${srcdir}/vendor/bin/phpunit -dzend.enable_gc=0 --stop-on-failure ${phpunit_extra_params}" passthru="true" checkreturn="true" />
- </target>
-
<target name="installsolr" description="Install Solr">
<!-- load previously installed version from marker file, if present -->
<if>
@@ -248,7 +242,7 @@
</target>
<target name="composer" description="Install dependencies with Composer">
- <httpget url="https://getcomposer.org/download/${composer_version}/composer.phar" sslVerifyPeer="false" dir="${srcdir}" />
+ <httpget url="https://getcomposer.org/composer.phar" sslVerifyPeer="false" dir="${srcdir}" />
<echo message="Installing dependencies..." />
<exec command="php ${srcdir}/composer.phar install ${composer_extra_params}" passthru="true" checkreturn="true" />
</target>
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index e5cd9e8d92a14ce655909c7c1c8ecc2e12dfa1c7..f33d6b17fe7f0ec919254e7b9a2ac3c6b001df1e 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -151,7 +151,7 @@ allowSavedSearches = true
; features (such as display of hierarchies).
nonJavascriptSupportEnabled = false
; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 6.1.2"
+generator = "VuFind 6.1.1"
; This section allows you to configure the mechanism used for storing user
; sessions. Available types: File, Memcache, Database, Redis.
@@ -601,20 +601,6 @@ sms = enabled
; store its path in the database (default "none").
url_shortener = none
-; Which method to use for generating the short link key. Options:
-; - base62: Base62-encode the database row ID (insecure, but makes very short URLs)
-; - md5: Create a salted MD5 hash of the URL (DEFAULT: more private, but also longer)
-; ...or any hash algorithm supported by PHP's hash() function.
-url_shortener_key_type = md5
-
-; Which redirect mechanism to use when shortlinks are resolved.
-; threshold:1000 (default) : If the URL is shorter than the given size, HTTP is used, else HTML.
-; html : HTML meta redirect after 3 seconds with infobox.
-; http : Use HTTP location header for redirects.
-; May cause problems if the HTTP header is longer than 8192 bytes
-; due to long URL's.
-;url_shortener_redirect_method = threshold:1000
-
; This section needs to be changed to match your database connection information
[Database]
; Connection string format is [platform]://[username]:[password]@[host]:[port]/[db]
@@ -1064,14 +1050,14 @@ timeout = 10
; Booksite CATS Enhanced Content - cover images, reviews, description, etc.
[Booksite]
url = "https://api.booksite.com"
-;key = "Key"
+;key = "XXXXXXXXXXXXXXXXX"
; Content Cafe is a subscription service from Baker & Taylor. If you are using this
; service (see the [Content] section above for details), you MUST uncomment and set
; the password (pw) setting. You may also change the API base URL (url) if needed.
[Contentcafe]
;url = "http://contentcafe2.btol.com"
-;pw = "Password"
+;pw = "xxxxxx"
; Summon is optional; this section is used for your API credentials. apiId is the
; short, human-readable identifier for your Summon account; apiKey is the longer,
@@ -1331,7 +1317,7 @@ url = https://www.myendnoteweb.com/EndNoteWeb.html
;type = socks5
; Default HTTP settings can be loaded here. These values will be passed to
-; the \Laminas\Http\Client's setOptions method.
+; the \Zend\Http\Client's setOptions method.
[Http]
;sslcapath = "/etc/ssl/certs" ; e.g. for Debian systems
;sslcafile = "/etc/pki/tls/cert.pem" ; e.g. for CentOS systems
@@ -1340,7 +1326,7 @@ url = https://www.myendnoteweb.com/EndNoteWeb.html
; Example: Using a CURL Adapter instead of the the defaultAdapter (Socket); note
; that you may also need to install CURL and PHP/CURL packages on your server.
-;adapter = 'Laminas\Http\Client\Adapter\Curl'
+;adapter = 'Zend\Http\Client\Adapter\Curl'
; Spelling Suggestions
;
@@ -1690,11 +1676,11 @@ HMACkey = mySuperSecretValue
; VUFIND_CACHE_DIR (see httpd-vufind.conf). The default location is inside the
; local settings directory.
[Cache]
-; Set time to live value for caches (in seconds), 0 means maximum possible.
+; Set time to live value for Zend caches (in seconds), 0 means maximum possible.
;ttl = 0
; Override umask for cache directories and files.
;umask = 022
-; Permissions for framework-created cache directories and files, subject to umask
+; Permissions for Zend-created cache directories and files, subject to umask
; Default dir_permission seems to be 0700.
;dir_permission = 0700
; Default file_permission seems to be 0600.
diff --git a/package.json b/package.json
index c37cfbc54e713a854521b976988632de1c6942fc..47d3beacdac3c91f736eb4f1bf55ddfb16a7e0a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vufind",
- "version": "6.1.0",
+ "version": "6.1.1",
"description": "Dev tools to handle css preprocessing, js magic, and compression",
"repository": {
"type": "git",
diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog
index a45a887f997af488dd9a5349d36eface54d8e1de..8e3780c4ab5f8f9a5e4408c154e5bb5d2be62fec 100644
--- a/packages/DEBIAN/changelog
+++ b/packages/DEBIAN/changelog
@@ -1,9 +1,3 @@
-vufind 6.1.2 distribution; urgency=low
-
- * VuFind 6.1.2 release (see http://vufind.org/wiki/changelog for details)
-
- -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Mo 13 Jul 2020 10:00:00 UTC
-
vufind 6.1.1 distribution; urgency=low
* VuFind 6.1.1 release (see http://vufind.org/wiki/changelog for details)
diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control
index 8e95f06574f548258e81b9fcd94f5747640ef3f4..15269aa3512dd25342025bc45ee8abac12b18159 100644
--- a/packages/DEBIAN/control
+++ b/packages/DEBIAN/control
@@ -1,5 +1,5 @@
Package: vufind
-Version: 6.1.2
+Version: 6.1.1
Section: World Wide Web
Priority: Optional
Architecture: all