[Pkg-freeipa-devel] [Git][freeipa-team/bind-dyndb-ldap][master] 6 commits: rules: Don't use multiarch path.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / bind-dyndb-ldap


Commits:
17638d28 by Timo Aaltonen at 2018-04-16T10:02:11Z
rules: Don't use multiarch path.

- - - - -
bee22c38 by Timo Aaltonen at 2018-04-16T10:03:03Z
releasing package bind-dyndb-ldap version 11.1-3

- - - - -
325930f3 by Timo Aaltonen at 2018-04-20T22:10:35Z
postinst: Migrate old style named.conf to new.

- - - - -
71508cb4 by Timo Aaltonen at 2018-07-31T20:40:37Z
control: Update the maintainer address.

- - - - -
09c2c9e2 by Timo Aaltonen at 2018-07-31T20:42:19Z
Bump policy to 4.15, dh to 11.

- - - - -
4a9031ea by Timo Aaltonen at 2018-07-31T20:44:21Z
releasing package bind-dyndb-ldap version 11.1-4

- - - - -


6 changed files:

- debian/bind9-dyndb-ldap.install
- debian/bind9-dyndb-ldap.postinst
- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/bind9-dyndb-ldap.install
=====================================
--- a/debian/bind9-dyndb-ldap.install
+++ b/debian/bind9-dyndb-ldap.install
@@ -1,2 +1,2 @@
-usr/lib
+usr/lib/bind
 usr/share/doc/


=====================================
debian/bind9-dyndb-ldap.postinst
=====================================
--- a/debian/bind9-dyndb-ldap.postinst
+++ b/debian/bind9-dyndb-ldap.postinst
@@ -1,9 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
+fix_named_conf() {
+    # The following sed script:
+    #   - scopes the named.conf changes to dynamic-db
+    #   - replaces arg "name value" syntax with name "value"
+    #   - changes dynamic-db header to dyndb
+    #   - uses the new way the define path to the library
+    #   - removes no longer supported arguments (library, cache_ttl,
+    #       psearch, serial_autoincrement, zone_refresh)
+
+    while read -r PATTERN
+    do
+        SEDSCRIPT+="$PATTERN"
+    done <<EOF
+/^\s*dynamic-db/,/};/ {
+  s/\(\s*\)arg\s\+\(["']\)\([a-zA-Z_]\+\s\)/\1\3\2/g;
+  s/^dynamic-db/dyndb/;
+  s@\(dyndb "[^"]\+"\)@\1 "/usr/lib/bind/ldap.so"@;
+  s@\(dyndb '[^']\+'\)@\1 '/usr/lib/bind/ldap.so'@;
+  /\s*library[^;]\+;/d;
+  /\s*cache_ttl[^;]\+;/d;
+  /\s*psearch[^;]\+;/d;
+  /\s*serial_autoincrement[^;]\+;/d;
+  /\s*zone_refresh[^;]\+;/d;
+}
+EOF
+    sed -i.bak -e "$SEDSCRIPT" /etc/bind/named.conf
+}
+
 if [ $1 = "configure" ]; then
     chown root:bind /var/cache/bind/dynamic /var/cache/bind/dyndb-ldap
     chmod 0770 /var/cache/bind/dynamic /var/cache/bind/dyndb-ldap
+
+    if dpkg --compare-versions "$2" lt "11.1-4"; then
+        fix_named_conf
+    fi
 fi
 
 #DEBHELPER#


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-bind-dyndb-ldap (11.1-3) UNRELEASED; urgency=medium
+bind-dyndb-ldap (11.1-4) unstable; urgency=medium
+
+  * postinst: Migrate old style named.conf to new.
+  * control: Update the maintainer address.
+  * Bump policy to 4.15, dh to 11.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 31 Jul 2018 23:44:13 +0300
+
+bind-dyndb-ldap (11.1-3) unstable; urgency=medium
 
   * control: Update VCS urls.
+  * rules: Don't use multiarch path.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Sat, 14 Apr 2018 10:20:18 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 16 Apr 2018 13:02:48 +0300
 
 bind-dyndb-ldap (11.1-2) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,16 @@
 Source: bind-dyndb-ldap
 Section: net
 Priority: optional
-Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
+Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at alioth-lists.debian.net>
 Uploaders: Timo Aaltonen <tjaalton at debian.org>
 Build-Depends:
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper (>= 11),
  libbind-dev (>= 1:9.11),
  libkrb5-dev,
  libldap2-dev,
  libsasl2-dev,
  uuid-dev,
-Standards-Version: 3.9.8
+Standards-Version: 4.1.5
 Homepage: https://pagure.io/bind-dyndb-ldap
 Vcs-Git: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap.git
 Vcs-Browser: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel --with autoreconf --builddirectory=build
+	dh $@ --builddirectory=build
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		--libdir=/usr/lib \
 		--docdir=/usr/share/doc/bind9-dyndb-ldap
 
 override_dh_auto_install:



View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/compare/2bf55579ca31915f6a7d1d260be676758d3ed75a...4a9031ea4d30f5b5d48b69aa092cef280d634760

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/compare/2bf55579ca31915f6a7d1d260be676758d3ed75a...4a9031ea4d30f5b5d48b69aa092cef280d634760
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20180731/a62b2784/attachment-0001.html>