components/openca-ocspd/patches/01-configure.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 26 Jan 2017 16:44:14 -0800
changeset 7617 14b1a4293086
parent 6104 583b39846694
permissions -rw-r--r--
Close of build 117.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6104
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     1
Patch origin: in-house
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     2
Patch status: Solaris-specific; not suitable for upstream
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     3
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     4
Need to add architectures and use an appropriate path for Oracle build
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     5
environments.
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     6
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     7
The default user/group should be daemon/daemon on Solaris.
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     8
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     9
--- openca-ocspd-3.1.2/configure	2015-11-10 13:31:40.892916326 -0800
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    10
+++ openca-ocspd-3.1.2/configure	2016-05-04 14:52:19.134435130 -0700
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    11
@@ -2331,7 +2331,7 @@
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    12
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    13
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    14
 mybits=""
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    15
-if [ `uname -m` = "x86_64" ] ; then
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    16
+if [ `uname -m` = "x86_64" ] || [ `uname -m` = "i86pc" ] || [ `uname -m` = "sun4v" ]; then
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    17
 	mybits="64";
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    18
 fi
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    19
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    20
@@ -3092,6 +3092,7 @@
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    21
 arch_target=
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    22
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    23
 case "$target" in
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    24
+	i386-pc-*)        arch_target=x86_64 ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    25
 	i*86-*)           arch_target=x86 ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    26
 	x86_64-*)         arch_target=x86_64 ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    27
 	sparc*-*)         arch_target=Sparc ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    28
@@ -13023,8 +13024,19 @@
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    29
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: with libpki-prefix     : $libpki_prefix " >&5
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    30
 $as_echo "with libpki-prefix     : $libpki_prefix " >&6; }
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    31
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    32
+case `uname -m`  in
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    33
+  "i86pc")
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    34
+  mach64=amd64
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    35
+  ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    36
+  "sun4v")
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    37
+  mach64=sparcv9
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    38
+  ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    39
+  *)
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    40
+  ;;
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    41
+esac
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    42
+
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    43
 if [ "x$libpki_prefix" != x ]; then
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    44
-        libpki_path=$libpki_prefix/lib
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    45
+        libpki_path=$libpki_prefix/lib/${mach64}
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    46
         libpki_config="${libpki_prefix}/bin/libpki-config"
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    47
 else
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    48
         # Extract the first word of "libpki-config", so it can be a program name with args.
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    49
@@ -13152,8 +13164,8 @@
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    50
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    51
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    52
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    53
-default_user=nobody
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    54
-default_group=nobody
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    55
+default_user=daemon
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    56
+default_group=daemon
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    57
 
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    58
 if [ "x$DIST_NAME" = "xUbuntu" ] ; then
583b39846694 PSARC/2016/233 OpenCA OCSP Responder
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    59
 	default_user=www-data