[arch-commits] Commit in sslh/trunk (4 files)

Sébastien Luttringer seblu at archlinux.org
Sat Feb 3 14:22:49 UTC 2018 

    Date: Saturday, February 3, 2018 @ 14:22:48
  Author: seblu
Revision: 288792

Prepare 1.19 release

Modified:
  sslh/trunk/PKGBUILD
  sslh/trunk/sslh.install
Deleted:
  sslh/trunk/PKGBUILD.next
  sslh/trunk/sslh.install.next

-------------------+
 PKGBUILD          |   39 +++++++++++++++++++---------
 PKGBUILD.next     |   71 ----------------------------------------------------
 sslh.install      |    6 ++++
 sslh.install.next |   24 -----------------
 4 files changed, 33 insertions(+), 107 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-03 13:44:16 UTC (rev 288791)
+++ PKGBUILD	2018-02-03 14:22:48 UTC (rev 288792)
@@ -4,34 +4,46 @@
 # Contributor: Jason Rodriguez <jason-aur at catloaf.net>
 
 pkgname=sslh
-pkgver=1.18
-pkgrel=4
+pkgver=1.19b
+pkgrel=1
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('x86_64')
-url='http://www.rutschle.net/tech/sslh.shtml'
+url='https://www.rutschle.net/tech/sslh/README.html'
 license=('GPL2')
-depends=('libcap' 'libconfig')
-backup=('etc/sslh.conf')
+makedepends=('systemd')
+depends=('glibc' 'libcap' 'libconfig' 'pcre' 'libsystemd')
+backup=('etc/sslh.cfg')
 install=$pkgname.install
-source=("http://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz"
-        'sslh.conf'
+source=("https://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz"{,.asc}
+        'sslh.cfg'
         'sslh.sysusers'
+        'sslh.service'
         'sslh-select.service'
         'sslh-fork.service')
-md5sums=('0e3568d5d234516c634d4df156473298'
+validpgpkeys=('CDDDBADBEA4B72748E007D326C056F7AC7934136') # Yves Rutschle <yves at rutschle.net>
+md5sums=('33e371c978614638b4c0db4e40afa5c4'
+         'SKIP'
          'd5405c7ca7e1813e4d49a473e5834640'
          'f39544277a30595d4b7476b3f87ebbcf'
+         'e66490eacc9cb586e48e4e0562ac25e3'
          '0f3f9e3ac2ac4b576d684b21b566aeb9'
          '4e64f0850ec9bd44071ae8d5369316e5')
 
 build() {
   cd $pkgname-v$pkgver
-  make VERSION=\"v$pkgver\" USELIBCAP=1
+  #FIXME: https://github.com/yrutschle/sslh/issues/103
+  #export CFLAGS=''
+  make VERSION=\"v$pkgver\" USELIBCAP=1 USESYSTEMD=1 all systemd-sslh-generator
 }
 
+#check() {
+#  cd $pkgname-v$pkgver
+#  make test
+#}
+
 package() {
   # default arch config
-  install -Dm 644 sslh.conf "$pkgdir/etc/sslh.conf"
+  install -Dm 644 sslh.cfg "$pkgdir/etc/sslh.cfg"
   # manually install to have both ssl-fork and ssl-select
   cd $pkgname-v$pkgver
   install -Dm 755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
@@ -39,13 +51,16 @@
   ln -s sslh-fork "$pkgdir/usr/bin/sslh"
   # install manpage
   install -Dm 644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+  ln -s sslh.8.gz "$pkgdir/usr/share/man/man8/sslh-fork.8.gz"
+  ln -s sslh.8.gz "$pkgdir/usr/share/man/man8/sslh-select.8.gz"
   # install examples files
   install -Dm 644 basic.cfg "$pkgdir/usr/share/doc/$pkgname/basic.cfg"
   install -Dm 644 example.cfg "$pkgdir/usr/share/doc/$pkgname/example.cfg"
   # systemd
+  install -dm 755 "$pkgdir"/usr/lib/{systemd/system,sysusers.d}
+  install -Dm 755 systemd-sslh-generator "$pkgdir/usr/lib/systemd/system-generators/systemd-sslh-generator"
   cd "$pkgdir"
-  install -dm 755 usr/lib/{systemd/system,sysusers.d}
-  install -Dm 644 "$srcdir"/sslh-{fork,select}.service usr/lib/systemd/system
+  install -Dm 644 "$srcdir"/sslh{,-fork,-select}.service usr/lib/systemd/system
   install -Dm 644 "$srcdir"/sslh.sysusers usr/lib/sysusers.d/sslh.conf
 }
 

Deleted: PKGBUILD.next
===================================================================
--- PKGBUILD.next	2018-02-03 13:44:16 UTC (rev 288791)
+++ PKGBUILD.next	2018-02-03 14:22:48 UTC (rev 288792)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
-# Contributor: Jason Rodriguez <jason-aur at catloaf.net>
-
-pkgname=sslh
-pkgver=1.18
-pkgrel=1.2
-pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
-arch=('x86_64')
-url='http://www.rutschle.net/tech/sslh.shtml'
-license=('GPL2')
-makedepends=('systemd')
-depends=('libcap' 'libconfig' 'libsystemd')
-backup=('etc/sslh.cfg')
-install=$pkgname.install
-source=("http://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz"{,.asc}
-        'sslh-master.zip'
-        'sslh.cfg'
-        'sslh.sysusers'
-        'sslh.service'
-        'sslh-select.service'
-        'sslh-fork.service')
-validpgpkeys=('CDDDBADBEA4B72748E007D326C056F7AC7934136') # Yves Rutschle <yves at rutschle.net>
-md5sums=('0e3568d5d234516c634d4df156473298'
-         'SKIP'
-         '5cfde7884d5c9d7a8b7b971b3f37e94b'
-         'd5405c7ca7e1813e4d49a473e5834640'
-         'f39544277a30595d4b7476b3f87ebbcf'
-         'e66490eacc9cb586e48e4e0562ac25e3'
-         '7f95dc8ce4c8dfbe5cd0b1cabb8acb31'
-         'ea5733ec4c68709a813e84b4403e342a')
-
-build() {
-  #cd $pkgname-v$pkgver
-  cd sslh-master
-  #FIXME: https://github.com/yrutschle/sslh/issues/103
-  export CFLAGS=''
-  make VERSION=\"v$pkgver\" USELIBCAP=1 USESYSTEMD=1 all systemd-sslh-generator
-}
-
-#check() {
-#  cd $pkgname-v$pkgver
-#  make test
-#}
-
-package() {
-  # default arch config
-  install -Dm 644 sslh.cfg "$pkgdir/etc/sslh.cfg"
-  # manually install to have both ssl-fork and ssl-select
-  #cd $pkgname-v$pkgver
-  cd sslh-master
-  install -Dm 755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
-  install -Dm 755 sslh-select "$pkgdir/usr/bin/sslh-select"
-  ln -s sslh-fork "$pkgdir/usr/bin/sslh"
-  # install manpage
-  install -Dm 644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
-  ln -s sslh.8.gz "$pkgdir/usr/share/man/man8/sslh-fork.8.gz"
-  ln -s sslh.8.gz "$pkgdir/usr/share/man/man8/sslh-select.8.gz"
-  # install examples files
-  install -Dm 644 basic.cfg "$pkgdir/usr/share/doc/$pkgname/basic.cfg"
-  install -Dm 644 example.cfg "$pkgdir/usr/share/doc/$pkgname/example.cfg"
-  # systemd
-  install -dm 755 "$pkgdir"/usr/lib/{systemd/system,sysusers.d}
-  install -Dm 755 systemd-sslh-generator "$pkgdir/usr/lib/systemd/system-generators/systemd-sslh-generator"
-  cd "$pkgdir"
-  install -Dm 644 "$srcdir"/sslh{,-fork,-select}.service usr/lib/systemd/system
-  install -Dm 644 "$srcdir"/sslh.sysusers usr/lib/sysusers.d/sslh.conf
-}
-
-# vim:set ts=2 sw=2 et:

Modified: sslh.install
===================================================================
--- sslh.install	2018-02-03 13:44:16 UTC (rev 288791)
+++ sslh.install	2018-02-03 14:22:48 UTC (rev 288792)
@@ -13,6 +13,12 @@
 ===> sslh may runs as unprivileged sslh user. Check your setup.
 EOF
   fi
+  if (( "$(vercmp $2 1.19b)" < 0 )); then
+    cat << EOF
+===> Default config path is now /etc/sslh.cfg (as required by systemd generator)
+===> Rename your /etc/sslh.conf into /etc/sslh.cfg
+EOF
+  fi
 }
 
 # vim:set ts=2 sw=2 ft=sh et:

Deleted: sslh.install.next
===================================================================
--- sslh.install.next	2018-02-03 13:44:16 UTC (rev 288791)
+++ sslh.install.next	2018-02-03 14:22:48 UTC (rev 288792)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if (( "$(vercmp $2 1.14-1)" <= 0 )); then
-    cat << EOF
-===> sslh systemd service has been splitted in sslh-fork.service and sslh-select.service
-EOF
-  fi
-  if (( "$(vercmp $2 1.16-3)" < 0 )); then
-    cat << EOF
-===> sslh may runs as unprivileged sslh user. Check your setup.
-EOF
-  fi
-  if (( "$(vercmp $2 1.18-2)" < 0 )); then
-    cat << EOF
-===> Default config path is now /etc/sslh.cfg (as required by systemd generator)
-===> Rename your /etc/sslh.conf into /etc/sslh.cfg
-EOF
-  fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

More information about the arch-commits mailing list