Author: justin
Date: 2005-11-22 08:35:58 -0700 (Tue, 22 Nov 2005)
New Revision: 1138
Added:
branches/dm/packages/rsync/
Modified:
branches/dm/Makefile
branches/dm/etc/group
branches/dm/etc/passwd
branches/dm/packages/blfs-bootscripts/Makefile
branches/dm/packages/gc/Makefile
Log:
Merged r1135 (Added rsync) from trunk to dm. Use VRS variable in gc Makefile.
Modified: branches/dm/Makefile
===================================================================
--- branches/dm/Makefile 2005-11-22 15:33:55 UTC (rev 1137)
+++ branches/dm/Makefile 2005-11-22 15:35:58 UTC (rev 1138)
@@ -335,7 +335,7 @@
ch-startup-notification chroot-gvim ch-xfce ch-vte ch-exo \
ch-XML-Parser ch-Terminal ch-irssi \
ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
- ch-traceroute \
+ ch-traceroute ch-rsync \
ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
Modified: branches/dm/etc/group
===================================================================
--- branches/dm/etc/group 2005-11-22 15:33:55 UTC (rev 1137)
+++ branches/dm/etc/group 2005-11-22 15:35:58 UTC (rev 1138)
@@ -15,4 +15,6 @@
usb:x:14:
cdrom:x:15:
mail:x:34:
+rsyncd:x:48:
+sshd:x:50:
nogroup:x:99:
Modified: branches/dm/etc/passwd
===================================================================
--- branches/dm/etc/passwd 2005-11-22 15:33:55 UTC (rev 1137)
+++ branches/dm/etc/passwd 2005-11-22 15:35:58 UTC (rev 1138)
@@ -1,3 +1,4 @@
root:x:0:0:root:/root:/bin/bash
+rsyncd:x:48:48:rsyncd:/home/rsync:/bin/false
sshd:x:50:50:sshd:/var/lib/sshd:/bin/false
nobody:x:99:99:nobody:/dev/null:/bin/false
Modified: branches/dm/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/dm/packages/blfs-bootscripts/Makefile 2005-11-22 15:33:55 UTC
(rev 1137)
+++ branches/dm/packages/blfs-bootscripts/Makefile 2005-11-22 15:35:58 UTC
(rev 1138)
@@ -35,6 +35,7 @@
install -m754 blfs/init.d/nfs-server /etc/rc.d/init.d/
install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/
install -m754 blfs/init.d/iptables /etc/rc.d/init.d/
+ install -m754 blfs/init.d/rsync /etc/rc.d/init.d/
clean:
-rm -rf $(DIR)
Modified: branches/dm/packages/gc/Makefile
===================================================================
--- branches/dm/packages/gc/Makefile 2005-11-22 15:33:55 UTC (rev 1137)
+++ branches/dm/packages/gc/Makefile 2005-11-22 15:35:58 UTC (rev 1138)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
- sed -i "s|\$$(datadir)/@PACKAGE@|&-6.5|" doc/Makefile.in
+ sed -i "s|\$$(datadir)/@PACKAGE@|&-$(VRS)|" doc/Makefile.in
./configure --prefix=/usr --datadir=/usr/share/doc --enable-cplusplus
make $(PM)
make install
Copied: branches/dm/packages/rsync (from rev 1135, trunk/packages/rsync)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
