diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 12:27:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 12:32:00 +0000 |
| commit | c38e2a8013d5b57d6c89d6e9dbc2b6e496618b52 (patch) | |
| tree | 330e2b0b3e6ec115322276b165846fa980215484 | |
| parent | 4bb4629073a637a0ad261d76f13f34ab6c8c6555 (diff) | |
| download | aports-c38e2a8013d5b57d6c89d6e9dbc2b6e496618b52.tar.bz2 aports-c38e2a8013d5b57d6c89d6e9dbc2b6e496618b52.tar.xz | |
main/alpine: build fix. underlinking of libcrypt and libcrypto
| -rw-r--r-- | main/alpine/APKBUILD | 15 | ||||
| -rw-r--r-- | main/alpine/libcrypt-underlinking.patch | 11 | ||||
| -rw-r--r-- | main/alpine/libcrypto-underlinking.patch | 11 |
3 files changed, 33 insertions, 4 deletions
diff --git a/main/alpine/APKBUILD b/main/alpine/APKBUILD index cc2204a354..a0de072be7 100644 --- a/main/alpine/APKBUILD +++ b/main/alpine/APKBUILD @@ -3,17 +3,21 @@ pkgname=alpine pkgver=2.00_p84 _ver=${pkgver%_p*} _pver=${pkgver##*_p} -pkgrel=1 +pkgrel=2 pkgdesc="Text-based email client, friendly for novices but powerful" url="http://www.washington.edu/alpine/" arch="all" license="APACHE" depends="" -makedepends="openldap-dev heimdal-dev ncurses-dev openssl-dev" +makedepends="openldap-dev heimdal-dev ncurses-dev openssl-dev + automake autoconf libtool" subpackages="$pkgname-doc" source="ftp://ftp.cac.washington.edu/alpine/alpine.tar.bz2 all_p84.patch - CVE-2008-5514.patch" + CVE-2008-5514.patch + libcrypt-underlinking.patch + libcrypto-underlinking.patch + " _builddir="$srcdir"/$pkgname-$_ver prepare() { @@ -26,6 +30,7 @@ prepare() { ;; esac done + libtoolize --force && aclocal -I m4 && autoconf && automake || return 1 } build() { @@ -46,4 +51,6 @@ package() { md5sums="84e44cbf71ed674800a5d57eed9c1c52 alpine.tar.bz2 785cea92b11d6655c183f3379468a643 all_p84.patch -1b52a54a656979116c09fb1d948a4325 CVE-2008-5514.patch" +1b52a54a656979116c09fb1d948a4325 CVE-2008-5514.patch +c0afe83884124c8945db376e91863a83 libcrypt-underlinking.patch +1db0d3aad97a0e11c6910234a802264c libcrypto-underlinking.patch" diff --git a/main/alpine/libcrypt-underlinking.patch b/main/alpine/libcrypt-underlinking.patch new file mode 100644 index 0000000000..b6c7836c07 --- /dev/null +++ b/main/alpine/libcrypt-underlinking.patch @@ -0,0 +1,11 @@ +--- ./alpine/Makefile.am.orig ++++ ./alpine/Makefile.am +@@ -35,7 +35,7 @@ + LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \ + ../pith/libpith.a ../pith/osdep/libpithosd.a \ + ../pith/charconv/libpithcc.a \ +- osdep/libpineosd.a ../c-client/c-client.a ++ osdep/libpineosd.a ../c-client/c-client.a -lcrypt + + AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -DLOCALEDIR=\"$(localedir)\" + diff --git a/main/alpine/libcrypto-underlinking.patch b/main/alpine/libcrypto-underlinking.patch new file mode 100644 index 0000000000..5007f7ead3 --- /dev/null +++ b/main/alpine/libcrypto-underlinking.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.orig ++++ ./configure.ac +@@ -954,7 +954,7 @@ + if test "x$alpine_SSLTYPE" != "xnone" ; then + AC_SEARCH_LIBS(SSL_library_init,ssl, + [ +- LIBS="$LIBS -lssl" ++ LIBS="$LIBS -lssl -lcrypto" + ]) + if test "x$alpine_SSLTYPE" = "xnone" ; then + AC_MSG_NOTICE([OpenSSL libraries NOT found]) |