From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 25 Jun 2022 07:34:56 +0000 (+0200)
Subject: - updated to 3.1.13 (fixes CVE-2018-1160 CVE-2021-31439 CVE-2022-0194 CVE-2022-23121... 
X-Git-Tag: auto/th/netatalk-3.1.13-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=fa966902ca1a16b2945968597150b82e8662752e;p=packages%2Fnetatalk.git

- updated to 3.1.13 (fixes CVE-2018-1160 CVE-2021-31439 CVE-2022-0194 CVE-2022-23121..23125
---

diff --git a/gcc10.patch b/gcc10.patch
deleted file mode 100644
index 368cb10..0000000
--- a/gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- netatalk-3.1.11/etc/afpd/directory.h~	2014-03-12 08:06:49.000000000 +0100
-+++ netatalk-3.1.11/etc/afpd/directory.h	2021-10-05 21:50:01.213813217 +0200
-@@ -91,7 +91,7 @@
- #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/netatalk.spec b/netatalk.spec
index d2d06e4..c41ccdc 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -9,18 +9,17 @@
 Summary:	Netatalk AFP fileserver for Apple clients
 Summary(pl.UTF-8):	Netatalk - serwer plików AFP dla klientów Apple
 Name:		netatalk
-Version:	3.1.11
-Release:	4
+Version:	3.1.13
+Release:	1
 Epoch:		2
 License:	GPL v2+ (with BSD parts)
 Group:		Daemons
-Source0:	http://downloads.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2
-# Source0-md5:	8f79ce2a275b128ebb07188766f088fc
+Source0:	https://downloads.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2
+# Source0-md5:	697421623c32ee0ab9c8076191766e5f
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.sysconfig
 Source4:	ICDumpSuffixMap
-Patch0:		gcc10.patch
 URL:		http://www.umich.edu/~rsug/netatalk/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -130,11 +129,9 @@ Statyczna biblioteka Netatalk.
 
 %prep
 %setup -q
-%patch0 -p1
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' \
-      contrib/shell_utils/afpstats \
-      libevent/event_rpcgen.py
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
+      contrib/shell_utils/afpstats
 
 %build
 %{__libtoolize}