Remove some patches than haven't been sent upstream in nearly 8 years,

and for which it wasn't clear they were necessary in the first place.
Ride PKGREVISION bump for patch-cf removal.

4 files changed, 1 insertions, 84 deletions

diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 5a24efa5c17..a5750635065 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2008/08/23 15:28:59 wiz Exp $
+$NetBSD: distinfo,v 1.23 2008/08/23 15:33:04 wiz Exp $
 
 SHA1 (cdrtools-2.01.01a45.tar.bz2) = c79ea5c87b48b2cb697e20c0efd9e11f752cfcb3
 RMD160 (cdrtools-2.01.01a45.tar.bz2) = e6e12fdae5ab98ba66f42eae27fb6e452f52eff1
@@ -7,10 +7,7 @@ SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8
 SHA1 (patch-ab) = 5352fee446483e2a5e7917ebf9a84e7c7fd65bb7
 SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
 SHA1 (patch-ad) = 06f33c8b995e7f6edb53d78164cb8fbcd0cdefa8
-SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
 SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336
-SHA1 (patch-ba) = 58b32b4b211fe620c57f510e1804f91d1b52fd28
-SHA1 (patch-bb) = 5d5f21b5d026df11245409c708534fe57886d3ff
 SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
 SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021
 SHA1 (patch-cj) = 6be6bb13345a5bfe8c2f9cce6090b40e7b44a258
diff --git a/sysutils/cdrtools/patches/patch-ah b/sysutils/cdrtools/patches/patch-ah
deleted file mode 100644
index c9cce18336f..00000000000
--- a/sysutils/cdrtools/patches/patch-ah
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/03/16 22:04:54 bad Exp $
-
---- cdda2wav/setuid.c.orig	2006-11-11 22:40:01.000000000 +0100
-+++ cdda2wav/setuid.c
-@@ -116,7 +116,7 @@ needroot(necessary)
- 	if (geteuid() == 0)
- 		return; /* nothing to do */
- 
--#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEUID)
-+#if defined(HAVE_SETEUID)
- 	if (seteuid(effective_uid)) {
- 		errmsg("Error with seteuid in needroot().\n");
- 		exit(PERM_ERROR);
-@@ -162,7 +162,7 @@ dontneedroot()
- 	if (geteuid() != 0)
- 		return; /* nothing to do */
- 
--#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEUID)
-+#if defined(HAVE_SETEUID)
- 	if (seteuid(real_uid)) {
- 		errmsg("Error with seteuid in dontneedroot().\n");
- 		exit(PERM_ERROR);
-@@ -264,7 +264,7 @@ needgroup(necessary)
- 	if (getegid() == effective_gid)
- 		return; /* nothing to do */
- 
--#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEGID)
-+#if defined(HAVE_SETEGID)
- 	if (setegid(effective_gid)) {
- 		errmsg("Error with setegid in needgroup().\n");
- 		exit(PERM_ERROR);
-@@ -302,7 +302,7 @@ dontneedgroup()
- 	}
- 	if (getegid() != effective_gid)
- 		return; /* nothing to do */
--#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEGID)
-+#if defined(HAVE_SETEGID)
- 	if (setegid(real_gid)) {
- 		errmsg("Error with setegid in dontneedgroup().\n");
- 		exit(PERM_ERROR);
diff --git a/sysutils/cdrtools/patches/patch-ba b/sysutils/cdrtools/patches/patch-ba
deleted file mode 100644
index 6ccabcd8ef5..00000000000
--- a/sysutils/cdrtools/patches/patch-ba
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2007/09/18 23:07:26 wiz Exp $
-
---- readcd/readcd.c.orig	2007-08-12 20:45:39.000000000 +0000
-+++ readcd/readcd.c
-@@ -497,12 +497,12 @@ main(ac, av)
- 	/*
- 	 * We don't need root privilleges anymore.
- 	 */
--#ifdef	HAVE_SETREUID
--	if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef	HAVE_SETEUID
- 	if (seteuid(getuid()) < 0)
- #else
-+#ifdef	HAVE_SETREUID
-+	if (setreuid(-1, getuid()) < 0)
-+#else
- 	if (setuid(getuid()) < 0)
- #endif
- #endif
diff --git a/sysutils/cdrtools/patches/patch-bb b/sysutils/cdrtools/patches/patch-bb
deleted file mode 100644
index 4e39eb14166..00000000000
--- a/sysutils/cdrtools/patches/patch-bb
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2007/09/18 23:07:27 wiz Exp $
-
---- mkisofs/mkisofs.c.orig	2007-08-20 16:18:07.000000000 +0000
-+++ mkisofs/mkisofs.c
-@@ -2239,12 +2239,12 @@ setcharset:
- 		}
- 	}
- 	/* We don't need root privilleges anymore. */
--#ifdef	HAVE_SETREUID
--	if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef	HAVE_SETEUID
- 	if (seteuid(getuid()) < 0)
- #else
-+#ifdef	HAVE_SETREUID
-+	if (setreuid(-1, getuid()) < 0)
-+#else
- 	if (setuid(getuid()) < 0)
- #endif
- #endif