delete old ebuild
This commit is contained in:
Mario Fetka
parent
58bd353d81
commit
5fc64e50f4
@ -1 +0,0 @@
|
|||||||
EBUILD emul-linux-x86-qtlibs-99999999-r1.ebuild 1407 SHA256 d74909d02ed7e07dfdb61128c6a33364d245f92ef54b46607086b978b907ec22 SHA512 3145197bd126c6d2c3a02b1eebdd55afb642fef60af7e04e25c2c3c5986a0525191a2b6118a08c58c5f64d970f05795f50d3a5492af1cf27827c0ce276777bea WHIRLPOOL 6d07a841b1a0946d0ecd11b838568509b8d77216c1864626830678cb3d2bcf579cf50e9b8bbedec811cfcedb600a96443e2f4cbdaf1bef137e325063d2701cbb
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
# Copyright 1999-2009 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
|
|
||||||
DESCRIPTION="Metapackage to provide 32bit libraries via multilib"
|
|
||||||
HOMEPAGE="http://www.gentoo.org/"
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="+dbus kde -nodep opengl +qt3 +qt4 +svg +sql +webkit"
|
|
||||||
|
|
||||||
DEPEND="!nodep? ( opengl? ( app-admin/eselect-opengl ) )"
|
|
||||||
|
|
||||||
RDEPEND="!nodep? ( =app-emulation/emul-linux-x86-baselibs-${PV}
|
|
||||||
=app-emulation/emul-linux-x86-soundlibs-${PV}
|
|
||||||
=app-emulation/emul-linux-x86-xlibs-${PV}
|
|
||||||
qt3? ( !qt4? ( x11-libs/qt:3[multilib_abi_x86] ) )
|
|
||||||
qt4? ( x11-libs/qt-core:4[multilib_abi_x86]
|
|
||||||
x11-libs/qt-gui:4[multilib_abi_x86]
|
|
||||||
svg? ( x11-libs/qt-svg:4[multilib_abi_x86] )
|
|
||||||
sql? ( x11-libs/qt-sql:4[multilib_abi_x86] )
|
|
||||||
x11-libs/qt-script:4[multilib_abi_x86]
|
|
||||||
x11-libs/qt-xmlpatterns:4[multilib_abi_x86]
|
|
||||||
dbus? ( x11-libs/qt-dbus:4[multilib_abi_x86] )
|
|
||||||
opengl? ( x11-libs/qt-opengl:4[multilib_abi_x86] )
|
|
||||||
!kde? ( || ( x11-libs/qt-phonon:4[multilib_abi_x86] media-libs/phonon[multilib_abi_x86] ) )
|
|
||||||
kde? ( media-libs/phonon[multilib_abi_x86] )
|
|
||||||
qt3? ( x11-libs/qt-qt3support:4[multilib_abi_x86] )
|
|
||||||
webkit? ( x11-libs/qt-webkit:4[multilib_abi_x86] )
|
|
||||||
x11-libs/qt-test:4[multilib_abi_x86]
|
|
||||||
x11-libs/qt-assistant:4[multilib_abi_x86] ) )"
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
#update GL symlinks
|
|
||||||
use opengl && eselect opengl set --use-old
|
|
||||||
}
|
|
||||||
105
dev-java/jna/ChangeLog
Normal file
105
dev-java/jna/ChangeLog
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
# ChangeLog for dev-java/jna
|
||||||
|
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.20 2012/06/11 14:05:33 mgorny Exp $
|
||||||
|
|
||||||
|
11 Jun 2012; Michał Górny <mgorny@gentoo.org> jna-3.4.0-r1.ebuild,
|
||||||
|
jna-3.4.0.ebuild:
|
||||||
|
Use matching name for download & S to make the ebuild forward-proof to vcs-
|
||||||
|
snapshot API.
|
||||||
|
|
||||||
|
07 Jun 2012; Brent Baude <ranger@gentoo.org> jna-3.4.0.ebuild:
|
||||||
|
Marking jna-3.4.0 ppc for bug 413157
|
||||||
|
|
||||||
|
*jna-3.4.0-r1 (13 May 2012)
|
||||||
|
|
||||||
|
13 May 2012; Ralph Sennhauser <sera@gentoo.org> +jna-3.4.0-r1.ebuild,
|
||||||
|
+files/jna-3.4.0-makefile-flags.patch:
|
||||||
|
Respect CC. #413277
|
||||||
|
Register optional dependency emul-linux-x86-jna for use with 32bit JVMs.
|
||||||
|
#313209
|
||||||
|
Cleanup.
|
||||||
|
|
||||||
|
07 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> jna-3.4.0.ebuild:
|
||||||
|
x86 stable wrt bug #413157
|
||||||
|
|
||||||
|
03 May 2012; Jeff Horelick <jdhore@gentoo.org> jna-3.0.3-r1.ebuild,
|
||||||
|
jna-3.2.4.ebuild, jna-3.4.0.ebuild:
|
||||||
|
dev-util/pkgconfig -> virtual/pkgconfig
|
||||||
|
|
||||||
|
23 Apr 2012; Agostino Sarubbo <ago@gentoo.org> jna-3.4.0.ebuild:
|
||||||
|
Stable for amd64, wrt bug #413157
|
||||||
|
|
||||||
|
25 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
|
||||||
|
-files/3.2.7-build.xml.patch, -files/3.2.7-makefile-flags.patch,
|
||||||
|
-files/3.3.0-build.xml.patch, -jna-3.2.7.ebuild,
|
||||||
|
-files/3.3.0-makefile-flags.patch, -jna-3.3.0.ebuild:
|
||||||
|
Removed obsolete versions
|
||||||
|
|
||||||
|
23 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jna-3.4.0.ebuild:
|
||||||
|
Fix running tests. #294289
|
||||||
|
|
||||||
|
23 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jna-3.4.0.ebuild:
|
||||||
|
Use vcs-snapshot eclass for github download.
|
||||||
|
Don't use xargs and also remove bundled libffi.
|
||||||
|
Drop libffi symlink workaround.
|
||||||
|
|
||||||
|
22 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jna-3.0.3-r1.ebuild,
|
||||||
|
jna-3.2.4.ebuild, jna-3.2.7.ebuild, jna-3.3.0.ebuild, jna-3.4.0.ebuild:
|
||||||
|
Add missing build dep dev-util/pkgconfig. #403577
|
||||||
|
|
||||||
|
*jna-3.4.0 (25 Dec 2011)
|
||||||
|
|
||||||
|
25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org>
|
||||||
|
+files/3.4.0-build.xml.patch, +jna-3.4.0.ebuild,
|
||||||
|
+files/3.4.0-makefile-flags.patch, metadata.xml:
|
||||||
|
Version bump. Added new USE flags, awt and nio-buffers. awt USE flag should
|
||||||
|
require X USE flag on used JDK/JRE but we do not have this flag on virtuals
|
||||||
|
yet.
|
||||||
|
|
||||||
|
*jna-3.3.0 (13 Dec 2011)
|
||||||
|
|
||||||
|
13 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org>
|
||||||
|
+files/3.3.0-build.xml.patch, +files/3.3.0-makefile-flags.patch,
|
||||||
|
+jna-3.3.0.ebuild:
|
||||||
|
Version bump
|
||||||
|
|
||||||
|
18 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> jna-3.2.4.ebuild:
|
||||||
|
ppc stable wrt #311105
|
||||||
|
|
||||||
|
*jna-3.2.7 (25 Jan 2011)
|
||||||
|
|
||||||
|
25 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org>
|
||||||
|
+files/3.2.7-build.xml.patch, +files/3.2.7-makefile-flags.patch,
|
||||||
|
+jna-3.2.7.ebuild:
|
||||||
|
Version bump. Switched to EAPI4, sources are now downloaded directly from
|
||||||
|
upstream, build.xml patches moved to patch file, also added building of
|
||||||
|
platform.jar.
|
||||||
|
|
||||||
|
23 May 2010; Pacho Ramos <pacho@gentoo.org> jna-3.2.4.ebuild:
|
||||||
|
stable amd64, bug 311105
|
||||||
|
|
||||||
|
24 Mar 2010; Christian Faulhammer <fauli@gentoo.org> jna-3.2.4.ebuild:
|
||||||
|
stable x86, bug 311105
|
||||||
|
|
||||||
|
*jna-3.2.4 (30 Dec 2009)
|
||||||
|
|
||||||
|
30 Dec 2009; Alistair Bush <ali_bush@gentoo.org>
|
||||||
|
+files/3.2.4-makefile-flags.patch, +jna-3.2.4.ebuild:
|
||||||
|
Version Bump.
|
||||||
|
|
||||||
|
25 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> jna-3.0.3-r1.ebuild:
|
||||||
|
Keywording for ppc, bug 270910
|
||||||
|
|
||||||
|
*jna-3.0.3-r1 (03 Jun 2009)
|
||||||
|
|
||||||
|
03 Jun 2009; Vlastimil Babka <caster@gentoo.org> +jna-3.0.3-r1.ebuild,
|
||||||
|
+files/makefile-flags.patch:
|
||||||
|
Revbump to switch to virtual/libffi, bug #272054.
|
||||||
|
|
||||||
|
*jna-3.0.3 (22 May 2009)
|
||||||
|
|
||||||
|
22 May 2009; Vlastimil Babka <caster@gentoo.org> +jna-3.0.3.ebuild,
|
||||||
|
+metadata.xml:
|
||||||
|
New package, jruby dependency, bug #244785. Ebuild provided by serkan and
|
||||||
|
chewi in java-overlay.
|
||||||
|
|
||||||
6
dev-java/jna/Manifest
Normal file
6
dev-java/jna/Manifest
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
AUX 4.1.0-build.xml.patch 1180 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd SHA512 c286dd84ef6868463aed22fb52e09e7ec68e9a0fb1c4276b0ab79dc4ce39897961c3710fd501ad8a376c4f644c3c3fb5a076c31e9772a2f8eadf2414610095aa WHIRLPOOL 8500dd0bc722b23149ce51044bbd5032cbcfe4c0b2da33b95de3566742f3bdb109d42a954c82388ff24947ddeb6b848aae5d73ff3f74a450648e0a32e0e2925c
|
||||||
|
AUX jna-4.1.0-makefile-flags.patch 2057 SHA256 7b6d0c5f2eecfab07c223050349d246740d234c38831c87744c0fd68139ebc33 SHA512 9dc427644ae75faaad6ee67fa3b71f22e449692c9b924c793aebb7cdf2b448cca95e53350968c11e20645c0ead974e4f4a17f3268612067b0fce0f7382d4014e WHIRLPOOL 6888a87ae8605e9c0415c608844f8e097b1fe6fe0c9462a21ce2f8897d9b0a4b1f0d43fca24f2e05cfa3382f568c9c6cd97eb4884176ba3a9c1b924aef62993d
|
||||||
|
DIST jna-4.1.0.tar.gz 34547165 SHA256 bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35 WHIRLPOOL 0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08
|
||||||
|
EBUILD jna-4.1.0.ebuild 2479 SHA256 049b9e335aa3c94427ec3586125ce085f40fc3de4c6e6c346b4473ee6098b24a SHA512 e1238f735a24f4e633aadd75d82a93698e7d0a279f419e34452fb5d511cba935e6cb7d469e9aedf1069cb5cb8e1f62ea3e8297f0530e58934b1b7a2c258d2648 WHIRLPOOL b79782e7664cf10fd1bb72c9c6c172a9c82814c1cd956062264b75d7691c707656bd1890ebd40a3657a5ac68e43f781ad630be3d5d346e0b1b33bc1f2caf5d11
|
||||||
|
MISC ChangeLog 3664 SHA256 41b1003af9e7504b17329ca27940f79896da3e4ca50f36b8238ac3d6e9171afd SHA512 8c2f4db7c1c01037ce075cf0754f556cad05030e7cc57bd668b677971043b0885efb3c647dcd5d5481c2e02b9df38654d494e06c853fded41701a5c01892e5a4 WHIRLPOOL 3e78a053bb5baf7323fb0dcc628b667f5061c2a32e9d17a8ea031bb51aa6e1bb917ec89d7add68c0114a60eb9d30296639fe9c05766a636a1b348e364d536d47
|
||||||
|
MISC metadata.xml 295 SHA256 7aeccd89219646978f39ce1d46b40051eb950e1452bd225e7dd8e2fe5267c8a2 SHA512 06282ec9de4b3cdc98ba09622461638e409db87d6057cece577abd0169618f17d0174a1a3f52785de0121019a050aa35b522057bf0313a958a7a1496c738c8b4 WHIRLPOOL e0722112734f828808c06e10b1c9a430a7821824cd04aecb3c0db7d565cffbd7d48cdbf25edbca06942375fcccc51eb4761eb38e9fa6b1e3c3c92ac8fb778699
|
||||||
31
dev-java/jna/files/4.1.0-build.xml.patch
Normal file
31
dev-java/jna/files/4.1.0-build.xml.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
--- build.xml.orig 2011-01-25 17:33:24.750473340 +0100
|
||||||
|
+++ build.xml 2011-01-25 17:07:14.657410373 +0100
|
||||||
|
@@ -176,7 +176,9 @@
|
||||||
|
<path id="test.runpath">
|
||||||
|
<pathelement path="${build}/${jar}"/>
|
||||||
|
<pathelement path="${test.classes}"/>
|
||||||
|
+ <!--
|
||||||
|
<pathelement path="lib/clover.jar"/>
|
||||||
|
+ -->
|
||||||
|
<path refid="test.libs"/>
|
||||||
|
</path>
|
||||||
|
</target>
|
||||||
|
@@ -433,13 +435,17 @@
|
||||||
|
<copy todir="${build}/jws" file="${build}/${jar}"/>
|
||||||
|
<copy todir="${build}/jws" file="${build}/${testjar}"/>
|
||||||
|
<copy todir="${build}/jws" file="lib/junit.jar"/>
|
||||||
|
+ <!--
|
||||||
|
<copy todir="${build}/jws" file="lib/clover.jar"/>
|
||||||
|
+ -->
|
||||||
|
<jar jarfile="${build}/jws/jnidispatch.jar">
|
||||||
|
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
||||||
|
</jar>
|
||||||
|
+ <!--
|
||||||
|
<signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
|
||||||
|
- <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
|
||||||
|
+ <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
|
||||||
|
</signjar>
|
||||||
|
+ -->
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- When running tests from an IDE, be sure to set jna.library.path -->
|
||||||
62
dev-java/jna/files/jna-4.1.0-makefile-flags.patch
Normal file
62
dev-java/jna/files/jna-4.1.0-makefile-flags.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
diff --git a/native/Makefile b/native/Makefile
|
||||||
|
index 75246a8..a1c3e66 100644
|
||||||
|
--- a/native/Makefile
|
||||||
|
+++ b/native/Makefile
|
||||||
|
@@ -70,7 +70,7 @@ LIBPFX=lib
|
||||||
|
LIBSFX=.so
|
||||||
|
ARSFX=.a
|
||||||
|
JNISFX=$(LIBSFX)
|
||||||
|
-CC=gcc
|
||||||
|
+CC?=gcc
|
||||||
|
LD=$(CC)
|
||||||
|
LIBS=
|
||||||
|
# Default to Sun recommendations for JNI compilation
|
||||||
|
@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
|
||||||
|
COUT=-o $@
|
||||||
|
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
|
||||||
|
CDEFINES=-D_REENTRANT
|
||||||
|
-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
|
||||||
|
-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
||||||
|
+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
|
||||||
|
+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
||||||
|
-DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
|
||||||
|
-LDFLAGS=-o $@ -shared
|
||||||
|
+LDFLAGS+=-o $@ -shared
|
||||||
|
ifeq ($(DYNAMIC_LIBFFI),true)
|
||||||
|
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
|
||||||
|
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
|
||||||
|
@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
|
||||||
|
CDEFINES=-DPSAPI_VERSION=1
|
||||||
|
CC = $(MINGW) -m64 -mno-cygwin
|
||||||
|
LD = $(CC)
|
||||||
|
-LDFLAGS=-o $@ -shared
|
||||||
|
+LDFLAGS+=-o $@ -shared
|
||||||
|
LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt
|
||||||
|
FFI_CONFIG += --host=x86_64-pc-mingw32
|
||||||
|
else
|
||||||
|
@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
|
||||||
|
ARCH=$(shell uname -m | sed 's/i.86/i386/g')
|
||||||
|
PCFLAGS+=-fPIC
|
||||||
|
CDEFINES+=-DHAVE_PROTECTION
|
||||||
|
-LDFLAGS+=-Wl,-soname,$@
|
||||||
|
+LDFLAGS+= -Wl,-soname,$(shell basename $@)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq (,$(findstring bsd,$(OS)))
|
||||||
|
ARCH=$(shell uname -m | sed 's/i.86/i386/g')
|
||||||
|
PCFLAGS+=-fPIC
|
||||||
|
CINCLUDES+=-I/usr/X11R6/include
|
||||||
|
-LDFLAGS=-o $@ -shared
|
||||||
|
+LDFLAGS+= -o $@ -shared
|
||||||
|
CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
|
||||||
|
endif
|
||||||
|
|
||||||
|
@@ -239,7 +239,7 @@ endif
|
||||||
|
|
||||||
|
PCFLAGS+=$(ISYSROOT) -x objective-c
|
||||||
|
CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
|
||||||
|
-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
|
||||||
|
+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
|
||||||
|
-compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
|
||||||
|
-current_version $(JNA_JNI_VERSION) \
|
||||||
|
-mmacosx-version-min=10.3 \
|
||||||
92
dev-java/jna/jna-4.1.0.ebuild
Normal file
92
dev-java/jna/jna-4.1.0.ebuild
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0-r1.ebuild,v 1.2 2012/06/11 14:05:33 mgorny Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
JAVA_PKG_IUSE="doc source test"
|
||||||
|
|
||||||
|
inherit eutils java-pkg-2 java-ant-2 toolchain-funcs vcs-snapshot
|
||||||
|
|
||||||
|
DESCRIPTION="Java Native Access (JNA)"
|
||||||
|
HOMEPAGE="https://github.com/twall/jna#readme"
|
||||||
|
SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~x86"
|
||||||
|
|
||||||
|
IUSE="+awt +nio-buffers"
|
||||||
|
REQUIRED_USE="test? ( awt nio-buffers )"
|
||||||
|
|
||||||
|
COMMON_DEP="
|
||||||
|
virtual/libffi"
|
||||||
|
RDEPEND="${COMMON_DEP}
|
||||||
|
>=virtual/jre-1.6"
|
||||||
|
DEPEND="${COMMON_DEP}
|
||||||
|
>=virtual/jdk-1.6
|
||||||
|
dev-java/ant-nodeps:0
|
||||||
|
virtual/pkgconfig
|
||||||
|
test? (
|
||||||
|
dev-java/ant-junit:0
|
||||||
|
dev-java/ant-trax:0
|
||||||
|
)"
|
||||||
|
|
||||||
|
java_prepare() {
|
||||||
|
# delete bundled jars and copy of libffi
|
||||||
|
find -name "*.jar" -exec rm -v {} + || die
|
||||||
|
rm -r native/libffi || die
|
||||||
|
|
||||||
|
epatch "${FILESDIR}/${PV}-build.xml.patch"
|
||||||
|
# respect CFLAGS, don't inhibit warnings, honour CC
|
||||||
|
epatch "${FILESDIR}/${P}-makefile-flags.patch"
|
||||||
|
tc-export CC
|
||||||
|
|
||||||
|
# Build to same directory on 64-bit archs.
|
||||||
|
mkdir build || die
|
||||||
|
ln -snf build build-d64 || die
|
||||||
|
|
||||||
|
if ! use awt ; then
|
||||||
|
sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! use nio-buffers ; then
|
||||||
|
sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
EANT_BUILD_TARGET="jar contrib-jars"
|
||||||
|
EANT_ANT_TASKS="ant-nodeps"
|
||||||
|
EANT_EXTRA_ARGS="-Ddynlink.native=true"
|
||||||
|
|
||||||
|
EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
|
||||||
|
src_test() {
|
||||||
|
local sysprops=""
|
||||||
|
|
||||||
|
# crashes vm (segfault)
|
||||||
|
sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die
|
||||||
|
|
||||||
|
# crashes vm, java 7 only (icedtea-7, oracle-jdk-bin-1.7)
|
||||||
|
sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die
|
||||||
|
|
||||||
|
sysprops+=" -Djava.awt.headless=true"
|
||||||
|
sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
|
||||||
|
|
||||||
|
mkdir -p lib || die
|
||||||
|
java-pkg_jar-from --into lib --build-only junit
|
||||||
|
|
||||||
|
# need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
|
||||||
|
# survive the junit task.
|
||||||
|
_JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
java-pkg_dojar build/${PN}.jar
|
||||||
|
java-pkg_dojar contrib/platform/dist/platform.jar
|
||||||
|
java-pkg_doso build/native/libjnidispatch.so
|
||||||
|
|
||||||
|
java-pkg_register-optional-dependency emul-linux-x86-jna #313209
|
||||||
|
|
||||||
|
use source && java-pkg_dosrc src/com
|
||||||
|
use doc && java-pkg_dojavadoc doc/javadoc
|
||||||
|
}
|
||||||
10
dev-java/jna/metadata.xml
Normal file
10
dev-java/jna/metadata.xml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<herd>java</herd>
|
||||||
|
<use>
|
||||||
|
<flag name='awt'>Enables support for Java AWT</flag>
|
||||||
|
<flag name='nio-buffers'>Enables support for NIO buffers</flag>
|
||||||
|
</use>
|
||||||
|
</pkgmetadata>
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,13 +0,0 @@
|
|||||||
AUX gentoo.config-1.0.0 4748 SHA256 67ae024ebb87a8236a358a081f2d9b038eef2d0f432705d05063274e7af28b4e SHA512 c68b7eb3d07a3b619f6c3e5f508e594efe2991aef91d8904019f967c20a7e9e9604d8fce1271b5bc247856411e81a800eed7710da46645b9d5d9e5cb184ab99b WHIRLPOOL a849c1ea7d7d0dfeac675636e801dd050c66866f6327e6619f233ede0fc0e59f5f2f554f7812a0c33bd40d76a7ba85ca3aab0a00f964e971de97f5af11a527bc
|
|
||||||
AUX openssl-0.9.8i-heimdal-partial.patch 6214 SHA256 f55586e59503680a11dc336f15afddeb5f538e57145d4f2e710b4e77bc5996a9 SHA512 2bf55288dbc2961dab48f87ac3376362fa521e2e66bad26d8078c2362915f89e950dd7d144b4562ff72cdb69ffaaeeee8a48c5df1842cabd756f9f0be870d627 WHIRLPOOL db0201bd2628833ba9304fec6669d9aba1ecb64096ecbb0a47474f682549b98f6bcbb0dcd2dc998bfcd0da2d765243894a03f54997416580d1aca0411dbf5d41
|
|
||||||
AUX openssl-1.0.0a-ldflags.patch 891 SHA256 f04cef1b912681393236f9631792cd404783586c2fd8e0f011ace6236cc6dc4a SHA512 8ced9f22e413f81ff0563793bd6b765912af16671a0d10bff0c518c44bced0177dbcd6536359ff5b6bd5d49fa5032de47c719198444254d4814e4b21301f606c WHIRLPOOL f9b2641b8df926ff5d9d5cf5a7737f5cb4a3a2be2225911ebebd944f13219acfac07d496eec9a8e91af3f50ac1275dc7b0652354e8e958a0d3f6708e641f8970
|
|
||||||
AUX openssl-1.0.0d-windres.patch 2890 SHA256 27664cfab4852f1a301c4020375eba029c8a1728d58829c831a36d3aa2fbe9f4 SHA512 32187d0a04c85118cc763ff1fe8c4635622294fe629b920c47e16408aa720fee2bcc42f97120f6750b59996878e0a3d249143d728a5b5775ec3a022f81bc230a WHIRLPOOL d5979143f7e637b0072f7d5f214d80f5cc0e53f54358781d7f10c0cdb15c2b52813e12d2aa07dde2b40e7a88fcb26d1d619443a8012530d90789609cf5ac4083
|
|
||||||
AUX openssl-1.0.0h-pkg-config.patch 1289 SHA256 542dea12747b1cb667707250e3eb3803cbdd396bd0d8e836e48a8018417dc1b8 SHA512 4d1f66dc8615cdf7c96719c8cc909c7d908089e91b0cfe2dd08ae7a332c525b5384e2eb8eb3922e89cbc035167f581eaa606ba826fca6253f16f89f66a9ef225 WHIRLPOOL cdd63a06205b0237ddef1f56df2accf29e5f43f886aed01f95711b49a3af07d87afd0953cb3c12c7e97d4a3392f7c691257dcb7ad3e97cc6fbf1cf399a8a6394
|
|
||||||
AUX openssl-1.0.1-parallel-build.patch 9918 SHA256 bd56e5fe1b6fe594ab93f34d25fef0b7372633bad8532f81da998f3e6655d221 SHA512 7255b3315133e415631b2ecadc8f5c50a705b9db507c46efded0190363ce9eb31ffbfe01c500669c060878e5202f858b1d2475c64948426fbf70820b4c798ba1 WHIRLPOOL 8a8c71c3806db85d6c6b355717cb4aa1e421fa1777aa7dcd7ee817ac1e552d4b671cdd7cceef9aee1a7dc1b305eb722b1ba0219832c7a6c1b808a0c49212df05
|
|
||||||
AUX openssl-1.0.1-x32.patch 3273 SHA256 a4f05b8757e225a05a9c5a3ea485159066760d878c9ee54c4eaf61760e33c6cf SHA512 6bed57fe2fbe2d0ced1279b53804d94426a679d5d6b80ad7d0ed18523a7fda397e02038032c08cdd4e6034f9ff6e82cad365ff2a724d49d91467cf2b77f47752 WHIRLPOOL 1366632e7dc1c6e54efc5b9791bf24833d20e7a61ca29aa38d31b5b9629febf926a29742e370b7cd6767c810c0a1676100ca9169f0d836dfd19ff0b2c29e49c1
|
|
||||||
AUX openssl-1.0.1e-ipv6.patch 18596 SHA256 430d15f2f62c2d7b9bbb968d3c1d3cea51c97d549e01683fd6befb20e2b60946 SHA512 15bfcafc8c173d2875954a43db19d15956619528a0fc356b6d36877f7434321071cf707d950767491261adc1e6403e56b3e014e3d0ffb6cef563daca00a128bd WHIRLPOOL d1dd63d00b166efb1ca9e5d8da931a47e571f5784e3b47780355553b4d0cf656885375e3fe7fc1554b6c5eb749371efeb370c7462e4fcc52c0dd85c6e2318ad8
|
|
||||||
DIST openssl-1.0.1e.tar.gz 4459777 SHA256 f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 SHA512 c76857e439431b2ef6f2aa123997e53f82b9c3c964d4d765d7cc6c0c20b37a21adf578f9b759b2b65ae3925454c432a01b7de0cd320ece7181dc292e00d3244e WHIRLPOOL e85cca98d9525935977bab00a1309682c0571973a1472cdd75ea1c96a1b12d8b86d1b51a501bc24a6fdbf3257b047a569b5d24d6164a903af689b01d46a7e428
|
|
||||||
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
|
|
||||||
EBUILD openssl-1.0.1e.ebuild 7439 SHA256 7e228e70d5990f6e811d253afbf3c008c82be79b1753ea809e3dd5fed906e349 SHA512 f2d4d95bf258906b03bcd6439bfa15954e098c701691df0f2d81775591f922f7bd8c44f7878d4113e517ef5e7f73ef24de157a6e8da4f352328a41607731d0c7 WHIRLPOOL daf433ed1535c90f7a66cc438e737ee96734b862e82fc38a2d1b32073e4bb72cf5e070e3b384297d62b0d5dddc78b94e53340362abfbca1c1eeeedc6d205fe9b
|
|
||||||
MISC ChangeLog 71499 SHA256 ea0d71a270dc4abeffe427b5f86d5324c98dcf1ab5c2e2d723acf0d406ebba38 SHA512 4b92831551cea9b088b7307d03b10ec8313837021cdeee5f7266e2b1dd1d1b600aa00948b80302c17a86643e54041ddcfb36a394cf689d464ea44030af362815 WHIRLPOOL 784c57e24e87b8a36e792830fa92569f30f88733cf37ec80d6f14cf93be89ca494e8f712cd8720e0643620e2ba87ff3b098a43c4ecc95aa40017601082e41eb0
|
|
||||||
MISC metadata.xml 374 SHA256 ce29618473c02511695f6767087277e246b2d252ef6e662dbc65e9df44722f5b SHA512 af8240564be62abad18e8f928694ac2836fc445ae186d5ac3b11dae060e5088dbcbbcac625fffe888de1df0e75934cf1484e54c113c00a25a55d57c39563d430 WHIRLPOOL 197464700dbd530c26a50055e98c1008cd1fd6f4f34ba2e9b4070fca6b87201599c3187b5e4689b6360a1311f1de6b96ae6a0050eb9677c648d8eaf28b0880b9
|
|
||||||
@ -1,159 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 1999-2011 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.5 2012/05/25 17:41:21 vapier Exp $
|
|
||||||
#
|
|
||||||
# Openssl doesn't play along nicely with cross-compiling
|
|
||||||
# like autotools based projects, so let's teach it new tricks.
|
|
||||||
#
|
|
||||||
# Review the bundled 'config' script to see why kind of targets
|
|
||||||
# we can pass to the 'Configure' script.
|
|
||||||
|
|
||||||
|
|
||||||
# Testing routines
|
|
||||||
if [[ $1 == "test" ]] ; then
|
|
||||||
for c in \
|
|
||||||
"arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \
|
|
||||||
"armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \
|
|
||||||
"x86_64-pc-linux-gnu |linux-x86_64" \
|
|
||||||
"alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \
|
|
||||||
"i686-pc-linux-gnu |linux-elf" \
|
|
||||||
"whatever-gentoo-freebsdX.Y |BSD-generic32" \
|
|
||||||
"i686-gentoo-freebsdX.Y |BSD-x86-elf" \
|
|
||||||
"sparc64-alpha-freebsdX.Y |BSD-sparc64" \
|
|
||||||
"ia64-gentoo-freebsd5.99234 |BSD-ia64" \
|
|
||||||
"x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
|
|
||||||
"hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
|
|
||||||
"powerpc-gentOO-linux-uclibc |linux-ppc" \
|
|
||||||
"powerpc64-unk-linux-gnu |linux-ppc64" \
|
|
||||||
"x86_64-apple-darwinX |darwin64-x86_64-cc" \
|
|
||||||
"powerpc64-apple-darwinX |darwin64-ppc-cc" \
|
|
||||||
"i686-apple-darwinX |darwin-i386-cc" \
|
|
||||||
"i386-apple-darwinX |darwin-i386-cc" \
|
|
||||||
"powerpc-apple-darwinX |darwin-ppc-cc" \
|
|
||||||
"i586-pc-winnt |winnt-parity" \
|
|
||||||
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
|
|
||||||
"s390x-linux-gnu |linux-s390x" \
|
|
||||||
;do
|
|
||||||
CHOST=${c/|*}
|
|
||||||
ret_want=${c/*|}
|
|
||||||
ret_got=$(CHOST=${CHOST} "$0")
|
|
||||||
|
|
||||||
if [[ ${ret_want} == "${ret_got}" ]] ; then
|
|
||||||
echo "PASS: ${CHOST}"
|
|
||||||
else
|
|
||||||
echo "FAIL: ${CHOST}"
|
|
||||||
echo -e "\twanted: ${ret_want}"
|
|
||||||
echo -e "\twe got: ${ret_got}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
|
|
||||||
|
|
||||||
|
|
||||||
# Detect the operating system
|
|
||||||
case ${CHOST} in
|
|
||||||
*-aix*) system="aix";;
|
|
||||||
*-darwin*) system="darwin";;
|
|
||||||
*-freebsd*) system="BSD";;
|
|
||||||
*-hpux*) system="hpux";;
|
|
||||||
*-linux*) system="linux";;
|
|
||||||
*-solaris*) system="solaris";;
|
|
||||||
*-winnt*) system="winnt";;
|
|
||||||
x86_64-*-mingw*) system="mingw64";;
|
|
||||||
*mingw*) system="mingw";;
|
|
||||||
*) exit 0;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
# Compiler munging
|
|
||||||
compiler="gcc"
|
|
||||||
if [[ ${CC} == "ccc" ]] ; then
|
|
||||||
compiler=${CC}
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Detect target arch
|
|
||||||
machine=""
|
|
||||||
chost_machine=${CHOST%%-*}
|
|
||||||
case ${system} in
|
|
||||||
linux)
|
|
||||||
case ${chost_machine}:${ABI} in
|
|
||||||
alphaev56*) machine=alpha+bwx-${compiler};;
|
|
||||||
alphaev[678]*)machine=alpha+bwx-${compiler};;
|
|
||||||
alpha*) machine=alpha-${compiler};;
|
|
||||||
armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
|
|
||||||
armv[4-9]*) machine="armv4 -DL_ENDIAN";;
|
|
||||||
arm*b*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
arm*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
avr*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
bfin*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
# hppa64*) machine=parisc64;;
|
|
||||||
hppa*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
i[0-9]86*|\
|
|
||||||
x86_64*:x86) machine=elf;;
|
|
||||||
ia64*) machine=ia64;;
|
|
||||||
m68*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
mips*el*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
mips*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
powerpc64*) machine=ppc64;;
|
|
||||||
powerpc*) machine=ppc;;
|
|
||||||
# sh64*) machine=elf;;
|
|
||||||
sh*b*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
sh*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
sparc*v7*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
sparc64*) machine=sparcv9;;
|
|
||||||
sparc*) machine=sparcv8;;
|
|
||||||
s390x*) machine=s390x;;
|
|
||||||
s390*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
x86_64*:x32) machine=x32;;
|
|
||||||
x86_64*) machine=x86_64;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
BSD)
|
|
||||||
case ${chost_machine} in
|
|
||||||
alpha*) machine=generic64;;
|
|
||||||
i[6-9]86*) machine=x86-elf;;
|
|
||||||
ia64*) machine=ia64;;
|
|
||||||
sparc64*) machine=sparc64;;
|
|
||||||
x86_64*) machine=x86_64;;
|
|
||||||
*) machine=generic32;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
aix)
|
|
||||||
machine=${compiler}
|
|
||||||
;;
|
|
||||||
darwin)
|
|
||||||
case ${chost_machine} in
|
|
||||||
powerpc64) machine=ppc-cc; system=${system}64;;
|
|
||||||
powerpc) machine=ppc-cc;;
|
|
||||||
i?86*) machine=i386-cc;;
|
|
||||||
x86_64) machine=x86_64-cc; system=${system}64;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
hpux)
|
|
||||||
case ${chost_machine} in
|
|
||||||
ia64) machine=ia64-${compiler} ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
solaris)
|
|
||||||
case ${chost_machine} in
|
|
||||||
i386) machine=x86-${compiler} ;;
|
|
||||||
x86_64*) machine=x86_64-${compiler}; system=${system}64;;
|
|
||||||
sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
|
|
||||||
sparc*) machine=sparcv8-${compiler};;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
winnt)
|
|
||||||
machine=parity
|
|
||||||
;;
|
|
||||||
mingw*)
|
|
||||||
# special case ... no xxx-yyy style name
|
|
||||||
echo ${system}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
# If we have something, show it
|
|
||||||
[[ -n ${machine} ]] && echo ${system}-${machine}
|
|
||||||
@ -1,217 +0,0 @@
|
|||||||
diff -Naur openssl-0.9.8i/include/openssl/kssl.h openssl-0.9.8i-heimdal/include/openssl/kssl.h
|
|
||||||
--- include/openssl/kssl.h 2005-04-09 23:55:55.000000000 +0000
|
|
||||||
+++ include/openssl/kssl.h 2008-11-22 16:27:24.000000000 +0000
|
|
||||||
@@ -81,6 +81,7 @@
|
|
||||||
*/
|
|
||||||
#ifdef KRB5_HEIMDAL
|
|
||||||
typedef unsigned char krb5_octet;
|
|
||||||
+typedef krb5_times krb5_ticket_times;
|
|
||||||
#define FAR
|
|
||||||
#else
|
|
||||||
|
|
||||||
diff -Naur openssl-0.9.8i/ssl/kssl.c openssl-0.9.8i-heimdal/ssl/kssl.c
|
|
||||||
--- ssl/kssl.c 2008-04-02 11:15:05.000000000 +0000
|
|
||||||
+++ ssl/kssl.c 2008-11-24 16:05:07.000000000 +0000
|
|
||||||
@@ -821,16 +821,27 @@
|
|
||||||
{
|
|
||||||
switch (enctype)
|
|
||||||
{
|
|
||||||
- case ENCTYPE_DES_HMAC_SHA1: /* EVP_des_cbc(); */
|
|
||||||
- case ENCTYPE_DES_CBC_CRC:
|
|
||||||
+ case ENCTYPE_DES_CBC_CRC: /* EVP_des_cbc(); */
|
|
||||||
case ENCTYPE_DES_CBC_MD4:
|
|
||||||
case ENCTYPE_DES_CBC_MD5:
|
|
||||||
+#ifdef KRB5_HEIMDAL
|
|
||||||
+ case ENCTYPE_DES_CBC_NONE:
|
|
||||||
+ case ENCTYPE_DES_CFB64_NONE:
|
|
||||||
+ case ENCTYPE_DES_PCBC_NONE:
|
|
||||||
+#else
|
|
||||||
+ case ENCTYPE_DES_HMAC_SHA1:
|
|
||||||
case ENCTYPE_DES_CBC_RAW:
|
|
||||||
+#endif
|
|
||||||
return EVP_des_cbc();
|
|
||||||
break;
|
|
||||||
case ENCTYPE_DES3_CBC_SHA1: /* EVP_des_ede3_cbc(); */
|
|
||||||
+#ifdef KRB5_HEIMDAL
|
|
||||||
+ case ENCTYPE_DES3_CBC_MD5:
|
|
||||||
+ case ENCTYPE_DES3_CBC_NONE:
|
|
||||||
+#else
|
|
||||||
case ENCTYPE_DES3_CBC_SHA:
|
|
||||||
case ENCTYPE_DES3_CBC_RAW:
|
|
||||||
+#endif
|
|
||||||
return EVP_des_ede3_cbc();
|
|
||||||
break;
|
|
||||||
default: return NULL;
|
|
||||||
@@ -883,6 +894,7 @@
|
|
||||||
{
|
|
||||||
int i, j, n;
|
|
||||||
static size_t *cklens = NULL;
|
|
||||||
+ size_t cksumsize;
|
|
||||||
|
|
||||||
#ifdef KRB5_MIT_OLD11
|
|
||||||
n = krb5_max_cksum;
|
|
||||||
@@ -894,13 +906,14 @@
|
|
||||||
if (!cklens && !(cklens = (size_t *) calloc(sizeof(int),n+1))) return NULL;
|
|
||||||
|
|
||||||
for (i=0; i < n; i++) {
|
|
||||||
- if (!valid_cksumtype(i)) continue; /* array has holes */
|
|
||||||
+ if (!krb5_c_valid_cksumtype(i)) continue; /* array has holes */
|
|
||||||
+ if (krb5_c_checksum_length(NULL, i, &cksumsize)) continue; /* there's something wrong */
|
|
||||||
for (j=0; j < n; j++) {
|
|
||||||
if (cklens[j] == 0) {
|
|
||||||
- cklens[j] = krb5_checksum_size(NULL,i);
|
|
||||||
+ cklens[j] = cksumsize;
|
|
||||||
break; /* krb5 elem was new: add */
|
|
||||||
}
|
|
||||||
- if (cklens[j] == krb5_checksum_size(NULL,i)) {
|
|
||||||
+ if (cklens[j] == cksumsize) {
|
|
||||||
break; /* ignore duplicate elements */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -957,14 +970,21 @@
|
|
||||||
print_krb5_data(char *label, krb5_data *kdata)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
+ unsigned char *datastring;
|
|
||||||
+
|
|
||||||
+#ifdef KRB5_HEIMDAL
|
|
||||||
+ memcpy(datastring, kdata->data, kdata->length);
|
|
||||||
+#else
|
|
||||||
+ datastring = kdata->data;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
printf("%s[%d] ", label, kdata->length);
|
|
||||||
for (i=0; i < (int)kdata->length; i++)
|
|
||||||
{
|
|
||||||
- if (0 && isprint((int) kdata->data[i]))
|
|
||||||
- printf( "%c ", kdata->data[i]);
|
|
||||||
+ if (0 && isprint((int) datastring[i]))
|
|
||||||
+ printf( "%c ", datastring[i]);
|
|
||||||
else
|
|
||||||
- printf( "%02x ", (unsigned char) kdata->data[i]);
|
|
||||||
+ printf( "%02x ", datastring[i]);
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
@@ -1002,28 +1022,28 @@
|
|
||||||
print_krb5_keyblock(char *label, krb5_keyblock *keyblk)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
+ unsigned char *keyblkcontents;
|
|
||||||
|
|
||||||
if (keyblk == NULL)
|
|
||||||
{
|
|
||||||
printf("%s, keyblk==0\n", label);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
#ifdef KRB5_HEIMDAL
|
|
||||||
printf("%s\n\t[et%d:%d]: ", label, keyblk->keytype,
|
|
||||||
- keyblk->keyvalue->length);
|
|
||||||
- for (i=0; i < (int)keyblk->keyvalue->length; i++)
|
|
||||||
- {
|
|
||||||
- printf("%02x",(unsigned char *)(keyblk->keyvalue->contents)[i]);
|
|
||||||
- }
|
|
||||||
- printf("\n");
|
|
||||||
+ keyblk->keyvalue.length);
|
|
||||||
+ memcpy(keyblkcontents, keyblk->keyvalue.data, keyblk->keyvalue.length);
|
|
||||||
+ for (i=0; i < (int)keyblk->keyvalue.length; i++)
|
|
||||||
#else
|
|
||||||
printf("%s\n\t[et%d:%d]: ", label, keyblk->enctype, keyblk->length);
|
|
||||||
+ keyblkcontents = keyblk->contents;
|
|
||||||
for (i=0; i < (int)keyblk->length; i++)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
- printf("%02x",keyblk->contents[i]);
|
|
||||||
+ printf("%02x",keyblkcontents[i]);
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
-#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1034,10 +1054,37 @@
|
|
||||||
print_krb5_princ(char *label, krb5_principal_data *princ)
|
|
||||||
{
|
|
||||||
int i, ui, uj;
|
|
||||||
+ unsigned int realmlength;
|
|
||||||
+ char *realmdata;
|
|
||||||
|
|
||||||
printf("%s principal Realm: ", label);
|
|
||||||
if (princ == NULL) return;
|
|
||||||
- for (ui=0; ui < (int)princ->realm.length; ui++) putchar(princ->realm.data[ui]);
|
|
||||||
+
|
|
||||||
+#ifdef KRB5_HEIMDAL
|
|
||||||
+ realmlength = krb5_realm_length(princ->realm);
|
|
||||||
+ realmdata = krb5_realm_data(princ->realm);
|
|
||||||
+#else
|
|
||||||
+ realmlength = princ->realm.length;
|
|
||||||
+ realmdata = princ->realm.data;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ for (ui=0; ui < (int)realmlength; ui++) putchar(realmdata[ui]);
|
|
||||||
+
|
|
||||||
+#ifdef KRB5_HEIMDAL
|
|
||||||
+ printf(" (nametype %d) has %d strings:\n",
|
|
||||||
+ princ->name.name_type,
|
|
||||||
+ princ->name.name_string.len);
|
|
||||||
+ for (i=0; i < (int)princ->name.name_string.len; i++)
|
|
||||||
+ {
|
|
||||||
+ realmlength = krb5_realm_length(princ->name.name_string.val[i]);
|
|
||||||
+ realmdata = krb5_realm_data(princ->name.name_string.val[i]);
|
|
||||||
+ printf("\t%d [%d]: ", i, realmlength);
|
|
||||||
+ for (uj=0; uj < (int)realmlength; uj++) {
|
|
||||||
+ putchar(realmdata[uj]);
|
|
||||||
+ }
|
|
||||||
+ printf("\n");
|
|
||||||
+ }
|
|
||||||
+#else
|
|
||||||
printf(" (nametype %d) has %d strings:\n", princ->type,princ->length);
|
|
||||||
for (i=0; i < (int)princ->length; i++)
|
|
||||||
{
|
|
||||||
@@ -1047,6 +1094,8 @@
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1275,6 +1324,17 @@
|
|
||||||
return krb5rc; /* or KRB5KRB_ERR_GENERIC; */
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef KRB5_HEIMDAL
|
|
||||||
+ krb5_principal_set_type(krb5context, new5ticket->server,
|
|
||||||
+ asn1ticket->sname->nametype->data[0]);
|
|
||||||
+/*
|
|
||||||
+** To do.
|
|
||||||
+** MIT krb5_ticket looks more like the Ticket type of Heimdal,
|
|
||||||
+** there seems to be no simple translation.
|
|
||||||
+** May be the whole kssl_TKT2tkt function will have to be left out,
|
|
||||||
+** and kssl_sget_tkt deeply rewriten for Heimdal.
|
|
||||||
+*/
|
|
||||||
+#else
|
|
||||||
krb5_princ_type(krb5context, new5ticket->server) =
|
|
||||||
asn1ticket->sname->nametype->data[0];
|
|
||||||
new5ticket->enc_part.enctype = asn1ticket->encdata->etype->data[0];
|
|
||||||
@@ -1296,6 +1356,7 @@
|
|
||||||
asn1ticket->encdata->cipher->data,
|
|
||||||
asn1ticket->encdata->cipher->length);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
*krb5ticket = new5ticket;
|
|
||||||
return 0;
|
|
||||||
diff -Naur openssl-0.9.8i/ssl/kssl.h openssl-0.9.8i-heimdal/ssl/kssl.h
|
|
||||||
--- ssl/kssl.h 2005-04-09 23:55:55.000000000 +0000
|
|
||||||
+++ ssl/kssl.h 2008-11-22 16:27:24.000000000 +0000
|
|
||||||
@@ -81,6 +81,7 @@
|
|
||||||
*/
|
|
||||||
#ifdef KRB5_HEIMDAL
|
|
||||||
typedef unsigned char krb5_octet;
|
|
||||||
+typedef krb5_times krb5_ticket_times;
|
|
||||||
#define FAR
|
|
||||||
#else
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
http://bugs.gentoo.org/327421
|
|
||||||
|
|
||||||
--- Makefile.org
|
|
||||||
+++ Makefile.org
|
|
||||||
@@ -189,6 +189,7 @@
|
|
||||||
MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
|
|
||||||
DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \
|
|
||||||
MAKEDEPPROG='$(MAKEDEPPROG)' \
|
|
||||||
+ LDFLAGS='${LDFLAGS}' \
|
|
||||||
SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \
|
|
||||||
KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \
|
|
||||||
ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \
|
|
||||||
--- Makefile.shared
|
|
||||||
+++ Makefile.shared
|
|
||||||
@@ -153,7 +153,7 @@
|
|
||||||
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
|
|
||||||
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
|
|
||||||
|
|
||||||
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
|
|
||||||
+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
|
|
||||||
|
|
||||||
#This is rather special. It's a special target with which one can link
|
|
||||||
#applications without bothering with any features that have anything to
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
URL: http://rt.openssl.org/Ticket/Display.html?id=2558
|
|
||||||
Subject: make windres controllable via build env var settings
|
|
||||||
|
|
||||||
atm, the windres code in openssl is only usable via the cross-compile prefix
|
|
||||||
option unlike all the other build tools. so add support for the standard $RC
|
|
||||||
/ $WINDRES env vars as well.
|
|
||||||
|
|
||||||
Index: Configure
|
|
||||||
===================================================================
|
|
||||||
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v
|
|
||||||
retrieving revision 1.621.2.40
|
|
||||||
diff -u -p -r1.621.2.40 Configure
|
|
||||||
--- Configure 30 Nov 2010 22:19:26 -0000 1.621.2.40
|
|
||||||
+++ Configure 4 Jul 2011 23:12:32 -0000
|
|
||||||
@@ -1094,6 +1094,7 @@ my $shared_extension = $fields[$idx_shar
|
|
||||||
my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
|
|
||||||
my $ar = $ENV{'AR'} || "ar";
|
|
||||||
my $arflags = $fields[$idx_arflags];
|
|
||||||
+my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres";
|
|
||||||
my $multilib = $fields[$idx_multilib];
|
|
||||||
|
|
||||||
# if $prefix/lib$multilib is not an existing directory, then
|
|
||||||
@@ -1511,12 +1512,14 @@ while (<IN>)
|
|
||||||
s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
|
|
||||||
s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
|
|
||||||
s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
|
|
||||||
+ s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/;
|
|
||||||
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
s/^CC=.*$/CC= $cc/;
|
|
||||||
s/^AR=\s*ar/AR= $ar/;
|
|
||||||
s/^RANLIB=.*/RANLIB= $ranlib/;
|
|
||||||
+ s/^WINDRES=.*/WINDRES= $windres/;
|
|
||||||
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
|
|
||||||
}
|
|
||||||
s/^CFLAG=.*$/CFLAG= $cflags/;
|
|
||||||
Index: Makefile.org
|
|
||||||
===================================================================
|
|
||||||
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v
|
|
||||||
retrieving revision 1.295.2.10
|
|
||||||
diff -u -p -r1.295.2.10 Makefile.org
|
|
||||||
--- Makefile.org 27 Jan 2010 16:06:58 -0000 1.295.2.10
|
|
||||||
+++ Makefile.org 4 Jul 2011 23:13:08 -0000
|
|
||||||
@@ -66,6 +66,7 @@ EXE_EXT=
|
|
||||||
ARFLAGS=
|
|
||||||
AR=ar $(ARFLAGS) r
|
|
||||||
RANLIB= ranlib
|
|
||||||
+WINDRES= windres
|
|
||||||
NM= nm
|
|
||||||
PERL= perl
|
|
||||||
TAR= tar
|
|
||||||
@@ -180,6 +181,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESS
|
|
||||||
CC='$(CC)' CFLAG='$(CFLAG)' \
|
|
||||||
AS='$(CC)' ASFLAG='$(CFLAG) -c' \
|
|
||||||
AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
|
|
||||||
+ WINDRES='$(WINDRES)' \
|
|
||||||
CROSS_COMPILE='$(CROSS_COMPILE)' \
|
|
||||||
PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \
|
|
||||||
SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \
|
|
||||||
Index: Makefile.shared
|
|
||||||
===================================================================
|
|
||||||
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v
|
|
||||||
retrieving revision 1.72.2.4
|
|
||||||
diff -u -p -r1.72.2.4 Makefile.shared
|
|
||||||
--- Makefile.shared 21 Aug 2010 11:36:49 -0000 1.72.2.4
|
|
||||||
+++ Makefile.shared 4 Jul 2011 23:13:52 -0000
|
|
||||||
@@ -293,7 +293,7 @@ link_a.cygwin:
|
|
||||||
fi; \
|
|
||||||
dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
|
|
||||||
$(PERL) util/mkrc.pl $$dll_name | \
|
|
||||||
- $(CROSS_COMPILE)windres -o rc.o; \
|
|
||||||
+ $(WINDRES) -o rc.o; \
|
|
||||||
extras="$$extras rc.o"; \
|
|
||||||
ALLSYMSFLAGS='-Wl,--whole-archive'; \
|
|
||||||
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
depend on other pc files rather than encoding library info directly in
|
|
||||||
every pkg-config file
|
|
||||||
|
|
||||||
--- a/Makefile.org
|
|
||||||
+++ b/Makefile.org
|
|
||||||
@@ -335,11 +335,11 @@ libssl.pc: Makefile
|
|
||||||
echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
|
|
||||||
echo 'includedir=$${prefix}/include'; \
|
|
||||||
echo ''; \
|
|
||||||
- echo 'Name: OpenSSL'; \
|
|
||||||
+ echo 'Name: OpenSSL-libssl'; \
|
|
||||||
echo 'Description: Secure Sockets Layer and cryptography libraries'; \
|
|
||||||
echo 'Version: '$(VERSION); \
|
|
||||||
- echo 'Requires: '; \
|
|
||||||
- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
|
|
||||||
+ echo 'Requires.private: libcrypto'; \
|
|
||||||
+ echo 'Libs: -L$${libdir} -lssl'; \
|
|
||||||
echo 'Libs.private: $(EX_LIBS)'; \
|
|
||||||
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
|
|
||||||
|
|
||||||
@@ -352,10 +353,7 @@ openssl.pc: Makefile
|
|
||||||
echo 'Name: OpenSSL'; \
|
|
||||||
echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
|
|
||||||
echo 'Version: '$(VERSION); \
|
|
||||||
- echo 'Requires: '; \
|
|
||||||
- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
|
|
||||||
- echo 'Libs.private: $(EX_LIBS)'; \
|
|
||||||
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
|
|
||||||
+ echo 'Requires: libssl libcrypto' ) > openssl.pc
|
|
||||||
|
|
||||||
Makefile: Makefile.org Configure config
|
|
||||||
@echo "Makefile is older than Makefile.org, Configure or config."
|
|
||||||
@ -1,337 +0,0 @@
|
|||||||
http://rt.openssl.org/Ticket/Display.html?id=2084
|
|
||||||
|
|
||||||
--- a/Makefile.org
|
|
||||||
+++ b/Makefile.org
|
|
||||||
@@ -247,17 +247,17 @@
|
|
||||||
build_libs: build_crypto build_ssl build_engines
|
|
||||||
|
|
||||||
build_crypto:
|
|
||||||
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
|
|
||||||
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
|
|
||||||
-build_ssl:
|
|
||||||
+build_ssl: build_crypto
|
|
||||||
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
|
|
||||||
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
|
|
||||||
-build_engines:
|
|
||||||
+build_engines: build_crypto
|
|
||||||
- @dir=engines; target=all; $(BUILD_ONE_CMD)
|
|
||||||
+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
|
|
||||||
-build_apps:
|
|
||||||
+build_apps: build_libs
|
|
||||||
- @dir=apps; target=all; $(BUILD_ONE_CMD)
|
|
||||||
+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
|
|
||||||
-build_tests:
|
|
||||||
+build_tests: build_libs
|
|
||||||
- @dir=test; target=all; $(BUILD_ONE_CMD)
|
|
||||||
+ +@dir=test; target=all; $(BUILD_ONE_CMD)
|
|
||||||
-build_tools:
|
|
||||||
+build_tools: build_libs
|
|
||||||
- @dir=tools; target=all; $(BUILD_ONE_CMD)
|
|
||||||
+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
|
|
||||||
|
|
||||||
all_testapps: build_libs build_testapps
|
|
||||||
build_testapps:
|
|
||||||
@@ -497,9 +497,9 @@
|
|
||||||
dist_pem_h:
|
|
||||||
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
|
|
||||||
|
|
||||||
-install: all install_docs install_sw
|
|
||||||
+install: install_docs install_sw
|
|
||||||
|
|
||||||
-install_sw:
|
|
||||||
+install_dirs:
|
|
||||||
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
|
|
||||||
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
|
|
||||||
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
|
|
||||||
@@ -508,6 +508,13 @@
|
|
||||||
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
|
|
||||||
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
|
|
||||||
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
|
|
||||||
+ @$(PERL) $(TOP)/util/mkdir-p.pl \
|
|
||||||
+ $(INSTALL_PREFIX)$(MANDIR)/man1 \
|
|
||||||
+ $(INSTALL_PREFIX)$(MANDIR)/man3 \
|
|
||||||
+ $(INSTALL_PREFIX)$(MANDIR)/man5 \
|
|
||||||
+ $(INSTALL_PREFIX)$(MANDIR)/man7
|
|
||||||
+
|
|
||||||
+install_sw: install_dirs
|
|
||||||
@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
|
|
||||||
do \
|
|
||||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
|
||||||
@@ -511,7 +511,7 @@
|
|
||||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
|
||||||
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
|
||||||
done;
|
|
||||||
- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
|
|
||||||
+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
|
|
||||||
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
|
|
||||||
do \
|
|
||||||
if [ -f "$$i" ]; then \
|
|
||||||
@@ -593,12 +600,7 @@
|
|
||||||
done; \
|
|
||||||
done
|
|
||||||
|
|
||||||
-install_docs:
|
|
||||||
- @$(PERL) $(TOP)/util/mkdir-p.pl \
|
|
||||||
- $(INSTALL_PREFIX)$(MANDIR)/man1 \
|
|
||||||
- $(INSTALL_PREFIX)$(MANDIR)/man3 \
|
|
||||||
- $(INSTALL_PREFIX)$(MANDIR)/man5 \
|
|
||||||
- $(INSTALL_PREFIX)$(MANDIR)/man7
|
|
||||||
+install_docs: install_dirs
|
|
||||||
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
|
|
||||||
here="`pwd`"; \
|
|
||||||
filecase=; \
|
|
||||||
--- a/Makefile.shared
|
|
||||||
+++ b/Makefile.shared
|
|
||||||
@@ -105,6 +105,7 @@ LINK_SO= \
|
|
||||||
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
|
|
||||||
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
|
|
||||||
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
|
|
||||||
+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
|
|
||||||
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
|
|
||||||
$${SHAREDCMD} $${SHAREDFLAGS} \
|
|
||||||
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
|
|
||||||
@@ -122,6 +124,7 @@ SYMLINK_SO= \
|
|
||||||
done; \
|
|
||||||
fi; \
|
|
||||||
if [ -n "$$SHLIB_SOVER" ]; then \
|
|
||||||
+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
|
|
||||||
( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
|
|
||||||
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
|
|
||||||
fi; \
|
|
||||||
--- a/crypto/Makefile
|
|
||||||
+++ b/crypto/Makefile
|
|
||||||
@@ -85,11 +85,11 @@
|
|
||||||
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
|
|
||||||
|
|
||||||
subdirs:
|
|
||||||
- @target=all; $(RECURSIVE_MAKE)
|
|
||||||
+ +@target=all; $(RECURSIVE_MAKE)
|
|
||||||
|
|
||||||
files:
|
|
||||||
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
|
||||||
- @target=files; $(RECURSIVE_MAKE)
|
|
||||||
+ +@target=files; $(RECURSIVE_MAKE)
|
|
||||||
|
|
||||||
links:
|
|
||||||
@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
|
|
||||||
@@ -100,7 +100,7 @@
|
|
||||||
# lib: $(LIB): are splitted to avoid end-less loop
|
|
||||||
lib: $(LIB)
|
|
||||||
@touch lib
|
|
||||||
-$(LIB): $(LIBOBJ)
|
|
||||||
+$(LIB): $(LIBOBJ) | subdirs
|
|
||||||
$(AR) $(LIB) $(LIBOBJ)
|
|
||||||
$(RANLIB) $(LIB) || echo Never mind.
|
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
libs:
|
|
||||||
- @target=lib; $(RECURSIVE_MAKE)
|
|
||||||
+ +@target=lib; $(RECURSIVE_MAKE)
|
|
||||||
|
|
||||||
install:
|
|
||||||
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
|
||||||
@@ -119,7 +119,7 @@
|
|
||||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
|
||||||
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
|
||||||
done;
|
|
||||||
- @target=install; $(RECURSIVE_MAKE)
|
|
||||||
+ +@target=install; $(RECURSIVE_MAKE)
|
|
||||||
|
|
||||||
lint:
|
|
||||||
@target=lint; $(RECURSIVE_MAKE)
|
|
||||||
--- a/engines/Makefile
|
|
||||||
+++ b/engines/Makefile
|
|
||||||
@@ -72,7 +72,7 @@
|
|
||||||
|
|
||||||
all: lib subdirs
|
|
||||||
|
|
||||||
-lib: $(LIBOBJ)
|
|
||||||
+lib: $(LIBOBJ) | subdirs
|
|
||||||
@if [ -n "$(SHARED_LIBS)" ]; then \
|
|
||||||
set -e; \
|
|
||||||
for l in $(LIBNAMES); do \
|
|
||||||
@@ -89,7 +89,7 @@
|
|
||||||
|
|
||||||
subdirs:
|
|
||||||
echo $(EDIRS)
|
|
||||||
- @target=all; $(RECURSIVE_MAKE)
|
|
||||||
+ +@target=all; $(RECURSIVE_MAKE)
|
|
||||||
|
|
||||||
files:
|
|
||||||
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
|
||||||
@@ -128,7 +128,7 @@
|
|
||||||
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
|
||||||
done; \
|
|
||||||
fi
|
|
||||||
- @target=install; $(RECURSIVE_MAKE)
|
|
||||||
+ +@target=install; $(RECURSIVE_MAKE)
|
|
||||||
|
|
||||||
tags:
|
|
||||||
ctags $(SRC)
|
|
||||||
--- a/test/Makefile
|
|
||||||
+++ b/test/Makefile
|
|
||||||
@@ -123,7 +123,7 @@
|
|
||||||
tags:
|
|
||||||
ctags $(SRC)
|
|
||||||
|
|
||||||
-tests: exe apps $(TESTS)
|
|
||||||
+tests: exe $(TESTS)
|
|
||||||
|
|
||||||
apps:
|
|
||||||
@(cd ..; $(MAKE) DIRS=apps all)
|
|
||||||
@@ -365,109 +365,109 @@
|
|
||||||
link_app.$${shlib_target}
|
|
||||||
|
|
||||||
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(RSATEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(RSATEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(BNTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(BNTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(ECTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(ECTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(EXPTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(EXPTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(IDEATEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(IDEATEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(MD2TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(MD2TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(SHATEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(SHATEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(SHA1TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(SHA1TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(SHA256TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(SHA256TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(SHA512TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(SHA512TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(RMDTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(RMDTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(MDC2TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(MDC2TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(MD4TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(MD4TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(MD5TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(MD5TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(HMACTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(HMACTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(WPTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(WPTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(RC2TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(RC2TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(BFTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(BFTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(CASTTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(CASTTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(RC4TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(RC4TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(RC5TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(RC5TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(DESTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(DESTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(RANDTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(RANDTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(DHTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(DHTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(DSATEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(DSATEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(METHTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(METHTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
|
|
||||||
- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
|
|
||||||
+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
|
|
||||||
|
|
||||||
$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(ENGINETEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(ENGINETEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(EVPTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(EVPTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(ECDSATEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(ECDSATEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(ECDHTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(ECDHTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(IGETEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(IGETEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(JPAKETEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(JPAKETEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(ASN1TEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(ASN1TEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
|
|
||||||
- @target=$(SRPTEST); $(BUILD_CMD)
|
|
||||||
+ +@target=$(SRPTEST); $(BUILD_CMD)
|
|
||||||
|
|
||||||
#$(AESTEST).o: $(AESTEST).c
|
|
||||||
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
|
|
||||||
@@ -480,7 +480,7 @@
|
|
||||||
# fi
|
|
||||||
|
|
||||||
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
|
|
||||||
- @target=dummytest; $(BUILD_CMD)
|
|
||||||
+ +@target=dummytest; $(BUILD_CMD)
|
|
||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
|
||||||
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721
|
|
||||||
|
|
||||||
UpstreamStatus: Pending
|
|
||||||
|
|
||||||
Received from H J Liu @ Intel
|
|
||||||
Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
|
|
||||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
|
|
||||||
|
|
||||||
ported the patch to the 1.0.0e version
|
|
||||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
|
|
||||||
Index: openssl-1.0.0e/Configure
|
|
||||||
===================================================================
|
|
||||||
--- openssl-1.0.0e.orig/Configure
|
|
||||||
+++ openssl-1.0.0e/Configure
|
|
||||||
@@ -393,6 +393,7 @@ my %table=(
|
|
||||||
"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
||||||
"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
||||||
"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
|
|
||||||
+"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
||||||
"dist", "cc:-O::(unknown)::::::",
|
|
||||||
|
|
||||||
# Basic configs that should work on any (32 and less bit) box
|
|
||||||
Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
|
|
||||||
===================================================================
|
|
||||||
--- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
|
|
||||||
+++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
|
|
||||||
@@ -55,7 +55,7 @@
|
|
||||||
* machine.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#ifdef _WIN64
|
|
||||||
+#if defined _WIN64 || !defined __LP64__
|
|
||||||
#define BN_ULONG unsigned long long
|
|
||||||
#else
|
|
||||||
#define BN_ULONG unsigned long
|
|
||||||
@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
|
|
||||||
asm (
|
|
||||||
" subq %2,%2 \n"
|
|
||||||
".p2align 4 \n"
|
|
||||||
- "1: movq (%4,%2,8),%0 \n"
|
|
||||||
- " adcq (%5,%2,8),%0 \n"
|
|
||||||
- " movq %0,(%3,%2,8) \n"
|
|
||||||
+ "1: movq (%q4,%2,8),%0 \n"
|
|
||||||
+ " adcq (%q5,%2,8),%0 \n"
|
|
||||||
+ " movq %0,(%q3,%2,8) \n"
|
|
||||||
" leaq 1(%2),%2 \n"
|
|
||||||
" loop 1b \n"
|
|
||||||
" sbbq %0,%0 \n"
|
|
||||||
@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
|
|
||||||
asm (
|
|
||||||
" subq %2,%2 \n"
|
|
||||||
".p2align 4 \n"
|
|
||||||
- "1: movq (%4,%2,8),%0 \n"
|
|
||||||
- " sbbq (%5,%2,8),%0 \n"
|
|
||||||
- " movq %0,(%3,%2,8) \n"
|
|
||||||
+ "1: movq (%q4,%2,8),%0 \n"
|
|
||||||
+ " sbbq (%q5,%2,8),%0 \n"
|
|
||||||
+ " movq %0,(%q3,%2,8) \n"
|
|
||||||
" leaq 1(%2),%2 \n"
|
|
||||||
" loop 1b \n"
|
|
||||||
" sbbq %0,%0 \n"
|
|
||||||
Index: openssl-1.0.0e/crypto/bn/bn.h
|
|
||||||
===================================================================
|
|
||||||
--- openssl-1.0.0e.orig/crypto/bn/bn.h
|
|
||||||
+++ openssl-1.0.0e/crypto/bn/bn.h
|
|
||||||
@@ -172,6 +172,13 @@ extern "C" {
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* Address type. */
|
|
||||||
+#ifdef _WIN64
|
|
||||||
+#define BN_ADDR unsigned long long
|
|
||||||
+#else
|
|
||||||
+#define BN_ADDR unsigned long
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* assuming long is 64bit - this is the DEC Alpha
|
|
||||||
* unsigned long long is only 64 bits :-(, don't define
|
|
||||||
* BN_LLONG for the DEC Alpha */
|
|
||||||
@ -1,656 +0,0 @@
|
|||||||
http://rt.openssl.org/Ticket/Display.html?id=2051
|
|
||||||
user/pass: guest/guest
|
|
||||||
|
|
||||||
Index: apps/s_apps.h
|
|
||||||
===================================================================
|
|
||||||
RCS file: /v/openssl/cvs/openssl/apps/s_apps.h,v
|
|
||||||
retrieving revision 1.21.2.1
|
|
||||||
diff -u -r1.21.2.1 s_apps.h
|
|
||||||
--- apps/s_apps.h 4 Sep 2009 17:42:04 -0000 1.21.2.1
|
|
||||||
+++ apps/s_apps.h 28 Dec 2011 00:28:14 -0000
|
|
||||||
@@ -148,7 +148,7 @@
|
|
||||||
#define PORT_STR "4433"
|
|
||||||
#define PROTOCOL "tcp"
|
|
||||||
|
|
||||||
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
|
|
||||||
+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
|
|
||||||
#ifdef HEADER_X509_H
|
|
||||||
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
|
|
||||||
#endif
|
|
||||||
@@ -156,7 +156,7 @@
|
|
||||||
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
|
|
||||||
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
|
|
||||||
#endif
|
|
||||||
-int init_client(int *sock, char *server, int port, int type);
|
|
||||||
+int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
|
|
||||||
int should_retry(int i);
|
|
||||||
int extract_port(char *str, short *port_ptr);
|
|
||||||
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
|
|
||||||
Index: apps/s_client.c
|
|
||||||
===================================================================
|
|
||||||
RCS file: /v/openssl/cvs/openssl/apps/s_client.c,v
|
|
||||||
retrieving revision 1.123.2.6.2.10
|
|
||||||
diff -u -r1.123.2.6.2.10 s_client.c
|
|
||||||
--- apps/s_client.c 14 Dec 2011 22:18:02 -0000 1.123.2.6.2.10
|
|
||||||
+++ apps/s_client.c 28 Dec 2011 00:28:14 -0000
|
|
||||||
@@ -285,6 +285,10 @@
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err,"usage: s_client args\n");
|
|
||||||
BIO_printf(bio_err,"\n");
|
|
||||||
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
|
||||||
+#endif
|
|
||||||
BIO_printf(bio_err," -host host - use -connect instead\n");
|
|
||||||
BIO_printf(bio_err," -port port - use -connect instead\n");
|
|
||||||
BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
|
|
||||||
@@ -564,6 +567,7 @@
|
|
||||||
int sbuf_len,sbuf_off;
|
|
||||||
fd_set readfds,writefds;
|
|
||||||
short port=PORT;
|
|
||||||
+ int use_ipv4, use_ipv6;
|
|
||||||
int full_log=1;
|
|
||||||
char *host=SSL_HOST_NAME;
|
|
||||||
char *cert_file=NULL,*key_file=NULL;
|
|
||||||
@@ -609,7 +613,11 @@
|
|
||||||
#endif
|
|
||||||
char *sess_in = NULL;
|
|
||||||
char *sess_out = NULL;
|
|
||||||
- struct sockaddr peer;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ struct sockaddr_storage peer;
|
|
||||||
+#else
|
|
||||||
+ struct sockaddr_in peer;
|
|
||||||
+#endif
|
|
||||||
int peerlen = sizeof(peer);
|
|
||||||
int enable_timeouts = 0 ;
|
|
||||||
long socket_mtu = 0;
|
|
||||||
@@ -630,6 +638,12 @@
|
|
||||||
meth=SSLv2_client_method();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ use_ipv4 = 1;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ use_ipv6 = 1;
|
|
||||||
+#else
|
|
||||||
+ use_ipv6 = 0;
|
|
||||||
+#endif
|
|
||||||
apps_startup();
|
|
||||||
c_Pause=0;
|
|
||||||
c_quiet=0;
|
|
||||||
@@ -951,6 +961,18 @@
|
|
||||||
jpake_secret = *++argv;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+ else if (strcmp(*argv,"-4") == 0)
|
|
||||||
+ {
|
|
||||||
+ use_ipv4 = 1;
|
|
||||||
+ use_ipv6 = 0;
|
|
||||||
+ }
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else if (strcmp(*argv,"-6") == 0)
|
|
||||||
+ {
|
|
||||||
+ use_ipv4 = 0;
|
|
||||||
+ use_ipv6 = 1;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
#ifndef OPENSSL_NO_SRTP
|
|
||||||
else if (strcmp(*argv,"-use_srtp") == 0)
|
|
||||||
{
|
|
||||||
@@ -1259,7 +1276,7 @@
|
|
||||||
|
|
||||||
re_start:
|
|
||||||
|
|
||||||
- if (init_client(&s,host,port,socket_type) == 0)
|
|
||||||
+ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
|
|
||||||
SHUTDOWN(s);
|
|
||||||
@@ -1285,7 +1302,7 @@
|
|
||||||
{
|
|
||||||
|
|
||||||
sbio=BIO_new_dgram(s,BIO_NOCLOSE);
|
|
||||||
- if (getsockname(s, &peer, (void *)&peerlen) < 0)
|
|
||||||
+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err, "getsockname:errno=%d\n",
|
|
||||||
get_last_socket_error());
|
|
||||||
===================================================================
|
|
||||||
RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v
|
|
||||||
retrieving revision 1.136.2.15.2.13
|
|
||||||
diff -u -r1.136.2.15.2.13 s_server.c
|
|
||||||
--- apps/s_server.c 27 Dec 2011 14:23:22 -0000 1.136.2.15.2.13
|
|
||||||
+++ apps/s_server.c 28 Dec 2011 00:28:14 -0000
|
|
||||||
@@ -558,6 +558,10 @@
|
|
||||||
# endif
|
|
||||||
BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
|
|
||||||
#endif
|
|
||||||
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
|
||||||
+#endif
|
|
||||||
BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
|
|
||||||
BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
|
|
||||||
}
|
|
||||||
@@ -943,6 +947,7 @@
|
|
||||||
int state=0;
|
|
||||||
const SSL_METHOD *meth=NULL;
|
|
||||||
int socket_type=SOCK_STREAM;
|
|
||||||
+ int use_ipv4, use_ipv6;
|
|
||||||
ENGINE *e=NULL;
|
|
||||||
char *inrand=NULL;
|
|
||||||
int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
|
|
||||||
@@ -981,6 +986,12 @@
|
|
||||||
/* #error no SSL version enabled */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ use_ipv4 = 1;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ use_ipv6 = 1;
|
|
||||||
+#else
|
|
||||||
+ use_ipv6 = 0;
|
|
||||||
+#endif
|
|
||||||
local_argc=argc;
|
|
||||||
local_argv=argv;
|
|
||||||
|
|
||||||
@@ -1329,6 +1340,18 @@
|
|
||||||
jpake_secret = *(++argv);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+ else if (strcmp(*argv,"-4") == 0)
|
|
||||||
+ {
|
|
||||||
+ use_ipv4 = 1;
|
|
||||||
+ use_ipv6 = 0;
|
|
||||||
+ }
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else if (strcmp(*argv,"-6") == 0)
|
|
||||||
+ {
|
|
||||||
+ use_ipv4 = 0;
|
|
||||||
+ use_ipv6 = 1;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
#ifndef OPENSSL_NO_SRTP
|
|
||||||
else if (strcmp(*argv,"-use_srtp") == 0)
|
|
||||||
{
|
|
||||||
@@ -1884,9 +1907,9 @@
|
|
||||||
BIO_printf(bio_s_out,"ACCEPT\n");
|
|
||||||
(void)BIO_flush(bio_s_out);
|
|
||||||
if (www)
|
|
||||||
- do_server(port,socket_type,&accept_socket,www_body, context);
|
|
||||||
+ do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
|
|
||||||
else
|
|
||||||
- do_server(port,socket_type,&accept_socket,sv_body, context);
|
|
||||||
+ do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
|
|
||||||
print_stats(bio_s_out,ctx);
|
|
||||||
ret=0;
|
|
||||||
end:
|
|
||||||
Index: apps/s_socket.c
|
|
||||||
===================================================================
|
|
||||||
RCS file: /v/openssl/cvs/openssl/apps/s_socket.c,v
|
|
||||||
retrieving revision 1.43.2.3.2.2
|
|
||||||
diff -u -r1.43.2.3.2.2 s_socket.c
|
|
||||||
--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2
|
|
||||||
+++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000
|
|
||||||
@@ -97,16 +97,16 @@
|
|
||||||
#include "netdb.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-static struct hostent *GetHostByName(char *name);
|
|
||||||
+static struct hostent *GetHostByName(char *name, int domain);
|
|
||||||
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
|
|
||||||
static void ssl_sock_cleanup(void);
|
|
||||||
#endif
|
|
||||||
static int ssl_sock_init(void);
|
|
||||||
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
|
|
||||||
-static int init_server(int *sock, int port, int type);
|
|
||||||
-static int init_server_long(int *sock, int port,char *ip, int type);
|
|
||||||
+static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
|
|
||||||
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
|
|
||||||
+static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
|
|
||||||
static int do_accept(int acc_sock, int *sock, char **host);
|
|
||||||
-static int host_ip(char *str, unsigned char ip[4]);
|
|
||||||
+static int host_ip(char *str, unsigned char *ip, int domain);
|
|
||||||
|
|
||||||
#ifdef OPENSSL_SYS_WIN16
|
|
||||||
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
|
|
||||||
@@ -234,38 +234,68 @@
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
-int init_client(int *sock, char *host, int port, int type)
|
|
||||||
+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
|
|
||||||
{
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ unsigned char ip[16];
|
|
||||||
+#else
|
|
||||||
unsigned char ip[4];
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
- memset(ip, '\0', sizeof ip);
|
|
||||||
- if (!host_ip(host,&(ip[0])))
|
|
||||||
- return 0;
|
|
||||||
- return init_client_ip(sock,ip,port,type);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
|
|
||||||
- {
|
|
||||||
- unsigned long addr;
|
|
||||||
+ if (use_ipv4)
|
|
||||||
+ if (host_ip(host,ip,AF_INET))
|
|
||||||
+ return(init_client_ip(sock,ip,port,type,AF_INET));
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ if (use_ipv6)
|
|
||||||
+ if (host_ip(host,ip,AF_INET6))
|
|
||||||
+ return(init_client_ip(sock,ip,port,type,AF_INET6));
|
|
||||||
+#endif
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
|
|
||||||
+ {
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ struct sockaddr_storage them;
|
|
||||||
+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
|
|
||||||
+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
|
|
||||||
+#else
|
|
||||||
struct sockaddr_in them;
|
|
||||||
+ struct sockaddr_in *them_in = &them;
|
|
||||||
+#endif
|
|
||||||
+ socklen_t addr_len;
|
|
||||||
int s,i;
|
|
||||||
|
|
||||||
if (!ssl_sock_init()) return(0);
|
|
||||||
|
|
||||||
memset((char *)&them,0,sizeof(them));
|
|
||||||
- them.sin_family=AF_INET;
|
|
||||||
- them.sin_port=htons((unsigned short)port);
|
|
||||||
- addr=(unsigned long)
|
|
||||||
- ((unsigned long)ip[0]<<24L)|
|
|
||||||
- ((unsigned long)ip[1]<<16L)|
|
|
||||||
- ((unsigned long)ip[2]<< 8L)|
|
|
||||||
- ((unsigned long)ip[3]);
|
|
||||||
- them.sin_addr.s_addr=htonl(addr);
|
|
||||||
+ if (domain == AF_INET)
|
|
||||||
+ {
|
|
||||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
|
||||||
+ them_in->sin_family=AF_INET;
|
|
||||||
+ them_in->sin_port=htons((unsigned short)port);
|
|
||||||
+#ifndef BIT_FIELD_LIMITS
|
|
||||||
+ memcpy(&them_in->sin_addr.s_addr, ip, 4);
|
|
||||||
+#else
|
|
||||||
+ memcpy(&them_in->sin_addr, ip, 4);
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ {
|
|
||||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
|
||||||
+ them_in6->sin6_family=AF_INET6;
|
|
||||||
+ them_in6->sin6_port=htons((unsigned short)port);
|
|
||||||
+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
|
|
||||||
+ }
|
|
||||||
+#else
|
|
||||||
+ return(0);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (type == SOCK_STREAM)
|
|
||||||
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
|
||||||
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
|
||||||
else /* ( type == SOCK_DGRAM) */
|
|
||||||
- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
|
|
||||||
+ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
|
|
||||||
|
|
||||||
if (s == INVALID_SOCKET) { perror("socket"); return(0); }
|
|
||||||
|
|
||||||
@@ -277,29 +315,27 @@
|
|
||||||
if (i < 0) { perror("keepalive"); return(0); }
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
|
|
||||||
+ if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
|
|
||||||
{ closesocket(s); perror("connect"); return(0); }
|
|
||||||
*sock=s;
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
|
|
||||||
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
|
|
||||||
{
|
|
||||||
int sock;
|
|
||||||
char *name = NULL;
|
|
||||||
int accept_socket = 0;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- if (!init_server(&accept_socket,port,type)) return(0);
|
|
||||||
-
|
|
||||||
+ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
|
|
||||||
if (ret != NULL)
|
|
||||||
{
|
|
||||||
*ret=accept_socket;
|
|
||||||
/* return(1);*/
|
|
||||||
}
|
|
||||||
- for (;;)
|
|
||||||
- {
|
|
||||||
+ for (;;)
|
|
||||||
+ {
|
|
||||||
if (type==SOCK_STREAM)
|
|
||||||
{
|
|
||||||
if (do_accept(accept_socket,&sock,&name) == 0)
|
|
||||||
@@ -322,41 +358,88 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int init_server_long(int *sock, int port, char *ip, int type)
|
|
||||||
+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
|
|
||||||
{
|
|
||||||
int ret=0;
|
|
||||||
+ int domain;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ struct sockaddr_storage server;
|
|
||||||
+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
|
|
||||||
+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
|
|
||||||
+#else
|
|
||||||
struct sockaddr_in server;
|
|
||||||
+ struct sockaddr_in *server_in = &server;
|
|
||||||
+#endif
|
|
||||||
+ socklen_t addr_len;
|
|
||||||
int s= -1;
|
|
||||||
|
|
||||||
+ if (!use_ipv4 && !use_ipv6)
|
|
||||||
+ goto err;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ /* we are fine here */
|
|
||||||
+#else
|
|
||||||
+ if (use_ipv6)
|
|
||||||
+ goto err;
|
|
||||||
+#endif
|
|
||||||
if (!ssl_sock_init()) return(0);
|
|
||||||
|
|
||||||
- memset((char *)&server,0,sizeof(server));
|
|
||||||
- server.sin_family=AF_INET;
|
|
||||||
- server.sin_port=htons((unsigned short)port);
|
|
||||||
- if (ip == NULL)
|
|
||||||
- server.sin_addr.s_addr=INADDR_ANY;
|
|
||||||
- else
|
|
||||||
-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
|
||||||
-#ifndef BIT_FIELD_LIMITS
|
|
||||||
- memcpy(&server.sin_addr.s_addr,ip,4);
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ domain = use_ipv6 ? AF_INET6 : AF_INET;
|
|
||||||
#else
|
|
||||||
- memcpy(&server.sin_addr,ip,4);
|
|
||||||
+ domain = AF_INET;
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
- if (type == SOCK_STREAM)
|
|
||||||
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
|
||||||
- else /* type == SOCK_DGRAM */
|
|
||||||
- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
|
|
||||||
+ if (type == SOCK_STREAM)
|
|
||||||
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
|
||||||
+ else /* type == SOCK_DGRAM */
|
|
||||||
+ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
|
|
||||||
|
|
||||||
if (s == INVALID_SOCKET) goto err;
|
|
||||||
#if defined SOL_SOCKET && defined SO_REUSEADDR
|
|
||||||
+ {
|
|
||||||
+ int j = 1;
|
|
||||||
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
|
||||||
+ (void *) &j, sizeof j);
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ if ((use_ipv4 == 0) && (use_ipv6 == 1))
|
|
||||||
{
|
|
||||||
- int j = 1;
|
|
||||||
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
|
||||||
- (void *) &j, sizeof j);
|
|
||||||
+ const int on = 1;
|
|
||||||
+
|
|
||||||
+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
|
|
||||||
+ (const void *) &on, sizeof(int));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
|
|
||||||
+ if (domain == AF_INET)
|
|
||||||
+ {
|
|
||||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
|
||||||
+ memset(server_in, 0, sizeof(struct sockaddr_in));
|
|
||||||
+ server_in->sin_family=AF_INET;
|
|
||||||
+ server_in->sin_port = htons((unsigned short)port);
|
|
||||||
+ if (ip == NULL)
|
|
||||||
+ server_in->sin_addr.s_addr = htonl(INADDR_ANY);
|
|
||||||
+ else
|
|
||||||
+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
|
||||||
+#ifndef BIT_FIELD_LIMITS
|
|
||||||
+ memcpy(&server_in->sin_addr.s_addr, ip, 4);
|
|
||||||
+#else
|
|
||||||
+ memcpy(&server_in->sin_addr, ip, 4);
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
|
||||||
+ memset(server_in6, 0, sizeof(struct sockaddr_in6));
|
|
||||||
+ server_in6->sin6_family = AF_INET6;
|
|
||||||
+ server_in6->sin6_port = htons((unsigned short)port);
|
|
||||||
+ if (ip == NULL)
|
|
||||||
+ server_in6->sin6_addr = in6addr_any;
|
|
||||||
+ else
|
|
||||||
+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
|
|
||||||
{
|
|
||||||
#ifndef OPENSSL_SYS_WINDOWS
|
|
||||||
perror("bind");
|
|
||||||
@@ -375,16 +458,23 @@
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int init_server(int *sock, int port, int type)
|
|
||||||
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
|
|
||||||
{
|
|
||||||
- return(init_server_long(sock, port, NULL, type));
|
|
||||||
+ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
|
|
||||||
}
|
|
||||||
|
|
||||||
static int do_accept(int acc_sock, int *sock, char **host)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
struct hostent *h1,*h2;
|
|
||||||
- static struct sockaddr_in from;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ struct sockaddr_storage from;
|
|
||||||
+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
|
|
||||||
+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
|
|
||||||
+#else
|
|
||||||
+ struct sockaddr_in from;
|
|
||||||
+ struct sockaddr_in *from_in = &from;
|
|
||||||
+#endif
|
|
||||||
int len;
|
|
||||||
/* struct linger ling; */
|
|
||||||
|
|
||||||
@@ -431,13 +521,23 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (host == NULL) goto end;
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ if (from.ss_family == AF_INET)
|
|
||||||
+#else
|
|
||||||
+ if (from.sin_family == AF_INET)
|
|
||||||
+#endif
|
|
||||||
#ifndef BIT_FIELD_LIMITS
|
|
||||||
- /* I should use WSAAsyncGetHostByName() under windows */
|
|
||||||
- h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
|
|
||||||
- sizeof(from.sin_addr.s_addr),AF_INET);
|
|
||||||
+ /* I should use WSAAsyncGetHostByName() under windows */
|
|
||||||
+ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
|
|
||||||
+ sizeof(from_in->sin_addr.s_addr), AF_INET);
|
|
||||||
#else
|
|
||||||
- h1=gethostbyaddr((char *)&from.sin_addr,
|
|
||||||
- sizeof(struct in_addr),AF_INET);
|
|
||||||
+ h1=gethostbyaddr((char *)&from_in->sin_addr,
|
|
||||||
+ sizeof(struct in_addr), AF_INET);
|
|
||||||
+#endif
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else
|
|
||||||
+ h1=gethostbyaddr((char *)&from_in6->sin6_addr,
|
|
||||||
+ sizeof(struct in6_addr), AF_INET6);
|
|
||||||
#endif
|
|
||||||
if (h1 == NULL)
|
|
||||||
{
|
|
||||||
@@ -454,15 +554,23 @@
|
|
||||||
}
|
|
||||||
BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
|
|
||||||
|
|
||||||
- h2=GetHostByName(*host);
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ h2=GetHostByName(*host, from.ss_family);
|
|
||||||
+#else
|
|
||||||
+ h2=GetHostByName(*host, from.sin_family);
|
|
||||||
+#endif
|
|
||||||
if (h2 == NULL)
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err,"gethostbyname failure\n");
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
- if (h2->h_addrtype != AF_INET)
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ if (h2->h_addrtype != from.ss_family)
|
|
||||||
+#else
|
|
||||||
+ if (h2->h_addrtype != from.sin_family)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
|
||||||
+ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -477,7 +585,7 @@
|
|
||||||
char *h,*p;
|
|
||||||
|
|
||||||
h=str;
|
|
||||||
- p=strchr(str,':');
|
|
||||||
+ p=strrchr(str,':');
|
|
||||||
if (p == NULL)
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err,"no port defined\n");
|
|
||||||
@@ -485,7 +593,7 @@
|
|
||||||
}
|
|
||||||
*(p++)='\0';
|
|
||||||
|
|
||||||
- if ((ip != NULL) && !host_ip(str,ip))
|
|
||||||
+ if ((ip != NULL) && !host_ip(str,ip,AF_INET))
|
|
||||||
goto err;
|
|
||||||
if (host_ptr != NULL) *host_ptr=h;
|
|
||||||
|
|
||||||
@@ -496,48 +604,58 @@
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int host_ip(char *str, unsigned char ip[4])
|
|
||||||
+static int host_ip(char *str, unsigned char *ip, int domain)
|
|
||||||
{
|
|
||||||
- unsigned int in[4];
|
|
||||||
+ unsigned int in[4];
|
|
||||||
+ unsigned long l;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
|
|
||||||
+ if ((domain == AF_INET) &&
|
|
||||||
+ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
|
|
||||||
{
|
|
||||||
+
|
|
||||||
for (i=0; i<4; i++)
|
|
||||||
if (in[i] > 255)
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err,"invalid IP address\n");
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
- ip[0]=in[0];
|
|
||||||
- ip[1]=in[1];
|
|
||||||
- ip[2]=in[2];
|
|
||||||
- ip[3]=in[3];
|
|
||||||
- }
|
|
||||||
+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
|
|
||||||
+ memcpy(ip, &l, 4);
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else if ((domain == AF_INET6) &&
|
|
||||||
+ (inet_pton(AF_INET6, str, ip) == 1))
|
|
||||||
+ return 1;
|
|
||||||
+#endif
|
|
||||||
else
|
|
||||||
{ /* do a gethostbyname */
|
|
||||||
struct hostent *he;
|
|
||||||
|
|
||||||
if (!ssl_sock_init()) return(0);
|
|
||||||
|
|
||||||
- he=GetHostByName(str);
|
|
||||||
+ he=GetHostByName(str,domain);
|
|
||||||
if (he == NULL)
|
|
||||||
{
|
|
||||||
BIO_printf(bio_err,"gethostbyname failure\n");
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
/* cast to short because of win16 winsock definition */
|
|
||||||
- if ((short)he->h_addrtype != AF_INET)
|
|
||||||
+ if ((short)he->h_addrtype != domain)
|
|
||||||
{
|
|
||||||
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
|
||||||
+ BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
- ip[0]=he->h_addr_list[0][0];
|
|
||||||
- ip[1]=he->h_addr_list[0][1];
|
|
||||||
- ip[2]=he->h_addr_list[0][2];
|
|
||||||
- ip[3]=he->h_addr_list[0][3];
|
|
||||||
+ if (domain == AF_INET)
|
|
||||||
+ memset(ip, 0, 4);
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else
|
|
||||||
+ memset(ip, 0, 16);
|
|
||||||
+#endif
|
|
||||||
+ memcpy(ip, he->h_addr_list[0], he->h_length);
|
|
||||||
+ return 1;
|
|
||||||
}
|
|
||||||
- return(1);
|
|
||||||
err:
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
@@ -574,7 +692,7 @@
|
|
||||||
static unsigned long ghbn_hits=0L;
|
|
||||||
static unsigned long ghbn_miss=0L;
|
|
||||||
|
|
||||||
-static struct hostent *GetHostByName(char *name)
|
|
||||||
+static struct hostent *GetHostByName(char *name, int domain)
|
|
||||||
{
|
|
||||||
struct hostent *ret;
|
|
||||||
int i,lowi=0;
|
|
||||||
@@ -589,14 +707,20 @@
|
|
||||||
}
|
|
||||||
if (ghbn_cache[i].order > 0)
|
|
||||||
{
|
|
||||||
- if (strncmp(name,ghbn_cache[i].name,128) == 0)
|
|
||||||
+ if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
|
|
||||||
+ (ghbn_cache[i].ent.h_addrtype == domain))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (i == GHBN_NUM) /* no hit*/
|
|
||||||
{
|
|
||||||
ghbn_miss++;
|
|
||||||
- ret=gethostbyname(name);
|
|
||||||
+ if (domain == AF_INET)
|
|
||||||
+ ret=gethostbyname(name);
|
|
||||||
+#if OPENSSL_USE_IPV6
|
|
||||||
+ else
|
|
||||||
+ ret=gethostbyname2(name, AF_INET6);
|
|
||||||
+#endif
|
|
||||||
if (ret == NULL) return(NULL);
|
|
||||||
/* else add to cache */
|
|
||||||
if(strlen(name) < sizeof ghbn_cache[0].name)
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<herd>base-system</herd>
|
|
||||||
<use>
|
|
||||||
<flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented)</flag>
|
|
||||||
<flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,222 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e.ebuild,v 1.1 2013/02/20 19:14:48 vapier Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic toolchain-funcs multilib
|
|
||||||
|
|
||||||
REV="1.7"
|
|
||||||
DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
|
|
||||||
HOMEPAGE="http://www.openssl.org/"
|
|
||||||
SRC_URI="mirror://openssl/source/${P}.tar.gz
|
|
||||||
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
|
|
||||||
|
|
||||||
LICENSE="openssl"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
|
||||||
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
|
|
||||||
|
|
||||||
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
|
|
||||||
# our libssl.a depends on libz.a/etc... at runtime.
|
|
||||||
LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
|
|
||||||
zlib? ( sys-libs/zlib[static-libs(+)] )
|
|
||||||
kerberos? ( virtual/krb5 )"
|
|
||||||
# The blocks are temporary just to make sure people upgrade to a
|
|
||||||
# version that lack runtime version checking. We'll drop them in
|
|
||||||
# the future.
|
|
||||||
RDEPEND="static-libs? ( ${LIB_DEPEND} )
|
|
||||||
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
|
||||||
!<net-misc/openssh-5.9_p1-r4
|
|
||||||
!<net-libs/neon-0.29.6-r1"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/diffutils
|
|
||||||
>=dev-lang/perl-5
|
|
||||||
test? ( sys-devel/bc )"
|
|
||||||
PDEPEND="app-misc/ca-certificates"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
unpack ${P}.tar.gz
|
|
||||||
SSL_CNF_DIR="/etc/ssl"
|
|
||||||
sed \
|
|
||||||
-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
|
|
||||||
-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
|
|
||||||
"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
|
|
||||||
> "${WORKDIR}"/c_rehash || die #416717
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# Make sure we only ever touch Makefile.org and avoid patching a file
|
|
||||||
# that gets blown away anyways by the Configure script in src_configure
|
|
||||||
rm -f Makefile
|
|
||||||
|
|
||||||
if ! use vanilla ; then
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.0.1e-ipv6.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.9.8i-heimdal-partial.patch
|
|
||||||
epatch_user #332661
|
|
||||||
fi
|
|
||||||
|
|
||||||
# disable fips in the build
|
|
||||||
# make sure the man pages are suffixed #302165
|
|
||||||
# don't bother building man pages if they're disabled
|
|
||||||
sed -i \
|
|
||||||
-e '/DIRS/s: fips : :g' \
|
|
||||||
-e '/^MANSUFFIX/s:=.*:=ssl:' \
|
|
||||||
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
|
|
||||||
-e $(has noman FEATURES \
|
|
||||||
&& echo '/^install:/s:install_docs::' \
|
|
||||||
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
|
|
||||||
Makefile.org \
|
|
||||||
|| die
|
|
||||||
# show the actual commands in the log
|
|
||||||
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
|
|
||||||
|
|
||||||
# allow openssl to be cross-compiled
|
|
||||||
cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
|
|
||||||
chmod a+rx gentoo.config
|
|
||||||
|
|
||||||
append-flags -fno-strict-aliasing
|
|
||||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
|
||||||
|
|
||||||
sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
|
|
||||||
./config --test-sanity || die "I AM NOT SANE"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
unset APPS #197996
|
|
||||||
unset SCRIPTS #312551
|
|
||||||
unset CROSS_COMPILE #311473
|
|
||||||
|
|
||||||
tc-export CC AR RANLIB RC
|
|
||||||
|
|
||||||
# Clean out patent-or-otherwise-encumbered code
|
|
||||||
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
|
|
||||||
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
|
||||||
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
|
||||||
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
|
|
||||||
# RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
|
|
||||||
|
|
||||||
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
|
|
||||||
echoit() { echo "$@" ; "$@" ; }
|
|
||||||
|
|
||||||
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "force-Heimdal")
|
|
||||||
|
|
||||||
local sslout=$(./gentoo.config)
|
|
||||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
|
||||||
local config="Configure"
|
|
||||||
[[ -z ${sslout} ]] && config="config"
|
|
||||||
echoit \
|
|
||||||
./${config} \
|
|
||||||
${sslout} \
|
|
||||||
$(use sse2 || echo "no-sse2") \
|
|
||||||
enable-camellia \
|
|
||||||
$(use_ssl !bindist ec) \
|
|
||||||
enable-idea \
|
|
||||||
enable-mdc2 \
|
|
||||||
$(use_ssl !bindist rc5) \
|
|
||||||
enable-tlsext \
|
|
||||||
$(use_ssl gmp gmp -lgmp) \
|
|
||||||
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
|
|
||||||
$(use_ssl rfc3779) \
|
|
||||||
$(use_ssl zlib) \
|
|
||||||
--prefix="${EPREFIX}"/usr \
|
|
||||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
|
||||||
--libdir=$(get_libdir) \
|
|
||||||
shared threads \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# Clean out hardcoded flags that openssl uses
|
|
||||||
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
|
|
||||||
-e 's:^CFLAG=::' \
|
|
||||||
-e 's:-fomit-frame-pointer ::g' \
|
|
||||||
-e 's:-O[0-9] ::g' \
|
|
||||||
-e 's:-march=[-a-z0-9]* ::g' \
|
|
||||||
-e 's:-mcpu=[-a-z0-9]* ::g' \
|
|
||||||
-e 's:-m[a-z0-9]* ::g' \
|
|
||||||
)
|
|
||||||
sed -i \
|
|
||||||
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
|
|
||||||
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
|
|
||||||
Makefile || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# depend is needed to use $confopts; it also doesn't matter
|
|
||||||
# that it's -j1 as the code itself serializes subdirs
|
|
||||||
emake -j1 depend
|
|
||||||
emake all
|
|
||||||
# rehash is needed to prep the certs/ dir; do this
|
|
||||||
# separately to avoid parallel build issues.
|
|
||||||
emake rehash
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake -j1 test
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake INSTALL_PREFIX="${D}" install
|
|
||||||
dobin "${WORKDIR}"/c_rehash #333117
|
|
||||||
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
|
|
||||||
dohtml -r doc/*
|
|
||||||
use rfc3779 && dodoc engines/ccgost/README.gost
|
|
||||||
|
|
||||||
# This is crappy in that the static archives are still built even
|
|
||||||
# when USE=static-libs. But this is due to a failing in the openssl
|
|
||||||
# build system: the static archives are built as PIC all the time.
|
|
||||||
# Only way around this would be to manually configure+compile openssl
|
|
||||||
# twice; once with shared lib support enabled and once without.
|
|
||||||
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
|
|
||||||
|
|
||||||
# create the certs directory
|
|
||||||
dodir ${SSL_CNF_DIR}/certs
|
|
||||||
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
|
|
||||||
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
|
|
||||||
|
|
||||||
# Namespace openssl programs to prevent conflicts with other man pages
|
|
||||||
cd "${ED}"/usr/share/man
|
|
||||||
local m d s
|
|
||||||
for m in $(find . -type f | xargs grep -L '#include') ; do
|
|
||||||
d=${m%/*} ; d=${d#./} ; m=${m##*/}
|
|
||||||
[[ ${m} == openssl.1* ]] && continue
|
|
||||||
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
|
|
||||||
mv ${d}/{,ssl-}${m}
|
|
||||||
# fix up references to renamed man pages
|
|
||||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
|
||||||
ln -s ssl-${m} ${d}/openssl-${m}
|
|
||||||
# locate any symlinks that point to this man page ... we assume
|
|
||||||
# that any broken links are due to the above renaming
|
|
||||||
for s in $(find -L ${d} -type l) ; do
|
|
||||||
s=${s##*/}
|
|
||||||
rm -f ${d}/${s}
|
|
||||||
ln -s ssl-${m} ${d}/ssl-${s}
|
|
||||||
ln -s ssl-${s} ${d}/openssl-${s}
|
|
||||||
done
|
|
||||||
done
|
|
||||||
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
|
|
||||||
|
|
||||||
dodir /etc/sandbox.d #254521
|
|
||||||
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
|
|
||||||
|
|
||||||
diropts -m0700
|
|
||||||
keepdir ${SSL_CNF_DIR}/private
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
|
||||||
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
|
|
||||||
c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
|
|
||||||
eend $?
|
|
||||||
|
|
||||||
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
|
||||||
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
|
||||||
}
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
AUX automake.patch 435 SHA256 7f7142cbd77469008fe8a8aa54a8a771470811a9be6a2ee3ae65855a43b62a9a SHA512 5dcb3ff62df4356f622ade738c94c89eeda54c45163bede17cc9f465898d1da1ec2a17b454177bfbde673bd271e6e449084f07af8d101f3a9d2e430c442bbd0d WHIRLPOOL c9eba980d56b430680c435e55e4e536b46230f2016a39ef254f6145c7d0dc9dc132c0434242be2296f5ff732b560c263bd3375cd3ae73ce6e92939d74b75ac87
|
AUX automake.patch 435 SHA256 7f7142cbd77469008fe8a8aa54a8a771470811a9be6a2ee3ae65855a43b62a9a SHA512 5dcb3ff62df4356f622ade738c94c89eeda54c45163bede17cc9f465898d1da1ec2a17b454177bfbde673bd271e6e449084f07af8d101f3a9d2e430c442bbd0d WHIRLPOOL c9eba980d56b430680c435e55e4e536b46230f2016a39ef254f6145c7d0dc9dc132c0434242be2296f5ff732b560c263bd3375cd3ae73ce6e92939d74b75ac87
|
||||||
AUX jfsclone-no-return.patch 448 SHA256 70c58ef363b87d7771172d66a2d3862a606427620f7ca6cc8b8c99de9521f92d SHA512 4ca41efb405cafcc072f51a5bf0c43281a909c1ac215b46ab99e2e486f52a41426acb719d9bc60e0ea5b720c76e0d7a9b9f9c9f28bdfd36bc8d8bbcdc626cf96 WHIRLPOOL d62ff0b9b116f15c317116cf30a5251cb38b90d220d466ad5e6401920a8932907be80430f5d97fd4339adc7fa684438a4674dad3173632af9f45855dbfd95caf
|
AUX jfsclone-no-return.patch 448 SHA256 70c58ef363b87d7771172d66a2d3862a606427620f7ca6cc8b8c99de9521f92d SHA512 4ca41efb405cafcc072f51a5bf0c43281a909c1ac215b46ab99e2e486f52a41426acb719d9bc60e0ea5b720c76e0d7a9b9f9c9f28bdfd36bc8d8bbcdc626cf96 WHIRLPOOL d62ff0b9b116f15c317116cf30a5251cb38b90d220d466ad5e6401920a8932907be80430f5d97fd4339adc7fa684438a4674dad3173632af9f45855dbfd95caf
|
||||||
DIST partclone-0.2.69.tar.gz 566531 SHA256 2248b1e0387e9d44c45be091dd3fb29e2f0d079f42023b713e6cc19b54587f55 SHA512 70c5056fe31fbe1099e0f9603efa35ea7729d1af9efab692493a8e3e93b64c4b23c69d943185c62b4574089ed1320aedf67b93fab93c212e048eaaefb0905847 WHIRLPOOL ae33f335e69d7eba1a85a741705fbb93f300da963a9c0871980d3c0971035692c1583f6bb3976ddb145d5d61315e2c0965d1be54bbc776544537d0984d5d8894
|
DIST partclone-0.2.69.tar.gz 566531 SHA256 2248b1e0387e9d44c45be091dd3fb29e2f0d079f42023b713e6cc19b54587f55 SHA512 70c5056fe31fbe1099e0f9603efa35ea7729d1af9efab692493a8e3e93b64c4b23c69d943185c62b4574089ed1320aedf67b93fab93c212e048eaaefb0905847 WHIRLPOOL ae33f335e69d7eba1a85a741705fbb93f300da963a9c0871980d3c0971035692c1583f6bb3976ddb145d5d61315e2c0965d1be54bbc776544537d0984d5d8894
|
||||||
EBUILD partclone-0.2.69.ebuild 2021 SHA256 2cfa980b2f3d6a8567bad316ecda74cb1a26645c866c37309116be54c7a879ee SHA512 16fc1b1c937ac0260b6a0da0e8cc5dbf8a2759c50bffbe9dc1a9b2ddf0bfb97712c7bca736d10769df5faa8f8924b3e51abb83c3f4b4b57b241a7b30989d15ea WHIRLPOOL 149ae3f86438fd0c4426d03a91f745a8c3f6b72cf6f94caf2ec9f48077ba82740bbed9afc832401df3fc4529f9a5d9e3c3b4da1ad27c22e3ffdf9363a1cec04c
|
EBUILD partclone-0.2.69.ebuild 2023 SHA256 719129a8f4b57972201141147f05a8e46a4d833e06ffffaa2d18eea814a7fb5e SHA512 a9b6909498511a682ee89638d75a10aea1de069cc2f6a0afa3815aa823eab5f28d6042b48514164f059cc87dd929e60087f510153182020be1ab6ff24a0742bd WHIRLPOOL 3ad2a0a582f9595b4562cf18b84f5e625444cac14320d82d5792dc621cb8a871dae3ddf2ee7cfc241b931c58a315a39e2fa31a233a5266bb65f314c65e78f0e3
|
||||||
MISC ChangeLog 1751 SHA256 5d9d96ae4d618a2f1a050d00623537181b2ac17ede702c85a324bb004973adb5 SHA512 bc4e888df8ab247f822a5f78ea0d8d1c4edb1d47d359e7bb51bf0678bef6b4f19778530e125ef5f2d7170691802e53fe65d6e1d5f8f82466c0866a66ad649510 WHIRLPOOL 783e19103530f554c487de5e2c8ff85750c9fb80af3dda88c504cfb1e552dbac59f8c4e6454fc3022fe0642f9c105336946b7849197832fb50084851870ccea4
|
MISC ChangeLog 1751 SHA256 5d9d96ae4d618a2f1a050d00623537181b2ac17ede702c85a324bb004973adb5 SHA512 bc4e888df8ab247f822a5f78ea0d8d1c4edb1d47d359e7bb51bf0678bef6b4f19778530e125ef5f2d7170691802e53fe65d6e1d5f8f82466c0866a66ad649510 WHIRLPOOL 783e19103530f554c487de5e2c8ff85750c9fb80af3dda88c504cfb1e552dbac59f8c4e6454fc3022fe0642f9c105336946b7849197832fb50084851870ccea4
|
||||||
MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96
|
MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96
|
||||||
|
|||||||
@ -31,8 +31,8 @@ src_prepare() {
|
|||||||
if [ "${ARCH}" = "arm" ]; then
|
if [ "${ARCH}" = "arm" ]; then
|
||||||
sed -e "s/fail-mbr//g" -i ${S}/Makefile.am
|
sed -e "s/fail-mbr//g" -i ${S}/Makefile.am
|
||||||
fi
|
fi
|
||||||
epatch "${FILESDIR}/automake.patch"
|
#epatch "${FILESDIR}/automake.patch"
|
||||||
epatch "${FILESDIR}/jfsclone-no-return.patch"
|
#epatch "${FILESDIR}/jfsclone-no-return.patch"
|
||||||
eautoreconf
|
eautoreconf
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
|
DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
|
||||||
DIST deblob-check-3.10 565672 SHA256 748df2cf5c1f012f9942948827e57b12bb05c569cae220416b3c0339520d9855 SHA512 341ea8a755c4f1f42ddbc4e7dfe8d786e8b29f497bee3fd72154c8c1c0bcadcb9efff04f2663090bd8741e5b5baafed26a62b9d16c31f3b31665cd3cd3e779d5 WHIRLPOOL 7e6c8eefa9b44e7d50011a9390baf7999533b4016122992c0ac0722cce05dbb8e4b7e96f1f05e9bfdd2ce3e4c08f0e06c8955b68ed8c044ff75f3a314a405824
|
DIST deblob-check-3.14 613747 SHA256 e1d5ced14e38fd415eb5a9a50e180cfdc63b2d0f0350a6d36645b82ef0351304 SHA512 f5901a7c41db34ea3c29e6c6f6fa1afacf4edca1cfad901599b982fd66b5ce3894aa9075b5d15b7a8a6c9694833752fb609d98889b5de39ab59aea7d024a740b WHIRLPOOL 5064bf7423a4703a976b4342da5b3cef65584ee701462e261398170b3e5189036327e114deb15a29ded79541dbe084fa86b08b8c293d4585614ac09f791d7f60
|
||||||
DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
|
DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
|
||||||
DIST patch-3.10.27.xz 519964 SHA256 88ea7b4edb7f84d1806c8063b61a23dd16b87f7ed030c1848c76f3bf54942cb0 SHA512 f6aba104b36e20675f0d1e40ce14e61c0338ab0c194cdf09466b805a0686851bb6d69b4ebef8f6f35e22a4979c7936ea72b908bddbc02514c68ef24fddc28ede WHIRLPOOL ef589dcd100d0e821f69078f9fc59846bd21a066620183f7d7e3cb9e9abfa1f6505fefe0206461f9c6394171cb5f47da80edd5dd85a29b33e533793cbd429783
|
DIST patch-3.14.21.xz 510880 SHA256 5ab01f154f0cb8b9fc9a941617e48b601c964db41c07f86c0f003305ea84e28a SHA512 fc75d0e9313d96438b5eeed677d208eae8953ce79e26904c4f6fe1c4525daa2293abe5bc5b1bb8b173f16122340ff34090a7f0944579c8213b6f5675e3c3d1c2 WHIRLPOOL 36397ddf2ee2126883e0bdc03d68afc0944e2d31f8efe3c8fdb7c191186670ce6b2e6811b8690308ba312c0bc0994addfacfadb1d45d4d93f926704b6b9de71e
|
||||||
DIST sablink-patches-3.10.27-2.tar.xz 2483240 SHA256 601882335b04ad394b83930d7d07eb9cd7904943b93ddd4772f7ddcd9d73dc75 SHA512 6e55d8c135d0f8f1d56a28e5be8c6595e63caa662c6880f4d88bc8e9f11e5603f1b52a1bfd78c01ef3b11c54fc62314e01bff8a74d5f997ab4a0cec6c50c4c13 WHIRLPOOL be2300d9b2bc1eb6baa83aad283c86bedebedee129d62e2e07f5dcda7901ba23c033af87ba6262db0a8a25926317a1543564c8f2c5a07c72a889896709737c97
|
DIST sablink-patches-3.14.21-7.tar.xz 2552004 SHA256 b48b4b0fecb774faebea7b474843ecbcdd406fb43d2d22a19cea9e648ffff3aa SHA512 2272c6301b2eb95eb2c1c3f8d63ba06eeab2ed10f9cd90ef35441a8c434923cef9327482cac4b0cf893bfa0220618c2214adb451bcb7e6049d97cd0ad9951585 WHIRLPOOL 05b70729b44510c9ac3cc011a24366d131da90b2d22f377020bbde416f73620ba543239778f8d31a8ae9d797a86f186588c61fd3196cac801e4a7a9252199d8b
|
||||||
EBUILD go-sources-3.10.27.ebuild 1397 SHA256 01a2ebe7524630c3b11ca8a9db4e2bc4044a266838cd317fb3075572c26e10d0 SHA512 45f2614b843837656d83d31f059a992fd001f5f5eeaa72e936783ef9a0d5f825cd860b36a3aeb917586b3030b8811b83cfa16d9d61ba64b74ab1ad09c88e0a60 WHIRLPOOL 5523242c81bdb2b5dd3481ab94e01943838e14d8aabfbe87ad63f66ed72ba51e75e1cdb3340495666e52514a30c71353b01ced3e53d62fed375d76c885b391a4
|
EBUILD go-sources-3.14.21.ebuild 1397 SHA256 a6b7ea84d443bc7013f80e154bac4d94e470c294468238c87be66cb0d96b74c0 SHA512 f719b8adea692c54b1d62327637e8647494ed562138df80bbfb749dda488ac346cada3f09e90bf3aaa6db07073a89793d73f9ef8f6681acc9bb55916109c0b7e WHIRLPOOL 5d5139619bc52222321ff9558eb5f1d65db0524288850073518c0dd99fb073c8a53235ca0551594bc6cd1215dfba3daee58a97a8d397739680629751fa0f61fb
|
||||||
MISC ChangeLog 14362 SHA256 f670eb9b836c23cad53fbff7297a44a1f0815ebbd80612fb8a39996d50f69e3f SHA512 121b6999e42f9acc49ea65c9dc711bf893c2f6c2389c016fbc9a4852612e05553e96b092b92d739b08b6fc2dc345f23a4234db997e51ae30227c8aa266117088 WHIRLPOOL 77064d09516a6e72446683632be0474c391462662b1e998917cef274b247a70ca6bcbb3c981078949b0d3b762ceb283d84e5b4d6d2535de23bf6331fa05c0e6a
|
MISC ChangeLog 14362 SHA256 f670eb9b836c23cad53fbff7297a44a1f0815ebbd80612fb8a39996d50f69e3f SHA512 121b6999e42f9acc49ea65c9dc711bf893c2f6c2389c016fbc9a4852612e05553e96b092b92d739b08b6fc2dc345f23a4234db997e51ae30227c8aa266117088 WHIRLPOOL 77064d09516a6e72446683632be0474c391462662b1e998917cef274b247a70ca6bcbb3c981078949b0d3b762ceb283d84e5b4d6d2535de23bf6331fa05c0e6a
|
||||||
MISC metadata.xml 324 SHA256 ed912585e62611ca96549ec2e0e0a257d9d278e8b9b8a167b0faa556584c60e8 SHA512 f77007e0d7826383b0109950a4a803739d3d4b32a7ccc57a038b450d397b37a2d48f7bdf7b174616846a60c04a66dd26411cefe69f482bb22f68778433f3b06c WHIRLPOOL 3428057f8256c458540acae55fce03dae1981e8bffcf66cb2f9583a3f0774f803ea6dc079b3bbe951fa55a453907b3e92081666635d002357592e3b5303c37bb
|
MISC metadata.xml 324 SHA256 ed912585e62611ca96549ec2e0e0a257d9d278e8b9b8a167b0faa556584c60e8 SHA512 f77007e0d7826383b0109950a4a803739d3d4b32a7ccc57a038b450d397b37a2d48f7bdf7b174616846a60c04a66dd26411cefe69f482bb22f68778433f3b06c WHIRLPOOL 3428057f8256c458540acae55fce03dae1981e8bffcf66cb2f9583a3f0774f803ea6dc079b3bbe951fa55a453907b3e92081666635d002357592e3b5303c37bb
|
||||||
|
|||||||
@ -8,7 +8,7 @@ K_DEBLOB_AVAILABLE="1"
|
|||||||
K_WANT_GENPATCHES=""
|
K_WANT_GENPATCHES=""
|
||||||
K_GENPATCHES_VER=""
|
K_GENPATCHES_VER=""
|
||||||
|
|
||||||
GOPATCHES_VER="2"
|
GOPATCHES_VER="7"
|
||||||
GOPATCHES="sablink-patches-${PV}-${GOPATCHES_VER}.tar.xz"
|
GOPATCHES="sablink-patches-${PV}-${GOPATCHES_VER}.tar.xz"
|
||||||
GOPATCHES_URI="http://ftp.disconnected-by-peer.at/sablink/sys-kernel/linux-sablink-patches/${GOPATCHES}"
|
GOPATCHES_URI="http://ftp.disconnected-by-peer.at/sablink/sys-kernel/linux-sablink-patches/${GOPATCHES}"
|
||||||
|
|
||||||
@ -1,6 +1,8 @@
|
|||||||
DIST 4567_distro-Gentoo-Kconfig.patch 3073 SHA256 65b3c18bd9b9d0e9bd9ed1e08b06a318ba6cbef4a8ee1c57237dc242142e2e6d SHA512 f9bb932d9c7c772ed456cf59b09fa791ff7f05c775f0ba3208642ac97212f19c29dcc41d5c015616b54e7874a193b2dfcfe6b87c5769c299c946ed6976d4b03f WHIRLPOOL 3813bfd1f26017721503068ea2d0f0ff96cea58bb0d145851b2a190ed80051811c97dc3ed1b1bcaa048e2ccf0d5f3fa2b7423a349c529553eb46d0d5db5ac963
|
DIST 4567_distro-Gentoo-Kconfig.patch 3073 SHA256 65b3c18bd9b9d0e9bd9ed1e08b06a318ba6cbef4a8ee1c57237dc242142e2e6d SHA512 f9bb932d9c7c772ed456cf59b09fa791ff7f05c775f0ba3208642ac97212f19c29dcc41d5c015616b54e7874a193b2dfcfe6b87c5769c299c946ed6976d4b03f WHIRLPOOL 3813bfd1f26017721503068ea2d0f0ff96cea58bb0d145851b2a190ed80051811c97dc3ed1b1bcaa048e2ccf0d5f3fa2b7423a349c529553eb46d0d5db5ac963
|
||||||
DIST linux-ti-omap4_3.5.0-233.49.tar.gz 109232676 SHA256 bd265cfe2490bd01b206afc9f5b14d47fd17e3d6681f4325f302300534c52bbd SHA512 2824881bf27d950879201e789a76f1f2e412e60c2a93ad38d2e2aa76728f2b249ea46df7a4f12e51048c0273068cfd06edc14c177aef96cac8a3ada5731deeb1 WHIRLPOOL 1ad8121c9fcc0f3148edce0974fa3f98e51806ec0d8443209e15022c9084de174d47600e40aabf4da94330d2c7be703bc92b9260029bbf0a6e99993b4c6f311b
|
DIST linux-ti-omap4_3.5.0-233.49.tar.gz 109232676 SHA256 bd265cfe2490bd01b206afc9f5b14d47fd17e3d6681f4325f302300534c52bbd SHA512 2824881bf27d950879201e789a76f1f2e412e60c2a93ad38d2e2aa76728f2b249ea46df7a4f12e51048c0273068cfd06edc14c177aef96cac8a3ada5731deeb1 WHIRLPOOL 1ad8121c9fcc0f3148edce0974fa3f98e51806ec0d8443209e15022c9084de174d47600e40aabf4da94330d2c7be703bc92b9260029bbf0a6e99993b4c6f311b
|
||||||
DIST linux-ti-omap4_3.5.7-235.51.tar.gz 109262678 SHA256 5e93f51da001257747d36f5effffd88ec521dff4c27bf32b8493cba64f2662e1 SHA512 1f39dd36c0baf5d81473cf3abd017e6c2a062e8bc860ada2d1147210c128e68b3e67a9811953b4eec181cf5c3024aac2bd04a4537a2df1cbaf481d48e870d088 WHIRLPOOL 533d0ddad126f7ee4cea190369a6844767955776c0253fa0e06220dce0d2eff270a87f8742f92b0b2fab8a902b5a58bb17904d6f6946ff56bcf8d7ab68b9bae6
|
DIST linux-ti-omap4_3.5.7-235.51.tar.gz 109262678 SHA256 5e93f51da001257747d36f5effffd88ec521dff4c27bf32b8493cba64f2662e1 SHA512 1f39dd36c0baf5d81473cf3abd017e6c2a062e8bc860ada2d1147210c128e68b3e67a9811953b4eec181cf5c3024aac2bd04a4537a2df1cbaf481d48e870d088 WHIRLPOOL 533d0ddad126f7ee4cea190369a6844767955776c0253fa0e06220dce0d2eff270a87f8742f92b0b2fab8a902b5a58bb17904d6f6946ff56bcf8d7ab68b9bae6
|
||||||
|
DIST linux-ti-omap4_3.5.7-242.58.tar.gz 109589622 SHA256 61948a510370459e4eb21d47b3a2542f66126baede3c4c7df955ae831044760c SHA512 d0fcb187dea98e13498f98364ce7cd851b007a719b869aa9de637c4df8f97173188a4f79ae02a7dcd1c0da408ea6003405a072af1d4a6f057245a3422ade1c94 WHIRLPOOL 05f5f1eb2eea63e9b9219c316c32ebf458127b21e9ac0241dd88a049a50f31167d20aef8c56c3a1a1f0a9b85713e5468da50df6f1c1c6e3b4512e69e3c91874d
|
||||||
EBUILD omap4-sources-3.5.0.233.49.ebuild 576 SHA256 4f79f34d01dbd8ab8496b1ec8cffcb237c4e7239c924b3ffa30d45ccabbdfcb3 SHA512 ea9df1b4bab558fa0bc1e3f7e775548f63e7f59985143a2232bccb86d6cca897b85778eb4035330b4b7bf475bbea6f63ed1ba60054b5a3b35367e9ec29a32a8d WHIRLPOOL 8e4c0bfbfa17b4ee04e265dfb77b6a3e7230eb934ea1a0b6ef03c3b69c0ecf861856c79c26306b4b5030a27ff160b259d68c86521ce8a3820ff566f27ac096d9
|
EBUILD omap4-sources-3.5.0.233.49.ebuild 576 SHA256 4f79f34d01dbd8ab8496b1ec8cffcb237c4e7239c924b3ffa30d45ccabbdfcb3 SHA512 ea9df1b4bab558fa0bc1e3f7e775548f63e7f59985143a2232bccb86d6cca897b85778eb4035330b4b7bf475bbea6f63ed1ba60054b5a3b35367e9ec29a32a8d WHIRLPOOL 8e4c0bfbfa17b4ee04e265dfb77b6a3e7230eb934ea1a0b6ef03c3b69c0ecf861856c79c26306b4b5030a27ff160b259d68c86521ce8a3820ff566f27ac096d9
|
||||||
EBUILD omap4-sources-3.5.7.235.51.ebuild 1768 SHA256 d83e814a25a81158df88626a6fbd44f992fda78a2a40ce628a5a1c5eaf58ee38 SHA512 f631ad4068344c5487f06546f472da6d148441798d1325ea39d2f27cc14148e2f47fa8d6e72470f3584565ea262ba0f250e98ea6224b0699e364b7019ec48c04 WHIRLPOOL 22fa4ed4197255f3fd243b780a3556d032acf865ea8ce5680df8bca21d46c00477ee3096726c2d5aa7569853f3c3f4aa70842395f90beee298aa65572bee31c7
|
EBUILD omap4-sources-3.5.7.235.51.ebuild 1768 SHA256 d83e814a25a81158df88626a6fbd44f992fda78a2a40ce628a5a1c5eaf58ee38 SHA512 f631ad4068344c5487f06546f472da6d148441798d1325ea39d2f27cc14148e2f47fa8d6e72470f3584565ea262ba0f250e98ea6224b0699e364b7019ec48c04 WHIRLPOOL 22fa4ed4197255f3fd243b780a3556d032acf865ea8ce5680df8bca21d46c00477ee3096726c2d5aa7569853f3c3f4aa70842395f90beee298aa65572bee31c7
|
||||||
|
EBUILD omap4-sources-3.5.7.242.58.ebuild 1768 SHA256 d83e814a25a81158df88626a6fbd44f992fda78a2a40ce628a5a1c5eaf58ee38 SHA512 f631ad4068344c5487f06546f472da6d148441798d1325ea39d2f27cc14148e2f47fa8d6e72470f3584565ea262ba0f250e98ea6224b0699e364b7019ec48c04 WHIRLPOOL 22fa4ed4197255f3fd243b780a3556d032acf865ea8ce5680df8bca21d46c00477ee3096726c2d5aa7569853f3c3f4aa70842395f90beee298aa65572bee31c7
|
||||||
MISC ChangeLog 541 SHA256 117ca458e2274b6181c64533fcfcfa80f0bf80eacb3b61d66fb84665ac6f46c7 SHA512 3f4591d9d5ecc7a07799513464ebd04e65975b5bf86ab342d5262725232c0447fa2c40a110abd9d3123f37f53afa097f2dedaadfed6732192e5963edc171e872 WHIRLPOOL 9ce5b8f0c9246f89bf3850b95d549133ae391aebdc347963c297d7f3cd807dcfcb2b42a2a682f901fed415c55507867d14da16eb7340f79a3fc499b023f28eca
|
MISC ChangeLog 541 SHA256 117ca458e2274b6181c64533fcfcfa80f0bf80eacb3b61d66fb84665ac6f46c7 SHA512 3f4591d9d5ecc7a07799513464ebd04e65975b5bf86ab342d5262725232c0447fa2c40a110abd9d3123f37f53afa097f2dedaadfed6732192e5963edc171e872 WHIRLPOOL 9ce5b8f0c9246f89bf3850b95d549133ae391aebdc347963c297d7f3cd807dcfcb2b42a2a682f901fed415c55507867d14da16eb7340f79a3fc499b023f28eca
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user