diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-20 14:03:39 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-20 14:03:39 +0000 |
| commit | 2025a625e69398c4a81942971a893e11a9b31a51 (patch) | |
| tree | 97cf160ca42c69e8714715d7fe23a746f7b467a9 /main | |
| parent | 3a7ce65edc5837db91835bcddb371802a8d65904 (diff) | |
main/openssh: fix build against musl
Diffstat (limited to 'main')
| -rw-r--r-- | main/openssh/APKBUILD | 11 | ||||
| -rw-r--r-- | main/openssh/openssh-fix-includes.diff | 12 | ||||
| -rw-r--r-- | main/openssh/openssh-fix-utmp.diff | 21 |
3 files changed, 43 insertions, 1 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index db9b448d216..bfa39182b2c 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -2,7 +2,7 @@ pkgname=openssh pkgver=6.3_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=1 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -14,6 +14,8 @@ source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar. openssh6.2-dynwindows.diff openssh-peaktput.diff openssh-hmac-accel.diff + openssh-fix-includes.diff + openssh-fix-utmp.diff sshd.initd sshd.confd " @@ -22,6 +24,7 @@ source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar. _builddir="$srcdir"/$pkgname-$_myver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case "$i" in *.diff.gz) @@ -103,17 +106,23 @@ md5sums="225e75c9856f76011966013163784038 openssh-6.3p1.tar.gz 2306a0f6ba8915c02c533e7bf6e64fe8 openssh6.2-dynwindows.diff 77da1e0dd9bfe98a9c84747e7e3dc7b3 openssh-peaktput.diff c65d454dc5b149647273485fc184636d openssh-hmac-accel.diff +7c86680602f7ad71b0773d9e98a30d73 openssh-fix-includes.diff +f7d9d6f96940ef66bd3c3a0aa27e57a7 openssh-fix-utmp.diff cb0dd08c413fad346f0c594107b4a2e0 sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" sha256sums="aea575ededd3ebd45c05d42d0a87af22c79131a847ea440c54e3fdd223f5a420 openssh-6.3p1.tar.gz 4f78f16807c6b6a3a3773c000b85df0c56ea8a93dc35eaa6bbdffe6e30328e58 openssh6.2-dynwindows.diff 6e803be3b3569eedfe69d9e9aeabef2e3fec2ed28f75bc456dfd69c2ef2c8198 openssh-peaktput.diff 902ea83a9ef726f32b096280da0f1b722f4372886c65c4e28985ee57e725d95c openssh-hmac-accel.diff +c3189ba0e17e60e83851ac2d6f18ad5b08cb90cccfce31d61cccb9fd76d44d59 openssh-fix-includes.diff +f2748da45d0bc31055727f8c80d93e1872cc043ced3202e2f6d150aca3c08dde openssh-fix-utmp.diff 3fa062fd4bfac64abf21f3c1d0548f1dfcf3c6e56e84ece14c848f53a293024e sshd.initd 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 sshd.confd" sha512sums="9ae0d11b7305739345e84adbf9dae769705ff93b3d3c3ccd9b7fb887a69716518bee931fd698f2c67087ae75281a25bcfd72220cbac1c751715d540d208a6a9a openssh-6.3p1.tar.gz 773cc0629e17a8f78e82be56e579855ea9b3ca8fd26360964aee854d717a7cfc2c9d4d654cf0fda5723c3aabe96e48ee2cfe6d1fd64b5717f0ef5eb997d00293 openssh6.2-dynwindows.diff 64f5aff3fc1a0d2f7c65ea875d1c2c4d98a3d305ff2677d9d4ca82f20778df9e317b1bfc428cee2b0df1bfa01a65dfcf83b68435a227a23a2cf3400fef35d656 openssh-peaktput.diff aaa128126400171d0755038a846672aa7b1e87340edf73a672962d403abf404ef1821466b17da51dde25f04ec7533ae4a653399ccc912ea9c4a7b1a14032e76f openssh-hmac-accel.diff +70e2c6613ab77ec379e03ddf029c1c38e5d852bb225db40ceaa63e642d58b0261fa7c954b288710736bb1dc71f8057f2598ea0d1f5b1214135fa5e9541d5f05a openssh-fix-includes.diff +cc909f68d9da1b264926973b96d36162b5c588299c98d62f526faf2ef1273d98bb8d8dea4d482770a2aef88bcbf15fa61144401aef9ab916c15e1623bcf449b5 openssh-fix-utmp.diff 1483e2bcd700da9b02f04508d490b472c816344787bf1675fef2f7e27f72b91e4323e4e8c1db701e47d81d37d6d4b0623eaeac46b2cf589ae5ad69f363baa594 sshd.initd b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 sshd.confd" diff --git a/main/openssh/openssh-fix-includes.diff b/main/openssh/openssh-fix-includes.diff new file mode 100644 index 00000000000..33c0f8a2fee --- /dev/null +++ b/main/openssh/openssh-fix-includes.diff @@ -0,0 +1,12 @@ +--- openssh-6.2p2/includes.h.orig ++++ openssh-6.2p2/includes.h +@@ -21,6 +21,8 @@ + #define _GNU_SOURCE /* activate extra prototypes for glibc */ + + #include <sys/types.h> ++#include <sys/param.h> ++#include <sys/time.h> + #include <sys/socket.h> /* For CMSG_* */ + + #ifdef HAVE_LIMITS_H + diff --git a/main/openssh/openssh-fix-utmp.diff b/main/openssh/openssh-fix-utmp.diff new file mode 100644 index 00000000000..6bfe49df65d --- /dev/null +++ b/main/openssh/openssh-fix-utmp.diff @@ -0,0 +1,21 @@ +--- openssh-6.2p2/loginrec.c.orig ++++ openssh-6.2p2/loginrec.c +@@ -784,12 +784,12 @@ + /* this is just a 128-bit IPv6 address */ + if (li->hostaddr.sa.sa_family == AF_INET6) { + sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa); +- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16); ++ memcpy(utx->ut_addr_v6, sa6->sin6_addr.s6_addr, 16); + if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) { +- ut->ut_addr_v6[0] = ut->ut_addr_v6[3]; +- ut->ut_addr_v6[1] = 0; +- ut->ut_addr_v6[2] = 0; +- ut->ut_addr_v6[3] = 0; ++ utx->ut_addr_v6[0] = utx->ut_addr_v6[3]; ++ utx->ut_addr_v6[1] = 0; ++ utx->ut_addr_v6[2] = 0; ++ utx->ut_addr_v6[3] = 0; + } + } + # endif + |