Browse Source

Refresh patch queue

Remove "add-systemd-documentation-key.patch", applied upstream.
Christoph Biedl 10 months ago
parent
commit
5c94acc961

+ 3 - 3
debian/patches/for-upstream/2018-08-11.use-asciidoctor-to-build-manpages.patch

@@ -5,8 +5,8 @@ Bug: https://github.com/latchset/tang/issues/32
 
 --- a/meson.build
 +++ b/meson.build
-@@ -51,7 +51,7 @@
- )
+@@ -53,7 +53,7 @@
+ add_project_arguments('-DVERSION="'+meson.project_version() + '"', language : 'c')
  
  jose = dependency('jose', version: '>=8')
 -a2x = find_program('a2x', required: false)
@@ -14,7 +14,7 @@ Bug: https://github.com/latchset/tang/issues/32
  compiler = meson.get_compiler('c')
  if not compiler.has_header('http_parser.h',args : '-I/usr/local/include')
    error('http-parser devel files not found.')
-@@ -78,16 +78,16 @@
+@@ -80,16 +80,16 @@
  install_data(units, install_dir: systemunitdir)
  install_data(licenses, install_dir: licensedir)
  

+ 0 - 14
debian/patches/for-upstream/2018-08-12.add-systemd-documentation-key.patch

@@ -1,14 +0,0 @@
-Subject: Add documentation key to system unit file
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2018-08-12
-Bug: https://github.com/latchset/tang/issues/49
-
---- a/units/tangd@.service.in
-+++ b/units/tangd@.service.in
-@@ -1,5 +1,6 @@
- [Unit]
- Description=Tang Server
-+Documentation=man:tangd(8)
- 
- [Service]
- StandardInput=socket

+ 3 - 1
debian/patches/for-upstream/2021-09-30.run-as-tang-user.patch

@@ -5,8 +5,10 @@ Forwarded: https://github.com/latchset/tang/issues/82
 
 --- a/units/tangd@.service.in
 +++ b/units/tangd@.service.in
-@@ -8,3 +8,4 @@
+@@ -8,4 +8,4 @@
  StandardError=journal
  ExecStart=@libexecdir@/tangd @jwkdir@
  User=@user@
+-Group=@group@
+\ No newline at end of file
 +Group=@group@

+ 0 - 1
debian/patches/series

@@ -3,7 +3,6 @@
 
 # patches for upstream
 for-upstream/2018-08-11.use-asciidoctor-to-build-manpages.patch
-for-upstream/2018-08-12.add-systemd-documentation-key.patch
 for-upstream/2021-09-30.run-as-tang-user.patch
 
 # patches for Debian