[packages/netatalk] 0.3.2

[aredridel]

commit 3b7c5f9f9091f1a381bf9d79698e04377543ecb5
Author: Aria Stewart <aredridel at nbtsc.org>
Date:   Tue Mar 19 18:48:54 2013 -0600

    0.3.2

 format-security.patch |  9 +++++----
 netatalk-build.patch  | 43 ++++++++++++-------------------------------
 netatalk.spec         | 15 ++++++++-------
 3 files changed, 25 insertions(+), 42 deletions(-)
---
diff --git a/netatalk.spec b/netatalk.spec
index 4c56a41..31f861e 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -4,13 +4,13 @@ Summary(pl.UTF-8):	Klient i serwer AppleTalk
 Summary(pt_BR.UTF-8):	Programas para rede AppleTalk
 Summary(zh_CN.UTF-8):	Appletalk 和 Appleshare/IP 服务工具
 Name:		netatalk
-Version:	3.0
-Release:	3
+Version:	3.0.2
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Daemons
-Source0:	http://download.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2
-# Source0-md5:	62eb034011bb60b0bfd95072af3693dc
+Source0:	http://downloads.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2
+# Source0-md5:	b5f1c2c4b3a5e64f5bca219415aa1c75
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.sysconfig
@@ -93,7 +93,7 @@ rm -f missing
 	--with-tcp-wrappers \
 	--with-ssl \
 	--enable-pgp-uam \
-	--disable-bundled-libevent
+	--with-libevent=%{_libdir}
 
 %{__make}
 
@@ -146,16 +146,17 @@ fi
 %dir %{_sysconfdir}/atalk
 %dir %{_sysconfdir}/atalk/msg
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/afp.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/atalk/extmap.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/netatalk
 
-%attr(755,root,root) %config /etc/rc.d/init.d/atalk
+%attr(754,root,root) %config /etc/rc.d/init.d/atalk
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/netatalk
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.netatalk
 
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/[!n]*
 %attr(755,root,root) %{_libdir}/libatalk.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libatalk.so.1
+%attr(755,root,root) %ghost %{_libdir}/libatalk.so.3
 %dir %{_libdir}/atalk
 %attr(755,root,root) %{_libdir}/atalk/*.so
 %{_mandir}/*/*
diff --git a/format-security.patch b/format-security.patch
index e635045..72e0806 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -1,10 +1,11 @@
---- netatalk-3.0/etc/afpd/afp_mdns.c.orig	2012-12-07 08:32:57.271193396 +0100
-+++ netatalk-3.0/etc/afpd/afp_mdns.c	2012-12-07 08:34:31.561190070 +0100
-@@ -232,7 +232,7 @@
+diff -ur netatalk-3.0.2-o/etc/afpd/afp_mdns.c netatalk-3.0.2/etc/afpd/afp_mdns.c
+--- netatalk-3.0.2-o/etc/afpd/afp_mdns.c	2013-01-21 10:28:44.000000000 -0700
++++ netatalk-3.0.2/etc/afpd/afp_mdns.c	2013-03-19 17:57:03.000000000 -0600
+@@ -237,7 +237,7 @@
              LOG(log_info, logtype_afpd, "Registering server '%s' with model '%s'",
                  dsi->bonjourname, obj->options.mimicmodel);
              TXTRecordCreate(&txt_devinfo, 0, NULL);
--            TXTRecordPrintf(&txt_devinfo, "model=%s", obj->options.mimicmodel);
+-            TXTRecordPrintf(&txt_devinfo, "model", obj->options.mimicmodel);
 +            TXTRecordPrintf(&txt_devinfo, "model=%s", "%s", obj->options.mimicmodel);
              error = DNSServiceRegister(&svc_refs[svc_ref_count++],
                                         0,               // no flags
diff --git a/netatalk-build.patch b/netatalk-build.patch
index 91bed7e..1b528c9 100644
--- a/netatalk-build.patch
+++ b/netatalk-build.patch
@@ -1,31 +1,12 @@
---- netatalk-2.0.3/etc/afpd/quota.c.org	2008-11-01 15:34:41.377545683 +0100
-+++ netatalk-2.0.3/etc/afpd/quota.c	2008-11-01 15:36:54.194822507 +0100
-@@ -65,6 +65,7 @@
- #include <linux/xqm.h>
- #else
- #ifdef HAVE_XFS_XQM_H
-+#define SWAB_H
- #include <xfs/xqm.h>
- #define HAVE_LINUX_XQM_H
- #endif /* HAVE_XFS_XQM_H */
---- netatalk-3.0/Makefile.am~	2012-05-30 17:00:28.000000000 +0200
-+++ netatalk-3.0/Makefile.am	2012-09-06 13:43:26.659673026 +0200
-@@ -1,6 +1,6 @@
- # Makefile.am for top level of netatalk package
- 
--SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test
-+SUBDIRS = libatalk bin config etc man contrib distrib include doc macros test
- 
- EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
- 
---- netatalk-3.0/etc/netatalk/Makefile.am~	2012-04-04 12:13:17.000000000 +0200
-+++ netatalk-3.0/etc/netatalk/Makefile.am	2012-09-06 13:45:26.799668789 +0200
-@@ -20,4 +20,6 @@
- 
- netatalk_LDADD += \
- 	$(top_builddir)/libevent/libevent.la
--endif
-\ No newline at end of file
-+else
-+netatalk_LDADD += -levent
-+endif
+diff -ur netatalk-3.0.2-o/configure.ac netatalk-3.0.2/configure.ac
+--- netatalk-3.0.2-o/configure.ac	2013-01-21 10:28:44.000000000 -0700
++++ netatalk-3.0.2/configure.ac	2013-03-19 17:44:47.000000000 -0600
+@@ -7,7 +7,7 @@
+ 
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER([config.h])
+ AM_MAINTAINER_MODE([enable])
+ 
+ dnl Checks for programs.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/netatalk.git/commitdiff/3b7c5f9f9091f1a381bf9d79698e04377543ecb5