From 2a36ba9cfb88e2f69b2a0970119e915e45a2d25d Mon Sep 17 00:00:00 2001 From: Tomasz Kazimierz Motyl Date: Mon, 8 Oct 2018 15:45:43 +0000 Subject: [PATCH 1/2] Update of the p6-zef --- p6-zef/Makefile | 14 ++++++++------ p6-zef/distinfo | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/p6-zef/Makefile b/p6-zef/Makefile index 5fe829af661..9ec738e5729 100644 --- a/p6-zef/Makefile +++ b/p6-zef/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ GITHUB_PROJECT= zef -GITHUB_TAG= v0.1.26 +GITHUB_TAG= v0.4.6 DISTNAME= zef-${GITHUB_TAG:S/v//} CATEGORIES= wip MASTER_SITES= ${MASTER_SITE_GITHUB:=ugexe/} @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/ugexe/zef/ COMMENT= Perl 6 module manager LICENSE= artistic -WRKSRC= ${WRKDIR}/zef-0.1.26 +WRKSRC= ${WRKDIR}/zef-0.4.6 USE_LANGUAGES= # none USE_TOOLS+= gtar EXTRACT_USING= gtar @@ -22,14 +22,16 @@ CHECK_INTERPRETER_SKIP+= share/perl6/site/bin/zef-j ZEF= ${PREFIX}/bin/perl6 -I${WRKSRC}/lib ${WRKSRC}/bin/zef do-build: - cd ${WRKSRC} && ${ZEF} build . --debug + echo "Build of ZEF no longer needed skipping" +# cd ${WRKSRC} && ${ZEF} build . --debug do-install: - cd ${WRKSRC} && ${ZEF} --to='inst#${DESTDIR}${PREFIX}/share/perl6/site' --force --debug install . + cd ${WRKSRC} && perl6 -I. bin/zef install . + #cd ${WRKSRC} && ${ZEF} --to='inst#${DESTDIR}${PREFIX}/share/perl6/site' --force --debug install . ${RM} -f ${DESTDIR}${PREFIX}/share/perl6/site/precomp/.lock - ${RM} -f ${DESTDIR}${PREFIX}/share/perl6/site/repo.lock + #${RM} -f ${DESTDIR}${PREFIX}/share/perl6/site/repo.lock ${RM} -f ${DESTDIR}${PREFIX}/share/perl6/site/version - cd ${DESTDIR}${PREFIX} && mkdir bin && ${LN} -s ../share/perl6/site/bin/zef bin/zef + cd ${DESTDIR}${PREFIX} && mkdir bin && ${LN} -fs ../share/perl6/site/bin/zef bin/zef .include "../../lang/rakudo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/p6-zef/distinfo b/p6-zef/distinfo index 15cae900bfe..99f00cd3c94 100644 --- a/p6-zef/distinfo +++ b/p6-zef/distinfo @@ -1,6 +1,6 @@ $NetBSD$ -SHA1 (zef-0.1.26.tar.gz) = 9ed56df820d5df8db24e4d254216cbb49d35ecf3 -RMD160 (zef-0.1.26.tar.gz) = 5a8c807a67d43ef6a6449288a990757e12876634 -SHA512 (zef-0.1.26.tar.gz) = c326065150254d4c348aad8f87f4d4da90043084716552539ee44c46da80651065ab71d93d13605e47923288c8dff2ef325b505048f1ea5b5feaac095184e505 -Size (zef-0.1.26.tar.gz) = 59699 bytes +SHA1 (zef-0.4.6.tar.gz) = bcc31c0f448184c7d17b6eac6ae9692655a14bb7 +RMD160 (zef-0.4.6.tar.gz) = 912e2f43156a73be8e8f3201702b3d00904b41fb +SHA512 (zef-0.4.6.tar.gz) = b6d9a296699ad059dfaf58d5dde8ddb32df84289c5da4d3a9885ea352a08b1a0dffa76ff78a8c10a29263a7f5c59d633d3376a2629a1f53a658fb7b199347e0d +Size (zef-0.4.6.tar.gz) = 62005 bytes From 1ee03f867428e8726403383aa8fa613e1aa702ca Mon Sep 17 00:00:00 2001 From: Tomasz Kazimierz Motyl Date: Mon, 8 Oct 2018 16:31:08 +0000 Subject: [PATCH 2/2] Corrected NetBSD port --- torsocks-git/Makefile | 6 +++- torsocks-git/PLIST | 22 ++++++------- torsocks-git/distinfo | 5 +++ torsocks-git/patches/patch-configure.ac | 13 ++++++++ torsocks-git/patches/patch-src_lib_accept.c | 13 ++++++++ torsocks-git/patches/patch-src_lib_torsocks.h | 33 +++++++++++++++++++ 6 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 torsocks-git/distinfo create mode 100644 torsocks-git/patches/patch-configure.ac create mode 100644 torsocks-git/patches/patch-src_lib_accept.c create mode 100644 torsocks-git/patches/patch-src_lib_torsocks.h diff --git a/torsocks-git/Makefile b/torsocks-git/Makefile index 87d4e7a26b1..b54b8423b78 100644 --- a/torsocks-git/Makefile +++ b/torsocks-git/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2015/05/24 13:55:43 i3enedek Exp $ +# $NetBSD: Makefile,v 1.5 2018/08/13 13:55:43 i3enedek, tmotyl Exp $ +TORSOCKS_VERSION = 0 DISTNAME= torsocks +PKGNAME= torsocks-${TORSOCKS_VERSION} CATEGORIES= net security MAINTAINER= pkgsrc-users@NetBSD.org @@ -42,6 +44,8 @@ SUBST_MESSAGE.lib= Fixing src/lib/torsocks.h SUBST_FILES.lib= src/lib/torsocks.h SUBST_SED.lib= -e '/LIBC_GETHOSTBYADDR_SIG/ s/const void \*addr/const char *addr/' .endif +PKG_ARGS_ADD += -v +PKGBASE_FROM_BSD_MK = ${PKGNAME:C/-[^-]*$//} pre-configure: cd ${WRKSRC} && autoreconf -fiv diff --git a/torsocks-git/PLIST b/torsocks-git/PLIST index 0addcfbbe9f..287a079674b 100644 --- a/torsocks-git/PLIST +++ b/torsocks-git/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.3 2014/08/15 20:59:39 leot1990 Exp $ -bin/torsocks -etc/tor/torsocks.conf -lib/torsocks/libtorsocks.la -man/man1/torsocks.1 -man/man5/torsocks.conf.5 -man/man8/torsocks.8 -share/doc/torsocks/ChangeLog -share/doc/torsocks/DEBUG -share/doc/torsocks/SOCKS5 -share/doc/torsocks/socks-extensions.txt +@comment $NetBSD$ +bin/${PKGNAME} +etc/tor/${PKGNAME}.conf +lib/${PKGNAME}/lib${PKGNAME}.la +man/man1/${PKGNAME}.1 +man/man5/${PKGNAME}.conf.5 +man/man8/${PKGNAME}.8 +share/doc/${PKGNAME}/ChangeLog +share/doc/${PKGNAME}/DEBUG +share/doc/${PKGNAME}/SOCKS5 +share/doc/${PKGNAME}/socks-extensions.txt diff --git a/torsocks-git/distinfo b/torsocks-git/distinfo new file mode 100644 index 00000000000..c181fcef1f1 --- /dev/null +++ b/torsocks-git/distinfo @@ -0,0 +1,5 @@ +$NetBSD$ + +SHA1 (patch-configure.ac) = 97b6239a07a0090ac18bd98db3351f4b6850d4c2 +SHA1 (patch-src_lib_accept.c) = 4b56eafc8ab87a93bf53e6df628258226cd514de +SHA1 (patch-src_lib_torsocks.h) = 1b876b023bec6cc2b6758a9c3bf741d493e758c8 diff --git a/torsocks-git/patches/patch-configure.ac b/torsocks-git/patches/patch-configure.ac new file mode 100644 index 00000000000..64405b70018 --- /dev/null +++ b/torsocks-git/patches/patch-configure.ac @@ -0,0 +1,13 @@ +$NetBSD$ + +--- configure.ac.orig 2018-10-08 16:14:24.525273866 +0000 ++++ configure.ac +@@ -124,7 +124,7 @@ AS_CASE([$host_os], + [linux*|kfreebsd*-gnu|freebsd*], + [ + libc_name=`ldd /usr/bin/yes | grep 'libc\.' | cut -d ' ' -f 1 | tr -d '\t'` +- if test "${libc_name}" == ""; then ++ if test "${libc_name}" = ""; then + # Default libc on most system. + libc_name="libc.so.6" + fi diff --git a/torsocks-git/patches/patch-src_lib_accept.c b/torsocks-git/patches/patch-src_lib_accept.c new file mode 100644 index 00000000000..cfb50eb9525 --- /dev/null +++ b/torsocks-git/patches/patch-src_lib_accept.c @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/lib/accept.c.orig 2018-10-08 16:15:36.361359954 +0000 ++++ src/lib/accept.c +@@ -87,7 +87,7 @@ LIBC_ACCEPT_DECL + return tsocks_accept(LIBC_ACCEPT_ARGS); + } + +-#if (defined(__linux__)) ++#if (defined(__linux__) || defined(__NetBSD__)) + + TSOCKS_LIBC_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) + diff --git a/torsocks-git/patches/patch-src_lib_torsocks.h b/torsocks-git/patches/patch-src_lib_torsocks.h new file mode 100644 index 00000000000..cceb1abfd12 --- /dev/null +++ b/torsocks-git/patches/patch-src_lib_torsocks.h @@ -0,0 +1,33 @@ +$NetBSD$ + +--- src/lib/torsocks.h.orig 2018-10-08 16:16:47.830610306 +0000 ++++ src/lib/torsocks.h +@@ -242,6 +242,9 @@ struct hostent **result, int *h_errnop + #define LIBC_SYSCALL_SIG long int number, ... + #define LIBC_SYSCALL_ARGS number + ++#endif /* __linux__ */ ++ ++#if defined(__linux__) || defined(__NetBSD__) + /* accept4(2) */ + #define LIBC_ACCEPT4_NAME accept4 + #define LIBC_ACCEPT4_NAME_STR XSTR(LIBC_ACCEPT4_NAME) +@@ -249,8 +252,8 @@ struct hostent **result, int *h_errnop + #define LIBC_ACCEPT4_SIG \ + int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags + #define LIBC_ACCEPT4_ARGS sockfd, addr, addrlen, flags ++#endif + +-#endif /* __linux__ */ + + #if (defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) + +@@ -414,7 +417,7 @@ TSOCKS_DECL(accept, LIBC_ACCEPT_RET_TYPE + LIBC_ACCEPT_NAME(LIBC_ACCEPT_SIG) + + /* accept4(2) */ +-#if (defined(__linux__)) ++#if (defined(__linux__) || defined(__NetBSD__)) + extern TSOCKS_LIBC_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) + TSOCKS_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) + #define LIBC_ACCEPT4_DECL LIBC_ACCEPT4_RET_TYPE \