Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

2 files changed, 28 insertions, 17 deletions

diff --git a/source/n/dhcpcd/50-ntp.conf.diff b/source/n/dhcpcd/50-ntp.conf.diff
index d86c299e..63fd914b 100644
--- a/source/n/dhcpcd/50-ntp.conf.diff
+++ b/source/n/dhcpcd/50-ntp.conf.diff
@@ -1,19 +1,29 @@
-diff -Nur dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf
---- dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf	2009-09-02 15:21:11.000000000 -0500
-+++ dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf	2009-09-12 00:36:04.447859980 -0500
-@@ -8,14 +8,8 @@
+--- ./dhcpcd-hooks/50-ntp.conf.orig	2010-11-19 04:17:14.000000000 -0600
++++ ./dhcpcd-hooks/50-ntp.conf	2010-12-29 16:07:48.000000000 -0600
+@@ -8,6 +8,26 @@
  #   NTP_CONF=/usr/pkg/etc/ntpd.conf
  # to use openntpd from pkgsrc instead of the system provided ntp.
  
--# Detect OpenRC or BSD rc
--# Distributions may want to just have their command here instead of this
--if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
--	ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
--elif [ -x /etc/rc.d/ntpd ]; then
-+if [ -x /etc/rc.d/ntpd ]; then
- 	ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
--elif [ -x /usr/local/etc/rc.d/ntpd ]; then
--	ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
- fi
- 
- ntp_conf_dir="$state_dir/ntp.conf"
++# Detect OpenRC, Debian or BSD rc
++# Distributions may want to just have their command here instead of this
++if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
++        ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
++elif type invoke-rc.d >/dev/null 2>&1; then
++        if [ -x /etc/init.d/ntp ]; then
++                ntpd_restart_cmd="invoke-rc.d ntp try-restart"
++        fi
++        # Debian as a seperate file for DHCP config to avoid stamping on
++        # the master.
++        [ -e /var/lib/ntp ] || mkdir /var/lib/ntp
++        : ${NTP_DHCP_CONF:=/var/lib/ntp/ntp.conf.dhcp}
++elif [ -x /etc/rc.d/ntpd ]; then
++        ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
++elif [ -x /usr/local/etc/rc.d/ntpd ]; then
++        ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
++elif [ -x /etc/rc.d/rc.ntpd ]; then
++        ntpd_restart_cmd="/etc/rc.d/rc.ntpd status >/dev/null 2>&1 && /etc/rc.d/rc.ntpd restart"
++fi
++
+ : ${ntpd_restart_cmd:=service_condcommand ntpd restart}
+ if type invoke-rc.d >/dev/null 2>&1; then
+ 	# Debian has a seperate file for DHCP config to avoid stamping on
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index 3ee95a90..c50048ae 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -104,7 +104,7 @@ mv $PKG/etc/dhcpcd.conf $PKG/etc/dhcpcd.conf.new
 )
 
 mkdir -p $PKG/usr/doc/dhcpcd-$VERSION
-cp -a README $PKG/usr/doc/dhcpcd-$VERSION
+cp -a README* $PKG/usr/doc/dhcpcd-$VERSION
 zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/dhcpcd-$VERSION/COPYRIGHT
 
 mkdir -p $PKG/install
@@ -113,3 +113,4 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/dhcpcd-$VERSION-$ARCH-$BUILD.txz
+