[arch-commits] Commit in dropbear/trunk (PKGBUILD localoptions.h)

[Alexander Rødseth]

    Date: Saturday, October 6, 2018 @ 15:13:55
  Author: arodseth
Revision: 390881

upgpkg: dropbear 2018.76-3

Modified:
  dropbear/trunk/PKGBUILD
  dropbear/trunk/localoptions.h

----------------+
 PKGBUILD       |   10 ++++++----
 localoptions.h |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-06 14:02:45 UTC (rev 390880)
+++ PKGBUILD	2018-10-06 15:13:55 UTC (rev 390881)
@@ -7,9 +7,9 @@
 # Contributor: Simon Perry <aur at sanxion.net>
 
 pkgbase=dropbear
-pkgname=(dropbear scp)
+pkgname=(dropbear dropbear-scp)
 pkgver=2018.76
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight SSH server'
 arch=('x86_64')
 url='https://matt.ucc.asn.au/dropbear/dropbear.html'
@@ -21,7 +21,7 @@
         "$pkgname.service")
 sha256sums=('f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65'
             'SKIP'
-            'ad524b470170ecb297df2c4a7307f56d4c56b65fb643b0356775799c4928e879'
+            'a284c2a2570d5b1f98f38fc044ab6fd45b9834be7a91216df7f159257b54e0bc'
             '0c0e5b9d121b9d728fed92d6574f2a96d74e4f8a61169dc1e452488f43bb1484')
 
 prepare() {
@@ -44,13 +44,15 @@
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_scp() {
+package_dropbear-scp() {
   pkgdesc='Lightweight application for copying files over SSH'
+  provides=('scp')
   conflicts=('openssh')
 
   make -C "$pkgbase-$pkgver" install PROGRAMS="scp" DESTDIR="$pkgdir"
   install -Dm644 "$pkgbase-$pkgver/LICENSE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rmdir "$pkgdir/usr/share/man"{/man1,}
 }
 
 # vim: ts=2 sw=2 et:

Modified: localoptions.h
===================================================================
--- localoptions.h	2018-10-06 14:02:45 UTC (rev 390880)
+++ localoptions.h	2018-10-06 15:13:55 UTC (rev 390881)
@@ -2,7 +2,7 @@
  * Arch Linux configuration for DropBear
  *
  * The majority of these options are disabled or enabled as a result of
- * running ssh-audit.
+ * running ssh-audit:
  *
  * https://github.com/arthepsy/ssh-audit
  */
@@ -10,7 +10,7 @@
 /* Disable CBC mode for ciphers */
 #define DROPBEAR_ENABLE_CBC_MODE 0
 
-/* Disable X11 Forwarding on the server */
+/* Disable X11 forwarding on the server */
 #define DROPBEAR_X11FWD 0
 
 /* Disable reverse DNS lookups */
@@ -29,12 +29,14 @@
 
 /* Disable ECDH */
 #define DROPBEAR_ECDH 0
-#define DROPBEAR_ECDSA 0
 
+/* Keep ECDSA, for practical purposes */
+#define DROPBEAR_ECDSA 1
+
 /* SFTP server path */
 #define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"
 
-/* Spend a small mount of bytes for an increase in performance */
+/* Spend a small amount of bytes for an increase in performance */
 #define DROPBEAR_SMALL_CODE 0
 
 /* Default path */