main/openrc: clean up obsolete patches

4 files changed, 0 insertions, 221 deletions

diff --git a/main/openrc/command-line-size-fix.patch b/main/openrc/command-line-size-fix.patch
deleted file mode 100644
index 77fa2bd810..0000000000
--- a/main/openrc/command-line-size-fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ru a/src/librc/librc.h b/src/librc/librc.h
---- a/src/librc/librc.h	2009-09-01 11:42:31.000000000 +0000
-+++ b/src/librc/librc.h	2009-09-01 11:42:47.000000000 +0000
-@@ -72,8 +72,6 @@
- #define librc_hidden_proto(x) hidden_proto(x)
- #define librc_hidden_def(x) hidden_def(x)
- 
--ssize_t rc_getline(char **, size_t *, FILE *);
--
- librc_hidden_proto(rc_config_list)
- librc_hidden_proto(rc_config_load)
- librc_hidden_proto(rc_config_value)
-diff -ru a/src/librc/rc.h.in b/src/librc/rc.h.in
---- a/src/librc/rc.h.in	2009-09-01 11:42:31.000000000 +0000
-+++ b/src/librc/rc.h.in	2009-09-01 11:42:47.000000000 +0000
-@@ -517,5 +517,9 @@
-  * @return NULL terminated list of pids */
- RC_PIDLIST *rc_find_pids(const char *, const char *const *, uid_t, pid_t);
- 
-+/* getline is a handy glibc function that not all libcs have, so
-+ * we have our own */
-+ssize_t rc_getline(char **, size_t *, FILE *);
-+
- __END_DECLS
- #endif
-diff -ru a/src/librc/rc.map b/src/librc/rc.map
---- a/src/librc/rc.map	2009-09-01 11:42:31.000000000 +0000
-+++ b/src/librc/rc.map	2009-09-01 11:42:47.000000000 +0000
-@@ -12,6 +12,7 @@
- 	rc_deptree_update_needed;
- 	rc_environ_fd;
- 	rc_find_pids;
-+	rc_getline;
- 	rc_newer_than;
- 	rc_older_than;
- 	rc_runlevel_exists;
-diff -ru a/src/rc/rc.c b/src/rc/rc.c
---- a/src/rc/rc.c	2009-09-01 11:42:31.000000000 +0000
-+++ b/src/rc/rc.c	2009-09-01 11:47:00.000000000 +0000
-@@ -43,10 +43,6 @@
- #include <sys/utsname.h>
- #include <sys/wait.h>
- 
--#ifdef __linux__
--#  include <asm/setup.h> /* for COMMAND_LINE_SIZE */
--#endif
--
- #include <errno.h>
- #include <dirent.h>
- #include <ctype.h>
-@@ -177,10 +173,8 @@
- proc_getent(const char *ent)
- {
- 	FILE *fp;
--	char proc[COMMAND_LINE_SIZE];
--	char *p;
--	char *value = NULL;
--	int i;
-+	char *proc, *p, *value = NULL;
-+	size_t i;
- 
- 	if (!exists("/proc/cmdline"))
- 		return NULL;
-@@ -190,11 +184,11 @@
- 		return NULL;
- 	}
- 
--	memset(proc, 0, sizeof(proc));
--	p = fgets(proc, sizeof(proc), fp);
--	if (p == NULL)
--		eerror("fgets: %s", strerror(errno));
--	else if (*proc && (p = strstr(proc, ent))) {
-+	proc = NULL;
-+	i = 0;
-+	if (rc_getline(&proc, &i, fp) == -1 || proc == NULL)
-+		eerror("rc_getline: %s", strerror(errno));
-+	if (*proc && (p = strstr(proc, ent))) {
- 		i = p - proc;
- 		if (i == '\0' || proc[i - 1] == ' ') {
- 			p += strlen(ent);
-@@ -205,6 +199,7 @@
- 	} else
- 		errno = ENOENT;
- 	fclose(fp);
-+	free(proc);
- 
- 	return value;
- }
-diff -ru a/src/test/rc.funcs.list b/src/test/rc.funcs.list
---- a/src/test/rc.funcs.list	2009-09-01 11:42:31.000000000 +0000
-+++ b/src/test/rc.funcs.list	2009-09-01 11:42:57.000000000 +0000
-@@ -20,6 +20,8 @@
- rc_deptree_update_needed@@RC_1.0
- rc_find_pids
- rc_find_pids@@RC_1.0
-+rc_getline
-+rc_getline@@RC_1.0
- rc_newer_than
- rc_newer_than@@RC_1.0
- rc_older_than
diff --git a/main/openrc/dont-provide-ourself.patch b/main/openrc/dont-provide-ourself.patch
deleted file mode 100644
index 2ff988f7f6..0000000000
--- a/main/openrc/dont-provide-ourself.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/librc/librc-depend.c

-===================================================================

---- a/src/librc/librc-depend.c (revision b4104957b198b38aba609ed3889e7fa605012d19)

-+++ b/src/librc/librc-depend.c (revision 7fbb6ad42742ebc5e6ec244eedc85e9ac0a6236d)

-@@ -802,4 +802,9 @@

- 				continue;

- 			}

-+

-+			/* Don't provide ourself */

-+			if (strcmp(type, "iprovide") == 0 &&

-+			    strcmp(depend, service) == 0)

-+				continue;

- 

- 			/* .sh files are not init scripts */

diff --git a/main/openrc/openrc-0.4.3-command-line-size-fix.patch b/main/openrc/openrc-0.4.3-command-line-size-fix.patch
deleted file mode 100644
index 0ca4c8b1de..0000000000
--- a/main/openrc/openrc-0.4.3-command-line-size-fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: src/librc/librc.h
-===================================================================
---- a/src/librc/librc.h (revision 7c81f74b60b9d15ed472f1ca63cab0a105a84c08)
-+++ b/src/librc/librc.h (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -73,6 +73,4 @@
- #define librc_hidden_def(x) hidden_def(x)
- 
--ssize_t rc_getline(char **, size_t *, FILE *);
--
- librc_hidden_proto(rc_config_list)
- librc_hidden_proto(rc_config_load)
-Index: src/librc/rc.h.in
-===================================================================
---- a/src/librc/rc.h.in (revision c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc)
-+++ b/src/librc/rc.h.in (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -518,4 +518,8 @@
- RC_PIDLIST *rc_find_pids(const char *, const char *const *, uid_t, pid_t);
- 
-+/* getline is a handy glibc function that not all libcs have, so
-+ * we have our own */
-+ssize_t rc_getline(char **, size_t *, FILE *);
-+
- __END_DECLS
- #endif
-Index: src/librc/rc.map
-===================================================================
---- a/src/librc/rc.map (revision 6615eb4b689d7aa1d047bd9ed75eca80beac9767)
-+++ b/src/librc/rc.map (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -13,4 +13,5 @@
- 	rc_environ_fd;
- 	rc_find_pids;
-+	rc_getline;
- 	rc_newer_than;
- 	rc_older_than;
-Index: src/rc/rc.c
-===================================================================
---- a/src/rc/rc.c
-+++ b/src/rc/rc.c
-@@ -43,10 +43,6 @@
- #include <sys/utsname.h>
- #include <sys/wait.h>
- 
--#ifdef __linux__
--# include <asm/setup.h> /* for COMMAND_LINE_SIZE */
--#endif
--
- #include <errno.h>
- #include <dirent.h>
- #include <ctype.h>
-@@ -176,10 +172,8 @@
- proc_getent(const char *ent)
- {
- 	FILE *fp;
--	char proc[COMMAND_LINE_SIZE];
--	char *p;
--	char *value = NULL;
--	int i;
-+	char *proc, *p, *value = NULL;
-+	size_t i;
- 
- 	if (!exists("/proc/cmdline"))
- 		return NULL;
-@@ -189,8 +183,10 @@
- 		return NULL;
- 	}
- 
--	memset(proc, 0, sizeof(proc));
--	fgets(proc, sizeof(proc), fp);
-+	proc = NULL;
-+	i = 0;
-+	if (rc_getline(&proc, &i, fp) == -1 || proc == NULL)
-+		eerror("rc_getline: %s", strerror(errno));
- 	if (*proc && (p = strstr(proc, ent))) {
- 		i = p - proc;
- 		if (i == '\0' || proc[i - 1] == ' ') {
-@@ -202,6 +198,7 @@
- 	} else
- 		errno = ENOENT;
- 	fclose(fp);
-+	free(proc);
- 
- 	return value;
- }
-Index: src/test/rc.funcs.list
-===================================================================
---- a/src/test/rc.funcs.list (revision 6615eb4b689d7aa1d047bd9ed75eca80beac9767)
-+++ b/src/test/rc.funcs.list (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -21,4 +21,6 @@
- rc_find_pids
- rc_find_pids@@RC_1.0
-+rc_getline
-+rc_getline@@RC_1.0
- rc_newer_than
- rc_newer_than@@RC_1.0
diff --git a/main/openrc/openrc-hwclock.patch b/main/openrc/openrc-hwclock.patch
deleted file mode 100644
index 593e9ba82f..0000000000
--- a/main/openrc/openrc-hwclock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hwclock.in
-===================================================================
---- a/init.d/hwclock.in	(revision 1571)
-+++ b/niit.d/hwclock.in	(working copy)
-@@ -118,7 +118,7 @@
- 
- 	if ! yesno $clock_adjfile; then
- 		# Some implementations don't handle adjustments
--		if LC_ALL=C hwclock --help | grep -q "\-\-noadjfile"; then
-+		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
- 			utc_cmd="$utc_cmd --noadjfile"
- 		fi
- 	fi