mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
putty, bump version, remove old bep/patch file (#1315)
This commit is contained in:
committed by
Scott McCreary
parent
5198c0a8ef
commit
6cd11a9512
@@ -1,24 +0,0 @@
|
||||
diff -urN putty-0.60/unix/configure.ac putty-0.60-haiku/unix/configure.ac
|
||||
--- putty-0.60/unix/configure.ac 2009-02-07 20:49:11.000000000 +0000
|
||||
+++ putty-0.60-haiku/unix/configure.ac 2009-02-07 21:50:05.000000000 +0000
|
||||
@@ -14,14 +14,16 @@
|
||||
CFLAGS="$CFLAGS -Wall -Werror"
|
||||
fi
|
||||
|
||||
-AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[
|
||||
-#include <sys/types.h>
|
||||
-#include <utmp.h>])
|
||||
+AC_CHECK_HEADERS([utmpx.h])
|
||||
+AC_CHECK_HEADERS([sys/select.h])
|
||||
+AC_CHECK_HEADERS([sys/types.h])
|
||||
+AC_CHECK_HEADERS([utmp.h])
|
||||
|
||||
-AM_PATH_GTK([1.2.0], [all_targets="all-cli all-gtk"], [all_targets="all-cli"])
|
||||
+#AM_PATH_GTK([1.2.0], [all_targets="all-cli all-gtk"], [all_targets="all-cli"])
|
||||
AC_SUBST([all_targets])
|
||||
|
||||
AC_SEARCH_LIBS([socket], [xnet])
|
||||
+AC_CHECK_LIB([network], [socket])
|
||||
|
||||
AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
|
||||
|
||||
72
net-misc/putty/patches/putty-0.69.patchset
Normal file
72
net-misc/putty/patches/putty-0.69.patchset
Normal file
@@ -0,0 +1,72 @@
|
||||
From 6a0b613dbc6a2c13e34c5b3641a22ef779d65747 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Tue, 2 May 2017 17:36:02 +0200
|
||||
Subject: fix build, fix gcc2 parse errors
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 540cb64..7457342 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -141,6 +141,7 @@ if test "$gtk" = "2" -o "$gtk" = "3"; then
|
||||
fi
|
||||
|
||||
AC_SEARCH_LIBS([socket], [xnet])
|
||||
+AC_CHECK_LIB([network], [socket])
|
||||
|
||||
AS_IF([test "x$with_gssapi" != xno],
|
||||
[AC_SEARCH_LIBS(
|
||||
@@ -185,7 +186,7 @@ AS_IF([test AS_VAR_GET(x_cv_linux_so_peercred) = yes],
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
:
|
||||
- AC_SUBST(WARNINGOPTS, ['-Wall -Werror'])
|
||||
+ AC_SUBST(WARNINGOPTS, ['-Wall'])
|
||||
else
|
||||
:
|
||||
AC_SUBST(WARNINGOPTS, [])
|
||||
diff --git a/unix/uxnet.c b/unix/uxnet.c
|
||||
index 79f4fbc..8be48e2 100644
|
||||
--- a/unix/uxnet.c
|
||||
+++ b/unix/uxnet.c
|
||||
@@ -1518,12 +1518,14 @@ static char *sk_tcp_peer_info(Socket sock)
|
||||
char uidbuf[64], gidbuf[64];
|
||||
sprintf(uidbuf, "%d", uid);
|
||||
sprintf(gidbuf, "%d", gid);
|
||||
- struct passwd *pw = getpwuid(uid);
|
||||
+ {
|
||||
+ struct passwd *pw = getpwuid(uid);
|
||||
struct group *gr = getgrgid(gid);
|
||||
return dupprintf("pid %d (%s:%s)", pid,
|
||||
pw ? pw->pw_name : uidbuf,
|
||||
gr ? gr->gr_name : gidbuf);
|
||||
}
|
||||
+ }
|
||||
return NULL;
|
||||
} else {
|
||||
return NULL;
|
||||
diff --git a/unix/uxstore.c b/unix/uxstore.c
|
||||
index 1580178..3666531 100644
|
||||
--- a/unix/uxstore.c
|
||||
+++ b/unix/uxstore.c
|
||||
@@ -767,7 +767,8 @@ void write_random_seed(void *data, int len)
|
||||
sfree(fname);
|
||||
return;
|
||||
}
|
||||
- char *dir, *errmsg;
|
||||
+ {
|
||||
+ char *dir, *errmsg;
|
||||
|
||||
dir = make_filename(INDEX_DIR, NULL);
|
||||
if ((errmsg = make_dir_path(dir, 0700)) != NULL) {
|
||||
@@ -802,6 +803,7 @@ void write_random_seed(void *data, int len)
|
||||
close(fd);
|
||||
sfree(fname);
|
||||
}
|
||||
+}
|
||||
|
||||
void cleanup_all(void)
|
||||
{
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
DESCRIPTION="PuTTY is a free implementation of Telnet and SSH"
|
||||
HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
|
||||
SOURCE_URI="http://the.earth.li/~sgtatham/putty/latest/putty-0.60.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="broken"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5="07e65fd98b16d115ae38a180bfb242e2"
|
||||
BUILD()
|
||||
{
|
||||
cd putty-0.60/unix
|
||||
autoconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make all-cli
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd putty-0.60/unix
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="MIT"
|
||||
COPYRIGHT="1997-2007 Simon Tatham et al."
|
||||
55
net-misc/putty/putty-0.69.recipe
Normal file
55
net-misc/putty/putty-0.69.recipe
Normal file
@@ -0,0 +1,55 @@
|
||||
SUMMARY="A Free Telnet/SSH Client"
|
||||
DESCRIPTION="PPuTTY is a free implementation of SSH and Telnet for Windows \
|
||||
and Unix platforms, along with an xterm terminal emulator.\
|
||||
LEGAL WARNING: Use of PuTTY, PSCP, PSFTP and Plink is illegal in countries \
|
||||
where encryption is outlawed. We believe it is legal to use PuTTY, PSCP, \
|
||||
PSFTP and Plink in England and Wales and in many other countries, but we \
|
||||
are not lawyers, and so if in doubt you should seek legal advice before \
|
||||
downloading it. You may find useful information at cryptolaw.org, which \
|
||||
collects information on cryptography laws in many countries, but we can't \
|
||||
vouch for its correctness. \
|
||||
Use of the Telnet-only binary (PuTTYtel) is unrestricted by any \
|
||||
cryptography laws."
|
||||
HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
|
||||
COPYRIGHT="1997-2017 Simon Tatham et al."
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://the.earth.li/~sgtatham/putty/latest/putty-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1"
|
||||
PATCHES="putty-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
putty
|
||||
cmd:plink
|
||||
cmd:pscp
|
||||
cmd:psftp
|
||||
cmd:puttygen
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:gcc
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf
|
||||
./configure --bindir=$binDir --mandir=$manDir
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
Reference in New Issue
Block a user