apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r648204 - in /apr/apr-util/trunk: ./ build/ include/ include/private/ ssl/ test/ test/ssl_data/
Date Tue, 15 Apr 2008 10:06:01 GMT
Author: jorton
Date: Tue Apr 15 03:05:52 2008
New Revision: 648204

URL: http://svn.apache.org/viewvc?rev=648204&view=rev
Log:
Remove ssl/, test/ssl*, include/private/*ssl*, and revert r416919,
r585704, and r421404.  Tweak test/Makefile{w,}.in to remove SSL tests;
hopefully correctly.

Per veto in msgid <20080414204254.GA16014@redhat.com>.

Removed:
    apr/apr-util/trunk/build/ssl.m4
    apr/apr-util/trunk/include/apr_ssl.h
    apr/apr-util/trunk/include/private/apr_ssl_openssl_private.h
    apr/apr-util/trunk/include/private/apr_ssl_private.h
    apr/apr-util/trunk/include/private/apr_ssl_winsock_private.h
    apr/apr-util/trunk/ssl/
    apr/apr-util/trunk/test/echod.c
    apr/apr-util/trunk/test/sockperf.c
    apr/apr-util/trunk/test/ssl_data/
Modified:
    apr/apr-util/trunk/NWGNUmakefile
    apr/apr-util/trunk/aprutil.dsp
    apr/apr-util/trunk/build/nw_apu_export.inc
    apr/apr-util/trunk/configure.in
    apr/apr-util/trunk/libaprutil.dsp
    apr/apr-util/trunk/test/Makefile.in
    apr/apr-util/trunk/test/Makefile.win

Modified: apr/apr-util/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/NWGNUmakefile?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/NWGNUmakefile (original)
+++ apr/apr-util/trunk/NWGNUmakefile Tue Apr 15 03:05:52 2008
@@ -256,9 +256,6 @@
 	$(OBJDIR)/apr_reslist.o \
 	$(OBJDIR)/apr_rmm.o \
 	$(OBJDIR)/apr_sha1.o \
-	$(OBJDIR)/apr_ssl.o \
-	$(OBJDIR)/apr_ssl_socket.o \
-	$(OBJDIR)/apr_ssl_winsock.o \
 	$(OBJDIR)/apu_version.o \
 	$(OBJDIR)/getuuid.o \
 	$(OBJDIR)/uuid.o \
@@ -289,7 +286,7 @@
 # Any specialized rules here
 #
 
-vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:ssl:strmatch:uri:xlate:xml
+vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate:xml
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

Modified: apr/apr-util/trunk/aprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/aprutil.dsp?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/aprutil.dsp (original)
+++ apr/apr-util/trunk/aprutil.dsp Tue Apr 15 03:05:52 2008
@@ -366,26 +366,6 @@
 SOURCE=.\dbm\sdbm\sdbm_tune.h
 # End Source File
 # End Group
-# Begin Group "ssl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl_openssl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl_socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl_winsock.c
-# End Source File
-# End Group
 # Begin Group "strmatch"
 
 # PROP Default_Filter ""
@@ -760,10 +740,6 @@
 # Begin Source File
 
 SOURCE=.\include\apr_sha1.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ssl.h
 # End Source File
 # Begin Source File
 

Modified: apr/apr-util/trunk/build/nw_apu_export.inc
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/nw_apu_export.inc?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/build/nw_apu_export.inc (original)
+++ apr/apr-util/trunk/build/nw_apu_export.inc Tue Apr 15 03:05:52 2008
@@ -31,7 +31,6 @@
 #include "apr_rmm.h"
 #include "apr_sdbm.h"
 #include "apr_sha1.h"
-#include "apr_ssl.h"
 #include "apr_strmatch.h"
 #include "apr_uri.h"
 #include "apr_uuid.h"

Modified: apr/apr-util/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/configure.in?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/configure.in (original)
+++ apr/apr-util/trunk/configure.in Tue Apr 15 03:05:52 2008
@@ -15,7 +15,6 @@
 sinclude(build/find_apr.m4)
 sinclude(build/dbm.m4)
 sinclude(build/dbd.m4)
-sinclude(build/ssl.m4)
 
 dnl Generate ./config.nice for reproducing runs of configure
 dnl 
@@ -174,8 +173,6 @@
 if test "$crypt_r" = "1"; then
   APU_CHECK_CRYPT_R_STYLE
 fi
-
-APU_FIND_SSL
 
 so_ext=$APR_SO_EXT
 lib_target=$APR_LIB_TARGET

Modified: apr/apr-util/trunk/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/libaprutil.dsp?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/libaprutil.dsp (original)
+++ apr/apr-util/trunk/libaprutil.dsp Tue Apr 15 03:05:52 2008
@@ -401,26 +401,6 @@
 SOURCE=.\dbm\sdbm\sdbm_tune.h
 # End Source File
 # End Group
-# Begin Group "ssl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl_openssl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl_socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssl\apr_ssl_winsock.c
-# End Source File
-# End Group
 # Begin Group "strmatch"
 
 # PROP Default_Filter ""
@@ -795,10 +775,6 @@
 # Begin Source File
 
 SOURCE=.\include\apr_sha1.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ssl.h
 # End Source File
 # Begin Source File
 

Modified: apr/apr-util/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.in?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.in (original)
+++ apr/apr-util/trunk/test/Makefile.in Tue Apr 15 03:05:52 2008
@@ -12,16 +12,14 @@
 
 INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
-STDTEST_PORTABLE = testall dbd testssl
+STDTEST_PORTABLE = testall dbd
 
 TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
 	testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
 	testxml.lo testrmm.lo testreslist.lo testqueue.lo testxlate.lo \
 	testmemcache.lo 
 
-OTHER_PROGRAMS = echod sockperf
-
-PROGRAMS = $(STDTEST_PORTABLE) $(OTHER_PROGRAMS)
+PROGRAMS = $(STDTEST_PORTABLE)
 
 TARGETS = $(PROGRAMS)
 
@@ -57,20 +55,6 @@
 OBJECTS_dbd = dbd.lo $(LOCAL_LIBS)
 dbd: $(OBJECTS_dbd)
 	$(LINK_PROG) $(OBJECTS_dbd) $(APRUTIL_LIBS)
-
-OBJECTS_testssl = testssl.lo $(LOCAL_LIBS)
-testssl: $(OBJECTS_testssl)
-	$(LINK_PROG) $(OBJECTS_testssl) $(APRUTIL_LIBS)
-
-# OTHER_PROGRAMS;
-
-OBJECTS_echod = echod.lo $(LOCAL_LIBS)
-echod: $(OBJECTS_echod)
-	$(LINK_PROG) $(OBJECTS_echod) $(APRUTIL_LIBS)
-
-OBJECTS_sockperf = sockperf.lo $(LOCAL_LIBS)
-sockperf: $(OBJECTS_sockperf)
-	$(LINK_PROG) $(OBJECTS_sockperf) $(APRUTIL_LIBS)
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	teststatus=0; \

Modified: apr/apr-util/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.win?rev=648204&r1=648203&r2=648204&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.win (original)
+++ apr/apr-util/trunk/test/Makefile.win Tue Apr 15 03:05:52 2008
@@ -68,8 +68,7 @@
 CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
 
 PROGRAMS = \
-	$(OUTDIR)\testall.exe \
-	$(OUTDIR)\testssl.exe
+	$(OUTDIR)\testall.exe
 
 OTHER_PROGRAMS = \
 	$(OUTDIR)\dbd.exe \
@@ -134,11 +133,6 @@
 # OTHER_PROGRAMS;
 
 $(OUTDIR)\dbd.exe: $(INTDIR)\dbd.obj $(PROGRAM_DEPENDENCIES)
-	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
-	@if exist "$@.manifest" \
-	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
-
-$(OUTDIR)\testssl.exe: $(INTDIR)\testssl.obj $(PROGRAM_DEPENDENCIES)
 	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
 	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;1



Mime
View raw message