summaryrefslogtreecommitdiff
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/network-scripts/network-scripts.SlackBuild2
-rw-r--r--source/n/network-scripts/scripts/rc.inet112
-rw-r--r--source/n/network-scripts/scripts/rc.inet280
-rwxr-xr-xsource/n/proftpd/proftpd.SlackBuild6
4 files changed, 55 insertions, 45 deletions
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index 4f35ed36..1d9c866f 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=network-scripts
VERSION=${VERSION:-15.0}
ARCH=noarch
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
diff --git a/source/n/network-scripts/scripts/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1
index cf9da0f4..59f89eda 100644
--- a/source/n/network-scripts/scripts/rc.inet1
+++ b/source/n/network-scripts/scripts/rc.inet1
@@ -22,7 +22,7 @@ else # output to stdout/stderr:
LOGGER=/bin/cat
fi
-# Handy wrapper for verbose logging
+# Handy wrapper for verbose logging:
debug_log() {
if [ "$DEBUG_ETH_UP" = "yes" ]; then
echo "/etc/rc.d/rc.inet1: $*" | $LOGGER
@@ -52,7 +52,7 @@ debug_log "List of interfaces: '${IFNAME[*]}'"
# LOOPBACK FUNCTIONS #
######################
-# Function to bring up the loopback interface. If loopback is
+# Function to bring up the loopback interface. If loopback is
# already up, do nothing.
lo_up() {
if [ -e /sys/class/net/lo ]; then
@@ -78,7 +78,7 @@ lo_down() {
# INTERFACE FUNCTIONS #
#######################
-# Function to create virtual interfaces
+# Function to create virtual interfaces.
virtif_create() {
# argument is 'i' - the position of this interface in the VIRTIFNAME array.
# this loop goes from i=0 to i=number_of_configured_virtual_interfaces_minus_one
@@ -88,7 +88,7 @@ virtif_create() {
done
}
-# Function to destory virtual interfaces
+# Function to destroy virtual interfaces.
virtif_destroy() {
# argument is 'i' - the position of this interface in the VIRTIFNAME array.
for i in $(seq 0 $((${#VIRTIFNAME[@]} - 1))); do
@@ -122,7 +122,7 @@ br_close() {
/sbin/ip link del ${IFNAME[$1]}
}
-# Function to bring up a network interface. If the interface is
+# Function to bring up a network interface. If the interface is
# already up or does not yet exist (perhaps because the kernel driver
# is not loaded yet), do nothing.
if_up() {
@@ -201,7 +201,7 @@ if_up() {
# fi
#fi
#### (end commented out)
- # 15 seconds should be a reasonable default DHCP timeout. 30 was too much.
+ # 15 seconds should be a reasonable default DHCP timeout. 30 was too much.
echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER
/sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}
if [ "$?" == "0" ]; then # the dhcp call has succeeded
diff --git a/source/n/network-scripts/scripts/rc.inet2 b/source/n/network-scripts/scripts/rc.inet2
index 300ede3e..ec68ba0b 100644
--- a/source/n/network-scripts/scripts/rc.inet2
+++ b/source/n/network-scripts/scripts/rc.inet2
@@ -13,19 +13,52 @@
# Modified for Slackware by Patrick Volkerding <volkerdi@slackware.com>
-# At this point, we are ready to talk to The World...
+# At this point, we are (almost) ready to talk to The World...
+# If there is a firewall script, run it before enabling packet forwarding.
+# See the HOWTOs on http://www.netfilter.org/ for documentation on
+# setting up a firewall or NAT on Linux. In some cases this might need to
+# be moved past the section below dealing with IP packet forwarding.
+if [ -x /etc/rc.d/rc.firewall ]; then
+ /etc/rc.d/rc.firewall start
+fi
+
+# Turn on IPv4 packet forwarding support.
+if [ -x /etc/rc.d/rc.ip_forward ]; then
+ . /etc/rc.d/rc.ip_forward start
+fi
+
+# Start krb5kdc, which is the Kerberos version 5 Authentication Service
+# and Key Distribution Center (AS/KDC). This needs to run first on both
+# master and secondary KDCs.
+if [ -x /etc/rc.d/rc.krb5kdc ]; then
+ sh /etc/rc.d/rc.krb5kdc start
+fi
+
+# Start the Kerberos administration server. This typically runs on the
+# master Kerberos server, which stores the KDC database.
+if [ -x /etc/rc.d/rc.kadmind ]; then
+ sh /etc/rc.d/rc.kadmind start
+fi
+
+# Start the Kerberos V5 slave KDC update server. This runs on a slave
+# (secondary) KDC server. It allows the master Kerberos server to use
+# kprop(8) to propagate its database to the slave servers.
+if [ -x /etc/rc.d/rc.kpropd ]; then
+ sh /etc/rc.d/rc.kpropd start
+fi
+
# Mount remote (NFS) filesystems:
if cat /etc/fstab | grep -v '^#' | grep -w nfs 1> /dev/null 2> /dev/null ; then
# Start rpc.portmap, /sbin/rpc.lockd, and /sbin/rpc.statd if we find NFS
# volumes defined in /etc/fstab since these will need to be running in order
- # to mount them. If they are not running, attempting to mount an NFS
+ # to mount them. If they are not running, attempting to mount an NFS
# partition will cause mount to hang, or at least result in unreliable
- # operation. Keep this in mind if you plan to mount unlisted NFS
+ # operation. Keep this in mind if you plan to mount unlisted NFS
# partitions...
# If you have uncommented NFS partitions in your /etc/fstab, rc.rpc is run
- # whether it is set as executable or not. If you don't want to run it,
+ # whether it is set as executable or not. If you don't want to run it,
# comment the NFS partitions out in /etc/fstab or erase/rename rc.rpc.
if [ -r /etc/rc.d/rc.rpc ]; then
sh /etc/rc.d/rc.rpc start
@@ -37,15 +70,15 @@ if cat /etc/fstab | grep -v '^#' | grep -w nfs 1> /dev/null 2> /dev/null ; then
fi
# If /etc/rc.d/rc.rpc is executable, run it to load rpc.portmap, rpc.lockd,
-# and rpc.statd. This might be needed to mount NFS partitions that are not
-# listed in /etc/fstab. Starting this twice won't hurt as the script will
+# and rpc.statd. This might be needed to mount NFS partitions that are not
+# listed in /etc/fstab. Starting this twice won't hurt as the script will
# check if things are already running before trying to start them.
if [ -x /etc/rc.d/rc.rpc ]; then
sh /etc/rc.d/rc.rpc start
fi
-# Mount remote CIFS filesystems. Note that where possible, using CIFS is
-# preferred over SMBFS. SMBFS is no longer actively maintained.
+# Mount remote CIFS filesystems. Note that where possible, using CIFS is
+# preferred over SMBFS. SMBFS is no longer actively maintained.
if cat /etc/fstab | grep -v '^#' | grep -w cifs 1> /dev/null 2> /dev/null ; then
echo "Mounting remote CIFS file systems: /sbin/mount -a -t cifs"
/sbin/mount -a -t cifs
@@ -62,24 +95,13 @@ if cat /etc/fstab | grep -v '^#' | grep -w smbfs 1> /dev/null 2> /dev/null ; the
fi
# Start the system logger if it is not already running (maybe because /usr
-# is on a network partition).
+# is on a network partition). NOTE: Don't put /usr on a network partition,
+# or even a separate local partition. This is not supported and is likely to
+# cause some problems...
if [ -x /etc/rc.d/rc.syslog -a -d /var/log -a ! -r /var/run/syslogd.pid ]; then
. /etc/rc.d/rc.syslog start
fi
-# If there is a firewall script, run it before enabling packet forwarding.
-# See the HOWTOs on http://www.netfilter.org/ for documentation on
-# setting up a firewall or NAT on Linux. In some cases this might need to
-# be moved past the section below dealing with IP packet forwarding.
-if [ -x /etc/rc.d/rc.firewall ]; then
- /etc/rc.d/rc.firewall start
-fi
-
-# Turn on IPv4 packet forwarding support.
-if [ -x /etc/rc.d/rc.ip_forward ]; then
- . /etc/rc.d/rc.ip_forward start
-fi
-
# Start the inetd server:
if [ -x /etc/rc.d/rc.inetd ]; then
/etc/rc.d/rc.inetd start
@@ -106,7 +128,7 @@ if [ -x /etc/rc.d/rc.openvpn ]; then
/etc/rc.d/rc.openvpn start
fi
-# Start the NFS server. Note that for this to work correctly, you'll
+# Start the NFS server. Note that for this to work correctly, you'll
# need nfsd support in the kernel (the startup script will try to load
# the module for you).
# You'll also need to set up some shares in /etc/exports.
@@ -128,15 +150,3 @@ fi
# echo "Starting system status server: /usr/sbin/rwhod"
# /usr/sbin/rwhod
# fi
-
-# # Fire up the PC-NFS daemon(s). This is a primarily obsolete system, and may
-# # not be very secure. It's not at all needed for normal NFS server support.
-# # You probably should not run this.
-# if [ -x /usr/sbin/rpc.pcnfsd ]; then
-# echo "Starting PC-NFS daemons: /usr/sbin/rpc.pcnfsd /usr/sbin/rpc.bwnfsd"
-# /usr/sbin/rpc.pcnfsd /var/spool/lpd
-# fi
-# if [ -x /usr/sbin/rpc.bwnfsd ]; then
-# /usr/sbin/rpc.bwnfsd /var/spool/lpd
-# fi
-
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index 5607c9c6..a2484230 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -23,9 +23,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=proftpd
-VERSION=1.3.6
-DIRVER=1.3.6
-BUILD=${BUILD:-4}
+VERSION=1.3.6a
+DIRVER=1.3.6a
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}