packages: eggdrop/eggdrop.spec, eggdrop/ssl-md5.patch (NEW)=?UTF-8?Q?=20?=- use md5 from ...

glen glen at pld-linux.org
Sat Mar 31 20:56:15 CEST 2012


Author: glen                         Date: Sat Mar 31 18:56:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use md5 from openssl

---- Files affected:
packages/eggdrop:
   eggdrop.spec (1.122 -> 1.123) , ssl-md5.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/eggdrop/eggdrop.spec
diff -u packages/eggdrop/eggdrop.spec:1.122 packages/eggdrop/eggdrop.spec:1.123
--- packages/eggdrop/eggdrop.spec:1.122	Sat Mar 31 18:45:42 2012
+++ packages/eggdrop/eggdrop.spec	Sat Mar 31 20:56:10 2012
@@ -68,6 +68,7 @@
 Patch8:		%{name}-nohostwhowhom.patch
 Patch9:		%{name}-nmu.patch
 Patch10:	%{name}-ipv6-ssl.patch
+Patch11:	ssl-md5.patch
 URL:		http://www.eggheads.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -173,6 +174,7 @@
 
 #%patch9 -p0 - wtf is this?
 #%{?with_ssl:%patch10 -p1}
+%patch11 -p1
 
 # detect threaded tcl version
 sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' acinclude.m4
@@ -234,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2012/03/31 18:56:10  glen
+- use md5 from openssl
+
 Revision 1.122  2012/03/31 16:45:42  glen
 - topicprot and ssl patches updated from egghelp.org
 

================================================================
Index: packages/eggdrop/ssl-md5.patch
diff -u /dev/null packages/eggdrop/ssl-md5.patch:1.1
--- /dev/null	Sat Mar 31 20:56:15 2012
+++ packages/eggdrop/ssl-md5.patch	Sat Mar 31 20:56:10 2012
@@ -0,0 +1,34 @@
+--- eggdrop1.6.21/src/Makefile.in	2012-03-31 21:43:01.365906412 +0300
++++ eggdrop1.6.21/src/Makefile.in	2012-03-31 21:51:20.130394596 +0300
+@@ -35,11 +35,11 @@
+ 	@echo ""
+ 	@cd .. && $(MAKE)
+ 
+-../$(EGGEXEC): build_msg $(eggdrop_objs) $(XREQS) compile_md5 compatability
++../$(EGGEXEC): build_msg $(eggdrop_objs) $(XREQS) compatability
+ 	@echo "Linking eggdrop $(EGGBUILD)."
+ 	@echo ""
+ 	@touch mod/mod.xlibs
+-	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` $(XSSL_LIBS) $(XSSL_INCLUDE)
++	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) compat/*.o `cat mod/mod.xlibs` $(XSSL_LIBS) $(XSSL_INCLUDE)
+ 	$(STRIP) ../$(EGGEXEC)
+ 	@echo ""
+ 	@echo "Successful compile: $(EGGEXEC)"
+--- eggdrop1.6.21/src/mod/idea.mod/idea.c~	2003-07-01 03:36:24.000000000 +0300
++++ eggdrop1.6.21/src/mod/idea.mod/idea.c	2012-03-31 21:52:35.356441426 +0300
+@@ -29,6 +29,7 @@
+ #define MAKING_ENCRYPTION
+ 
+ #include "src/mod/module.h"
++#ifndef EGG_SSL_EXT
+ /*
+ #include "../../md5/md5c.c"
+ #include "../../md5/md5.h"
+@@ -45,6 +46,7 @@
+ #undef MD5_Init
+ #define MD5_Init ((void (*)(MD5_CTX *))global[277])
+ #undef global
++#endif
+ static Function *global = NULL;
+ /********************************************/
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/eggdrop/eggdrop.spec?r1=1.122&r2=1.123



More information about the pld-cvs-commit mailing list