sync openssl changes from stable

fink · Oct 1, 2015 · ac009a1 · ac009a1
1 parent f749bd1
commit ac009a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/10.7/cvs.info b/10.7/cvs.info
@@ -1,7 +1,7 @@
 # -*- coding: ascii; tab-width: 4; x-counterpart: cvs.patch -*-
 Package: cvs
 Version: 1.12.13
-Revision: 17
+Revision: 18
 Maintainer: Daniel Johnson <daniel@daniel-johnson.org>
 #
 Conflicts: cvs-stable, cvs-proxy
@@ -16,15 +16,14 @@ ConfigureParams: <<
 --with-libiconv-prefix=%p\
 --with-libintl-prefix=%p\
 --with-gssapi=/usr\
---with-krb4=/usr\
 --enable-case-sensitivity\
 --with-external-zlib\
 --with-editor=vim\
 ac_cv_func_working_mktime=no
 <<
 SetCFLAGS: -D_DARWIN_NO_64_BIT_INODE -O2 -g -Wall
-BuildDepends: openssl100-dev (>= 1.0.1e-1), libgettext8-dev, libiconv-dev, fink (>= 0.30.0)
-Depends: openssl100-shlibs (>= 1.0.1e-1), libgettext8-shlibs, libiconv
+BuildDepends: libgettext8-dev, libiconv-dev, fink (>= 0.30.0)
+Depends: libgettext8-shlibs, libiconv
 PatchScript: cat %{PatchFile} | patch -p0
 # Tests take a REALLY long time and I did get a failure.
 #InfoTest: <<

diff --git a/10.7/openssl100-dev.info b/10.7/openssl100-dev.info
@@ -1,6 +1,6 @@
 # -*- coding: ascii; tab-width: 4; x-counterpart: openssl100-dev.patch -*-
 Package: openssl100-dev
-Version: 1.0.2a
+Version: 1.0.2d
 Revision: 1
 Description: Secure Sockets Layer and Crypto Library
 License: OSI-Approved
@@ -10,18 +10,24 @@ Maintainer: Daniel Johnson <daniel@daniel-johnson.org>
 Conflicts: <<
 	libressl-libcrypto30,
 	libressl-libcrypto32,
+	libressl-libcrypto33,
+	libressl-libcrypto34,
 	libressl-libssl27,
 	libressl-libssl29,
 	libressl-libssl32,
+	libressl-libssl33,
 	openssl100-dev,
 	system-openssl-dev
 <<
 Replaces: <<
 	libressl-libcrypto30,
 	libressl-libcrypto32,
+	libressl-libcrypto33,
+	libressl-libcrypto34,
 	libressl-libssl27,
 	libressl-libssl29,
 	libressl-libssl32,
+	libressl-libssl33,
 	openssl100-dev,
 	system-openssl-dev
 <<
@@ -32,7 +38,7 @@ CustomMirror: <<
   Primary:   http://www.openssl.org/
   Secondary: ftp://ftp.openssl.org/
 <<
-Source-MD5: a06c547dac9044161a477211049f60ef
+Source-MD5: 38dd619b2e77cbac69b99f52a053d25a
 
 PatchFile: %{ni}.patch
 PatchFile-MD5: 8d86d626da439dd15dfb515193d4d573