From 2fe9c959e1c3711c1e83911a01d487e813f4ca5f Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 15:39:13 -0400 Subject: [PATCH] Relocate rsync to stx-integ/base/rsync Move content from stx-gplv3 into stx-integ Packages will be relocated to stx-integ: base/ anaconda crontabs dnsmasq rsync database/ python-psycopg2 filesystem/ parted grub/ grub2 security/ python-keyring Change-Id: Ia34fa4d2e8644492dd322a5a96c9d1d06c525af5 Story: 2002801 Task: 22687 Signed-off-by: Scott Little --- centos_pkg_dirs | 1 - rsync/centos/build_srpm.data | 2 - ...te-package-versioning-for-TIS-format.patch | 27 ------ rsync/centos/meta_patches/PATCH_ORDER | 1 - rsync/centos/srpm_path | 1 - rsync/files/rsyncd | 93 ------------------- rsync/files/rsyncd.conf | 51 ---------- 7 files changed, 176 deletions(-) delete mode 100644 rsync/centos/build_srpm.data delete mode 100644 rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch delete mode 100644 rsync/centos/meta_patches/PATCH_ORDER delete mode 100644 rsync/centos/srpm_path delete mode 100755 rsync/files/rsyncd delete mode 100644 rsync/files/rsyncd.conf diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 0e33ee0..d56cc52 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,5 +1,4 @@ parted python-keyring -rsync seabios grub2 diff --git a/rsync/centos/build_srpm.data b/rsync/centos/build_srpm.data deleted file mode 100644 index 2c93764..0000000 --- a/rsync/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="$PKG_BASE/files/rsyncd.conf" -TIS_PATCH_VER=1 diff --git a/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index ca0acc3..0000000 --- a/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 20f4e2f0f19c6d0e9c8ee1314481bc8e85dbd5bb Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 16:32:24 -0400 -Subject: [PATCH 1/1] WRS: 0001-Update-package-versioning-for-TIS-format.patch - -Conflicts: - SPECS/rsync.spec ---- - SPECS/rsync.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/rsync.spec b/SPECS/rsync.spec -index 85b01f2..310b284 100644 ---- a/SPECS/rsync.spec -+++ b/SPECS/rsync.spec -@@ -8,7 +8,7 @@ - Summary: A program for synchronizing files over a network - Name: rsync - Version: 3.0.9 --Release: 18%{?prerelease}%{?dist} -+Release: 18.el7%{?_tis_dist}.%{tis_patch_ver} - Group: Applications/Internet - URL: http://rsync.samba.org/ - --- -1.9.1 - diff --git a/rsync/centos/meta_patches/PATCH_ORDER b/rsync/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 91f9a80..0000000 --- a/rsync/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch diff --git a/rsync/centos/srpm_path b/rsync/centos/srpm_path deleted file mode 100644 index 1780040..0000000 --- a/rsync/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/rsync-3.0.9-18.el7.src.rpm diff --git a/rsync/files/rsyncd b/rsync/files/rsyncd deleted file mode 100755 index df550ba..0000000 --- a/rsync/files/rsyncd +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: rsyncd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: RSYNC daemon -# Description: RSYNC daemon -### END INIT INFO - -DESC="rsyncd" -DAEMON="/usr/bin/rsync" -RUNDIR="/var/run" -PIDFILE="${RUNDIR}/rsyncd.pid" -OPTIONS="--daemon --config=/etc/rsyncd.conf" - - -start() -{ - if [ -e $PIDFILE ]; then - PIDDIR=/proc/$(cat $PIDFILE) - if [ -d ${PIDDIR} ]; then - echo "$DESC already running." - exit 0 - else - echo "Removing stale PID file $PIDFILE" - rm -f $PIDFILE - fi - fi - - echo -n "Starting $DESC..." - mkdir -p $RUNDIR - start-stop-daemon --start --quiet --background \ - --pidfile ${PIDFILE} --exec ${DAEMON} \ - -- $OPTIONS - - if [ $? -eq 0 ]; then - echo "done." - else - echo "failed." - exit 1 - fi -} - -stop() -{ - echo -n "Stopping $DESC..." - start-stop-daemon --stop --quiet --pidfile $PIDFILE - if [ $? -eq 0 ]; then - echo "done." - else - echo "failed." - fi - rm -f $PIDFILE -} - -status() -{ - pid=`cat $PIDFILE 2>/dev/null` - if [ -n "$pid" ]; then - if ps -p $pid &>/dev/null ; then - echo "$DESC is running" - exit 0 - else - echo "$DESC is not running but has pid file" - exit 1 - fi - fi - echo "$DESC is not running" - exit 3 -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|force-reload|reload) - stop - start - ;; - status) - status - ;; - *) - echo "Usage: $0 {start|stop|force-reload|restart|reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/rsync/files/rsyncd.conf b/rsync/files/rsyncd.conf deleted file mode 100644 index 8b56742..0000000 --- a/rsync/files/rsyncd.conf +++ /dev/null @@ -1,51 +0,0 @@ -# /etc/rsyncd.conf - -# Configuration file for rsync daemon -# See rsync(1) and rsyncd.conf(5) man pages for help - -# This file is required by rsync --daemon -pid file = /var/run/rsyncd.pid -use chroot = yes -read only = yes - -# Simple example for enabling your own local rsync server -#[everything] -# path = / -# comment = Everything except /etc exposed -# exclude = /etc - -[patching] - path = /opt/patching - comment = Patching filesystem - uid = root - read only = no - -[repo] - path = /www/pages/updates - comment = Patching repo - uid = root - read only = no - -[platform] - path = /etc/platform - comment = Platform configuration - uid = root - read only = no - -[certificate] - path = /etc/ssl/private - comment = SSL certificate - uid = root - read only = no - -[instances] - path = /etc/nova/instances - comment = Nova instances data - uid = root - read only = no - -[cacert] - path = /etc/ssl/certs - comment = SSL ca certificate - uid = root - read only = no