mirror of
https://github.com/archlinux/aur.git
synced 2026-02-19 11:03:49 +01:00
1.0.2i
This commit is contained in:
Schala
parent
da72448b97
commit
9fd082e553
3 changed files with 9 additions and 90 deletions
14
.SRCINFO
14
.SRCINFO
|
|
@ -1,9 +1,9 @@
|
|||
# Generated by mksrcinfo v8
|
||||
# Fri Aug 19 22:09:00 UTC 2016
|
||||
# Fri Sep 23 04:26:33 UTC 2016
|
||||
pkgbase = mingw-w64-openssl
|
||||
pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)
|
||||
pkgver = 1.0.2.h
|
||||
pkgrel = 2
|
||||
pkgver = 1.0.2.i
|
||||
pkgrel = 1
|
||||
url = http://www.openssl.org
|
||||
arch = any
|
||||
license = custom:BSD
|
||||
|
|
@ -14,18 +14,16 @@ pkgbase = mingw-w64-openssl
|
|||
options = !buildflags
|
||||
options = staticlibs
|
||||
options = !emptydirs
|
||||
source = http://www.openssl.org/source/openssl-1.0.2h.tar.gz
|
||||
source = http://www.openssl.org/source/openssl-1.0.2h.tar.gz.asc
|
||||
source = http://www.openssl.org/source/openssl-1.0.2i.tar.gz
|
||||
source = http://www.openssl.org/source/openssl-1.0.2i.tar.gz.asc
|
||||
source = openssl-0.9.6-x509.patch
|
||||
source = openssl-1.0.0a-ldflags.patch
|
||||
source = openssl-1.0.0d-windres.patch
|
||||
source = openssl-1.0.1-x32.patch
|
||||
source = openssl-1.0.2a-parallel-build.patch
|
||||
md5sums = 9392e65072ce4b614c1392eefc1f23d0
|
||||
md5sums = 678374e63f8df456a697d3e5e5a931fb
|
||||
md5sums = SKIP
|
||||
md5sums = 990d027cc82ff8b2acffead24073d43c
|
||||
md5sums = dd616e53eba607f5ab46634f93d5c5a5
|
||||
md5sums = df46ea89a28b0bd18f13b9ab63d1ade3
|
||||
md5sums = 7400927e547cd4c68d2af2fe0b322345
|
||||
md5sums = 7ea5aaac21cee0f89dfb58b03219caaa
|
||||
|
||||
|
|
|
|||
9
PKGBUILD
9
PKGBUILD
|
|
@ -1,9 +1,9 @@
|
|||
# Contributor: ant32 <antreimer@gmail.com>
|
||||
# Contributor: Filip Brcic <brcha@gna.org>
|
||||
pkgname=mingw-w64-openssl
|
||||
_ver=1.0.2h
|
||||
_ver=1.0.2i
|
||||
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)"
|
||||
arch=(any)
|
||||
depends=(mingw-w64-zlib)
|
||||
|
|
@ -14,14 +14,12 @@ url="http://www.openssl.org"
|
|||
source=("http://www.openssl.org/source/openssl-$_ver.tar.gz"{,.asc}
|
||||
"openssl-0.9.6-x509.patch"
|
||||
"openssl-1.0.0a-ldflags.patch"
|
||||
"openssl-1.0.0d-windres.patch"
|
||||
"openssl-1.0.1-x32.patch"
|
||||
"openssl-1.0.2a-parallel-build.patch")
|
||||
md5sums=('9392e65072ce4b614c1392eefc1f23d0'
|
||||
md5sums=('678374e63f8df456a697d3e5e5a931fb'
|
||||
'SKIP'
|
||||
'990d027cc82ff8b2acffead24073d43c'
|
||||
'dd616e53eba607f5ab46634f93d5c5a5'
|
||||
'df46ea89a28b0bd18f13b9ab63d1ade3'
|
||||
'7400927e547cd4c68d2af2fe0b322345'
|
||||
'7ea5aaac21cee0f89dfb58b03219caaa')
|
||||
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
|
||||
|
|
@ -31,7 +29,6 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
|
|||
prepare() {
|
||||
cd openssl-$_ver
|
||||
patch -p1 -i ${srcdir}/openssl-1.0.0a-ldflags.patch
|
||||
patch -p1 -i ${srcdir}/openssl-1.0.0d-windres.patch
|
||||
patch -p1 -i ${srcdir}/openssl-1.0.2a-parallel-build.patch
|
||||
patch -p1 -i ${srcdir}/openssl-1.0.1-x32.patch
|
||||
patch -p1 -i ${srcdir}/openssl-0.9.6-x509.patch
|
||||
|
|
|
|||
|
|
@ -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
|
||||
--- a/Configure 30 Nov 2010 22:19:26 -0000 1.621.2.40
|
||||
+++ b/Configure 4 Jul 2011 23:12:32 -0000
|
||||
@@ -1244,6 +1244,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
|
||||
@@ -1706,12 +1707,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
|
||||
--- a/Makefile.org 27 Jan 2010 16:06:58 -0000 1.295.2.10
|
||||
+++ b/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
|
||||
@@ -207,6 +208,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
|
||||
--- a/Makefile.shared 21 Aug 2010 11:36:49 -0000 1.72.2.4
|
||||
+++ b/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'; \
|
||||
Loading…
Add table
Reference in a new issue