security/openssl/patches/patch-af

   1 $NetBSD$
   2
   3 --- Makefile.org.orig   2008-12-30 14:26:26.000000000 +0100
   4 +++ Makefile.org
   5 @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
   6
   7  # Do not edit this manually. Use Configure --openssldir=DIR do change this!
   8  OPENSSLDIR=/usr/local/ssl
   9 +EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
  10
  11  # NO_IDEA - Define to build without the IDEA algorithm
  12  # NO_RC4  - Define to build without the RC4 algorithm
  13 @@ -131,8 +132,8 @@ FIPSCANLIB=
  14
  15  BASEADDR=
  16
  17 -DIRS=   crypto fips ssl engines apps test tools
  18 -SHLIBDIRS= crypto ssl fips
  19 +DIRS=   crypto ssl engines apps test tools # fips
  20 +SHLIBDIRS= crypto ssl # fips
  21
  22  # dirs in crypto to build
  23  SDIRS=  \
  24 @@ -152,7 +153,7 @@ TESTS = alltests
  25
  26  MAKEFILE= Makefile
  27
  28 -MANDIR=$(OPENSSLDIR)/man
  29 +MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
  30  MAN1=1
  31  MAN3=3
  32  MANSUFFIX=
  33 @@ -168,6 +169,7 @@ SHARED_SSL=libssl$(SHLIB_EXT)
  34  SHARED_FIPS=
  35  SHARED_LIBS=
  36  SHARED_LIBS_LINK_EXTS=
  37 +LIBRPATH=$(INSTALLTOP)/lib
  38  SHARED_LDFLAGS=
  39
  40  GENERAL=        Makefile
  41 @@ -200,7 +202,7 @@ BUILDENV=   PLATFORM='${PLATFORM}' PROCESS
  42                 CC='${CC}' CFLAG='${CFLAG}'                     \
  43                 AS='${CC}' ASFLAG='${CFLAG} -c'                 \
  44                 AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'    \
  45 -               SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'   \
  46 +               SDIRS='${SDIRS}' LIBRPATH='${LIBRPATH}'         \
  47                 INSTALL_PREFIX='${INSTALL_PREFIX}'              \
  48                 INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'   \
  49                 MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
  50 @@ -608,7 +610,7 @@ dist:
  51  dist_pem_h:
  52         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  53
  54 -install: all install_docs install_sw
  55 +install: install_docs install_sw
  56
  57  install_sw:
  58         @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  59 @@ -616,9 +618,7 @@ install_sw:
  60                 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
  61                 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
  62                 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  63 -               $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
  64 -               $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
  65 -               $(INSTALL_PREFIX)$(OPENSSLDIR)/private
  66 +               $(INSTALL_PREFIX)$(EXAMPLEDIR)
  67         @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
  68         do \
  69         (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  70 @@ -688,35 +688,53 @@ install_docs:
  71         set -e; for i in doc/apps/*.pod; do \
  72                 fn=`basename $$i .pod`; \
  73                 sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
  74 -               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  75 +               case "$$fn" in \
  76 +               CA.pl|openssl) ofn="$$fn" ;; \
  77 +               *) ofn="openssl_$$fn" ;; \
  78 +               esac; \
  79 +               echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
  80                 (cd `$(PERL) util/dirname.pl $$i`; \
  81                 sh -c "$$pod2man \
  82                         --section=$$sec --center=OpenSSL \
  83                         --release=$(VERSION) `basename $$i`") \
  84 -                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
  85 +                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
  86                 $(PERL) util/extract-names.pl < $$i | \
  87                         (grep -v $$filecase "^$$fn\$$"; true) | \
  88                         (grep -v "[     ]"; true) | \
  89                         (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
  90                          while read n; do \
  91 -                               $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
  92 +                               case "$$n" in \
  93 +                               CA.pl|openssl) on="$$n" ;; \
  94 +                               *) on="openssl_$$n" ;; \
  95 +                               esac; \
  96 +                               $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
  97                          done); \
  98         done; \
  99         set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
 100                 fn=`basename $$i .pod`; \
 101                 sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
 102 -               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 103 +               case "$$fn" in \
 104 +               ui*) ofn="openssl_$$fn" ;; \
 105 +               [A-Z]*|*_*) ofn="$$fn" ;; \
 106 +               *) ofn="openssl_$$fn" ;; \
 107 +               esac; \
 108 +               echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
 109                 (cd `$(PERL) util/dirname.pl $$i`; \
 110                 sh -c "$$pod2man \
 111                         --section=$$sec --center=OpenSSL \
 112                         --release=$(VERSION) `basename $$i`") \
 113 -                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 114 +                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
 115                 $(PERL) util/extract-names.pl < $$i | \
 116                         (grep -v $$filecase "^$$fn\$$"; true) | \
 117                         (grep -v "[     ]"; true) | \
 118                         (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 119                          while read n; do \
 120 -                               $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 121 +                               case "$$n" in \
 122 +                               ui*) on="openssl_$$n" ;; \
 123 +                               [A-Z]*|*_*) on="$$n" ;; \
 124 +                               *) on="openssl_$$n" ;; \
 125 +                               esac; \
 126 +                               $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
 127                          done); \
 128         done
 129