Sfoglia il codice sorgente

Upgrade to OpenSSL 0.9.7! This is not a small upgrade as with the 0.9.6<x> versions, hence I performed a full rebuild-test of all packages which depend on "openssl". The result is promising: 1. packages which failed (I'll investigate): - w3m/w3m.spec (https://www.openssl.org/ -> Segmentation fault (core dumped)) - curl/curl.spec (conflicting types for `ENGINE') - imapd/imapd.spec ( Cannot continue without libsasl2. because of DES API changes in OpenSSL and hence sasl) - rdesktop/rdesktop.spec (/cw/include/openssl/bn.h:234: parse error before "BN_ULONG") 2. packages which failed, but not because of OpenSSL: . cadaver/cadaver.spec (multiple definition of `optarg') . cpu/cpu.spec (undefined reference to `ldap_init') . dsniff/dsniff.spec (`ETH_H' undeclared (first use in this function) 3. packages which compiles correctly: + apache/apache.spec + bind/bind.spec + c-client/c-client.spec + cfengine/cfengine.spec + easysoap/easysoap.spec + ethereal/ethereal.spec + exim/exim.spec (but: tls-openssl.c:343: warning: assignment from incompatible pointer type) + fetchmail/fetchmail.spec + inn/inn.spec + linc/linc.spec + links/links.spec + lynx/lynx.spec + mozilla/mozilla.spec + mutt/mutt.spec + neon/neon.spec + openldap/openldap.spec + openssh/openssh.spec + openvpn/openvpn.spec + perl-ssl/perl-ssl.spec + postfix/postfix.spec + postgresql/postgresql.spec + qpopper/qpopper.spec + samba/samba.spec + sasl/sasl.spec + scanssh/scanssh.spec + sendmail/sendmail.spec + siege/siege.spec + sitecopy/sitecopy.spec + snmp/snmp.spec + socat/socat.spec + stunnel/stunnel.spec + subversion/subversion.spec + sysmon/sysmon.spec + tcpdump/tcpdump.spec + wget/wget.spec

Ralf S. Engelschall 23 anni fa
parent
commit
4d308a80d3
2 ha cambiato i file con 7 aggiunte e 38 eliminazioni
  1. 0 31
      openssl/openssl.patch
  2. 7 7
      openssl/openssl.spec

+ 0 - 31
openssl/openssl.patch

@@ -1,31 +0,0 @@
---- config.orig	Fri Mar 15 17:47:23 2002
-+++ config	Sat Jun 29 09:55:45 2002
-@@ -562,6 +564,7 @@
-   *-freebsd[1-2]*) OUT="FreeBSD" ;;
-   *86*-*-netbsd) OUT="NetBSD-x86" ;;
-   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
-+  sparc64-*-netbsd) OUT="NetBSD-sparc64" ;;
-   *-*-netbsd) OUT="NetBSD-sparc" ;;
-   *86*-*-openbsd) OUT="OpenBSD-x86" ;;
-   alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
---- Configure.orig	Fri May 10 01:05:49 2002
-+++ Configure	Sat Jun 29 09:56:35 2002
-@@ -346,12 +346,13 @@
- "linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::SIXTY_FOUR_BIT_LONG:::::::::::linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc64","gcc:-DTERMIOS -O3 -fomit-frame-pointer -m64 -mcpu=v9 -Wall -DB_ENDIAN::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
--"bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
--"bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-+"bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -march=i486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
-+"bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
- "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
- # NCR MP-RAS UNIX ver 02.03.01

+ 7 - 7
openssl/openssl.spec

@@ -32,18 +32,17 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [CORE]
 Group:        Cryptography
 License:      BSD-style
-Version:      0.9.6h
-Release:      20021209
+Version:      0.9.7
+Release:      20021231
 
 #   list of sources
 Source0:      ftp://ftp.openssl.org/source/openssl-%{version}.tar.gz
-Patch0:       openssl.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, perl, make, gcc
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021230, perl, make, gcc
+PreReq:       OpenPKG, openpkg >= 20021230
 AutoReq:      no
 AutoReqProv:  no
 
@@ -60,8 +59,8 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch0 -p0
     %{l_shtool} subst -e 's;-m486;-march=i486;g' Configure
+    %{l_shtool} subst -e 's;test "$OSTYPE" = msdosdjgpp;true;' util/point.sh
 
 %build
     %{l_prefix}/bin/perl util/perlpath.pl %{l_prefix}/bin/perl
@@ -91,7 +90,8 @@ AutoReqProv:  no
       done )
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/openssl/openssl.cnf'
+        '%config %{l_prefix}/etc/openssl/openssl.cnf' \
+        '%not %dir %{l_prefix}/lib/pkgconfig'
 
 %files -f files