소스 검색

alpine: update to 2.20

New version requires a patch to skip openssl runtime checking when cross-compiling.

Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
Antti Seppälä 10 년 전
부모
커밋
fb65b9d460
2개의 변경된 파일31개의 추가작업 그리고 10개의 파일을 삭제
  1. 2
    10
      mail/alpine/Makefile
  2. 29
    0
      mail/alpine/patches/100-no-openssl-check-cross-compile.patch

+ 2
- 10
mail/alpine/Makefile 파일 보기

@@ -8,12 +8,12 @@
8 8
 include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=alpine
11
-PKG_VERSION:=2.11
11
+PKG_VERSION:=2.20
12 12
 PKG_RELEASE:=1
13 13
 
14 14
 PKG_SOURCE_URL:=http://patches.freeiz.com/alpine/release/src/
15 15
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
16
-PKG_MD5SUM:=a3bba218787691080d706b36215eec06
16
+PKG_MD5SUM:=043b67666af73b26f9627ad97e2aaf92
17 17
 
18 18
 PKG_MAINTAINER:=Antti Seppälä <a.seppala@gmail.com>
19 19
 PKG_LICENSE:=Apache-2.0
@@ -102,14 +102,6 @@ else
102 102
   DISABLE_IPV6:=--without-ipv6
103 103
 endif
104 104
 
105
-define Build/Configure
106
-	$(call Build/Configure/Default)
107
-	( cd $(PKG_BUILD_DIR)/regex ; \
108
-		make ; \
109
-	)
110
-	$(call Build/Configure/Default)
111
-endef
112
-
113 105
 define Build/Compile
114 106
 	( cd $(PKG_BUILD_DIR)/pith ; \
115 107
 		$(HOSTCC) help_h_gen.c -c -o help_h_gen.o ; \

+ 29
- 0
mail/alpine/patches/100-no-openssl-check-cross-compile.patch 파일 보기

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