From c3be2a9e3e87038a085b0876f400a11283cb4cb4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 9 May 2017 16:03:43 +0200 Subject: [PATCH] packaging: Remove SWAT references from RHEL Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp --- packaging/RHEL/samba.spec.tmpl | 45 +++------------------------------- packaging/RHEL/setup/swat | 15 ------------ 2 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 packaging/RHEL/setup/swat diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index bb8ff11e5c4..c621fb63b67 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -92,19 +92,6 @@ Samba-common provides files necessary for both the server and client packages of Samba. -####################################################################### -%package swat -Summary: The Samba SMB server configuration program. -Group: Applications/System -Requires: samba = %{version} xinetd -Provides: samba-swat = %{version}-%{release} - -%description swat -The samba-swat package includes the new SWAT (Samba Web Administration -Tool), for remotely managing Samba's smb.conf file using your favorite -Web browser. - - ####################################################################### %package doc Summary: Samba Documentation @@ -113,9 +100,9 @@ Provides: samba-doc = %{version}-%{release} Prereq: /usr/bin/find /bin/rm /usr/bin/xargs %description doc -The samba-doc package includes the HTML versions of the Samba manpages -utilized by SWAT as well as the HTML and PDF version of "Using Samba", -"Samba By Example", and "The Official Samba HOWTO and Reference Guide". +The samba-doc package includes the HTML versions of the Samba manpages as well +as the HTML and PDF version of "Using Samba", "Samba By Example", and "The +Official Samba HOWTO and Reference Guide". ####################################################################### @@ -158,8 +145,6 @@ CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-mandir=%{_mandir} \ --with-piddir=/var/run \ --with-privatedir=%{_sysconfdir}/samba \ - --with-sambabook=%{_datadir}/swat/using_samba \ - --with-swatdir=%{_datadir}/swat \ --enable-cups \ --with-acl-support \ --with-ads \ @@ -198,7 +183,6 @@ find examples docs -type f | xargs -r chmod -x rm -rf $RPM_BUILD_ROOT # Create the target build directory hierarchy -mkdir -p $RPM_BUILD_ROOT%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}} mkdir -p $RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}} @@ -235,7 +219,6 @@ install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.s echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts install -m644 setup/samba.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba -install -m644 setup/swat $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind @@ -251,10 +234,8 @@ ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind # Remove "*.old" files find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; -## don't duplicate the docs. These are installed by/with SWAT rm -rf docs/htmldocs rm -rf docs/manpages -( cd docs; ln -s %{_prefix}/share/swat/help htmldocs ) ## ## Clean out man pages for tools not installed here @@ -297,12 +278,6 @@ if [ "$1" -ge "1" ]; then fi -%post swat -# Add swat entry to /etc/services if not already there. -if [ ! "`grep ^\s**swat /etc/services`" ]; then - echo 'swat 901/tcp # Add swat service used via inetd' >> /etc/services -fi - %post common /sbin/ldconfig @@ -381,20 +356,6 @@ fi %doc docs %doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting %doc examples/printing -%doc %{_datadir}/swat/help -%doc %{_datadir}/swat/using_samba - -########## - -%files swat -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/xinetd.d/swat -%dir %{_datadir}/swat -%{_datadir}/swat/include -%{_datadir}/swat/images -%{_datadir}/swat/lang -%{_sbindir}/swat -%{_mandir}/man8/swat.8* ########## diff --git a/packaging/RHEL/setup/swat b/packaging/RHEL/setup/swat deleted file mode 100644 index 8b62348dde3..00000000000 --- a/packaging/RHEL/setup/swat +++ /dev/null @@ -1,15 +0,0 @@ -# default: off -# description: SWAT is the Samba Web Admin Tool. Use swat \ -# to configure your Samba server. To use SWAT, \ -# connect to port 901 with your favorite web browser. -service swat -{ - port = 901 - socket_type = stream - wait = no - only_from = 127.0.0.1 - user = root - server = /usr/sbin/swat - log_on_failure += USERID - disable = yes -} -- 2.34.1