From 345f1777038abac656aab6dc9b38e0a4861351c2 Mon Sep 17 00:00:00 2001
From: Josef Ridky <jridky@redhat.com>
Date: Wed, 31 Jan 2018 14:55:32 +0100
Subject: [PATCH] remove modifications of backup files

---
 net-snmp-5.7.3-openssl.patch | 71 ------------------------------------
 1 file changed, 71 deletions(-)

diff --git a/net-snmp-5.7.3-openssl.patch b/net-snmp-5.7.3-openssl.patch
index 9e61048..0651a24 100644
--- a/net-snmp-5.7.3-openssl.patch
+++ b/net-snmp-5.7.3-openssl.patch
@@ -127,58 +127,6 @@ diff -urNp old/configure.d/config_os_libs2 new/configure.d/config_os_libs2
                  AC_DEFINE(HAVE_LIBSSL, 1,
                      [Define to 1 if you have the `ssl' library (-lssl).])
                  LIBCRYPTO=" -lssl $LIBCRYPTO",	
-diff -urNp old/configure.systemd new/configure.systemd
---- old/configure.systemd	2014-12-08 21:23:37.000000000 +0100
-+++ new/configure.systemd	2017-02-20 10:49:36.601692898 +0100
-@@ -23146,9 +23146,9 @@ $as_echo "#define HAVE_AES_CFB128_ENCRYP
- fi
- 
- 
--            as_ac_Lib=`$as_echo "ac_cv_lib_${CRYPTO}''_EVP_MD_CTX_create" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_create in -l${CRYPTO}" >&5
--$as_echo_n "checking for EVP_MD_CTX_create in -l${CRYPTO}... " >&6; }
-+            as_ac_Lib=`$as_echo "ac_cv_lib_${CRYPTO}''_EVP_MD_CTX_new" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_new in -l${CRYPTO}" >&5
-+$as_echo_n "checking for EVP_MD_CTX_new in -l${CRYPTO}... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -23163,11 +23163,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char EVP_MD_CTX_create ();
-+char EVP_MD_CTX_new ();
- int
- main ()
- {
--return EVP_MD_CTX_create ();
-+return EVP_MD_CTX_new ();
-   ;
-   return 0;
- }
-@@ -23186,10 +23186,10 @@ eval ac_res=\$$as_ac_Lib
- $as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- 
--$as_echo "#define HAVE_EVP_MD_CTX_CREATE /**/" >>confdefs.h
-+$as_echo "#define HAVE_EVP_MD_CTX_NEW /**/" >>confdefs.h
- 
- 
--$as_echo "#define HAVE_EVP_MD_CTX_DESTROY /**/" >>confdefs.h
-+$as_echo "#define HAVE_EVP_MD_CTX_FREE /**/" >>confdefs.h
- 
- fi
- 
-@@ -23263,7 +23263,7 @@ char SSL_library_init ();
- int
- main ()
- {
--return SSL_library_init ();
-+return OPENSSL_init_ssl(0, NULL);
-   ;
-   return 0;
- }
 diff -urNp old/include/net-snmp/net-snmp-config.h.in new/include/net-snmp/net-snmp-config.h.in
 --- old/include/net-snmp/net-snmp-config.h.in	2017-02-20 10:08:16.443522417 +0100
 +++ new/include/net-snmp/net-snmp-config.h.in	2017-02-20 10:24:05.790584283 +0100
@@ -191,25 +139,6 @@ diff -urNp old/include/net-snmp/net-snmp-config.h.in new/include/net-snmp/net-sn
 +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
 +#undef HAVE_EVP_MD_CTX_NEW
  
--/* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */
--#undef HAVE_EVP_MD_CTX_DESTROY
-+/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
-+#undef HAVE_EVP_MD_CTX_FREE
- 
- /* Define if you have EVP_sha224/256 in openssl */
- #undef HAVE_EVP_SHA224
-diff -urNp old/include/net-snmp/net-snmp-config.h.in.systemd new/include/net-snmp/net-snmp-config.h.in.systemd
---- old/include/net-snmp/net-snmp-config.h.in.systemd	2014-12-08 21:23:22.000000000 +0100
-+++ new/include/net-snmp/net-snmp-config.h.in.systemd	2017-02-20 10:24:43.996918184 +0100
-@@ -149,11 +149,11 @@
- /* Define to 1 if you have the `eval_pv' function. */
- #undef HAVE_EVAL_PV
- 
--/* Define to 1 if you have the `EVP_MD_CTX_create' function. */
--#undef HAVE_EVP_MD_CTX_CREATE
-+/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
-+#undef HAVE_EVP_MD_CTX_NEW
- 
 -/* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */
 -#undef HAVE_EVP_MD_CTX_DESTROY
 +/* Define to 1 if you have the `EVP_MD_CTX_free' function. */