1
0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-20 07:38:40 +02:00

Merge pull request #5825 from neheb/alpine

alpine: Update to 2.21.999 and update URLS
This commit is contained in:
Hannu Nyman 2018-06-13 20:58:01 +03:00 committed by GitHub
commit 996773d366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 33 deletions

View File

@ -8,17 +8,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=alpine
PKG_VERSION:=2.20
PKG_RELEASE:=2
PKG_VERSION:=2.21.999
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://patches.freeiz.com/alpine/release/src/
PKG_SOURCE_PROTO:=git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227
PKG_SOURCE_URL:=http://repo.or.cz/alpine.git
PKG_SOURCE_VERSION:=349642a84039a4b026513c32a3b4f8594acd50df
PKG_MIRROR_HASH:=8db14c4ae14329a7cffc8ea5099b7fa5c7adf79ca03893b23b1a8c45b847e5af
PKG_MAINTAINER:=Antti Seppälä <a.seppala@gmail.com>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

View File

@ -1,29 +0,0 @@
diff -Nru alpine-2.20-orig/configure alpine-2.20/configure
--- alpine-2.20-orig/configure 2015-01-18 09:00:42.100645053 +0200
+++ alpine-2.20/configure 2015-01-25 12:01:11.831015443 +0200
@@ -17643,10 +17643,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.1c" >&5
$as_echo_n "checking Openssl library version >= 1.0.1c... " >&6; }
if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
diff -Nru alpine-2.20-orig/configure.ac alpine-2.20/configure.ac
--- alpine-2.20-orig/configure.ac 2015-01-18 08:38:08.893495949 +0200
+++ alpine-2.20/configure.ac 2015-01-25 12:01:02.773015236 +0200
@@ -1370,7 +1370,8 @@
}
]])],
[ AC_MSG_RESULT(yes) ],
- [ alpine_SSLTYPE="none" ])
+ [ alpine_SSLTYPE="none" ],
+ [ AC_MSG_WARN([cross compiling: not checking])])
if test "x$alpine_SSLTYPE" = "xnone" ; then
AC_MSG_ERROR(Install openssl version >= 1.0.1c)