From f51d09212073087402b71bb98b9265caba8b9260 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Wed, 27 Mar 2019 13:20:32 +0100
Subject: [PATCH] Remove unused parts of spec file

---
 openssh-5.9p1-wIm.patch | 78 -----------------------------------------
 openssh.spec            | 11 ------
 2 files changed, 89 deletions(-)
 delete mode 100644 openssh-5.9p1-wIm.patch

diff --git a/openssh-5.9p1-wIm.patch b/openssh-5.9p1-wIm.patch
deleted file mode 100644
index a00046a..0000000
--- a/openssh-5.9p1-wIm.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -up openssh-5.9p1/Makefile.in.wIm openssh-5.9p1/Makefile.in
---- openssh-5.9p1/Makefile.in.wIm	2011-08-05 22:15:18.000000000 +0200
-+++ openssh-5.9p1/Makefile.in	2011-09-12 16:24:18.643674014 +0200
-@@ -66,7 +66,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
- 	cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
- 	compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
- 	log.o match.o md-sha256.o moduli.o nchan.o packet.o \
--	readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
-+	readpass.o rsa.o ttymodes.o whereIam.o xmalloc.o addrmatch.o \
- 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
- 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
- 	kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
-diff -up openssh-5.9p1/log.h.wIm openssh-5.9p1/log.h
---- openssh-5.9p1/log.h.wIm	2011-06-20 06:42:23.000000000 +0200
-+++ openssh-5.9p1/log.h	2011-09-12 16:34:52.984674326 +0200
-@@ -65,6 +65,8 @@ void     verbose(const char *, ...) __at
- void     debug(const char *, ...) __attribute__((format(printf, 1, 2)));
- void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
- void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
-+void	 _debug_wIm_body(const char *, int, const char *, const char *, int);
-+#define	debug_wIm(a,b) _debug_wIm_body(a,b,__func__,__FILE__,__LINE__)
- 
- 
- void	 set_log_handler(log_handler_fn *, void *);
-diff -up openssh-5.9p1/sshd.c.wIm openssh-5.9p1/sshd.c
---- openssh-5.9p1/sshd.c.wIm	2011-06-23 11:45:51.000000000 +0200
-+++ openssh-5.9p1/sshd.c	2011-09-12 16:38:35.787816490 +0200
-@@ -140,6 +140,9 @@ int deny_severity;
- 
- extern char *__progname;
- 
-+/* trace of fork processes */
-+extern int whereIam;
-+
- /* Server configuration options. */
- ServerOptions options;
- 
-@@ -666,6 +669,7 @@ privsep_preauth(Authctxt *authctxt)
- 		return 1;
- 	} else {
- 		/* child */
-+		whereIam = 1;
- 		close(pmonitor->m_sendfd);
- 		close(pmonitor->m_log_recvfd);
- 
-@@ -715,6 +719,7 @@ privsep_postauth(Authctxt *authctxt)
- 
- 	/* child */
- 
-+	whereIam = 2;
- 	close(pmonitor->m_sendfd);
- 	pmonitor->m_sendfd = -1;
- 
-@@ -1325,6 +1330,8 @@ main(int ac, char **av)
- 	Key *key;
- 	Authctxt *authctxt;
- 
-+	whereIam = 0;
-+
- #ifdef HAVE_SECUREWARE
- 	(void)set_auth_parameters(ac, av);
- #endif
-diff -up openssh-5.9p1/whereIam.c.wIm openssh-5.9p1/whereIam.c
---- openssh-5.9p1/whereIam.c.wIm	2011-09-12 16:24:18.722674167 +0200
-+++ openssh-5.9p1/whereIam.c	2011-09-12 16:24:18.724674418 +0200
-@@ -0,0 +1,12 @@
-+
-+int whereIam = -1;
-+
-+void _debug_wIm_body(const char *txt, int val, const char *func, const char *file, int line)
-+{
-+	if (txt)
-+		debug("%s=%d, %s(%s:%d) wIm = %d, uid=%d, euid=%d", txt, val, func, file, line, whereIam, getuid(), geteuid());
-+	else
-+		debug("%s(%s:%d) wIm = %d, uid=%d, euid=%d", func, file, line, whereIam, getuid(), geteuid());
-+}
-+
-+
diff --git a/openssh.spec b/openssh.spec
index 3a4f29c..7794d31 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -92,9 +92,6 @@ Source13: sshd-keygen
 Source14: sshd.tmpfiles
 Source15: sshd-keygen.target
 
-# Internal debug
-Patch0: openssh-5.9p1-wIm.patch
-
 #https://bugzilla.mindrot.org/show_bug.cgi?id=2581
 Patch100: openssh-6.7p1-coverity.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1894
@@ -387,10 +384,6 @@ The module is most useful for su and sudo service stacks.
 %prep
 gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
 %setup -q -a 4
-#Do not enable by default
-%if 0
-%patch0 -p1 -b .wIm
-%endif
 
 # investigate %%patch102 -p1 -b .getaddrinfo
 
@@ -471,10 +464,6 @@ popd
 
 %patch100 -p1 -b .coverity
 
-%if 0
-# Nothing here yet
-%endif
-
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
 autoreconf