Update to netatalk-3.1.14.

This commit is contained in:
ajacoutot 2023-01-13 09:11:04 +00:00
parent c34ec940b3
commit b1d01b65f7
8 changed files with 5 additions and 90 deletions

View File

@ -1,18 +1,10 @@
COMMENT= AFP file and print services for IP networks
V= 3.1.13
V= 3.1.14
DISTNAME= netatalk-${V}
EXTRACT_SUFX= .tar.bz2
PKGSPEC= netatalk->=3,<4
EPOCH= 0
REVISION= 2
# https://github.com/Netatalk/Netatalk/pull/174
MASTER_SITES0= https://src.fedoraproject.org/rpms/netatalk/raw/rawhide/f/
PATCHFILES= netatalk_add_entry.patch:0
PATCH_DIST_STRIP= -p1
SHARED_LIBS += atalk 16.0 # 18.0
CATEGORIES= net
@ -29,7 +21,7 @@ WANTLIB += event_core event_extra ffi gcrypt gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gpg-error gthread-2.0 iconv intl pcre2-8 pthread
WANTLIB += tdb execinfo
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
MASTER_SITES= https://github.com/Netatalk/Netatalk/releases/download/netatalk-${V:S/./-/g}/
MODULES= lang/python

View File

@ -1,4 +1,2 @@
SHA256 (netatalk-3.1.13.tar.bz2) = ia2mvP4bOa2U9YwjZlTR2UTyZFw+femLM3TgvTfV4F0=
SHA256 (netatalk_add_entry.patch) = y98S2iNpKAFZZ645Qx0PXOhG2bb/wOOA2vrJBdbxiGE=
SIZE (netatalk-3.1.13.tar.bz2) = 1218394
SIZE (netatalk_add_entry.patch) = 34415
SHA256 (netatalk-3.1.14.tar.gz) = J8wEwGvFmohj3sDeLtwbdDjV3ZgQMbqIv1+lZzT884c=
SIZE (netatalk-3.1.14.tar.gz) = 1800211

View File

@ -1,17 +0,0 @@
From d2262267537fbe301e218901656b582f021bf67f Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Wed, 12 Dec 2018 10:19:29 -0600
Subject: [PATCH] make afpstats python 3 compatible
Index: contrib/shell_utils/afpstats
--- contrib/shell_utils/afpstats.orig
+++ contrib/shell_utils/afpstats
@@ -23,7 +23,7 @@ def main():
reply = iface.GetUsers()
for name in reply:
- print name
+ print(name)
if __name__ == '__main__':
main()

View File

@ -1,21 +0,0 @@
Index: contrib/shell_utils/asip-status.pl.in
--- contrib/shell_utils/asip-status.pl.in.orig
+++ contrib/shell_utils/asip-status.pl.in
@@ -20,7 +20,7 @@
#
use strict;
-use IO::Socket::INET6; # sucks because Timeout doesn't
+use IO::Socket::IP; # sucks because Timeout doesn't
my ($arg);
my ($hostport);
@@ -137,7 +137,7 @@ sub sendpacket
print "opening $host:$port\n" if ($main::debug);
- my ($asip_sock) = IO::Socket::INET6->new(
+ my ($asip_sock) = IO::Socket::IP->new(
Domain => $main::ipv,
PeerAddr => $host,
PeerPort => $port,

View File

@ -1,12 +0,0 @@
Index: doc/manpages/man1/asip-status.pl.1.xml
--- doc/manpages/man1/asip-status.pl.1.xml.orig
+++ doc/manpages/man1/asip-status.pl.1.xml
@@ -75,7 +75,7 @@
supports both IPv4 and IPv6. It's decided by your system which IP version
to use. You can use -4 or -6 option to specify IP version.</para>
- <note><para><command>asip-status.pl</command> requires IO::Socket::INET6
+ <note><para><command>asip-status.pl</command> requires IO::Socket::IP
module.</para></note>
</refsect1>

View File

@ -3,7 +3,7 @@ Pick-up libevent2 from LOCALBASE.
Index: etc/netatalk/Makefile.in
--- etc/netatalk/Makefile.in.orig
+++ etc/netatalk/Makefile.in
@@ -433,7 +433,7 @@ netatalk_LDADD = \
@@ -431,7 +431,7 @@ netatalk_LDADD = \
@ZEROCONF_LIBS@ \
$(top_builddir)/libatalk/libatalk.la

View File

@ -1,13 +0,0 @@
Index: etc/uams/openssl_compat.h
--- etc/uams/openssl_compat.h.orig
+++ etc/uams/openssl_compat.h
@@ -11,7 +11,8 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
#ifndef OPENSSL_COMPAT_H
#define OPENSSL_COMPAT_H
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
{
/* If the fields p and g in d are NULL, the corresponding input

View File

@ -1,12 +0,0 @@
Index: man/man1/asip-status.pl.1.in
--- man/man1/asip-status.pl.1.in.orig
+++ man/man1/asip-status.pl.1.in
@@ -63,7 +63,7 @@ supports both IPv4 and IPv6\&. It\*(Aqs decided by you
.br
.PP
\fBasip\-status\&.pl\fR
-requires IO::Socket::INET6 module\&.
+requires IO::Socket::IP module\&.
.sp .5v
.RE
.SH "OPTIONS"