[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] 2 commits: use-bash.diff: Force bash only for pkidaemon, where it's actually needed, and...

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki


Commits:
8e07d539 by Timo Aaltonen at 2020-12-16T15:56:18+02:00
use-bash.diff: Force bash only for pkidaemon, where it's actually needed, and fix syntax for scripts/config. (Closes: #963049)

- - - - -
c8191cc9 by Timo Aaltonen at 2020-12-16T15:56:35+02:00
releasing package dogtag-pki version 10.10.2-1

- - - - -


2 changed files:

- debian/changelog
- debian/patches/use-bash.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-dogtag-pki (10.10.2-1) UNRELEASED; urgency=medium
+dogtag-pki (10.10.2-1) unstable; urgency=medium
 
   * New upstream release.
   * fix-tomcat-paths.diff: Fix some dangling symlinks to point to the
@@ -10,8 +10,10 @@ dogtag-pki (10.10.2-1) UNRELEASED; urgency=medium
     drop libservlet3.1-java from dependencies.
   * control: Move pki-tools to pki-base-java Suggests to avoid a
     circular dependency. (Closes: #977418)
+  * use-bash.diff: Force bash only for pkidaemon, where it's actually
+    needed, and fix syntax for scripts/config. (Closes: #963049)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 10 Dec 2020 15:45:13 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 16 Dec 2020 15:56:20 +0200
 
 dogtag-pki (10.10.1-1) unstable; urgency=medium
 


=====================================
debian/patches/use-bash.diff
=====================================
@@ -1,11 +1,3 @@
---- a/base/scripts/pkiclihelp
-+++ b/base/scripts/pkiclihelp
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- ##  BEGIN COPYRIGHT BLOCK
- ##  (C) 2014 Red Hat, Inc.
- ##  All rights reserved.
 --- a/base/server/scripts/pkidaemon
 +++ b/base/server/scripts/pkidaemon
 @@ -1,4 +1,4 @@
@@ -14,83 +6,17 @@
  #
  # --- BEGIN COPYRIGHT BLOCK ---
  # This program is free software; you can redistribute it and/or modify
---- a/base/common/sbin/pki-upgrade
-+++ b/base/common/sbin/pki-upgrade
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/console/templates/pki_console_wrapper
-+++ b/base/console/templates/pki_console_wrapper
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/tools/bin/pki
-+++ b/base/tools/bin/pki
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/tools/templates/pki_java_command_wrapper.in
-+++ b/base/tools/templates/pki_java_command_wrapper.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/tools/templates/pretty_print_cert_command_wrapper.in
-+++ b/base/tools/templates/pretty_print_cert_command_wrapper.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/tools/templates/pretty_print_crl_command_wrapper.in
-+++ b/base/tools/templates/pretty_print_crl_command_wrapper.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/server/sbin/pki-server
-+++ b/base/server/sbin/pki-server
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/server/sbin/pki-server-upgrade
-+++ b/base/server/sbin/pki-server-upgrade
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/server/sbin/pkidestroy
-+++ b/base/server/sbin/pkidestroy
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
---- a/base/server/sbin/pkispawn
-+++ b/base/server/sbin/pkispawn
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # --- BEGIN COPYRIGHT BLOCK ---
- # This program is free software; you can redistribute it and/or modify
+--- a/base/common/scripts/config
++++ b/base/common/scripts/config
+@@ -38,8 +38,9 @@ fi
+ NSS_DEFAULT_DB_TYPE=${_PKI_NSS_DEFAULT_DB_TYPE}
+ case ${NSS_DEFAULT_DB_TYPE} in
+     dbm|sql)
+-        break;;
++        ;;
+     *)
+         echo "ERROR: Unsupported NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE}"
+-        exit 1;;
++        exit 1
++        ;;
+ esac



View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/ca51396e4701f0e21b4cef5444ae94da48829c09...c8191cc9fa66ad9642a7bb9bef226dae89382b36

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/ca51396e4701f0e21b4cef5444ae94da48829c09...c8191cc9fa66ad9642a7bb9bef226dae89382b36
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/20201216/0c5edf88/attachment-0001.html>