From a734fc10542a8f0598b27ed4f5204c86947e3459 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 15 Apr 2006 11:57:23 +0000
Subject: [PATCH] Disable man generation for openssl Add a modules.d/ for
 kmod-crypto and kmod-mppe, closes #412

SVN-Revision: 3658
---
 .../patches/160-disable_doc_tests.patch       | 69 +++++++++++++++++++
 openwrt/target/linux/linux-2.4/Makefile       |  5 +-
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 openwrt/package/openssl/patches/160-disable_doc_tests.patch

diff --git a/openwrt/package/openssl/patches/160-disable_doc_tests.patch b/openwrt/package/openssl/patches/160-disable_doc_tests.patch
new file mode 100644
index 0000000000..7aba9e9a65
--- /dev/null
+++ b/openwrt/package/openssl/patches/160-disable_doc_tests.patch
@@ -0,0 +1,69 @@
+diff -urN openssl-0.9.7i/Makefile openssl-0.9.7i.new/Makefile
+--- openssl-0.9.7i/Makefile	2005-10-15 00:27:49.000000000 +0200
++++ openssl-0.9.7i.new/Makefile	2006-04-15 12:50:22.000000000 +0200
+@@ -178,7 +178,7 @@
+ # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
+ SHLIB_MARK=
+ 
+-DIRS=   crypto fips ssl $(SHLIB_MARK) sigs apps test tools
++DIRS=   crypto fips ssl $(SHLIB_MARK) sigs apps tools
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+@@ -193,7 +193,7 @@
+ 
+ # tests to perform.  "alltests" is a special word indicating that all tests
+ # should be performed.
+-TESTS = alltests
++TESTS = 
+ 
+ MAKEFILE= Makefile
+ 
+@@ -205,7 +205,7 @@
+ 
+ TOP=    .
+ ONEDIRS=out tmp
+-EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
++EDIRS=  times bugs util include certs ms shlib mt demos perl sf dep VMS
+ WDIRS=  windows
+ LIBS=   libcrypto.a libssl.a
+ SIGS=	libcrypto.a.sha1
+@@ -773,7 +773,7 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+diff -urN openssl-0.9.7i/Makefile.org openssl-0.9.7i.new/Makefile.org
+--- openssl-0.9.7i/Makefile.org	2006-04-15 12:47:55.000000000 +0200
++++ openssl-0.9.7i.new/Makefile.org	2006-04-15 12:51:18.000000000 +0200
+@@ -191,7 +191,7 @@
+ 
+ # tests to perform.  "alltests" is a special word indicating that all tests
+ # should be performed.
+-TESTS = alltests
++TESTS = 
+ 
+ MAKEFILE= Makefile
+ 
+@@ -203,7 +203,7 @@
+ 
+ TOP=    .
+ ONEDIRS=out tmp
+-EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
++EDIRS=  times bugs util include certs ms shlib mt demos perl sf dep VMS
+ WDIRS=  windows
+ LIBS=   libcrypto.a libssl.a
+ SIGS=	libcrypto.a.sha1
+@@ -767,7 +767,7 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index 83b30c531c..8fbed21ac7 100644
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -198,7 +198,8 @@ $(eval $(call KMOD_template,VFAT,vfat,\
 ,CONFIG_VFAT_FS,,30,fat vfat))
 $(eval $(call KMOD_template,CRYPTO,crypto,\
 	$(MODULES_DIR)/kernel/crypto/*.o \
-))
+,,,20,arc4 \
+	sha1))
 $(eval $(call KMOD_template,PPP,ppp,\
 	$(MODULES_DIR)/kernel/drivers/net/ppp_async.o \
 	$(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
@@ -206,7 +207,7 @@ $(eval $(call KMOD_template,PPP,ppp,\
 ,CONFIG_PPP))
 $(eval $(call KMOD_template,MPPE,mppe,\
 	$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \
-,CONFIG_PPP_MPPE_MPPC))
+,CONFIG_PPP_MPPE_MPPC,,30,ppp_mppe_mppc))
 $(eval $(call KMOD_template,PPPOE,pppoe,\
 	$(MODULES_DIR)/kernel/drivers/net/pppoe.o \
 	$(MODULES_DIR)/kernel/drivers/net/pppox.o \
-- 
2.30.2