diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 5541d31599f..b6ab9522f53 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,12 +1,11 @@ COMMENT= AFP file and print services for IP networks -V= 3.1.12 +V= 3.1.13 DISTNAME= netatalk-${V} EXTRACT_SUFX= .tar.bz2 PKGSPEC= netatalk->=3,<4 -REVISION= 4 -SHARED_LIBS += atalk 16.0 # 16.0 +SHARED_LIBS += atalk 16.0 # 18.0 CATEGORIES= net diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo index 90c23ef037b..dc27429ecec 100644 --- a/net/netatalk3/distinfo +++ b/net/netatalk3/distinfo @@ -1,2 +1,2 @@ -SHA256 (netatalk-3.1.12.tar.bz2) = FWD4Oj2kG+l+C3CpbiQCFZuN3GMdOFODYLFHhL6tpdE= -SIZE (netatalk-3.1.12.tar.bz2) = 1918312 +SHA256 (netatalk-3.1.13.tar.bz2) = ia2mvP4bOa2U9YwjZlTR2UTyZFw+femLM3TgvTfV4F0= +SIZE (netatalk-3.1.13.tar.bz2) = 1218394 diff --git a/net/netatalk3/patches/patch-etc_afpd_directory_h b/net/netatalk3/patches/patch-etc_afpd_directory_h deleted file mode 100644 index 6627d312908..00000000000 --- a/net/netatalk3/patches/patch-etc_afpd_directory_h +++ /dev/null @@ -1,17 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -Index: etc/afpd/directory.h ---- etc/afpd/directory.h.orig -+++ etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/net/netatalk3/patches/patch-etc_netatalk_Makefile_in b/net/netatalk3/patches/patch-etc_netatalk_Makefile_in index 95180cbdeb9..b3eff6ecd6f 100644 --- a/net/netatalk3/patches/patch-etc_netatalk_Makefile_in +++ b/net/netatalk3/patches/patch-etc_netatalk_Makefile_in @@ -1,13 +1,14 @@ Pick-up libevent2 from LOCALBASE. ---- etc/netatalk/Makefile.in.orig Tue Dec 29 03:02:05 2015 -+++ etc/netatalk/Makefile.in Wed Dec 30 06:50:05 2015 -@@ -101,7 +101,7 @@ sbin_PROGRAMS = netatalk$(EXEEXT) - @USE_BUILTIN_LIBEVENT_TRUE@ $(top_builddir)/libevent/libevent.la +Index: etc/netatalk/Makefile.in +--- etc/netatalk/Makefile.in.orig ++++ etc/netatalk/Makefile.in +@@ -433,7 +433,7 @@ netatalk_LDADD = \ + @ZEROCONF_LIBS@ \ + $(top_builddir)/libatalk/libatalk.la + +-netatalk_LDFLAGS = @LIBEVENT_LDFLAGS@ -levent ++netatalk_LDFLAGS = @LIBEVENT_LDFLAGS@ $$(pkg-config --libs libevent) + noinst_HEADERS = afp_zeroconf.h afp_avahi.h afp_mdns.h + all: all-am - @USE_BUILTIN_LIBEVENT_FALSE@am__append_3 = @LIBEVENT_CFLAGS@ --@USE_BUILTIN_LIBEVENT_FALSE@am__append_4 = @LIBEVENT_LDFLAGS@ -levent -+@USE_BUILTIN_LIBEVENT_FALSE@am__append_4 = @LIBEVENT_LDFLAGS@ $$(pkg-config --libs libevent) - subdir = etc/netatalk - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/macros/afs-check.m4 \