system/openrc-services: Updated for version 20181107 + SYSCONFDIR changed.

4 files changed, 24 insertions, 21 deletions

diff --git a/system/openrc-services/README.Slackware b/system/openrc-services/README.Slackware
index d90a80209dbe..2e5949809d2f 100644
--- a/system/openrc-services/README.Slackware
+++ b/system/openrc-services/README.Slackware
@@ -13,3 +13,5 @@ $ rc-status
 
 Enabled services across all runlevels can be queried with:
 $ rc-update
+
+Note- Services are installed to /etc/openrc/init.d
diff --git a/system/openrc-services/doinst.sh b/system/openrc-services/doinst.sh
index 114f65125a41..4b684ae733c6 100644
--- a/system/openrc-services/doinst.sh
+++ b/system/openrc-services/doinst.sh
@@ -26,14 +26,14 @@ preserve_perms() {
 openrc_accessibility=(espeakup)
 openrc_base=(device-mapper dmcrypt lvm mdadm mdraid udev udev-settle udev-trigger)
 openrc_desktop=(acpid alsasound xdm gpm wpa_supplicant)
-openrc_devel=(git-daemon influxdb mysqld postgresql svn distccd redis)
-openrc_misc=(bitlbee cpupower connman ntpd ntp-client sntp rsyslog saned metalog pulseaudio syslog-ng sensord fancontrol lm_sensors lircd irexec haveged salt-master salt-minion salt-syncdic hdparm clamd boinc atd libvirtd)
-openrc_net=(named dhcpd dhcrelay dhcrelay6 dnsmasq iptables ip6tables rpcbind nfs nfsclient nginx openntpd slapd sshd openvpn quota rsyncd samba saslauthd squid transmission-daemon ufw vnstatd xinetd tor NetworkManager httpd syncthing)
-openrc_slack=(dcron sendmail snmpd snmptrapd sysklogd)
-openrc_video=(vgl bumblebee)
+openrc_devel=(git-daemon influxdb mysqld postgresql svn distccd jenkins redis)
+openrc_misc=(bitlbee cpupower connman ntpd ntp-client sntp rsyslog saned metalog pulseaudio syslog-ng sensord fancontrol lm_sensors lircd irexec haveged salt-master salt-minion salt-syncdic hdparm clamd boinc atd libvirtd docker)
+openrc_net=(named dhcpd dhcrelay dhcrelay6 hostapd dnsmasq iptables ip6tables rpcbind nfs nfsclient nginx openntpd slapd sshd openvpn quota rsyncd samba saslauthd squid transmission-daemon ufw vnstatd xinetd tor NetworkManager httpd syncthing)
+openrc_slack=(dcron sendmail snmpd snmptrapd sysklogd fail2ban)
+openrc_video=(vgl bumblebee nvidia-persistenced)
 
 for file in "${openrc_accessibility[@]}" "${openrc_base[@]}" "${openrc_desktop[@]}" "${openrc_devel[@]}" "${openrc_misc[@]}" "${openrc_net[@]}" "${openrc_slack[@]}" "${openrc_video[@]}"; do
-  config "etc/conf.d/${file}.new"
+  config "etc/openrc/conf.d/${file}.new"
 done
 
 BACKUP_FILE=(logrotate.d/jenkins)
@@ -43,11 +43,11 @@ done
 
 BACKUP_LOCAL=(rcM.start rcd_net.start)
 for file in "${BACKUP_LOCAL[@]}"; do
-  preserve_perms etc/local.d/${file}.new
+  preserve_perms "etc/openrc/local.d/${file}.new"
 done
 
 # disable udev-postmount
-[ -e etc/runlevels/sysinit/udev-postmount ] && rm -v etc/runlevels/sysinit/udev-postmount
+[ -e "etc/openrc/runlevels/sysinit/udev-postmount" ] && rm -v "etc/openrc/runlevels/sysinit/udev-postmount"
 
 # disable kmod-static-nodes (openrc-0.26.1, 2017-05-14)
-[ -e etc/runlevels/sysinit/kmod-static-nodes ] && rm -v etc/runlevels/sysinit/kmod-static-nodes
+[ -e "etc/openrc/runlevels/sysinit/kmod-static-nodes" ] && rm -v "etc/openrc/runlevels/sysinit/kmod-static-nodes"
diff --git a/system/openrc-services/openrc-services.SlackBuild b/system/openrc-services/openrc-services.SlackBuild
index 2e481a77f4bc..0b152f9914ba 100644
--- a/system/openrc-services/openrc-services.SlackBuild
+++ b/system/openrc-services/openrc-services.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openrc-services
-VERSION=${VERSION:-20180916}
+VERSION=${VERSION:-20181107}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,19 +71,20 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Install
-sh install.sh "$PKG"
+SYSCONFDIR="etc/openrc"
+SYSCONFDIR="$SYSCONFDIR" sh install.sh "$PKG"
 
 # Install slackware compatibility services
-install -Dm 644 misc/local.d/rcM.start "$PKG/etc/local.d/rcM.start"
-install -Dm 755 misc/local.d/rcd_net.start "$PKG/etc/local.d/rcd_net.start"
+install -Dm 644 misc/local.d/rcM.start "$PKG/etc/openrc/local.d/rcM.start"
+install -Dm 755 misc/local.d/rcd_net.start "$PKG/etc/openrc/local.d/rcd_net.start"
 
 # Enable some basic services
-install -d "$PKG/etc/runlevels/sysinit"
-ln -sf /etc/init.d/udev "$PKG/etc/runlevels/sysinit/udev"
-ln -sf /etc/init.d/udev-trigger "$PKG/etc/runlevels/sysinit/udev-trigger"
+install -d "$PKG/etc/openrc/runlevels/sysinit"
+ln -sf /etc/openrc/init.d/udev "$PKG/etc/openrc/runlevels/sysinit/udev"
+ln -sf /etc/openrc/init.d/udev-trigger "$PKG/etc/openrc/runlevels/sysinit/udev-trigger"
 
 # Backup config files
-for file in $PKG/etc/conf.d/*; do
+for file in $PKG/etc/openrc/conf.d/*; do
   mv "$file" "${file}.new"
 done
 
@@ -91,7 +92,7 @@ for file in $PKG/etc/logrotate.d/*; do
   mv "$file" "${file}.new"
 done
 
-for file in $PKG/etc/local.d/*; do
+for file in $PKG/etc/openrc/local.d/*; do
   mv "$file" "${file}.new"
 done
 
diff --git a/system/openrc-services/openrc-services.info b/system/openrc-services/openrc-services.info
index 9614b627328d..0e8f56bcee43 100644
--- a/system/openrc-services/openrc-services.info
+++ b/system/openrc-services/openrc-services.info
@@ -1,8 +1,8 @@
 PRGNAM="openrc-services"
-VERSION="20180916"
+VERSION="20181107"
 HOMEPAGE="https://gitlab.com/aadityabagga/openrc-services"
-DOWNLOAD="https://gitlab.com/aadityabagga/openrc-services/-/archive/20180916/openrc-services-20180916.tar.gz"
-MD5SUM="4c33ff8929d1e961dcd664ef75396f32"
+DOWNLOAD="https://gitlab.com/aadityabagga/openrc-services/-/archive/20181107/openrc-services-20181107.tar.gz"
+MD5SUM="6423d53bced28d30f6d1e7a1488aba34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openrc"