| 1 |
vapier 10/01/27 00:10:17 |
| 2 |
|
| 3 |
Modified: openssl-0.9.8l-r2.ebuild ChangeLog |
| 4 |
openssl-1.0.0_beta5.ebuild |
| 5 |
Log: |
| 6 |
Unify the sed statements and make sure we always set MANSUFFIX #302165 by Hanno Boeck. |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 dev-libs/openssl/openssl-0.9.8l-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: openssl-0.9.8l-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- openssl-0.9.8l-r2.ebuild 11 Jan 2010 03:32:09 -0000 1.8 |
| 23 |
+++ openssl-0.9.8l-r2.ebuild 27 Jan 2010 00:10:17 -0000 1.9 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.8 2010/01/11 03:32:09 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.9 2010/01/27 00:10:17 vapier Exp $ |
| 29 |
|
| 30 |
inherit eutils flag-o-matic toolchain-funcs |
| 31 |
|
| 32 |
@@ -41,23 +41,28 @@ |
| 33 |
epatch "${FILESDIR}"/${P}-CVE-2009-2409.patch #280591 |
| 34 |
epatch "${FILESDIR}"/${P}-dtls-compat.patch #280370 |
| 35 |
epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130 |
| 36 |
- sed -i -e '/DIRS/ s/ fips / /g' Makefile.org \ |
| 37 |
- || die "Removing fips from openssl failed." |
| 38 |
+ |
| 39 |
+ # disable fips in the build |
| 40 |
+ # make sure the man pages are suffixed #302165 |
| 41 |
+ # don't bother building man pages if they're disabled |
| 42 |
+ sed -i \ |
| 43 |
+ -e '/DIRS/s: fips : :g' \ |
| 44 |
+ -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
| 45 |
+ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
| 46 |
+ -e $(has noman FEATURES \ |
| 47 |
+ && echo '/^install:/s:install_docs::' \ |
| 48 |
+ || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ |
| 49 |
+ Makefile{,.org} \ |
| 50 |
+ || die |
| 51 |
+ # show the actual commands in the log |
| 52 |
+ sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
| 53 |
|
| 54 |
# allow openssl to be cross-compiled |
| 55 |
cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed" |
| 56 |
chmod a+rx gentoo.config |
| 57 |
|
| 58 |
- # Don't build manpages if we don't want them |
| 59 |
- has noman FEATURES \ |
| 60 |
- && sed -i '/^install:/s:install_docs::' Makefile.org \ |
| 61 |
- || sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org |
| 62 |
- |
| 63 |
append-flags -fno-strict-aliasing |
| 64 |
append-flags -Wa,--noexecstack |
| 65 |
- # show the actual commands in the log |
| 66 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
| 67 |
- sed -i '/^MAKEDEPPROG/s:=.*:=$(CC):' Makefile.org |
| 68 |
|
| 69 |
# using a library directory other than lib requires some magic |
| 70 |
sed -i \ |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.317 dev-libs/openssl/ChangeLog |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.317&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.317&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.316&r2=1.317 |
| 79 |
|
| 80 |
Index: ChangeLog |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v |
| 83 |
retrieving revision 1.316 |
| 84 |
retrieving revision 1.317 |
| 85 |
diff -u -r1.316 -r1.317 |
| 86 |
--- ChangeLog 21 Jan 2010 04:54:19 -0000 1.316 |
| 87 |
+++ ChangeLog 27 Jan 2010 00:10:17 -0000 1.317 |
| 88 |
@@ -1,6 +1,11 @@ |
| 89 |
# ChangeLog for dev-libs/openssl |
| 90 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.316 2010/01/21 04:54:19 vapier Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.317 2010/01/27 00:10:17 vapier Exp $ |
| 93 |
+ |
| 94 |
+ 27 Jan 2010; Mike Frysinger <vapier@g.o> openssl-0.9.8l-r2.ebuild, |
| 95 |
+ openssl-1.0.0_beta5.ebuild: |
| 96 |
+ Unify the sed statements and make sure we always set MANSUFFIX #302165 by |
| 97 |
+ Hanno Boeck. |
| 98 |
|
| 99 |
*openssl-1.0.0_beta5 (21 Jan 2010) |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.2 dev-libs/openssl/openssl-1.0.0_beta5.ebuild |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild?rev=1.2&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild?rev=1.2&content-type=text/plain |
| 108 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild?r1=1.1&r2=1.2 |
| 109 |
|
| 110 |
Index: openssl-1.0.0_beta5.ebuild |
| 111 |
=================================================================== |
| 112 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild,v |
| 113 |
retrieving revision 1.1 |
| 114 |
retrieving revision 1.2 |
| 115 |
diff -u -r1.1 -r1.2 |
| 116 |
--- openssl-1.0.0_beta5.ebuild 21 Jan 2010 04:54:19 -0000 1.1 |
| 117 |
+++ openssl-1.0.0_beta5.ebuild 27 Jan 2010 00:10:17 -0000 1.2 |
| 118 |
@@ -1,6 +1,6 @@ |
| 119 |
# Copyright 1999-2010 Gentoo Foundation |
| 120 |
# Distributed under the terms of the GNU General Public License v2 |
| 121 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild,v 1.1 2010/01/21 04:54:19 vapier Exp $ |
| 122 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild,v 1.2 2010/01/27 00:10:17 vapier Exp $ |
| 123 |
|
| 124 |
inherit eutils flag-o-matic toolchain-funcs |
| 125 |
|
| 126 |
@@ -35,23 +35,28 @@ |
| 127 |
#epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch |
| 128 |
#epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 |
| 129 |
epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130 |
| 130 |
- sed -i -e '/DIRS/ s/ fips / /g' Makefile{,.org} \ |
| 131 |
- || die "Removing fips from openssl failed." |
| 132 |
+ |
| 133 |
+ # disable fips in the build |
| 134 |
+ # make sure the man pages are suffixed #302165 |
| 135 |
+ # don't bother building man pages if they're disabled |
| 136 |
+ sed -i \ |
| 137 |
+ -e '/DIRS/s: fips : :g' \ |
| 138 |
+ -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
| 139 |
+ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
| 140 |
+ -e $(has noman FEATURES \ |
| 141 |
+ && echo '/^install:/s:install_docs::' \ |
| 142 |
+ || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ |
| 143 |
+ Makefile{,.org} \ |
| 144 |
+ || die |
| 145 |
+ # show the actual commands in the log |
| 146 |
+ sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
| 147 |
|
| 148 |
# allow openssl to be cross-compiled |
| 149 |
cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed" |
| 150 |
chmod a+rx gentoo.config |
| 151 |
|
| 152 |
- # Don't build manpages if we don't want them |
| 153 |
- has noman FEATURES \ |
| 154 |
- && sed -i '/^install:/s:install_docs::' Makefile.org \ |
| 155 |
- || sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org |
| 156 |
- |
| 157 |
append-flags -fno-strict-aliasing |
| 158 |
append-flags -Wa,--noexecstack |
| 159 |
- # show the actual commands in the log |
| 160 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
| 161 |
- sed -i '/^MAKEDEPPROG/s:=.*:=$(CC):' Makefile.org |
| 162 |
|
| 163 |
sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 |
| 164 |
./config --test-sanity || die "I AM NOT SANE" |
Archives