openrc-net-20151228-1: updating version

2 files changed, 71 insertions, 70 deletions

diff --git a/pcr/openrc-net/PKGBUILD b/pcr/openrc-net/PKGBUILD
index e05a716cb..59f6086b4 100644
--- a/pcr/openrc-net/PKGBUILD
+++ b/pcr/openrc-net/PKGBUILD
@@ -42,7 +42,7 @@ pkgname=('autofs-openrc'
         'syncthing-openrc'
         'nginx-openrc'
         'vnstat-openrc')
-pkgver=20151015
+pkgver=20151228
 pkgrel=1
 pkgdesc="OpenRC init scripts"
 arch=('any')
@@ -210,8 +210,8 @@ _inst_initd(){
 
 	sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \
             -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|' \
-		-e 's|/var/run|/run|g' \
-		-i ${pkgdir}/etc/init.d/$1
+            -e 's|/var/run|/run|g' \
+            -i ${pkgdir}/etc/init.d/$1
 }
 
 _inst_confd(){
@@ -228,20 +228,20 @@ package_apache-openrc() {
 	install -Dm755 "${srcdir}/gentoo-apache-${_apver}/init/apache2.initd" "${pkgdir}/etc/init.d/httpd"
 
 	sed -e "${_shebang}" \
-		-e 's|/usr/sbin/apache2|/usr/bin/apachectl|' \
-		-e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \
-		-e 's/! test -f/test -f/' \
-		-e 's|/usr/lib/apache2|/usr/lib/httpd|' \
-		-e 's|apache2.pid|httpd/httpd.pid|' \
-		-e 's|apache2 >/dev/null|httpd >/dev/null|' \
-		-e 's|/run/apache_ssl_mutex|/run/httpd|' \
-		-i "${pkgdir}/etc/init.d/httpd"
+            -e 's|/usr/sbin/apache2|/usr/bin/apachectl|' \
+            -e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \
+            -e 's/! test -f/test -f/' \
+            -e 's|/usr/lib/apache2|/usr/lib/httpd|' \
+            -e 's|apache2.pid|httpd/httpd.pid|' \
+            -e 's|apache2 >/dev/null|httpd >/dev/null|' \
+            -e 's|/run/apache_ssl_mutex|/run/httpd|' \
+            -i "${pkgdir}/etc/init.d/httpd"
 
 	sed -e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \
-		-e 's|/usr/lib/apache2|/usr/lib/httpd|' \
-		-e 's|apache2.pid|httpd/httpd.pid|' \
-		-e 's|apache2|httpd|g' \
-		-i "${pkgdir}/etc/conf.d/httpd"
+            -e 's|/usr/lib/apache2|/usr/lib/httpd|' \
+            -e 's|apache2.pid|httpd/httpd.pid|' \
+            -e 's|apache2|httpd|g' \
+            -i "${pkgdir}/etc/conf.d/httpd"
 }
 
 package_autofs-openrc() {
@@ -252,7 +252,7 @@ package_autofs-openrc() {
 	_inst_initd 'autofs'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/autofs"
+            -i "${pkgdir}/etc/init.d/autofs"
 }
 
 package_bind-openrc() {
@@ -265,8 +265,8 @@ package_bind-openrc() {
 	_inst_initd 'named'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's|/etc/bind/named.conf|/etc/named.conf|g' \
-		-i "${pkgdir}/etc/init.d/named"
+            -e 's|/etc/bind/named.conf|/etc/named.conf|g' \
+            -i "${pkgdir}/etc/init.d/named"
 }
 
 package_cyrus-sasl-openrc() {
@@ -277,7 +277,7 @@ package_cyrus-sasl-openrc() {
 	_inst_initd 'saslauthd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/saslauthd"
+            -i "${pkgdir}/etc/init.d/saslauthd"
 }
 
 package_dhcp-openrc() {
@@ -301,9 +301,9 @@ package_dhcp-openrc() {
 	install -Dm755 "${srcdir}/dhcrelay.initd" "${pkgdir}/etc/init.d/dhcrelay6"
 
 	for f in ${pkgdir}/etc/init.d/*;do
-		sed -e 's|/usr/sbin|/usr/bin|g' \
-			-e 's|#@slapd@|ldap slapd|' \
-			-i $f
+            sed -e 's|/usr/sbin|/usr/bin|g' \
+                -e 's|#@slapd@|ldap slapd|' \
+                -i $f
 	done
 }
 
@@ -316,8 +316,7 @@ package_hostapd-openrc() {
 	_inst_confd 'hostapd'
 	_inst_initd 'hostapd'
 
-	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/hostapd"
+	sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/hostapd"
 }
 
 package_iptables-openrc() {
@@ -336,8 +335,7 @@ package_iptables-openrc() {
 	install -Dm755 "${srcdir}/iptables.initd" "${pkgdir}/etc/init.d/ip6tables"
 
 	for f in ${pkgdir}/etc/init.d/*;do
-		sed -e 's|/sbin|/usr/bin|g' \
-			-i $f
+            sed -e 's|/sbin|/usr/bin|g' -i $f
 	done
 }
 
@@ -351,10 +349,10 @@ package_krb5-openrc() {
         done
 
 	for f in ${pkgdir}/etc/init.d/*;do
-		sed -e 's|/usr/sbin|/usr/bin|g' \
-			-e 's|mit-krb5kdc|krb5kdc|g' \
-			-e 's|mit-krb5kadmind|krb5kadmind|g' \
-			-i $f
+            sed -e 's|/usr/sbin|/usr/bin|g' \
+                -e 's|mit-krb5kdc|krb5kdc|g' \
+                -e 's|mit-krb5kadmind|krb5kadmind|g' \
+                -i $f
 	done
 }
 
@@ -368,8 +366,8 @@ package_lighttpd-openrc() {
 	_inst_initd 'lighttpd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's/lighttpd:lighttpd/http:http/' \
-		-i "${pkgdir}/etc/init.d/lighttpd"
+            -e 's/lighttpd:lighttpd/http:http/' \
+            -i "${pkgdir}/etc/init.d/lighttpd"
 }
 
 package_rpcbind-openrc() {
@@ -381,8 +379,8 @@ package_rpcbind-openrc() {
 	_inst_initd 'rpcbind'
 
 	sed -e 's|/sbin|/usr/bin|g' \
-		-e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \
-		-i "${pkgdir}/etc/init.d/rpcbind"
+            -e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \
+            -i "${pkgdir}/etc/init.d/rpcbind"
 }
 
 package_nfs-utils-openrc() {
@@ -405,8 +403,7 @@ package_nfs-utils-openrc() {
         done
 
 	for f in ${pkgdir}/etc/init.d/*;do
-		sed -e 's|/usr/sbin|/usr/bin|g' \
-			-i $f
+            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
 	done
 }
 
@@ -425,7 +422,7 @@ package_openntpd-openrc() {
 	_inst_initd 'ntpd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/ntpd"
+            -i "${pkgdir}/etc/init.d/ntpd"
 }
 
 package_openldap-openrc() {
@@ -438,8 +435,8 @@ package_openldap-openrc() {
 	_inst_initd 'slapd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's|/usr/lib/openldap/slapd|/usr/lib/slapd|g' \
-		-i "${pkgdir}/etc/init.d/slapd"
+            -e 's|/usr/lib/openldap/slapd|/usr/lib/slapd|g' \
+            -i "${pkgdir}/etc/init.d/slapd"
 }
 
 package_openslp-openrc() {
@@ -450,7 +447,7 @@ package_openslp-openrc() {
 	_inst_initd 'slpd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/slpd"
+            -i "${pkgdir}/etc/init.d/slpd"
 }
 
 package_openssh-openrc() {
@@ -464,10 +461,10 @@ package_openssh-openrc() {
 	_inst_initd 'sshd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/conf.d/sshd"
+            -i "${pkgdir}/etc/conf.d/sshd"
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/sshd"
+            -i "${pkgdir}/etc/init.d/sshd"
 }
 
 package_openvpn-openrc() {
@@ -480,7 +477,7 @@ package_openvpn-openrc() {
 	_inst_initd 'openvpn'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/openvpn"
+            -i "${pkgdir}/etc/init.d/openvpn"
 }
 
 package_polipo-openrc() {
@@ -491,7 +488,7 @@ package_polipo-openrc() {
 	_inst_initd 'polipo'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/polipo"
+            -i "${pkgdir}/etc/init.d/polipo"
 }
 
 package_postfix-openrc() {
@@ -505,7 +502,7 @@ package_postfix-openrc() {
 	_inst_initd 'postfix'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/postfix"
+            -i "${pkgdir}/etc/init.d/postfix"
 }
 
 package_privoxy-openrc() {
@@ -516,9 +513,9 @@ package_privoxy-openrc() {
 	_inst_initd 'privoxy'
 
 	sed -e "${_shebang}" \
-		-e 's|/usr/sbin|/usr/bin|g' \
-		-e "${_runpath}" \
-		-i "${pkgdir}/etc/init.d/privoxy"
+            -e 's|/usr/sbin|/usr/bin|g' \
+            -e "${_runpath}" \
+            -i "${pkgdir}/etc/init.d/privoxy"
 }
 
 package_quota-tools-openrc() {
@@ -533,8 +530,7 @@ package_quota-tools-openrc() {
 	_inst_initd 'rpc.rquotad'
 
 	for f in ${pkgdir}/etc/init.d/*;do
-		sed -e 's|/usr/sbin|/usr/bin|g' \
-			-i $f
+            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
 	done
 }
 
@@ -548,7 +544,7 @@ package_rsync-openrc() {
 	_inst_initd 'rsyncd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/rsyncd"
+            -i "${pkgdir}/etc/init.d/rsyncd"
 }
 
 package_samba-openrc() {
@@ -561,13 +557,13 @@ package_samba-openrc() {
 	_inst_initd 'smb'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's/="samba"/="smb"/' \
-		-i "${pkgdir}/etc/conf.d/smb"
+            -e 's/="samba"/="smb"/' \
+            -i "${pkgdir}/etc/conf.d/smb"
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's/##samba/##smb/' \
-		-e 's|"samba"|"smb"|' \
-		-i "${pkgdir}/etc/init.d/smb"
+            -e 's/##samba/##smb/' \
+            -e 's|"samba"|"smb"|' \
+            -i "${pkgdir}/etc/init.d/smb"
 }
 
 package_squid-openrc() {
@@ -581,9 +577,9 @@ package_squid-openrc() {
 	_inst_initd 'squid'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's|chown squid|chown proxy|' \
-		-e 's|squid:squid|proxy:proxy|' \
-		-i "${pkgdir}/etc/init.d/squid"
+            -e 's|chown squid|chown proxy|' \
+            -e 's|squid:squid|proxy:proxy|' \
+            -i "${pkgdir}/etc/init.d/squid"
 }
 
 package_transmission-openrc() {
@@ -606,8 +602,8 @@ package_ufw-openrc() {
 	_inst_initd 'ufw'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' \
-		-i "${pkgdir}/etc/init.d/ufw"
+            -e 's|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' \
+            -i "${pkgdir}/etc/init.d/ufw"
 }
 
 package_vsftpd-openrc() {
@@ -621,12 +617,12 @@ package_vsftpd-openrc() {
 	install -Dm755 "${srcdir}/vsftpd-checkconfig.sh" "${pkgdir}/usr/lib/vsftpd-checkconfig.sh"
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-e 's|/usr/libexec/|/usr/lib/|g' \
-		-e 's|/etc/vsftpd/|/etc/|g' \
-		-i "${pkgdir}/etc/init.d/vsftpd"
+            -e 's|/usr/libexec/|/usr/lib/|g' \
+            -e 's|/etc/vsftpd/|/etc/|g' \
+            -i "${pkgdir}/etc/init.d/vsftpd"
 
 	sed -e 's|/etc/vsftpd/|/etc/|g' \
-		-i "${pkgdir}/usr/lib/vsftpd-checkconfig.sh"
+            -i "${pkgdir}/usr/lib/vsftpd-checkconfig.sh"
 }
 
 package_xinetd-openrc() {
@@ -639,7 +635,7 @@ package_xinetd-openrc() {
 	_inst_initd 'xinetd'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/xinetd"
+            -i "${pkgdir}/etc/init.d/xinetd"
 }
 
 package_ypbind-mt-openrc() {
@@ -653,7 +649,7 @@ package_ypbind-mt-openrc() {
 	_inst_initd 'ypbind'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/ypbind"
+            -i "${pkgdir}/etc/init.d/ypbind"
 }
 
 package_ypserv-openrc() {
@@ -670,8 +666,7 @@ package_ypserv-openrc() {
         done
 
 	for f in ${pkgdir}/etc/init.d/*;do
-		sed -e 's|/usr/sbin|/usr/bin|g' \
-			-i $f
+            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
 	done
 }
 
@@ -711,7 +706,7 @@ package_nginx-openrc() {
 	_inst_initd 'nginx'
 
 	sed -e 's|/usr/sbin|/usr/bin|g' \
-		-i "${pkgdir}/etc/init.d/nginx"
+            -i "${pkgdir}/etc/init.d/nginx"
 }
 
 package_vnstat-openrc() {
diff --git a/pcr/openrc-net/tor.install b/pcr/openrc-net/tor.install
index d5c4f50eb..f8262248d 100644
--- a/pcr/openrc-net/tor.install
+++ b/pcr/openrc-net/tor.install
@@ -2,6 +2,12 @@ _svc="tor"
 _rlvl="default"
 
 post_install() {
+	echo "	==> /etc/tor/torrc needs these adjustments:
+	echo "	User tor"
+	echo "	PIDFile /run/tor/tor.pid"
+	echo "	Log notice syslog"
+	echo "	DataDirectory /var/lib/tor/data"
+
 	_cmd="rc-update add ${_svc} ${_rlvl}"
 	echo "	==> run '${_cmd}'"
 }