old

5 files changed, 0 insertions, 221 deletions

diff --git a/sys-apps/baselayout/files/baselayout-1.12.10-svn2690.patch b/sys-apps/baselayout/files/baselayout-1.12.10-svn2690.patch
deleted file mode 100644
index e644353b5a5b..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.10-svn2690.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: etc/fstab
-===================================================================
---- etc/fstab	(revision 2558)
-+++ etc/fstab	(working copy)
-@@ -17,7 +17,7 @@
- /dev/BOOT		/boot		ext2		noauto,noatime	1 2
- /dev/ROOT		/		ext3		noatime		0 1
- /dev/SWAP		none		swap		sw		0 0
--/dev/cdrom		/mnt/cdrom	audo		noauto,ro	0 0
-+/dev/cdrom		/mnt/cdrom	auto		noauto,ro	0 0
- #/dev/fd0		/mnt/floppy	auto		noauto		0 0
- 
- # glibc 2.2 and above expects tmpfs to be mounted at /dev/shm for 
-Index: lib/rcscripts/net/system.sh
-===================================================================
---- lib/rcscripts/net/system.sh	(revision 2558)
-+++ lib/rcscripts/net/system.sh	(working copy)
-@@ -19,7 +19,7 @@
- }
- 
- system_dns() {
--	local iface="$1" ifvar=$(bash_variable "$1") x= domain= search=
-+	local iface="$1" ifvar=$(bash_variable "$1") x= domain= search= sortlist= options=
- 	local buffer=
- 	local -a servers=()
- 
-@@ -31,8 +31,14 @@
- 
- 	search="dns_search_${ifvar}"
- 	[[ -z ${!search} ]] && search="dns_search"
--	
--	[[ -z ${!servers} && -z ${!domain} && -z ${!search} ]] && return 0
-+
-+	sortlist="dns_sortlist_${ifvar}"
-+	[[ -z ${!sortlist} ]] && sortlist="dns_sortlist"
-+
-+	options="dns_options_${ifvar}"
-+	[[ -z ${!options} ]] && options="dns_options"
-+
-+	[[ -z ${!servers} && -z ${!domain} && -z ${!search} && -z ${!sortlist} && -z ${!options} ]] && return 0
- 
- 	buffer="# Generated by net-scripts for interface ${iface}\n"
- 	[[ -n ${!domain} ]] && buffer="${buffer}domain ${!domain}\n"
-@@ -42,6 +48,9 @@
- 		buffer="${buffer}nameserver ${x}\n"
- 	done
- 
-+	[[ -n ${!sortlist} ]] && buffer="${buffer}sortlist ${!sortlist}\n"
-+	[[ -n ${!options} ]] && buffer="${buffer}options ${!options}\n"
-+
- 	# Support resolvconf if we have it.
- 	if [[ -x /sbin/resolvconf ]] ; then
- 		echo -e "${buffer}" | resolvconf -a "${iface}"
-Index: lib/rcscripts/net/ip6to4.sh
-===================================================================
---- lib/rcscripts/net/ip6to4.sh	(revision 2558)
-+++ lib/rcscripts/net/ip6to4.sh	(working copy)
-@@ -25,7 +25,7 @@
- # addresses on a pre-configured interface.
- # Returns 0 on success, otherwise 1.
- ip6to4_start() {
--	local iface="$1" addr=""
-+	local iface="$1" addr="" localip=""
- 	local ifvar=$(bash_variable "${iface}")
- 
- 	# Ensure the interface is sit0 if we're using ifconfig
-@@ -71,6 +71,12 @@
- 
- 		# Now apply our IPv6 address to our config
- 		new=( "${new[@]}" "${ip6}/16" )
-+
-+		if [[ -n ${localip} ]] ; then
-+			localip="any"
-+		else
-+			localip="${ip}"
-+		fi
- 	done	
- 
- 	if [[ -z ${new} ]] ; then
-@@ -80,7 +86,7 @@
- 
- 	if [[ ${iface} != "sit0" ]] ; then
- 		ebegin "Creating 6to4 tunnel on ${iface}"
--		interface_tunnel add "${iface}" mode sit ttl 255 remote any local "${ip}"
-+		interface_tunnel add "${iface}" mode sit ttl 255 remote any local "${localip}"
- 		eend $? || return 1
- 	fi
- 	
-Index: lib/rcscripts/net/iwconfig.sh
-===================================================================
---- lib/rcscripts/net/iwconfig.sh	(revision 2558)
-+++ lib/rcscripts/net/iwconfig.sh	(working copy)
-@@ -232,7 +232,7 @@
- 	fi
- 
- 	# Then set the ESSID
--	if ! eval iwconfig "${iface}" essid "${ESSID}" ; then
-+	if ! iwconfig "${iface}" essid "${ESSID}" ; then
- 		eerror "${iface} does not support setting ESSID to \"${dessid}\""
- 		return 1
- 	fi
-@@ -378,7 +378,7 @@
- 		[[ ${key} != "off" ]] && w=$(iwconfig_get_wep_status "${iface}")
- 	fi
- 
--	if ! eval iwconfig "${iface}" essid "${ESSID}" ; then
-+	if ! iwconfig "${iface}" essid "${ESSID}" ; then
- 		if [[ ${ESSID} != "any" ]]; then
- 			ewarn "${iface} does not support setting ESSID to \"${dessid}\""
- 		fi
---- /var/tmp/portage/sys-apps/baselayout-1.12.10-r4/work/baselayout-1.12.10/lib/rcscripts/net/system.sh	2007-01-03 10:43:37 +0000
-+++ /local/baselayout/branches/baselayout-1_12/net-scripts/net/system.sh	2007-05-03 12:19:48 +0100
diff --git a/sys-apps/baselayout/files/baselayout-1.12.9-wireless-deprecate.patch b/sys-apps/baselayout/files/baselayout-1.12.9-wireless-deprecate.patch
deleted file mode 100644
index 99804e82733a..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.9-wireless-deprecate.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: lib/rcscripts/net/essidnet.sh
-===================================================================
---- lib/rcscripts/net/essidnet.sh	(revision 2560)
-+++ lib/rcscripts/net/essidnet.sh	(working copy)
-@@ -5,8 +5,11 @@
- # motivation for me to make this and keep on improving it
- 
- # Load our config if it exists
--[[ -f "$(add_suffix "/etc/conf.d/wireless" )" ]] \
--	&& source "$(add_suffix "/etc/conf.d/wireless" )"
-+if [[ -f "$(add_suffix "/etc/conf.d/wireless" )" ]] ; then
-+	ewarn "/etc/conf.d/wireless is deprecated"
-+	ewarn "Please put all settings in /etc/conf.d/net"
-+	source "$(add_suffix "/etc/conf.d/wireless" )"
-+fi
- 
- # void essidnet_depend(void)
- #
diff --git a/sys-apps/baselayout/files/baselayout-2.0.0_rc4-ssd.patch b/sys-apps/baselayout/files/baselayout-2.0.0_rc4-ssd.patch
deleted file mode 100644
index a0de71487fee..000000000000
--- a/sys-apps/baselayout/files/baselayout-2.0.0_rc4-ssd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/librc-daemon.c
-===================================================================
---- src/librc-daemon.c	(revision 2865)
-+++ src/librc-daemon.c	(working copy)
-@@ -118,7 +118,7 @@
- 			continue;
- 
- 		if (uid) {
--			snprintf (buffer, sizeof (buffer), "/proc/%d", pid);
-+			snprintf (buffer, sizeof (buffer), "/proc/%d", p);
- 			if (stat (buffer, &sb) != 0 || sb.st_uid != uid)
- 				continue;
- 		}
diff --git a/sys-apps/baselayout/files/baselayout-2.0.0_rc6-ssd-path.patch b/sys-apps/baselayout/files/baselayout-2.0.0_rc6-ssd-path.patch
deleted file mode 100644
index 0f77c509c784..000000000000
--- a/sys-apps/baselayout/files/baselayout-2.0.0_rc6-ssd-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c
-index 551bad5..31752fb 100644
---- a/src/start-stop-daemon.c
-+++ b/src/start-stop-daemon.c
-@@ -916,6 +916,7 @@ int start_stop_daemon (int argc, char **argv)
- 				char *token;
- 				char *np;
- 				int l;
-+				int t;
- 
- 				p += 5;
- 				while ((token = strsep (&p, ":"))) {
-@@ -923,15 +924,17 @@ int start_stop_daemon (int argc, char **argv)
- 						strcmp (token, RC_LIBDIR "/sbin") == 0)
- 						continue;
- 					
-+					t = strlen (token);
- 					if (newpath) {
- 						l = strlen (newpath);
--						newpath = xrealloc (newpath, sizeof (char) *
--											(l + strlen (token) + 2));
-+						newpath = xrealloc (newpath, sizeof (char) * (l + t + 2));
- 						np = newpath + l;
- 						*np++ = ':';
- 						memcpy (np, token, sizeof (char) * strlen (token));
-+						np += t;
-+						*np = '\0';	
- 					} else {
--						l = strlen ("PATH=") + strlen (token) + 1;
-+						l = strlen ("PATH=") + t + 1;
- 						newpath = xmalloc (sizeof (char) * l);
- 						snprintf (newpath, l, "PATH=%s", token);
- 					}
diff --git a/sys-apps/baselayout/files/copyright b/sys-apps/baselayout/files/copyright
deleted file mode 100644
index 2bdf95eb73a1..000000000000
--- a/sys-apps/baselayout/files/copyright
+++ /dev/null
@@ -1,45 +0,0 @@
-This package is maintained for Debian by Bdale Garbee, <bdale@gag.com>.
-
-It was downloaded from ftp.redhat.com, as a source .rpm from the 5.1 release
-tree.
-
-Copyright:
-
-No explicit copyright is asserted.  Nick Holloway is the earliest author 
-recorded in the sourcecode.  I queried him for an explicit statement 
-regarding the license status of this work, and this is his reply:
-  
- Date: Tue, 21 Jul 1998 19:57:10 +0100
- From: Nick Holloway <Nick.Holloway@alfie.demon.co.uk>
- Message-Id: <199807211857.TAA19068@alfie.demon.co.uk>
- To: Bdale Garbee <bdale@gag.com>
- Subject: Re: makedev license?
- 
- > I maintain the makedev package for Debian GNU/Linux.  I am about to move 
- > from the ill-fated makedev-1.6 to the makedev-2.3.1 derived from your work 
- > by the folks at Redhat.  I don't see any evidence of a copyright assertion 
- > or explicit license statement in the source.  Your name appears to be the 
- > earliest attached to the current sourcecode.  Am I correct in assuming the 
- > GPL?  We try to be meticulous about having our base system be compliant 
- > with our Debian Free Software Guidelines, so I'd like an explicit statement.
- 
- It was never explictly released as GPL, as that would have required
- including the file COPYING which would have been much larger than the
- actual MAKEDEV script (I was also too lazy to find out what incantations
- needed to be made).  However, it is intended to be used as anyone sees
- fit, and the statement under "Copying Policy" is "Freely Redistributable"
- (see MAKEDEV.lsm from any of the releases I made).
- 
- The more recent modifications were done by Michael K. Johnson at
- Redhat.  I think the understanding was that he would be taking over the
- maintenance of MAKEDEV (our discussion took place last September).
- 
- The only previous history was (according to an old posting to
- comp.os.linux) that I started with Jim Winstead's script.
- 
- So, as far as I am concerned, it is consistentwith the Debian FSG.
- 
- -- 
-  `O O'  | Home: Nick.Holloway@alfie.demon.co.uk  http://www.alfie.demon.co.uk/
- // ^ \\ | Work: Nick.Holloway@parallax.co.uk
-