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

2020-07-19 Thread Sébastien Luttringer via arch-commits 
Date: Sunday, July 19, 2020 @ 21:42:27
  Author: seblu
Revision: 664600

upgpkg: sslh 1.21b-2

Modified:
  sslh/trunk/PKGBUILD
  sslh/trunk/sslh-fork.service
  sslh/trunk/sslh-select.service
  sslh/trunk/sslh.service

-+
 PKGBUILD|   14 +++---
 sslh-fork.service   |2 +-
 sslh-select.service |2 +-
 sslh.service|2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-19 17:57:37 UTC (rev 664599)
+++ PKGBUILD2020-07-19 21:42:27 UTC (rev 664600)
@@ -3,7 +3,7 @@
 # Contributor: Jason Rodriguez 
 
 pkgname=sslh
-pkgver=1.20
+pkgver=1.21b
 pkgrel=2
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('x86_64')
@@ -19,12 +19,12 @@
 'sslh-select.service'
 'sslh-fork.service')
 validpgpkeys=('CDDDBADBEA4B72748E007D326C056F7AC7934136') # Yves Rutschle 

-md5sums=('6a69c6128d0349e5fb22167675d18aee'
- 'SKIP'
- '67a119213538aabf5d70a756ae7a99d0'
- 'ecbb46c46874d7b620202926d36b8478'
- '2b98633ee61bc5a809a4f75479628b2f'
- 'ca5ec0adf9149f1db4e09af659391659')
+sha256sums=('2058d3d463d33886f57230ffc8cb00486b05252cbd505f4904b6a01b0bd16d38'
+'SKIP'
+'35ed3d14c6fa78f82037b64779ec3e6884563e15df471689ede1606a05e8a59a'
+'49ed1c88b0de079bc31a94e600b63edd7ea95b4aa9b5f533c15db1221d0892db'
+'5824ae86ced9142c37343367bd737661c2da826fba244cea7072685347be2250'
+'d41f7cb8a3a3d8fc11608bc552014f03177ac3cdd8c5c6157d7d1a557d91cacb')
 
 build() {
   cd $pkgname-v$pkgver

Modified: sslh-fork.service
===
--- sslh-fork.service   2020-07-19 17:57:37 UTC (rev 664599)
+++ sslh-fork.service   2020-07-19 21:42:27 UTC (rev 664600)
@@ -4,7 +4,7 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sslh-fork --config --foreground
+ExecStart=/usr/bin/sslh-fork --config /etc/sslh.cfg --foreground
 KillMode=process
 ProtectSystem=strict
 ProtectHome=true

Modified: sslh-select.service
===
--- sslh-select.service 2020-07-19 17:57:37 UTC (rev 664599)
+++ sslh-select.service 2020-07-19 21:42:27 UTC (rev 664600)
@@ -4,7 +4,7 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sslh-select --config --foreground
+ExecStart=/usr/bin/sslh-select --config /etc/sslh.cfg --foreground
 KillMode=process
 ProtectSystem=strict
 ProtectHome=true

Modified: sslh.service
===
--- sslh.service2020-07-19 17:57:37 UTC (rev 664599)
+++ sslh.service2020-07-19 21:42:27 UTC (rev 664600)
@@ -5,7 +5,7 @@
 PartOf=sslh.socket
 
 [Service]
-ExecStart=/usr/bin/sslh --config --foreground
+ExecStart=/usr/bin/sslh --config /etc/sslh.cfg --foreground
 KillMode=process
 ProtectSystem=strict
 ProtectHome=true

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

2018-02-03 Thread Sébastien Luttringer via arch-commits 
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
===
--- PKGBUILD2018-02-03 13:44:16 UTC (rev 288791)
+++ PKGBUILD2018-02-03 14:22:48 UTC (rev 288792)
@@ -4,34 +4,46 @@
 # Contributor: Jason Rodriguez 
 
 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 

+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 
-# Contributor: Le_suisse 
-# Contributor: Jason Rodriguez 
-
-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 

-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