From 02ebe9918d4f0a26232c825d04516efee38b81bf Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <marco.van.wieringen@bareos.com>
Date: Mon, 23 Jun 2014 21:56:59 +0200
Subject: [PATCH] Install bsmtp as a symlink in the sbin dir pointing to the
 bin dir.

---
 debian/bareos-common.install           | 1 -
 debian/bareos-common.links             | 1 +
 platforms/packaging/bareos-RHEL_4.spec | 8 ++++++--
 platforms/packaging/bareos.spec        | 4 ++++
 src/tools/Makefile.in                  | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 debian/bareos-common.links

diff --git a/debian/bareos-common.install b/debian/bareos-common.install
index 932d897ae94..f751ff4fb30 100644
--- a/debian/bareos-common.install
+++ b/debian/bareos-common.install
@@ -13,7 +13,6 @@
 /usr/lib/libbareosndmp.so
 /usr/lib/libbareosndmp-*.so
 /usr/bin/bsmtp
-/usr/sbin/bsmtp
 /usr/sbin/btraceback
 /usr/share/man/man1/bsmtp.1.gz
 /usr/share/man/man8/btraceback.8.gz
diff --git a/debian/bareos-common.links b/debian/bareos-common.links
new file mode 100644
index 00000000000..8e5055f0d24
--- /dev/null
+++ b/debian/bareos-common.links
@@ -0,0 +1 @@
+/usr/bin/bsmtp /usr/sbin/bsmtp
diff --git a/platforms/packaging/bareos-RHEL_4.spec b/platforms/packaging/bareos-RHEL_4.spec
index 2f7e2624b14..fb9ce79ed0f 100644
--- a/platforms/packaging/bareos-RHEL_4.spec
+++ b/platforms/packaging/bareos-RHEL_4.spec
@@ -636,6 +636,9 @@ install -m 644 platforms/systemd/bareos-fd.service %{buildroot}%{_unitdir}
 install -m 644 platforms/systemd/bareos-sd.service %{buildroot}%{_unitdir}
 %endif
 
+# Create a symlink in sbin dir pointing to bsmtp now located in bin dir
+ln -s ../bin/bsmtp %{buildroot}%{_sbindir}/bsmtp
+
 # Create the Readme files for the meta packages
 [ -d %{buildroot}%{_docdir}/%{name}/ ]  || install -d -m 755 %{buildroot}%{_docdir}/%{name}
 echo "This meta package emulates the former bareos-client package" > %{buildroot}%{_docdir}/%{name}/README.bareos-client
@@ -683,9 +686,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %{script_dir}/make_catalog_backup
 %{script_dir}/make_catalog_backup.pl
 %{_sbindir}/bareos-dir
-%{_bindir}/bsmtp
 %dir %{_docdir}/%{name}
-%{_mandir}/man1/bsmtp.1.gz
 %{_mandir}/man8/bareos-dir.8.gz
 %{_mandir}/man8/bareos.8.gz
 %if 0%{?systemd_support}
@@ -782,7 +783,10 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %dir %{_libdir}/bareos/
 %endif
 %dir %{plugin_dir}
+%{_bindir}/bsmtp
+%{_sbindir}/bsmtp
 %{_sbindir}/btraceback
+%{_mandir}/man1/bsmtp.1.gz
 %{_mandir}/man8/btraceback.8.gz
 %attr(0770, %{daemon_user}, %{daemon_group}) %dir %{working_dir}
 %attr(0775, %{daemon_user}, %{daemon_group}) %dir /var/log/bareos
diff --git a/platforms/packaging/bareos.spec b/platforms/packaging/bareos.spec
index 0888d335203..99ba2f4b22e 100644
--- a/platforms/packaging/bareos.spec
+++ b/platforms/packaging/bareos.spec
@@ -621,6 +621,9 @@ install -m 644 platforms/systemd/bareos-fd.service %{buildroot}%{_unitdir}
 install -m 644 platforms/systemd/bareos-sd.service %{buildroot}%{_unitdir}
 %endif
 
+# Create a symlink in sbin dir pointing to bsmtp now located in bin dir
+ln -s ../bin/bsmtp %{buildroot}%{_sbindir}/bsmtp
+
 # Create the Readme files for the meta packages
 [ -d %{buildroot}%{_docdir}/%{name}/ ]  || install -d -m 755 %{buildroot}%{_docdir}/%{name}
 echo "This meta package emulates the former bareos-client package" > %{buildroot}%{_docdir}/%{name}/README.bareos-client
@@ -762,6 +765,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %endif
 %dir %{plugin_dir}
 %{_bindir}/bsmtp
+%{_sbindir}/bsmtp
 %{_sbindir}/btraceback
 %{_mandir}/man1/bsmtp.1.gz
 %{_mandir}/man8/btraceback.8.gz
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index 2eaa9f7e7d8..729f0ebbdf1 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -25,7 +25,7 @@ GETTEXT_LIBS = @LIBINTL@
 OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@
 GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
 
-TOOLS = bsmtp drivetype fstype bregex bwild bpluginfo bscrypto timelimit
+TOOLS = drivetype fstype bregex bwild bpluginfo bscrypto timelimit
 TOOLS_BIN = bsmtp bwild bregex
 TOOLS_SBIN = bpluginfo bscrypto