5 files changed, 24 insertions, 15 deletions
diff --git a/system/letsencrypt/README b/system/letsencrypt/README
index 6e439e00c5..96337ef219 100644
--- a/system/letsencrypt/README
+++ b/system/letsencrypt/README
@@ -1,6 +1,10 @@
-The Let's Encrypt Client is a tool to automatically receive and
-install X.509 certificates to enable TLS on servers.
+The Let's Encrypt Client (now called certbot) is a tool to
+automatically receive and install X.509 certificates to enable TLS on servers.
 The client will interoperate with the Let's Encrypt CA which will be
 issuing browser-trusted certificates for free.
 
 See README.Slackware for more detailed instructions.
+
+Note: the certificate client tool is now certbot, but a symlink is provided
+to be backward compatible with previous letsencrypt version.
+Please rename the script to the new name: certbot
diff --git a/system/letsencrypt/README.Slackware b/system/letsencrypt/README.Slackware
index c35a22d74c..1ff60af3be 100644
--- a/system/letsencrypt/README.Slackware
+++ b/system/letsencrypt/README.Slackware
@@ -8,7 +8,7 @@ Since Slackware is not yet supported, instead of running "letsencrypt-auto certo
 as instructed, you can run "letsencrypt certonly" to install certificates manually using standalone plugin.
 
 Here's what i use to create a certificate using port 443 for domain validation
-letsencrypt certonly --webroot-path=<DOCUMENT-ROOT> --standalone-supported-challenges tls-sni-01 -d <DOMAIN-NAME> \
+certbot certonly --webroot-path=<DOCUMENT-ROOT> --standalone-supported-challenges tls-sni-01 -d <DOMAIN-NAME> \
 --email <ADMIN-EMAIL> --renew-by-default --agree-tos --text --standalone
 
 If you want to use port 80 for domain validation, replace
@@ -31,8 +31,8 @@ Best way is to use a simple bash script that perform following actions:
 - start httpd service
 
 RATE LIMIT
-Rate limit on registrations per IP is now 10 per 3 hours.
-Rate limit on certificates per Domain is now 5 per 7 days.
+Rate limit on registrations per IP is now 500 per 3 hours.
+Rate limit on certificates per Domain is now 20 per 7 days.
 
 CONFIGURATION FILES
 
diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild
index 2e1bfc198f..6d62dd7ee6 100644
--- a/system/letsencrypt/letsencrypt.SlackBuild
+++ b/system/letsencrypt/letsencrypt.SlackBuild
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=letsencrypt
-VERSION=${VERSION:-0.5.0}
+SRCNAM=certbot
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -95,6 +96,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.rst *.md *.txt *.in $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+cd $PKG/usr/bin
+ln -s certbot letsencrypt
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info
index c3777c1e41..9c62d01f24 100644
--- a/system/letsencrypt/letsencrypt.info
+++ b/system/letsencrypt/letsencrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="letsencrypt"
-VERSION="0.5.0"
+VERSION="0.6.0"
 HOMEPAGE="https://letsencrypt.org/"
-DOWNLOAD="https://github.com/letsencrypt/letsencrypt/archive/v0.5.0.tar.gz"
-MD5SUM="767521d7b5ae1f648071128356e8de5a"
+DOWNLOAD="https://github.com/certbot/certbot/archive/v0.6.0.tar.gz"
+MD5SUM="350c3cecbb066b96739a50cba04f5d4c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="configobj mock python-requests pytz python2-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python-augeas pyparsing"
diff --git a/system/letsencrypt/slack-desc b/system/letsencrypt/slack-desc
index 87d971c033..d8cd1639ca 100644
--- a/system/letsencrypt/slack-desc
+++ b/system/letsencrypt/slack-desc
@@ -8,12 +8,13 @@
            |-----handy-ruler------------------------------------------------------|
 letsencrypt: letsencrypt (Manage X.509 certificates)
 letsencrypt:
-letsencrypt: The Let's Encrypt Client is a tool to automatically receive and
-letsencrypt: install X.509 certificates to enable TLS on servers.
+letsencrypt: The Let's Encrypt Client (now called certbot) is a tool to
+letsencrypt: automatically receive and install X.509 certificates to enable TLS
+letsencrypt: on servers.
+letsencrypt:
 letsencrypt: The client will interoperate with the Let's Encrypt CA which will be
 letsencrypt: issuing browser-trusted certificates for free.
 letsencrypt:
-letsencrypt:
 letsencrypt: Project URL: https://letsencrypt.org/
 letsencrypt:
 letsencrypt: