Package: resolv-wrapper
Version: 1.1.8-1
Severity: wishlist
Control: tags -1 +patch

Hi

I recently became interested in the cwrap projects [1] and have packaged
priv-wrapper [2] and joined the sssd-team and have uploaded new versions
of uid-wrapper, nss-wrapper and pam-wrapper into Debian.

Next on my radar is socket-wrapper and resolv-wrapper.  These packages
are quite similar to the other *-wrapper projects, and the debian/
directory share a lots of similarities.  Thus I think it would be nice
to join efforts and I would be happy to help with socket-wrapper and
resolv-wrapper too.  Wether to do it under the SSSD umbrella (I hope
Timo is happy to add you) or not doesn't matter to me, but it seems nice
to have all cwrap projects under the same "home" in Debian.

What do you think?

I'm attaching a concrete debdiff patch for resolv-wrapper that I
propose, if you agree I can upload it to make it "official".  I'm also
happy to revise it as you prefer.

/Simon

[1] https://cwrap.org/
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042827
diff -Nru resolv-wrapper-1.1.8/debian/changelog resolv-wrapper-1.1.8/debian/changelog
--- resolv-wrapper-1.1.8/debian/changelog	2023-01-21 12:44:51.000000000 +0100
+++ resolv-wrapper-1.1.8/debian/changelog	2023-08-06 10:19:30.000000000 +0200
@@ -1,3 +1,20 @@
+resolv-wrapper (1.1.8-2) unstable; urgency=medium
+
+  * Make package team maintained.
+  * Drop obsolete XS-Testsuite.
+  * Add debian/upstream/metadata.
+  * Add debian/upstream/signing-key.asc.
+  * Update debian/watch and use pgpsigurlmangle.
+  * copyright: Add myself for debian/* changes.
+  * Add Vcs-* fields.
+  * Add Rules-Requires-Root: no.
+  * Build with hardening=+all.
+  * Drop versioned constraint on cmake and
+    libcmocka-dev (unnecessary since buster).
+  * Rebuild manpage with asciidoctor since upstream uses that.
+
+ -- Simon Josefsson <si...@josefsson.org>  Sun, 06 Aug 2023 10:19:30 +0200
+
 resolv-wrapper (1.1.8-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru resolv-wrapper-1.1.8/debian/control resolv-wrapper-1.1.8/debian/control
--- resolv-wrapper-1.1.8/debian/control	2023-01-21 12:44:51.000000000 +0100
+++ resolv-wrapper-1.1.8/debian/control	2023-08-06 10:17:25.000000000 +0200
@@ -2,15 +2,20 @@
 Homepage: https://cwrap.org/resolv_wrapper.html
 Section: devel
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
+Maintainer: Debian SSSD Team <pkg-sssd-de...@alioth-lists.debian.net>
+Uploaders: Laszlo Boszormenyi (GCS) <g...@debian.org>,
+           Timo Aaltonen <tjaal...@debian.org>,
+           Simon Josefsson <si...@josefsson.org>
 Build-Depends:
  debhelper-compat (= 13),
  dh-buildinfo,
- cmake (>= 2.8.8-3~),
- libcmocka-dev (>= 0.4.1),
- asciidoc, libxml2-utils, xsltproc, docbook-xml, docbook-xsl
-XS-Testsuite: autopkgtest
+ cmake,
+ libcmocka-dev,
+ asciidoctor
 Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/sssd-team/resolv-wrapper.git
+Vcs-Browser: https://salsa.debian.org/sssd-team/resolv-wrapper
+Rules-Requires-Root: no
 
 Package: libresolv-wrapper
 Architecture: any
diff -Nru resolv-wrapper-1.1.8/debian/copyright resolv-wrapper-1.1.8/debian/copyright
--- resolv-wrapper-1.1.8/debian/copyright	2023-01-21 12:44:51.000000000 +0100
+++ resolv-wrapper-1.1.8/debian/copyright	2023-08-06 10:10:25.000000000 +0200
@@ -39,6 +39,7 @@
 
 Files: debian/*
 Copyright: 2016-     Laszlo Boszormenyi (GCS) <g...@debian.org>
+           2023 Simon Josefsson <si...@josefsson.org>
 License: GPL-3+
 
 License: GPL-3+
diff -Nru resolv-wrapper-1.1.8/debian/rules resolv-wrapper-1.1.8/debian/rules
--- resolv-wrapper-1.1.8/debian/rules	2023-01-21 12:44:51.000000000 +0100
+++ resolv-wrapper-1.1.8/debian/rules	2023-08-06 10:17:34.000000000 +0200
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_install:
-	a2x --doctype manpage --format manpage doc/resolv_wrapper.1.adoc
+	asciidoctor -b manpage -d manpage doc/resolv_wrapper.1.adoc
 	dh_auto_install
 
 %:
diff -Nru resolv-wrapper-1.1.8/debian/upstream/metadata resolv-wrapper-1.1.8/debian/upstream/metadata
--- resolv-wrapper-1.1.8/debian/upstream/metadata	1970-01-01 01:00:00.000000000 +0100
+++ resolv-wrapper-1.1.8/debian/upstream/metadata	2023-08-06 10:06:58.000000000 +0200
@@ -0,0 +1,4 @@
+Name: resolv_wrapper
+Bug-Database: https://bugzilla.samba.org/enter_bug.cgi?product=cwrap
+Repository-Browse: https://git.samba.org/?p=resolv_wrapper.git
+Repository: https://git.samba.org/resolv_wrapper.git
diff -Nru resolv-wrapper-1.1.8/debian/upstream/signing-key.asc resolv-wrapper-1.1.8/debian/upstream/signing-key.asc
--- resolv-wrapper-1.1.8/debian/upstream/signing-key.asc	1970-01-01 01:00:00.000000000 +0100
+++ resolv-wrapper-1.1.8/debian/upstream/signing-key.asc	2023-08-06 10:08:30.000000000 +0200
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFJPzkEBEADJ9TlY0WFt+O9DKqUY73DKZsjRQ3rsQ0bJGcOLjKb9ESLp+doU
+Zx/GhqqmfuD8/gnKhEf3//PI+GJiGl7hNsaDhrLHxbRf15QKOxSNUtl9p1mpxYBZ
++c6+Ymmh3dxrsvs5VzMAVwVbSLvPIs+v9WWxd0FAscZilsvInVk+R9F7WUkAL3/c
+Rq5A+QkeX4egfW0OI1WzfMua/lL5uBgkzmP//x4A2apAzx8fqaV4JqyhNJuDtsXd
+LOus20VQqGUBWj4wLaCmMiFGbod9u2+Uj6fOFPB+2LLnfnNJtA04b+0Awjzm0zZc
+APMnbUaIAs54UW6/1wGY8g4rbN1DAbPQpAQy601sHF20CsRqvelfy9dV/Z2almA7
+zVGlfTYw8JRcSUgtIWIcXE4DsXaN6y/UzKT9o/vpYM1Dk+t3K4K0O+KyX4B1xcyI
+Jn2Pq0QKFSHm6x1+lrLgF+bDO/HcX0YAOiE0/3VkBaLSH6gO2Ot1YFN2KIaEcKuM
+LplZkNeD7yzIL9jTbj0UVvcHh18GRnrtR/a6r84VoMBrolFJuN7IpiuIwZqxvtnh
+NRrBVfl1edFiWyeA+xhxVoodxPwJKdF4f7k++fF3XvMaLk556xnz60QfHJTj95S3
+H0dgAFhS5I/3vHF3qK+C5oGiSEdOW3MqjjtRJZpzCA+btBxDWg4LufEU1QARAQAB
+tCZBbmRyZWFzIFNjaG5laWRlciA8YXNuQGNyeXB0b21pbGsub3JnPokCPAQTAQIA
+JgIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheABQJST9KQAhkBAAoJEH7g/E3M
+AU49eDAQAKfz9jKUUnVOCAdD/oelkjlfMdGokIyE61RJBBvqMh7LfCZhEi+Zy6EG
+qBIVYtqfmvIiSVT1K6mqxOiTGe8cCTGHrcN9ChXzTa1SQk3c+NOms4yKXEShN/58
+MFb2D9sjGR4RC0d4YMjn99DFC3PSOL3e1OrgDTN+D6KsEc89hhyNXk6wZ1weblRj
+dxCVeZgX7nIt0fbyY28JYhGD2b5ghLteehVTWSADRamPZdJwohol11+RxFj95Oqj
+rN89iNewMAYQmFY2CC1XiyCBG9eLlGf4Je7/P7j3/3eEWcj8EsB0+kIBPFWewdop
+sdmF5+Y4uJiTMt/SyyK76lx9nSB2dBDX06S6gRhnzB6s2z3UCCdoGgXHP8Jj7i7Z
+F6uNCh6TYMGn8CaF63K5tr6W0EYauuXuKnRM8M2/kK8OEktI/PBthkEeyd/hisby
+wtrOxFxUKjaBoOH4mLzT7in6T6f9O6EnpADmaQ9qxjCJnnH94VAOzxkK8f0ocuri
+5tQwsAoH3oZ1l0jZ4NabL/QEYKjMH0IYBYyTxCThDxVwN5c/hzFL/limyAAm9uQe
+u50/jTbGeyZdiZ3e1aH47Dp87El7t+ZQXOFnGtgJGzWt7rGLkecx2hRwokcD5rtI
+8Vwc7Jx3GfwjUiDpIz9La7WU0YBSXVKG3sPinpn7hxlqoCwd5uRDtCFBbmRyZWFz
+IFNjaG5laWRlciA8YXNuQHNhbWJhLm9yZz6JAjkEEwECACMCGwMHCwkIBwMCAQYV
+CAIJCgsEFgIDAQIeAQIXgAUCUk/SkAAKCRB+4PxNzAFOPYhKD/9WGSjHKu459hoR
+u9VBHEpfEPOgFlXlt/oLvI2im4QaMXZU0IJPAopxKDer9sdGr+KYXSIGCQS059Fa
+WFIexBbDShLNmGDFwoXvCQPc55T8GoZcijHReuRuu1iaWh2tAuqkNxlRLLphi0oh
+LCT7mSys9yDO6hBe9Zhz7d8T1aHt0c0zMNdfJ74gc140kCFJ3KIsA+wwz0pNH5zW
+0TJUAqfZK2yQarilCXc8xCm1prv/dbIoV8L5TkGzjo2t+a634YiF2+iFt+1WzTBt
+eANlGdcRb7560ZbSMNc60CxlKKd4C/liX4gQ81NohBWGp8P8jl4Wc/QM6xj3dkXY
+WzAJ2yMfqtkBfy8rQHgQ+7PE4A6uuxKAhhBXV5oHK2w6Lo/FLxIkag61Tg31wLjS
+84t9ViaewTdZXfylnKihUR/Xv6AVuSta7smfpVminIKMbcvW5B5vpKBtxIWtFpkI
+DE66QVhf0CBrDkuPmJ6L+PlOM2dOHtiiDPENizwZb620SXnnSRR6b3GLTUvMGzCx
+0k1Qu4xhxdhyY6PWUO0LXOUOWAXUMqZorbsv+Uqa5YzOAr6rdsLs8OE3jDPqCEh1
+ED1bRc0LvkeOyn7uX961r4cdkOM1E4ddL5VGLXP0I07jr46OvOdcvCOMLUf4oU9c
+e05KP4EaGfWVZ/I0hvbBmk3+S5gvP7kCDQRST85BARAA0dn7hDmDm56E5CvRnUHP
+TOD77bJmA3WO639sCcRN3xXl1qq2Zm30wY64Z3wsL4FBZlUs+BT1HoUwqKMLqm02
+b3+elvTG22z3WGesjW06BWV/O3axB0TtPUSwrTHdUvqvezaKz17nn6Al9G5GWxf+
+1Y6tIMhoIHjK2nZOkHszRDx1UWjtIUe4mr/v2OrTNGFTBQ/zaqqJtpFUNnJyQlZj
+wHZEVocLltj6iAvp6mfgzswqVLvOUVLw84nvdtB1CVC4ZgCFOnT3qABDrH9cxJZt
+ck3EzFwSQJSl9MOlW4WiI8dAbl1viMIKXNuQq7WZqY2caPuOJh2ufmErfJyFt4vd
+pWbin6/px7fsqBUE3Tzi3558W40OmvMTjG62/fjlHBW/JdAodr8ton5k5ItqEJYt
+WgAbpd/5M+sfzu7cQklLEOqoymaoPWSUmvMbLbGbimToq7rq8h4af9k1rNMGAIgS
+AfSuVHf2HRkovt2J/lnHZCJ3QxtfU9nqSuEgTfl0wuSv+GSZ2r34lqSbvKzVhE2T
+DG4mnJa4ozZMWvjJytSk+Lky3Xoy+itC2x7LT+oamJX5R4bNFlfJYk2TZMhjcY6d
+Mj0Rz+saXSnw1/KWZiG8LKrWbwXklFqQsgZS4yHndA92uC1JRG/NQIBCMqIFiPtq
+NJMgb89nMffo3Qqd7PHIcFsAEQEAAYkCHwQYAQIACQUCUk/OQQIbDAAKCRB+4PxN
+zAFOPXDSD/46NQRZ0z67mCv53UE4tLpnT8sskZGEinNCLrHTmmW8rQig7a1ewmMN
+6St9ui2nWbrGulQ8kSHiCmtwfDu8L1A5QpkjF5pz5qg6aew0YuTcVW/EyWzGFJP1
+nXk6vw6Ju3+B8WIy7+PVCzXm2YswYFA6INpYkUcDxAEZfl8w07AKE4p8r/M6gXRL
+rSB5Ya+CqcBC9uLvVUVLAcoqRv7NX8zLCTiF9DQgDkLot52h7RCHzBJKHRxDvfzo
+W1NH0IDTMyaNzPjtsVH22LpD+VSTb+NonoIrs8Ib3HwkYSpDR0FuA4M6Rub/Xvvd
+hat5DVPuf0D6yiIfuuXZqxlvX3w9xRJCve7m26fjXLUStmanXQyI6pX9iqaktyEa
+Yy7mXXI1i/ke97neiAZPUPJNiIOfBlbutcMRVxsJ55fji95999lwo5R/bUvF9WkI
+oC6jLd4NORBR4/VIUsaKR2PCf3k1gud5LQ+gaTPbT0bV9glOh8Hcg6PDgugwyKS0
+q4LN4RSxnxB9FUtyoFoOWOZX20dVFKYSp8XTP+uJISkFfTFgvUJTGO91W8fcgHhT
+M+ql9RhPN1gYiSGIJUmZvI7UEbwqxGzsBi4s0PUS0KD6a12hTghKyL9IhwVJbZSx
+0h1Dswa8Bsfi78NiCD8vbDKGulZxMbRjPQm3BoX48MHrYhG6ApJ/sw==
+=2yyT
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru resolv-wrapper-1.1.8/debian/watch resolv-wrapper-1.1.8/debian/watch
--- resolv-wrapper-1.1.8/debian/watch	2016-04-04 17:45:37.000000000 +0200
+++ resolv-wrapper-1.1.8/debian/watch	2023-08-06 10:09:19.000000000 +0200
@@ -1,3 +1,4 @@
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
-https://ftp.samba.org/pub/cwrap/ resolv_wrapper-v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+version=4
+opts=pgpsigurlmangle=s/$/.asc/ \
+https://ftp.samba.org/pub/cwrap/ \
+resolv_wrapper-@ANY_VERSION@@ARCHIVE_EXT@

Attachment: signature.asc
Description: PGP signature

Reply via email to